BOINC / boinc

html/ops/bbcode_convert_response1.php

Spacing +4 added lines, -4 removed lines

@@ -42,15 +42,15 @@
     $start_id = 0; //Set this to something else if you like
     $profiles = _mysql_query("select * from profile where userid>$start_id order by userid");
     echo _mysql_error();
-    $i=0;
-    while ($profile = _mysql_fetch_object($profiles)){
+    $i = 0;
+    while ($profile = _mysql_fetch_object($profiles)) {
         $i++;
         if ($i%100 == 0) {                      //For every 100 profiles
-            echo $profile->userid.". "; flush();   // print out where we are
+            echo $profile->userid.". "; flush(); // print out where we are
             //usleep(200000);
         }
 
-        if ($profile->userid > $start_id){
+        if ($profile->userid > $start_id) {
             fix_profile($profile);
         }
     }

Braces +4 added lines, -3 removed lines

@@ -43,14 +43,15 @@
     $profiles = _mysql_query("select * from profile where userid>$start_id order by userid");
     echo _mysql_error();
     $i=0;
-    while ($profile = _mysql_fetch_object($profiles)){
+    while ($profile = _mysql_fetch_object($profiles)) {
         $i++;
-        if ($i%100 == 0) {                      //For every 100 profiles
+        if ($i%100 == 0) {
+//For every 100 profiles
             echo $profile->userid.". "; flush();   // print out where we are
             //usleep(200000);
         }
 
-        if ($profile->userid > $start_id){
+        if ($profile->userid > $start_id) {
             fix_profile($profile);
         }
     }

html/ops/check_account_ownership_keys.php

Indentation +4 added lines, -4 removed lines

@@ -23,15 +23,15 @@
 admin_page_head("Account Ownership Keys");
 
 if (!file_exists($account_ownership_private_key_file_path)) {
-  echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
+    echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
 } else {
-  echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' exists.</p>";
+    echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' exists.</p>";
 }
 
 if (!file_exists($account_ownership_public_key_file_path)) {
-  echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
+    echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
 } else {
-  echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' exists.</p>";
+    echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' exists.</p>";
 }
 
 echo "<p>For more info see the related wiki page: <a href=\"https://github.com/BOINC/boinc/wiki/ProofOfOwnership\">ProofOfOwnership</a></p>";

Spacing +4 added lines, -4 removed lines

@@ -23,15 +23,15 @@
 admin_page_head("Account Ownership Keys");
 
 if (!file_exists($account_ownership_private_key_file_path)) {
-  echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
+  echo "<p>The account ownership private key '".$account_ownership_private_key_file_name."' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
 } else {
-  echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' exists.</p>";
+  echo "<p>The account ownership private key '".$account_ownership_private_key_file_name."' exists.</p>";
 }
 
 if (!file_exists($account_ownership_public_key_file_path)) {
-  echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
+  echo "<p>The account ownership public key '".$account_ownership_public_key_file_name."' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
 } else {
-  echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' exists.</p>";
+  echo "<p>The account ownership public key '".$account_ownership_public_key_file_name."' exists.</p>";
 }
 
 echo "<p>For more info see the related wiki page: <a href=\"https://github.com/BOINC/boinc/wiki/ProofOfOwnership\">ProofOfOwnership</a></p>";

html/inc/cert.inc

Spacing +4 added lines, -4 removed lines

@@ -43,10 +43,10 @@ 
     credit_to_ops($credit, $ops, $unit);
 
     if ($bolden) {
-        $lbold="[[";
-        $rbold="]]";
+        $lbold = "[[";
+        $rbold = "]]";
     } else {
-        $lbold="";        $rbold="";
+        $lbold = ""; $rbold = "";
     }
     return " $lbold$cobbs Cobblestones$rbold of computation ($ops $unit floating-point operations)";
 }
@@ -86,7 +86,7 @@ 
 //
 function show_share_buttons() {
     echo '<p>';
-    $current_url = (empty($_SERVER['HTTPS']) ? 'http' : 'https') . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
+    $current_url = (empty($_SERVER['HTTPS']) ? 'http' : 'https')."://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
     $cert_url = urlencode($current_url);
 
     // Share on Facebook

html/user/cert_team.php

Spacing +4 added lines, -4 removed lines

@@ -27,10 +27,10 @@ 
 if (DISABLE_TEAMS) error_page("Teams are disabled");
 
 $border = get_str("border", true);
-if ($border=="no") {
-    $border=0;
+if ($border == "no") {
+    $border = 0;
 } else {
-    $border=8;
+    $border = 8;
 }
 
 // Make sure user_id is in the URL so that share functions work
@@ -39,7 +39,7 @@ 
 if (!$user_id) {
     $user = get_logged_in_user();
     Header(sprintf('Location: %s/cert_team.php?user_id=%d%s',
-        url_base(), $user->id, $border==0?'&border=no':''
+        url_base(), $user->id, $border == 0 ? '&border=no' : ''
     ));
     exit;
 }

html/user/cert1.php

Spacing +4 added lines, -4 removed lines

@@ -24,10 +24,10 @@ 
 require_once("../inc/cert.inc");
 
 $border = get_str("border", true);
-if ($border=="no") {
-    $border=0;
+if ($border == "no") {
+    $border = 0;
 } else {
-    $border=8;
+    $border = 8;
 }
 
 // Make sure user_id is in the URL so that share functions work
@@ -36,7 +36,7 @@ 
 if (!$user_id) {
     $user = get_logged_in_user();
     Header(sprintf('Location: %s/cert1.php?user_id=%d%s',
-        url_base(), $user->id, $border==0?'&border=no':''
+        url_base(), $user->id, $border == 0 ? '&border=no' : ''
     ));
     exit;
 }

html/user/cert_all.php

Spacing +5 added lines, -5 removed lines

@@ -25,10 +25,10 @@ 
 require_once("../inc/user.inc");
 
 $border = get_str("border", true);
-if ($border=="no") {
-    $border=0;
+if ($border == "no") {
+    $border = 0;
 } else {
-    $border=8;
+    $border = 8;
 }
 
 // Make sure user_id is in the URL so that share functions work
@@ -37,7 +37,7 @@ 
 if (!$user_id) {
     $user = get_logged_in_user();
     Header(sprintf('Location: %s/cert_all.php?user_id=%d%s',
-        url_base(), $user->id, $border==0?'&border=no':''
+        url_base(), $user->id, $border == 0 ? '&border=no' : ''
     ));
     exit;
 }
@@ -91,7 +91,7 @@ 
     <tr><th align=left>Project</th><th align=left>Cobblestones</th><th align=left>Joined</th></tr>
 ";
 foreach ($user->projects as $p) {
-    if ($p->total_credit<100) continue;
+    if ($p->total_credit < 100) continue;
     show_proj($p);
 }
 echo "

html/inc/delete_account.inc

Spacing +8 added lines, -8 removed lines

@@ -42,7 +42,7 @@ 
 if (!defined("DELETE_DELAY")) define("DELETE_DELAY", 2);
 
 function is_delete_account_token_valid($userid, $token) {
-    if (!is_valid_token($userid, $token, TOKEN_TYPE_DELETE_ACCOUNT) ) {
+    if (!is_valid_token($userid, $token, TOKEN_TYPE_DELETE_ACCOUNT)) {
         sleep(LOGIN_FAIL_SLEEP_SEC);
         return false;
     }
@@ -126,7 +126,7 @@ 
 //
 function is_over_but_not_validated($res) {
     if ($res->server_state == RESULT_SERVER_STATE_OVER && $res->outcome == RESULT_OUTCOME_SUCCESS &&
-            ($res->validate_state == VALIDATE_STATE_INIT || $res->validate_state == VALIDATE_STATE_INCONCLUSIVE) ) {
+            ($res->validate_state == VALIDATE_STATE_INIT || $res->validate_state == VALIDATE_STATE_INCONCLUSIVE)) {
         return true;
     }
     return false;
@@ -144,8 +144,8 @@ 
 //
 function cancel_results_for_user($user) {
     $ress = BoincResult::enum("userid = $user->id");
-    $cancel_clause="server_state=".RESULT_SERVER_STATE_OVER.", outcome=".RESULT_OUTCOME_CLIENT_DETACHED.", validate_state=".VALIDATE_STATE_INVALID;
-    $set_id_clause="hostid=0, userid=0";
+    $cancel_clause = "server_state=".RESULT_SERVER_STATE_OVER.", outcome=".RESULT_OUTCOME_CLIENT_DETACHED.", validate_state=".VALIDATE_STATE_INVALID;
+    $set_id_clause = "hostid=0, userid=0";
     foreach ($ress as $res) {
         if (is_in_progress($res) || is_over_but_not_validated($res)) {
             $res->update($cancel_clause.", ".$set_id_clause);
@@ -168,12 +168,12 @@ 
 
     // delete remote submit user
     //
-    delete_remote_submit_user($user);  // from submit_util.inc
+    delete_remote_submit_user($user); // from submit_util.inc
 
     // remove user's team records
     //
-    user_erase_team_owner($user);      // from team.inc
-    user_quit_team($user);        // from team.inc
+    user_erase_team_owner($user); // from team.inc
+    user_quit_team($user); // from team.inc
     user_erase_team_delta($user); // from team.inc
 
     // Items that do not have logic elsewhere
@@ -200,6 +200,6 @@ 
     BoincTeamAdmin::delete("userid=$user->id");
 
     // final action
-    delete_user($user);  //from user_util.inc
+    delete_user($user); //from user_util.inc
     return 0;
 }

html/inc/prefs_util.inc

Spacing +28 added lines, -28 removed lines

@@ -42,9 +42,9 @@ 
 }
 
 abstract class PREF {
-    public $desc;       // short description
-    public $tooltip;    // longer description, shown as tooltip
-    public $tag;        // the pref's primary XML tag
+    public $desc; // short description
+    public $tooltip; // longer description, shown as tooltip
+    public $tag; // the pref's primary XML tag
     function __construct($desc, $tooltip, $tag) {
         $this->desc = $desc;
         $this->tooltip = $tooltip;
@@ -122,15 +122,15 @@ 
 
 class PREF_BOOL extends PREF {
     public $default;
-    public $invert;     // show to user in opposite sense
-    function __construct($desc, $tooltip, $tag, $default, $invert=false) {
+    public $invert; // show to user in opposite sense
+    function __construct($desc, $tooltip, $tag, $default, $invert = false) {
         $this->default = $default;
         $this->invert = $invert;
         parent::__construct($desc, $tooltip, $tag);
     }
     function show_value($prefs) {
         $tag = $this->tag;
-        $v = $this->invert?!$prefs->$tag:$prefs->$tag;
+        $v = $this->invert ? !$prefs->$tag : $prefs->$tag;
         echo "<td>".readonly_checkbox($v)."</td>";
     }
     function show_form($prefs, $error) {
@@ -142,7 +142,7 @@ 
         }
         echo "<td ".VALUE_ATTRS.">"
             ."<input type=checkbox name=$this->tag "
-            . ($checked?"checked":"")
+            . ($checked ? "checked" : "")
             ."></td>
         ";
     }
@@ -155,7 +155,7 @@ 
     function xml_string($prefs) {
         $tag = $this->tag;
         return "<$tag>"
-            .($prefs->$tag?"1":"0")
+            .($prefs->$tag ? "1" : "0")
             ."</$tag>\n";
     }
     function xml_parse(&$prefs, $name, $text) {
@@ -175,9 +175,9 @@ 
     public $consent_type_id; // the consent_type_id from the consent_type table
     public $consent_name; // the consent_name to configure
     public $default;
-    public $invert;     // show to user in opposite sense
+    public $invert; // show to user in opposite sense
 
-    function __construct($desc, $tooltip, $tag, $consent_type_id, $consent_name, $default, $invert=false) {
+    function __construct($desc, $tooltip, $tag, $consent_type_id, $consent_name, $default, $invert = false) {
         $this->consent_type_id = $consent_type_id;
         $this->consent_name = $consent_name;
         $this->default = $default;
@@ -240,7 +240,7 @@ 
         } else {
             $value = false;
         }
-        echo "<td>" . readonly_checkbox($value) . "</td>";
+        echo "<td>".readonly_checkbox($value)."</td>";
     }
     function show_form($user, $error) {
         $consent_type_id = $this->consent_type_id;
@@ -257,7 +257,7 @@ 
         }
         echo "<td ".VALUE_ATTRS.">"
             ."<input type=checkbox name=$this->tag "
-            . ($checked?"checked":"")
+            . ($checked ? "checked" : "")
             ."></td>
         ";
     }
@@ -276,7 +276,7 @@ 
             "userid=$user->id AND consent_type_id='$consent_type_id$'"
         );
 
-        if ((($cr) and ($cr->consent_flag!=$flag)) or (!$cr)) {
+        if ((($cr) and ($cr->consent_flag != $flag)) or (!$cr)) {
             $rc = consent_to_a_policy(
                 $user, $consent_type_id, $flag, 0, 'Webform', time()
             );
@@ -316,7 +316,7 @@ 
         // this is the value if they check the box
     public $scale;
 
-    function __construct($suffix, $min, $max, $default, $scale=1, $default2=0) {
+    function __construct($suffix, $min, $max, $default, $scale = 1, $default2 = 0) {
         $this->suffix = " $suffix";
         $this->min = $min;
         $this->max = $max;
@@ -335,7 +335,7 @@ 
         $v .= "$this->suffix ";
         return $v;
     }
-    function form_str($tag, $v, $had_error, $disabled=false, $id=null) {
+    function form_str($tag, $v, $had_error, $disabled = false, $id = null) {
         if (is_numeric($v)) {
             $v /= $this->scale;
             if (!$had_error && ($v < $this->min || $v > $this->max)) {
@@ -343,7 +343,7 @@ 
             }
         }
         if ($disabled) $v = "";
-        $i = $id?"id=\"$id\"":"";
+        $i = $id ? "id=\"$id\"" : "";
         return '<input type="text" size="5" class="form-control input-sm" name="'.$tag.'" value="'.$v."\" $disabled $i> &nbsp; $this->suffix ";
     }
     function form_convert($in, &$out, &$error) {
@@ -466,8 +466,8 @@ 
         $text_id = $this->tag;
         $default = $this->num_spec->get_default();
         $val = $prefs->$tag;
-        $c = $val?"checked":"";
-        $d = $val?"":"disabled";
+        $c = $val ? "checked" : "";
+        $d = $val ? "" : "disabled";
         echo "<td $attrs>"
             ."<input type=checkbox id=$checkbox_id onClick=\"checkbox_clicked('$checkbox_id', '$text_id', $default)\" $c> &nbsp;"
             .$this->num_spec->form_str($tag, $prefs->$tag, $had_error, $d, $text_id)
@@ -580,8 +580,8 @@ 
 function hour_select($x, $name, $id, $d) {
     $s = "";
     $s .= "<select class=\"selectbox form-control input-sm\" name=$name id=$id $d>\n";
-    for ($i=0; $i<24; $i++) {
-        $sel = ($x == $i)?"selected":"";
+    for ($i = 0; $i < 24; $i++) {
+        $sel = ($x == $i) ? "selected" : "";
         $s .= "<option value=$i $sel> $i:00";
     }
     $s .= "</select>\n";
@@ -682,7 +682,7 @@ 
 
 // row_defs - Display a value for all 4 venues in one row
 //
-function row_defs($pre, $item, $post, $type, $prefs, $tooltip=null) {
+function row_defs($pre, $item, $post, $type, $prefs, $tooltip = null) {
     $gen = $prefs->$item;
     $hom  = (isset($prefs->home) && isset($prefs->home->$item)) ? $prefs->home->$item : "--";
     $schl = (isset($prefs->school) && isset($prefs->school->$item)) ? $prefs->school->$item : "--";
@@ -694,10 +694,10 @@ 
         echo "<tr>";
     }
     echo "<td ".NAME_ATTRS.">$pre</td>";
-    row_field($gen,  $type);
-    row_field($hom,  $type);
+    row_field($gen, $type);
+    row_field($hom, $type);
     row_field($schl, $type);
-    row_field($wrk,  $type);
+    row_field($wrk, $type);
     echo "<td align=left>$post</td></tr>\n";
 }
 
@@ -707,16 +707,16 @@ 
 function row_field($value, $type) {
     echo "<td>";
     $type = $value === "--" ? "--" : $type;
-    switch($type) {
+    switch ($type) {
     case "yesno":
-        echo $value ?tra("yes"):tra("no");
+        echo $value ?tra("yes") : tra("no");
         break;
     case "noyes":
-        echo $value ?tra("no"):tra("yes");
+        echo $value ?tra("no") : tra("yes");
         break;
     case "limit":
         $x = max_bytes_display_mode($value);
-        $y = "$x " . BYTE_ABBR;
+        $y = "$x ".BYTE_ABBR;
         echo $x ? "$y" : tra("no limit");
         break;
     case "minutes":

html/ops/dbinfo.php

Indentation +109 added lines, -109 removed lines

@@ -15,10 +15,10 @@ 
     function __construct($n, $d, $i, $t, $r, $s) {
         $this->name = $n;
         $this->data_size = $d;
-		$this->index_size = $i;
-		$this->total_size = $t;
-		$this->rows = $r;
-		$this->size_per_row = $s;
+        $this->index_size = $i;
+        $this->total_size = $t;
+        $this->rows = $r;
+        $this->size_per_row = $s;
     }
     function __destruct() {
     }
@@ -42,25 +42,25 @@ 
 
 // returns formatted data size
 function size_format($size){
-	$retval = 0;
+    $retval = 0;
 
-	$KB = 1024;
+    $KB = 1024;
     $MB = 1024*1024;
     $GB = 1024*1024*1024;
-	$TB = 1024*1024*1024*1024;
+    $TB = 1024*1024*1024*1024;
 
     if ($size < $KB) {
-	    $retval = $size;
+        $retval = $size;
     } elseif (($size > $KB) && ($size < $MB)) {
-		$retval = sprintf("%.0fK", ($size / $KB));
+        $retval = sprintf("%.0fK", ($size / $KB));
     } elseif ( ($size >= $MB) && ($size < $GB)) {
-		$retval = sprintf("%.2fMB", ($size / $MB));
+        $retval = sprintf("%.2fMB", ($size / $MB));
     } elseif ( ($size >= $GB) && ($size < $TB)) {
-		$retval = sprintf("%.2fGB", ($size / $GB));
-	} elseif ( $size >= $TB ) {
-		$retval = sprintf("%.2fTB", ($size / $TB));
-	}
-	return $retval;
+        $retval = sprintf("%.2fGB", ($size / $GB));
+    } elseif ( $size >= $TB ) {
+        $retval = sprintf("%.2fTB", ($size / $TB));
+    }
+    return $retval;
 }
 
 
@@ -73,9 +73,9 @@ 
     // SQL output
     // mysql> show table status from [table_name];
     // | Name | Engine | Version | Row_format | Rows
-	// | Avg_row_length | Data_length | Max_data_length
-	// | Index_length | Data_free  | Auto_increment | Create_time
-	// | Update_time | Check_time | Collation | Checksum | Create_options | Comment |
+    // | Avg_row_length | Data_length | Max_data_length
+    // | Index_length | Data_free  | Auto_increment | Create_time
+    // | Update_time | Check_time | Collation | Checksum | Create_options | Comment |
     //
 
     $gdata  = 0;
@@ -83,19 +83,19 @@ 
     $gtotal = 0;
     $grows  = 0;
 
-	$i = 0;
-	$db_rec = array();
-	while ($myarr = _mysql_fetch_assoc($result)) {
+    $i = 0;
+    $db_rec = array();
+    while ($myarr = _mysql_fetch_assoc($result)) {
         if ($myarr['Comment'] == 'VIEW') continue;
 
-		// sum grand totals
-		$total  =  $myarr["Data_length"] + $myarr["Index_length"];
-		$gindex += $myarr["Index_length"];
+        // sum grand totals
+        $total  =  $myarr["Data_length"] + $myarr["Index_length"];
+        $gindex += $myarr["Index_length"];
         $gdata  += $myarr["Data_length"];
-		$grows  += $myarr["Rows"];
-		$gtotal += $total;
+        $grows  += $myarr["Rows"];
+        $gtotal += $total;
 
-	    $db_rec[$i] = new DB_REC(
+        $db_rec[$i] = new DB_REC(
             $myarr["Name"],
             $myarr["Data_length"],
             $myarr["Index_length"],
@@ -103,131 +103,131 @@ 
             $myarr["Rows"],
             $myarr["Avg_row_length"]
         );
-		$i++;
-	}
+        $i++;
+    }
     $db_rec[$i] = new DB_REC ("Total", $gdata, $gindex, $gtotal, $grows, "" );
-	return $db_rec;
+    return $db_rec;
 }
 
 // show the DB structure
 //
 function show_db_info($db_name, $db_rec) {
-	echo "<table cols=6>";
-	echo "<tr>";
-	echo "<th colspan=6> Database $db_name </th>";
-	echo "</tr>";
-
-	echo "<tr>";
-	echo "<th>Table</th>";
-	echo "<th>Data Size</th>";
-	echo "<th>Index Size</th>";
-	echo "<th>Total Size</th>";
-	echo "<th>Total Rows</th>";
-	echo "<th>Avg. Size per Row</th>";
-	echo "</tr>";
-
-	for ($i = 0; $i < sizeof($db_rec)-1; $i++){
-		echo "<tr>";
-		echo "<td align=left valign=top class=fieldname>" . $db_rec[$i]->name . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->data_size)  . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->index_size) . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->total_size) . "</td>";
+    echo "<table cols=6>";
+    echo "<tr>";
+    echo "<th colspan=6> Database $db_name </th>";
+    echo "</tr>";
+
+    echo "<tr>";
+    echo "<th>Table</th>";
+    echo "<th>Data Size</th>";
+    echo "<th>Index Size</th>";
+    echo "<th>Total Size</th>";
+    echo "<th>Total Rows</th>";
+    echo "<th>Avg. Size per Row</th>";
+    echo "</tr>";
+
+    for ($i = 0; $i < sizeof($db_rec)-1; $i++){
+        echo "<tr>";
+        echo "<td align=left valign=top class=fieldname>" . $db_rec[$i]->name . "</td>";
+        echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->data_size)  . "</td>";
+        echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->index_size) . "</td>";
+        echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->total_size) . "</td>";
         echo "<td align=left valign=top class=fieldname>" . number_format($db_rec[$i]->rows)     . "</td>";
         echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->size_per_row) . "</td>";
-		echo "</tr>";
-	}
+        echo "</tr>";
+    }
 
-	// Last record is just a summary
-	$i = sizeof($db_rec)-1;
-	echo "<tr>";
+    // Last record is just a summary
+    $i = sizeof($db_rec)-1;
+    echo "<tr>";
     echo "<th align=left>" . $db_rec[$i]->name . "</th>";
     echo "<th align=left>" . size_format($db_rec[$i]->data_size)  . "</th>";
     echo "<th align=left>" . size_format($db_rec[$i]->index_size) . "</th>";
     echo "<th align=left>" . size_format($db_rec[$i]->total_size) . "</th>";
     echo "<th align=left>" . number_format($db_rec[$i]->rows)     . "</th>";
     echo "<th align=left></th>";
-	echo "</tr>";
+    echo "</tr>";
     echo "</table>";
 }
 
 // same as show_db_info but with sortable columns
 //
 function sort_db_info($db_name, $db_rec) {
-	$file_list = array();
+    $file_list = array();
     $file_sort = array();
 
-	$sort =  get_str("sort", true);
-	$r = get_str("r", true);
-
-	if (empty($sort)) $sort = "name";
-	// check for allowed keys
-	if ((strcmp($sort, "name")!=0) &&
-		(strcmp($sort, "data_size")!=0) &&
-		(strcmp($sort, "index_size")!=0) &&
-		(strcmp($sort, "total_size")!=0)  &&
-		(strcmp($sort, "rows")!=0) &&
-		(strcmp($sort, "size_per_row")!=0)
+    $sort =  get_str("sort", true);
+    $r = get_str("r", true);
+
+    if (empty($sort)) $sort = "name";
+    // check for allowed keys
+    if ((strcmp($sort, "name")!=0) &&
+        (strcmp($sort, "data_size")!=0) &&
+        (strcmp($sort, "index_size")!=0) &&
+        (strcmp($sort, "total_size")!=0)  &&
+        (strcmp($sort, "rows")!=0) &&
+        (strcmp($sort, "size_per_row")!=0)
     ) {
-		$sort = "name";
+        $sort = "name";
     }
-	if (empty($r)) $r=0;
-
-	for ($i=0; $i < sizeof($db_rec)-1; $i++){
-		$file_details["name"]         = $db_rec[$i]->name;
-		$file_details["data_size"]    = $db_rec[$i]->data_size;
-		$file_details["index_size"]   = $db_rec[$i]->index_size;
-		$file_details["total_size"]   = $db_rec[$i]->total_size;
-	    $file_details["rows"]         = $db_rec[$i]->rows;
-		$file_details["size_per_row"] = $db_rec[$i]->size_per_row;
-
-		$file_list[$i] = $file_details;
-		$key = strtolower($file_details[$sort]);
-		$file_sort[$i] = $key;
-	}
-
-	if ($r) {
+    if (empty($r)) $r=0;
+
+    for ($i=0; $i < sizeof($db_rec)-1; $i++){
+        $file_details["name"]         = $db_rec[$i]->name;
+        $file_details["data_size"]    = $db_rec[$i]->data_size;
+        $file_details["index_size"]   = $db_rec[$i]->index_size;
+        $file_details["total_size"]   = $db_rec[$i]->total_size;
+        $file_details["rows"]         = $db_rec[$i]->rows;
+        $file_details["size_per_row"] = $db_rec[$i]->size_per_row;
+
+        $file_list[$i] = $file_details;
+        $key = strtolower($file_details[$sort]);
+        $file_sort[$i] = $key;
+    }
+
+    if ($r) {
         arsort($file_sort);
     } else {
         asort($file_sort);
     }
 
-	echo "<table cols=6>";
-	echo "<tr>";
-	echo "<th colspan=6> Database $db_name </th>";
-	echo "</tr>";
+    echo "<table cols=6>";
+    echo "<tr>";
+    echo "<th colspan=6> Database $db_name </th>";
+    echo "</tr>";
 
-	echo "<tr>";
-	echo "<th><a href='dbinfo.php?sort=name&r=" . (!$r) . "'>Table </a></th>";
-	echo "<th><a href='dbinfo.php?sort=data_size&r=" . (!$r) . "'>Data Size</a></th>";
-	echo "<th><a href='dbinfo.php?sort=index_size&r=" . (!$r) . "'>Index Size</a></th>";
-	echo "<th><a href='dbinfo.php?sort=total_size&r=" . (!$r) . "'>Total Size</a></th>";
-	echo "<th><a href='dbinfo.php?sort=rows&r=" . (!$r) . "'>Total Rows</a></th>";
-	echo "<th><a href='dbinfo.php?sort=size_per_row&r=" . (!$r) . "'>Avg. Size per Row</a></th>";
-	echo "</tr>";
+    echo "<tr>";
+    echo "<th><a href='dbinfo.php?sort=name&r=" . (!$r) . "'>Table </a></th>";
+    echo "<th><a href='dbinfo.php?sort=data_size&r=" . (!$r) . "'>Data Size</a></th>";
+    echo "<th><a href='dbinfo.php?sort=index_size&r=" . (!$r) . "'>Index Size</a></th>";
+    echo "<th><a href='dbinfo.php?sort=total_size&r=" . (!$r) . "'>Total Size</a></th>";
+    echo "<th><a href='dbinfo.php?sort=rows&r=" . (!$r) . "'>Total Rows</a></th>";
+    echo "<th><a href='dbinfo.php?sort=size_per_row&r=" . (!$r) . "'>Avg. Size per Row</a></th>";
+    echo "</tr>";
 
     foreach ($file_sort as $key=>$value) {
-		$value = $file_list[$key];
+        $value = $file_list[$key];
 
-		echo "<tr>";
-		echo "<td align=left valign=top class=fieldname>" . $value["name"] . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($value["data_size"])  . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($value["index_size"]) . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($value["total_size"]) . "</td>";
+        echo "<tr>";
+        echo "<td align=left valign=top class=fieldname>" . $value["name"] . "</td>";
+        echo "<td align=left valign=top class=fieldname>" . size_format($value["data_size"])  . "</td>";
+        echo "<td align=left valign=top class=fieldname>" . size_format($value["index_size"]) . "</td>";
+        echo "<td align=left valign=top class=fieldname>" . size_format($value["total_size"]) . "</td>";
         echo "<td align=left valign=top class=fieldname>" . number_format($value["rows"])     . "</td>";
         echo "<td align=left valign=top class=fieldname>" . size_format($value["size_per_row"]) . "</td>";
-		echo "</tr>";
-	}
+        echo "</tr>";
+    }
 
-	// Last record is a summary
-	$i = sizeof($db_rec)-1;
-	echo "<tr>";
+    // Last record is a summary
+    $i = sizeof($db_rec)-1;
+    echo "<tr>";
     echo "<th align=left>" . $db_rec[$i]->name . "</th>";
     echo "<th align=left>" . size_format($db_rec[$i]->data_size)  . "</th>";
     echo "<th align=left>" . size_format($db_rec[$i]->index_size) . "</th>";
     echo "<th align=left>" . size_format($db_rec[$i]->total_size) . "</th>";
     echo "<th align=left>" . number_format($db_rec[$i]->rows)     . "</th>";
     echo "<th align=left></th>";
-	echo "</tr>";
+    echo "</tr>";
 
     echo "</table>";
 }

Spacing +52 added lines, -52 removed lines

@@ -41,7 +41,7 @@ 
 
 
 // returns formatted data size
-function size_format($size){
+function size_format($size) {
 	$retval = 0;
 
 	$KB = 1024;
@@ -52,13 +52,13 @@ 
     if ($size < $KB) {
 	    $retval = $size;
     } elseif (($size > $KB) && ($size < $MB)) {
-		$retval = sprintf("%.0fK", ($size / $KB));
-    } elseif ( ($size >= $MB) && ($size < $GB)) {
-		$retval = sprintf("%.2fMB", ($size / $MB));
-    } elseif ( ($size >= $GB) && ($size < $TB)) {
-		$retval = sprintf("%.2fGB", ($size / $GB));
-	} elseif ( $size >= $TB ) {
-		$retval = sprintf("%.2fTB", ($size / $TB));
+		$retval = sprintf("%.0fK", ($size/$KB));
+    } elseif (($size >= $MB) && ($size < $GB)) {
+		$retval = sprintf("%.2fMB", ($size/$MB));
+    } elseif (($size >= $GB) && ($size < $TB)) {
+		$retval = sprintf("%.2fGB", ($size/$GB));
+	} elseif ($size >= $TB) {
+		$retval = sprintf("%.2fTB", ($size/$TB));
 	}
 	return $retval;
 }
@@ -89,9 +89,9 @@ 
         if ($myarr['Comment'] == 'VIEW') continue;
 
 		// sum grand totals
-		$total  =  $myarr["Data_length"] + $myarr["Index_length"];
+		$total = $myarr["Data_length"] + $myarr["Index_length"];
 		$gindex += $myarr["Index_length"];
-        $gdata  += $myarr["Data_length"];
+        $gdata += $myarr["Data_length"];
 		$grows  += $myarr["Rows"];
 		$gtotal += $total;
 
@@ -105,7 +105,7 @@ 
         );
 		$i++;
 	}
-    $db_rec[$i] = new DB_REC ("Total", $gdata, $gindex, $gtotal, $grows, "" );
+    $db_rec[$i] = new DB_REC("Total", $gdata, $gindex, $gtotal, $grows, "");
 	return $db_rec;
 }
 
@@ -126,25 +126,25 @@ 
 	echo "<th>Avg. Size per Row</th>";
 	echo "</tr>";
 
-	for ($i = 0; $i < sizeof($db_rec)-1; $i++){
+	for ($i = 0; $i < sizeof($db_rec) - 1; $i++) {
 		echo "<tr>";
-		echo "<td align=left valign=top class=fieldname>" . $db_rec[$i]->name . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->data_size)  . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->index_size) . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->total_size) . "</td>";
-        echo "<td align=left valign=top class=fieldname>" . number_format($db_rec[$i]->rows)     . "</td>";
-        echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->size_per_row) . "</td>";
+		echo "<td align=left valign=top class=fieldname>".$db_rec[$i]->name."</td>";
+		echo "<td align=left valign=top class=fieldname>".size_format($db_rec[$i]->data_size)."</td>";
+		echo "<td align=left valign=top class=fieldname>".size_format($db_rec[$i]->index_size)."</td>";
+		echo "<td align=left valign=top class=fieldname>".size_format($db_rec[$i]->total_size)."</td>";
+        echo "<td align=left valign=top class=fieldname>".number_format($db_rec[$i]->rows)."</td>";
+        echo "<td align=left valign=top class=fieldname>".size_format($db_rec[$i]->size_per_row)."</td>";
 		echo "</tr>";
 	}
 
 	// Last record is just a summary
-	$i = sizeof($db_rec)-1;
+	$i = sizeof($db_rec) - 1;
 	echo "<tr>";
-    echo "<th align=left>" . $db_rec[$i]->name . "</th>";
-    echo "<th align=left>" . size_format($db_rec[$i]->data_size)  . "</th>";
-    echo "<th align=left>" . size_format($db_rec[$i]->index_size) . "</th>";
-    echo "<th align=left>" . size_format($db_rec[$i]->total_size) . "</th>";
-    echo "<th align=left>" . number_format($db_rec[$i]->rows)     . "</th>";
+    echo "<th align=left>".$db_rec[$i]->name."</th>";
+    echo "<th align=left>".size_format($db_rec[$i]->data_size)."</th>";
+    echo "<th align=left>".size_format($db_rec[$i]->index_size)."</th>";
+    echo "<th align=left>".size_format($db_rec[$i]->total_size)."</th>";
+    echo "<th align=left>".number_format($db_rec[$i]->rows)."</th>";
     echo "<th align=left></th>";
 	echo "</tr>";
     echo "</table>";
@@ -156,28 +156,28 @@ 
 	$file_list = array();
     $file_sort = array();
 
-	$sort =  get_str("sort", true);
+	$sort = get_str("sort", true);
 	$r = get_str("r", true);
 
 	if (empty($sort)) $sort = "name";
 	// check for allowed keys
-	if ((strcmp($sort, "name")!=0) &&
-		(strcmp($sort, "data_size")!=0) &&
-		(strcmp($sort, "index_size")!=0) &&
-		(strcmp($sort, "total_size")!=0)  &&
-		(strcmp($sort, "rows")!=0) &&
-		(strcmp($sort, "size_per_row")!=0)
+	if ((strcmp($sort, "name") != 0) &&
+		(strcmp($sort, "data_size") != 0) &&
+		(strcmp($sort, "index_size") != 0) &&
+		(strcmp($sort, "total_size") != 0) &&
+		(strcmp($sort, "rows") != 0) &&
+		(strcmp($sort, "size_per_row") != 0)
     ) {
 		$sort = "name";
     }
-	if (empty($r)) $r=0;
+	if (empty($r)) $r = 0;
 
-	for ($i=0; $i < sizeof($db_rec)-1; $i++){
+	for ($i = 0; $i < sizeof($db_rec) - 1; $i++) {
 		$file_details["name"]         = $db_rec[$i]->name;
 		$file_details["data_size"]    = $db_rec[$i]->data_size;
 		$file_details["index_size"]   = $db_rec[$i]->index_size;
 		$file_details["total_size"]   = $db_rec[$i]->total_size;
-	    $file_details["rows"]         = $db_rec[$i]->rows;
+	    $file_details["rows"] = $db_rec[$i]->rows;
 		$file_details["size_per_row"] = $db_rec[$i]->size_per_row;
 
 		$file_list[$i] = $file_details;
@@ -197,35 +197,35 @@ 
 	echo "</tr>";
 
 	echo "<tr>";
-	echo "<th><a href='dbinfo.php?sort=name&r=" . (!$r) . "'>Table </a></th>";
-	echo "<th><a href='dbinfo.php?sort=data_size&r=" . (!$r) . "'>Data Size</a></th>";
-	echo "<th><a href='dbinfo.php?sort=index_size&r=" . (!$r) . "'>Index Size</a></th>";
-	echo "<th><a href='dbinfo.php?sort=total_size&r=" . (!$r) . "'>Total Size</a></th>";
-	echo "<th><a href='dbinfo.php?sort=rows&r=" . (!$r) . "'>Total Rows</a></th>";
-	echo "<th><a href='dbinfo.php?sort=size_per_row&r=" . (!$r) . "'>Avg. Size per Row</a></th>";
+	echo "<th><a href='dbinfo.php?sort=name&r=".(!$r)."'>Table </a></th>";
+	echo "<th><a href='dbinfo.php?sort=data_size&r=".(!$r)."'>Data Size</a></th>";
+	echo "<th><a href='dbinfo.php?sort=index_size&r=".(!$r)."'>Index Size</a></th>";
+	echo "<th><a href='dbinfo.php?sort=total_size&r=".(!$r)."'>Total Size</a></th>";
+	echo "<th><a href='dbinfo.php?sort=rows&r=".(!$r)."'>Total Rows</a></th>";
+	echo "<th><a href='dbinfo.php?sort=size_per_row&r=".(!$r)."'>Avg. Size per Row</a></th>";
 	echo "</tr>";
 
     foreach ($file_sort as $key=>$value) {
 		$value = $file_list[$key];
 
 		echo "<tr>";
-		echo "<td align=left valign=top class=fieldname>" . $value["name"] . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($value["data_size"])  . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($value["index_size"]) . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($value["total_size"]) . "</td>";
-        echo "<td align=left valign=top class=fieldname>" . number_format($value["rows"])     . "</td>";
-        echo "<td align=left valign=top class=fieldname>" . size_format($value["size_per_row"]) . "</td>";
+		echo "<td align=left valign=top class=fieldname>".$value["name"]."</td>";
+		echo "<td align=left valign=top class=fieldname>".size_format($value["data_size"])."</td>";
+		echo "<td align=left valign=top class=fieldname>".size_format($value["index_size"])."</td>";
+		echo "<td align=left valign=top class=fieldname>".size_format($value["total_size"])."</td>";
+        echo "<td align=left valign=top class=fieldname>".number_format($value["rows"])."</td>";
+        echo "<td align=left valign=top class=fieldname>".size_format($value["size_per_row"])."</td>";
 		echo "</tr>";
 	}
 
 	// Last record is a summary
-	$i = sizeof($db_rec)-1;
+	$i = sizeof($db_rec) - 1;
 	echo "<tr>";
-    echo "<th align=left>" . $db_rec[$i]->name . "</th>";
-    echo "<th align=left>" . size_format($db_rec[$i]->data_size)  . "</th>";
-    echo "<th align=left>" . size_format($db_rec[$i]->index_size) . "</th>";
-    echo "<th align=left>" . size_format($db_rec[$i]->total_size) . "</th>";
-    echo "<th align=left>" . number_format($db_rec[$i]->rows)     . "</th>";
+    echo "<th align=left>".$db_rec[$i]->name."</th>";
+    echo "<th align=left>".size_format($db_rec[$i]->data_size)."</th>";
+    echo "<th align=left>".size_format($db_rec[$i]->index_size)."</th>";
+    echo "<th align=left>".size_format($db_rec[$i]->total_size)."</th>";
+    echo "<th align=left>".number_format($db_rec[$i]->rows)."</th>";
     echo "<th align=left></th>";
 	echo "</tr>";
 

Braces +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 
 
 // returns formatted data size
-function size_format($size){
+function size_format($size) {
 	$retval = 0;
 
 	$KB = 1024;
@@ -126,7 +126,7 @@ 
 	echo "<th>Avg. Size per Row</th>";
 	echo "</tr>";
 
-	for ($i = 0; $i < sizeof($db_rec)-1; $i++){
+	for ($i = 0; $i < sizeof($db_rec)-1; $i++) {
 		echo "<tr>";
 		echo "<td align=left valign=top class=fieldname>" . $db_rec[$i]->name . "</td>";
 		echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->data_size)  . "</td>";
@@ -172,7 +172,7 @@ 
     }
 	if (empty($r)) $r=0;
 
-	for ($i=0; $i < sizeof($db_rec)-1; $i++){
+	for ($i=0; $i < sizeof($db_rec)-1; $i++) {
 		$file_details["name"]         = $db_rec[$i]->name;
 		$file_details["data_size"]    = $db_rec[$i]->data_size;
 		$file_details["index_size"]   = $db_rec[$i]->index_size;