@@ -37,7 +37,7 @@ |
||
37 | 37 | } |
38 | 38 | |
39 | 39 | function upload_path($filename) { |
40 | - static $upload_dir=null; |
|
40 | + static $upload_dir = null; |
|
41 | 41 | if (!$upload_dir) { |
42 | 42 | $config = get_config(); |
43 | 43 | $upload_dir = parse_config($config, '<upload_dir>'); |
@@ -43,10 +43,10 @@ discard block |
||
43 | 43 | credit_to_ops($credit, $ops, $unit); |
44 | 44 | |
45 | 45 | if ($bolden) { |
46 | - $lbold="[["; |
|
47 | - $rbold="]]"; |
|
46 | + $lbold = "[["; |
|
47 | + $rbold = "]]"; |
|
48 | 48 | } else { |
49 | - $lbold=""; $rbold=""; |
|
49 | + $lbold = ""; $rbold = ""; |
|
50 | 50 | } |
51 | 51 | return " $lbold$cobbs Cobblestones$rbold of computation ($ops $unit floating-point operations)"; |
52 | 52 | } |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | // |
87 | 87 | function show_share_buttons() { |
88 | 88 | echo '<p>'; |
89 | - $current_url = (empty($_SERVER['HTTPS']) ? 'http' : 'https') . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"; |
|
89 | + $current_url = (empty($_SERVER['HTTPS']) ? 'http' : 'https')."://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"; |
|
90 | 90 | $cert_url = urlencode($current_url); |
91 | 91 | |
92 | 92 | // Share on Facebook |
@@ -27,10 +27,10 @@ discard block |
||
27 | 27 | if (DISABLE_TEAMS) error_page("Teams are disabled"); |
28 | 28 | |
29 | 29 | $border = get_str("border", true); |
30 | -if ($border=="no") { |
|
31 | - $border=0; |
|
30 | +if ($border == "no") { |
|
31 | + $border = 0; |
|
32 | 32 | } else { |
33 | - $border=8; |
|
33 | + $border = 8; |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | // Make sure user_id is in the URL so that share functions work |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | if (!$user_id) { |
40 | 40 | $user = get_logged_in_user(); |
41 | 41 | Header(sprintf('Location: %s/cert_team.php?user_id=%d%s', |
42 | - url_base(), $user->id, $border==0?'&border=no':'' |
|
42 | + url_base(), $user->id, $border == 0 ? '&border=no' : '' |
|
43 | 43 | )); |
44 | 44 | exit; |
45 | 45 | } |
@@ -24,10 +24,10 @@ discard block |
||
24 | 24 | require_once("../inc/cert.inc"); |
25 | 25 | |
26 | 26 | $border = get_str("border", true); |
27 | -if ($border=="no") { |
|
28 | - $border=0; |
|
27 | +if ($border == "no") { |
|
28 | + $border = 0; |
|
29 | 29 | } else { |
30 | - $border=8; |
|
30 | + $border = 8; |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | // Make sure user_id is in the URL so that share functions work |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | if (!$user_id) { |
37 | 37 | $user = get_logged_in_user(); |
38 | 38 | Header(sprintf('Location: %s/cert1.php?user_id=%d%s', |
39 | - url_base(), $user->id, $border==0?'&border=no':'' |
|
39 | + url_base(), $user->id, $border == 0 ? '&border=no' : '' |
|
40 | 40 | )); |
41 | 41 | exit; |
42 | 42 | } |
@@ -25,10 +25,10 @@ discard block |
||
25 | 25 | require_once("../inc/user.inc"); |
26 | 26 | |
27 | 27 | $border = get_str("border", true); |
28 | -if ($border=="no") { |
|
29 | - $border=0; |
|
28 | +if ($border == "no") { |
|
29 | + $border = 0; |
|
30 | 30 | } else { |
31 | - $border=8; |
|
31 | + $border = 8; |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | // Make sure user_id is in the URL so that share functions work |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | if (!$user_id) { |
38 | 38 | $user = get_logged_in_user(); |
39 | 39 | Header(sprintf('Location: %s/cert_all.php?user_id=%d%s', |
40 | - url_base(), $user->id, $border==0?'&border=no':'' |
|
40 | + url_base(), $user->id, $border == 0 ? '&border=no' : '' |
|
41 | 41 | )); |
42 | 42 | exit; |
43 | 43 | } |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | <tr><th align=left>Project</th><th align=left>Cobblestones</th><th align=left>Joined</th></tr> |
92 | 92 | "; |
93 | 93 | foreach ($user->projects as $p) { |
94 | - if ($p->total_credit<100) continue; |
|
94 | + if ($p->total_credit < 100) continue; |
|
95 | 95 | show_proj($p); |
96 | 96 | } |
97 | 97 | echo " |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | if (!defined("DELETE_DELAY")) define("DELETE_DELAY", 2); |
43 | 43 | |
44 | 44 | function is_delete_account_token_valid($userid, $token) { |
45 | - if (!is_valid_token($userid, $token, TOKEN_TYPE_DELETE_ACCOUNT) ) { |
|
45 | + if (!is_valid_token($userid, $token, TOKEN_TYPE_DELETE_ACCOUNT)) { |
|
46 | 46 | sleep(LOGIN_FAIL_SLEEP_SEC); |
47 | 47 | return false; |
48 | 48 | } |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | // |
127 | 127 | function is_over_but_not_validated($res) { |
128 | 128 | if ($res->server_state == RESULT_SERVER_STATE_OVER && $res->outcome == RESULT_OUTCOME_SUCCESS && |
129 | - ($res->validate_state == VALIDATE_STATE_INIT || $res->validate_state == VALIDATE_STATE_INCONCLUSIVE) ) { |
|
129 | + ($res->validate_state == VALIDATE_STATE_INIT || $res->validate_state == VALIDATE_STATE_INCONCLUSIVE)) { |
|
130 | 130 | return true; |
131 | 131 | } |
132 | 132 | return false; |
@@ -144,8 +144,8 @@ discard block |
||
144 | 144 | // |
145 | 145 | function cancel_results_for_user($user) { |
146 | 146 | $ress = BoincResult::enum("userid = $user->id"); |
147 | - $cancel_clause="server_state=".RESULT_SERVER_STATE_OVER.", outcome=".RESULT_OUTCOME_CLIENT_DETACHED.", validate_state=".VALIDATE_STATE_INVALID; |
|
148 | - $set_id_clause="hostid=0, userid=0"; |
|
147 | + $cancel_clause = "server_state=".RESULT_SERVER_STATE_OVER.", outcome=".RESULT_OUTCOME_CLIENT_DETACHED.", validate_state=".VALIDATE_STATE_INVALID; |
|
148 | + $set_id_clause = "hostid=0, userid=0"; |
|
149 | 149 | foreach ($ress as $res) { |
150 | 150 | if (is_in_progress($res) || is_over_but_not_validated($res)) { |
151 | 151 | $res->update($cancel_clause.", ".$set_id_clause); |
@@ -168,12 +168,12 @@ discard block |
||
168 | 168 | |
169 | 169 | // delete remote submit user |
170 | 170 | // |
171 | - delete_remote_submit_user($user); // from submit_util.inc |
|
171 | + delete_remote_submit_user($user); // from submit_util.inc |
|
172 | 172 | |
173 | 173 | // remove user's team records |
174 | 174 | // |
175 | - user_erase_team_owner($user); // from team.inc |
|
176 | - user_quit_team($user); // from team.inc |
|
175 | + user_erase_team_owner($user); // from team.inc |
|
176 | + user_quit_team($user); // from team.inc |
|
177 | 177 | user_erase_team_delta($user); // from team.inc |
178 | 178 | |
179 | 179 | // Items that do not have logic elsewhere |
@@ -200,6 +200,6 @@ discard block |
||
200 | 200 | BoincTeamAdmin::delete("userid=$user->id"); |
201 | 201 | |
202 | 202 | // final action |
203 | - delete_user($user); //from user_util.inc |
|
203 | + delete_user($user); //from user_util.inc |
|
204 | 204 | return 0; |
205 | 205 | } |
@@ -29,14 +29,14 @@ discard block |
||
29 | 29 | // |
30 | 30 | $idx = strpos($master_url, '://'); |
31 | 31 | if ($idx) { |
32 | - $url = substr($master_url, $idx+strlen('://')); |
|
32 | + $url = substr($master_url, $idx + strlen('://')); |
|
33 | 33 | } else { |
34 | 34 | $url = $master_url; |
35 | 35 | } |
36 | 36 | |
37 | 37 | // convert invalid characters into underscores |
38 | 38 | // |
39 | -for ($i=0; $i<strlen($url); $i++) { |
|
39 | +for ($i = 0; $i < strlen($url); $i++) { |
|
40 | 40 | $c = $url[$i]; |
41 | 41 | if (!ctype_alnum($c) && $c != '.' && $c != '-' && $c != '_') { |
42 | 42 | $url[$i] = '_'; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | |
46 | 46 | //remove trailing underscore(s) |
47 | 47 | // |
48 | -$account_file = "account_" . rtrim($url, '_') . ".xml"; |
|
48 | +$account_file = "account_".rtrim($url, '_').".xml"; |
|
49 | 49 | |
50 | 50 | page_head(tra("Account keys")); |
51 | 51 | text_start(); |
@@ -57,12 +57,12 @@ discard block |
||
57 | 57 | <p>", |
58 | 58 | tra("This key can be used to:"), |
59 | 59 | "<ul> |
60 | - <li><a href=get_passwd.php>",tra("log in to your account on the web"),"</a>; |
|
60 | + <li><a href=get_passwd.php>",tra("log in to your account on the web"), "</a>; |
|
61 | 61 | <li>", |
62 | 62 | tra("attach a computer to your account without using the BOINC Manager. |
63 | 63 | To do so, install BOINC, |
64 | 64 | create a file named %1 in the BOINC |
65 | - data directory, and set its contents to:","<b>$account_file</b>")," |
|
65 | + data directory, and set its contents to:","<b>$account_file</b>"), " |
|
66 | 66 | <p><pre>", |
67 | 67 | htmlspecialchars( |
68 | 68 | "<account> |
@@ -76,10 +76,10 @@ discard block |
||
76 | 76 | as described above, but cannot be used to log in to your account or change it in any way. |
77 | 77 | If you want to attach untrusted or insecure computers to your account, |
78 | 78 | do so using your weak account key. |
79 | - Your weak account key is:")," |
|
79 | + Your weak account key is:"), " |
|
80 | 80 | <p><pre>$weak_auth</pre><p> |
81 | 81 | ", |
82 | - tra("The key depends on your account's email address and password. If you change either of these, the weak account key will change.")," |
|
82 | + tra("The key depends on your account's email address and password. If you change either of these, the weak account key will change."), " |
|
83 | 83 | </td></tr></table>" |
84 | 84 | ; |
85 | 85 | text_end(); |
@@ -42,9 +42,9 @@ discard block |
||
42 | 42 | } |
43 | 43 | |
44 | 44 | abstract class PREF { |
45 | - public $desc; // short description |
|
46 | - public $tooltip; // longer description, shown as tooltip |
|
47 | - public $tag; // the pref's primary XML tag |
|
45 | + public $desc; // short description |
|
46 | + public $tooltip; // longer description, shown as tooltip |
|
47 | + public $tag; // the pref's primary XML tag |
|
48 | 48 | function __construct($desc, $tooltip, $tag) { |
49 | 49 | $this->desc = $desc; |
50 | 50 | $this->tooltip = $tooltip; |
@@ -122,15 +122,15 @@ discard block |
||
122 | 122 | |
123 | 123 | class PREF_BOOL extends PREF { |
124 | 124 | public $default; |
125 | - public $invert; // show to user in opposite sense |
|
126 | - function __construct($desc, $tooltip, $tag, $default, $invert=false) { |
|
125 | + public $invert; // show to user in opposite sense |
|
126 | + function __construct($desc, $tooltip, $tag, $default, $invert = false) { |
|
127 | 127 | $this->default = $default; |
128 | 128 | $this->invert = $invert; |
129 | 129 | parent::__construct($desc, $tooltip, $tag); |
130 | 130 | } |
131 | 131 | function show_value($prefs) { |
132 | 132 | $tag = $this->tag; |
133 | - $v = $this->invert?!$prefs->$tag:$prefs->$tag; |
|
133 | + $v = $this->invert ? !$prefs->$tag : $prefs->$tag; |
|
134 | 134 | echo "<td>".readonly_checkbox($v)."</td>"; |
135 | 135 | } |
136 | 136 | function show_form($prefs, $error) { |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | } |
143 | 143 | echo "<td ".VALUE_ATTRS.">" |
144 | 144 | ."<input type=checkbox name=$this->tag " |
145 | - . ($checked?"checked":"") |
|
145 | + . ($checked ? "checked" : "") |
|
146 | 146 | ."></td> |
147 | 147 | "; |
148 | 148 | } |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | function xml_string($prefs) { |
156 | 156 | $tag = $this->tag; |
157 | 157 | return "<$tag>" |
158 | - .($prefs->$tag?"1":"0") |
|
158 | + .($prefs->$tag ? "1" : "0") |
|
159 | 159 | ."</$tag>\n"; |
160 | 160 | } |
161 | 161 | function xml_parse(&$prefs, $name, $text) { |
@@ -175,9 +175,9 @@ discard block |
||
175 | 175 | public $consent_type_id; // the consent_type_id from the consent_type table |
176 | 176 | public $consent_name; // the consent_name to configure |
177 | 177 | public $default; |
178 | - public $invert; // show to user in opposite sense |
|
178 | + public $invert; // show to user in opposite sense |
|
179 | 179 | |
180 | - function __construct($desc, $tooltip, $tag, $consent_type_id, $consent_name, $default, $invert=false) { |
|
180 | + function __construct($desc, $tooltip, $tag, $consent_type_id, $consent_name, $default, $invert = false) { |
|
181 | 181 | $this->consent_type_id = $consent_type_id; |
182 | 182 | $this->consent_name = $consent_name; |
183 | 183 | $this->default = $default; |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | } else { |
241 | 241 | $value = false; |
242 | 242 | } |
243 | - echo "<td>" . readonly_checkbox($value) . "</td>"; |
|
243 | + echo "<td>".readonly_checkbox($value)."</td>"; |
|
244 | 244 | } |
245 | 245 | function show_form($user, $error) { |
246 | 246 | $consent_type_id = $this->consent_type_id; |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | } |
258 | 258 | echo "<td ".VALUE_ATTRS.">" |
259 | 259 | ."<input type=checkbox name=$this->tag " |
260 | - . ($checked?"checked":"") |
|
260 | + . ($checked ? "checked" : "") |
|
261 | 261 | ."></td> |
262 | 262 | "; |
263 | 263 | } |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | "userid=$user->id AND consent_type_id='$consent_type_id$'" |
277 | 277 | ); |
278 | 278 | |
279 | - if ((($cr) and ($cr->consent_flag!=$flag)) or (!$cr)) { |
|
279 | + if ((($cr) and ($cr->consent_flag != $flag)) or (!$cr)) { |
|
280 | 280 | $rc = consent_to_a_policy( |
281 | 281 | $user, $consent_type_id, $flag, 0, 'Webform', time() |
282 | 282 | ); |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | // this is the value if they check the box |
317 | 317 | public $scale; |
318 | 318 | |
319 | - function __construct($suffix, $min, $max, $default, $scale=1, $default2=0) { |
|
319 | + function __construct($suffix, $min, $max, $default, $scale = 1, $default2 = 0) { |
|
320 | 320 | $this->suffix = " $suffix"; |
321 | 321 | $this->min = $min; |
322 | 322 | $this->max = $max; |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | $v .= "$this->suffix "; |
336 | 336 | return $v; |
337 | 337 | } |
338 | - function form_str($tag, $v, $had_error, $disabled=false, $id=null) { |
|
338 | + function form_str($tag, $v, $had_error, $disabled = false, $id = null) { |
|
339 | 339 | if (is_numeric($v)) { |
340 | 340 | $v /= $this->scale; |
341 | 341 | if (!$had_error && ($v < $this->min || $v > $this->max)) { |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | } |
344 | 344 | } |
345 | 345 | if ($disabled) $v = ""; |
346 | - $i = $id?"id=\"$id\"":""; |
|
346 | + $i = $id ? "id=\"$id\"" : ""; |
|
347 | 347 | return '<input type="text" size="5" class="form-control input-sm" name="'.$tag.'" value="'.$v."\" $disabled $i> $this->suffix "; |
348 | 348 | } |
349 | 349 | function form_convert($in, &$out, &$error) { |
@@ -466,8 +466,8 @@ discard block |
||
466 | 466 | $text_id = $this->tag; |
467 | 467 | $default = $this->num_spec->get_default(); |
468 | 468 | $val = $prefs->$tag; |
469 | - $c = $val?"checked":""; |
|
470 | - $d = $val?"":"disabled"; |
|
469 | + $c = $val ? "checked" : ""; |
|
470 | + $d = $val ? "" : "disabled"; |
|
471 | 471 | echo "<td $attrs>" |
472 | 472 | ."<input type=checkbox id=$checkbox_id onClick=\"checkbox_clicked('$checkbox_id', '$text_id', $default)\" $c> " |
473 | 473 | .$this->num_spec->form_str($tag, $prefs->$tag, $had_error, $d, $text_id) |
@@ -580,8 +580,8 @@ discard block |
||
580 | 580 | function hour_select($x, $name, $id, $d) { |
581 | 581 | $s = ""; |
582 | 582 | $s .= "<select class=\"selectbox form-control input-sm\" name=$name id=$id $d>\n"; |
583 | - for ($i=0; $i<24; $i++) { |
|
584 | - $sel = ($x == $i)?"selected":""; |
|
583 | + for ($i = 0; $i < 24; $i++) { |
|
584 | + $sel = ($x == $i) ? "selected" : ""; |
|
585 | 585 | $s .= "<option value=$i $sel> $i:00"; |
586 | 586 | } |
587 | 587 | $s .= "</select>\n"; |
@@ -682,7 +682,7 @@ discard block |
||
682 | 682 | |
683 | 683 | // row_defs - Display a value for all 4 venues in one row |
684 | 684 | // |
685 | -function row_defs($pre, $item, $post, $type, $prefs, $tooltip=null) { |
|
685 | +function row_defs($pre, $item, $post, $type, $prefs, $tooltip = null) { |
|
686 | 686 | $gen = $prefs->$item; |
687 | 687 | $hom = (isset($prefs->home) && isset($prefs->home->$item)) ? $prefs->home->$item : "--"; |
688 | 688 | $schl = (isset($prefs->school) && isset($prefs->school->$item)) ? $prefs->school->$item : "--"; |
@@ -694,10 +694,10 @@ discard block |
||
694 | 694 | echo "<tr>"; |
695 | 695 | } |
696 | 696 | echo "<td ".NAME_ATTRS.">$pre</td>"; |
697 | - row_field($gen, $type); |
|
698 | - row_field($hom, $type); |
|
697 | + row_field($gen, $type); |
|
698 | + row_field($hom, $type); |
|
699 | 699 | row_field($schl, $type); |
700 | - row_field($wrk, $type); |
|
700 | + row_field($wrk, $type); |
|
701 | 701 | echo "<td align=left>$post</td></tr>\n"; |
702 | 702 | } |
703 | 703 | |
@@ -707,16 +707,16 @@ discard block |
||
707 | 707 | function row_field($value, $type) { |
708 | 708 | echo "<td>"; |
709 | 709 | $type = $value === "--" ? "--" : $type; |
710 | - switch($type) { |
|
710 | + switch ($type) { |
|
711 | 711 | case "yesno": |
712 | - echo $value ?tra("yes"):tra("no"); |
|
712 | + echo $value ?tra("yes") : tra("no"); |
|
713 | 713 | break; |
714 | 714 | case "noyes": |
715 | - echo $value ?tra("no"):tra("yes"); |
|
715 | + echo $value ?tra("no") : tra("yes"); |
|
716 | 716 | break; |
717 | 717 | case "limit": |
718 | 718 | $x = max_bytes_display_mode($value); |
719 | - $y = "$x " . BYTE_ABBR; |
|
719 | + $y = "$x ".BYTE_ABBR; |
|
720 | 720 | echo $x ? "$y" : tra("no limit"); |
721 | 721 | break; |
722 | 722 | case "minutes": |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | |
42 | 42 | |
43 | 43 | // returns formatted data size |
44 | -function size_format($size){ |
|
44 | +function size_format($size) { |
|
45 | 45 | $retval = 0; |
46 | 46 | |
47 | 47 | $KB = 1024; |
@@ -52,13 +52,13 @@ discard block |
||
52 | 52 | if ($size < $KB) { |
53 | 53 | $retval = $size; |
54 | 54 | } elseif (($size > $KB) && ($size < $MB)) { |
55 | - $retval = sprintf("%.0fK", ($size / $KB)); |
|
56 | - } elseif ( ($size >= $MB) && ($size < $GB)) { |
|
57 | - $retval = sprintf("%.2fMB", ($size / $MB)); |
|
58 | - } elseif ( ($size >= $GB) && ($size < $TB)) { |
|
59 | - $retval = sprintf("%.2fGB", ($size / $GB)); |
|
60 | - } elseif ( $size >= $TB ) { |
|
61 | - $retval = sprintf("%.2fTB", ($size / $TB)); |
|
55 | + $retval = sprintf("%.0fK", ($size/$KB)); |
|
56 | + } elseif (($size >= $MB) && ($size < $GB)) { |
|
57 | + $retval = sprintf("%.2fMB", ($size/$MB)); |
|
58 | + } elseif (($size >= $GB) && ($size < $TB)) { |
|
59 | + $retval = sprintf("%.2fGB", ($size/$GB)); |
|
60 | + } elseif ($size >= $TB) { |
|
61 | + $retval = sprintf("%.2fTB", ($size/$TB)); |
|
62 | 62 | } |
63 | 63 | return $retval; |
64 | 64 | } |
@@ -89,9 +89,9 @@ discard block |
||
89 | 89 | if ($myarr['Comment'] == 'VIEW') continue; |
90 | 90 | |
91 | 91 | // sum grand totals |
92 | - $total = $myarr["Data_length"] + $myarr["Index_length"]; |
|
92 | + $total = $myarr["Data_length"] + $myarr["Index_length"]; |
|
93 | 93 | $gindex += $myarr["Index_length"]; |
94 | - $gdata += $myarr["Data_length"]; |
|
94 | + $gdata += $myarr["Data_length"]; |
|
95 | 95 | $grows += $myarr["Rows"]; |
96 | 96 | $gtotal += $total; |
97 | 97 | |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | ); |
106 | 106 | $i++; |
107 | 107 | } |
108 | - $db_rec[$i] = new DB_REC ("Total", $gdata, $gindex, $gtotal, $grows, "" ); |
|
108 | + $db_rec[$i] = new DB_REC("Total", $gdata, $gindex, $gtotal, $grows, ""); |
|
109 | 109 | return $db_rec; |
110 | 110 | } |
111 | 111 | |
@@ -126,25 +126,25 @@ discard block |
||
126 | 126 | echo "<th>Avg. Size per Row</th>"; |
127 | 127 | echo "</tr>"; |
128 | 128 | |
129 | - for ($i = 0; $i < sizeof($db_rec)-1; $i++){ |
|
129 | + for ($i = 0; $i < sizeof($db_rec) - 1; $i++) { |
|
130 | 130 | echo "<tr>"; |
131 | - echo "<td align=left valign=top class=fieldname>" . $db_rec[$i]->name . "</td>"; |
|
132 | - echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->data_size) . "</td>"; |
|
133 | - echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->index_size) . "</td>"; |
|
134 | - echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->total_size) . "</td>"; |
|
135 | - echo "<td align=left valign=top class=fieldname>" . number_format($db_rec[$i]->rows) . "</td>"; |
|
136 | - echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->size_per_row) . "</td>"; |
|
131 | + echo "<td align=left valign=top class=fieldname>".$db_rec[$i]->name."</td>"; |
|
132 | + echo "<td align=left valign=top class=fieldname>".size_format($db_rec[$i]->data_size)."</td>"; |
|
133 | + echo "<td align=left valign=top class=fieldname>".size_format($db_rec[$i]->index_size)."</td>"; |
|
134 | + echo "<td align=left valign=top class=fieldname>".size_format($db_rec[$i]->total_size)."</td>"; |
|
135 | + echo "<td align=left valign=top class=fieldname>".number_format($db_rec[$i]->rows)."</td>"; |
|
136 | + echo "<td align=left valign=top class=fieldname>".size_format($db_rec[$i]->size_per_row)."</td>"; |
|
137 | 137 | echo "</tr>"; |
138 | 138 | } |
139 | 139 | |
140 | 140 | // Last record is just a summary |
141 | - $i = sizeof($db_rec)-1; |
|
141 | + $i = sizeof($db_rec) - 1; |
|
142 | 142 | echo "<tr>"; |
143 | - echo "<th align=left>" . $db_rec[$i]->name . "</th>"; |
|
144 | - echo "<th align=left>" . size_format($db_rec[$i]->data_size) . "</th>"; |
|
145 | - echo "<th align=left>" . size_format($db_rec[$i]->index_size) . "</th>"; |
|
146 | - echo "<th align=left>" . size_format($db_rec[$i]->total_size) . "</th>"; |
|
147 | - echo "<th align=left>" . number_format($db_rec[$i]->rows) . "</th>"; |
|
143 | + echo "<th align=left>".$db_rec[$i]->name."</th>"; |
|
144 | + echo "<th align=left>".size_format($db_rec[$i]->data_size)."</th>"; |
|
145 | + echo "<th align=left>".size_format($db_rec[$i]->index_size)."</th>"; |
|
146 | + echo "<th align=left>".size_format($db_rec[$i]->total_size)."</th>"; |
|
147 | + echo "<th align=left>".number_format($db_rec[$i]->rows)."</th>"; |
|
148 | 148 | echo "<th align=left></th>"; |
149 | 149 | echo "</tr>"; |
150 | 150 | echo "</table>"; |
@@ -156,28 +156,28 @@ discard block |
||
156 | 156 | $file_list = array(); |
157 | 157 | $file_sort = array(); |
158 | 158 | |
159 | - $sort = get_str("sort", true); |
|
159 | + $sort = get_str("sort", true); |
|
160 | 160 | $r = get_str("r", true); |
161 | 161 | |
162 | 162 | if (empty($sort)) $sort = "name"; |
163 | 163 | // check for allowed keys |
164 | - if ((strcmp($sort, "name")!=0) && |
|
165 | - (strcmp($sort, "data_size")!=0) && |
|
166 | - (strcmp($sort, "index_size")!=0) && |
|
167 | - (strcmp($sort, "total_size")!=0) && |
|
168 | - (strcmp($sort, "rows")!=0) && |
|
169 | - (strcmp($sort, "size_per_row")!=0) |
|
164 | + if ((strcmp($sort, "name") != 0) && |
|
165 | + (strcmp($sort, "data_size") != 0) && |
|
166 | + (strcmp($sort, "index_size") != 0) && |
|
167 | + (strcmp($sort, "total_size") != 0) && |
|
168 | + (strcmp($sort, "rows") != 0) && |
|
169 | + (strcmp($sort, "size_per_row") != 0) |
|
170 | 170 | ) { |
171 | 171 | $sort = "name"; |
172 | 172 | } |
173 | - if (empty($r)) $r=0; |
|
173 | + if (empty($r)) $r = 0; |
|
174 | 174 | |
175 | - for ($i=0; $i < sizeof($db_rec)-1; $i++){ |
|
175 | + for ($i = 0; $i < sizeof($db_rec) - 1; $i++) { |
|
176 | 176 | $file_details["name"] = $db_rec[$i]->name; |
177 | 177 | $file_details["data_size"] = $db_rec[$i]->data_size; |
178 | 178 | $file_details["index_size"] = $db_rec[$i]->index_size; |
179 | 179 | $file_details["total_size"] = $db_rec[$i]->total_size; |
180 | - $file_details["rows"] = $db_rec[$i]->rows; |
|
180 | + $file_details["rows"] = $db_rec[$i]->rows; |
|
181 | 181 | $file_details["size_per_row"] = $db_rec[$i]->size_per_row; |
182 | 182 | |
183 | 183 | $file_list[$i] = $file_details; |
@@ -197,35 +197,35 @@ discard block |
||
197 | 197 | echo "</tr>"; |
198 | 198 | |
199 | 199 | echo "<tr>"; |
200 | - echo "<th><a href='dbinfo.php?sort=name&r=" . (!$r) . "'>Table </a></th>"; |
|
201 | - echo "<th><a href='dbinfo.php?sort=data_size&r=" . (!$r) . "'>Data Size</a></th>"; |
|
202 | - echo "<th><a href='dbinfo.php?sort=index_size&r=" . (!$r) . "'>Index Size</a></th>"; |
|
203 | - echo "<th><a href='dbinfo.php?sort=total_size&r=" . (!$r) . "'>Total Size</a></th>"; |
|
204 | - echo "<th><a href='dbinfo.php?sort=rows&r=" . (!$r) . "'>Total Rows</a></th>"; |
|
205 | - echo "<th><a href='dbinfo.php?sort=size_per_row&r=" . (!$r) . "'>Avg. Size per Row</a></th>"; |
|
200 | + echo "<th><a href='dbinfo.php?sort=name&r=".(!$r)."'>Table </a></th>"; |
|
201 | + echo "<th><a href='dbinfo.php?sort=data_size&r=".(!$r)."'>Data Size</a></th>"; |
|
202 | + echo "<th><a href='dbinfo.php?sort=index_size&r=".(!$r)."'>Index Size</a></th>"; |
|
203 | + echo "<th><a href='dbinfo.php?sort=total_size&r=".(!$r)."'>Total Size</a></th>"; |
|
204 | + echo "<th><a href='dbinfo.php?sort=rows&r=".(!$r)."'>Total Rows</a></th>"; |
|
205 | + echo "<th><a href='dbinfo.php?sort=size_per_row&r=".(!$r)."'>Avg. Size per Row</a></th>"; |
|
206 | 206 | echo "</tr>"; |
207 | 207 | |
208 | 208 | foreach ($file_sort as $key=>$value) { |
209 | 209 | $value = $file_list[$key]; |
210 | 210 | |
211 | 211 | echo "<tr>"; |
212 | - echo "<td align=left valign=top class=fieldname>" . $value["name"] . "</td>"; |
|
213 | - echo "<td align=left valign=top class=fieldname>" . size_format($value["data_size"]) . "</td>"; |
|
214 | - echo "<td align=left valign=top class=fieldname>" . size_format($value["index_size"]) . "</td>"; |
|
215 | - echo "<td align=left valign=top class=fieldname>" . size_format($value["total_size"]) . "</td>"; |
|
216 | - echo "<td align=left valign=top class=fieldname>" . number_format($value["rows"]) . "</td>"; |
|
217 | - echo "<td align=left valign=top class=fieldname>" . size_format($value["size_per_row"]) . "</td>"; |
|
212 | + echo "<td align=left valign=top class=fieldname>".$value["name"]."</td>"; |
|
213 | + echo "<td align=left valign=top class=fieldname>".size_format($value["data_size"])."</td>"; |
|
214 | + echo "<td align=left valign=top class=fieldname>".size_format($value["index_size"])."</td>"; |
|
215 | + echo "<td align=left valign=top class=fieldname>".size_format($value["total_size"])."</td>"; |
|
216 | + echo "<td align=left valign=top class=fieldname>".number_format($value["rows"])."</td>"; |
|
217 | + echo "<td align=left valign=top class=fieldname>".size_format($value["size_per_row"])."</td>"; |
|
218 | 218 | echo "</tr>"; |
219 | 219 | } |
220 | 220 | |
221 | 221 | // Last record is a summary |
222 | - $i = sizeof($db_rec)-1; |
|
222 | + $i = sizeof($db_rec) - 1; |
|
223 | 223 | echo "<tr>"; |
224 | - echo "<th align=left>" . $db_rec[$i]->name . "</th>"; |
|
225 | - echo "<th align=left>" . size_format($db_rec[$i]->data_size) . "</th>"; |
|
226 | - echo "<th align=left>" . size_format($db_rec[$i]->index_size) . "</th>"; |
|
227 | - echo "<th align=left>" . size_format($db_rec[$i]->total_size) . "</th>"; |
|
228 | - echo "<th align=left>" . number_format($db_rec[$i]->rows) . "</th>"; |
|
224 | + echo "<th align=left>".$db_rec[$i]->name."</th>"; |
|
225 | + echo "<th align=left>".size_format($db_rec[$i]->data_size)."</th>"; |
|
226 | + echo "<th align=left>".size_format($db_rec[$i]->index_size)."</th>"; |
|
227 | + echo "<th align=left>".size_format($db_rec[$i]->total_size)."</th>"; |
|
228 | + echo "<th align=left>".number_format($db_rec[$i]->rows)."</th>"; |
|
229 | 229 | echo "<th align=left></th>"; |
230 | 230 | echo "</tr>"; |
231 | 231 |