BOINC / boinc

html/inc/db_conn.inc

Braces +2 added lines, -1 removed lines

@@ -33,7 +33,8 @@
         } else {
             $port = null;
         }
-        if (1) {        // don't use persistent connections for now
+        if (1) {
+// don't use persistent connections for now
             $this->db_conn = @new mysqli(
                 $host, $user, $passwd, $name, $port
             );

Spacing +8 added lines, -8 removed lines

@@ -22,12 +22,12 @@ 
 // Intended to be subclassed (e.g., BoincDb, BossaDb)
 //
 class DbConn {
-    var $db_conn;       // a mysqli object
-    var $db_name;       // the DB name
+    var $db_conn; // a mysqli object
+    var $db_name; // the DB name
 
     function init_conn($user, $passwd, $host, $name) {
         $x = explode(":", $host);
-        if (sizeof($x)>1) {
+        if (sizeof($x) > 1) {
             $host = $x[0];
             $port = $x[1];
         } else {
@@ -137,10 +137,10 @@ 
             $where_clause = "where $where_clause";
         }
         $query = "select $fields from DBNAME.$table $where_clause $order_clause";
-        return $this->enum_general($classname,$query);
+        return $this->enum_general($classname, $query);
     }
 
-    function enum($table, $classname, $where_clause=null, $order_clause=null) {
+    function enum($table, $classname, $where_clause = null, $order_clause = null) {
         return self::enum_fields(
             $table, $classname, '*', $where_clause, $order_clause
         );
@@ -185,15 +185,15 @@ 
         if ($x) return (double)$x->$field;
         return false;
     }
-    function count($table, $clause="TRUE") {
+    function count($table, $clause = "TRUE") {
         $query = "select count(*) as total from DBNAME.$table where $clause";
         return $this->get_int($query, 'total');
     }
-    function sum($table, $field, $clause="") {
+    function sum($table, $field, $clause = "") {
         $query = "select sum($field) as total from DBNAME.$table $clause";
         return $this->get_double($query, 'total');
     }
-    function max($table, $field, $clause="") {
+    function max($table, $field, $clause = "") {
         $query = "select max($field) as total from DBNAME.$table $clause";
         return $this->get_double($query, 'total');
     }

html/inc/boinc_db.inc

Spacing +19 added lines, -19 removed lines

@@ -44,8 +44,8 @@ 
 // close() closes the connection.
 
 class BoincDb {
-    static $instance;       // a DbConn object, or null
-    static $dbnum;          // which replica we're connected to
+    static $instance; // a DbConn object, or null
+    static $dbnum; // which replica we're connected to
 
     // connect to DB $dbnum (0, 1, ...)
     // If the requested DB doesn't exist or connection fails, connect to DB 0.
@@ -56,7 +56,7 @@ 
         self::$instance = null;
         $config = get_config();
         if ($dbnum) {
-            $r = $dbnum==1?'':strval($dbnum);
+            $r = $dbnum == 1 ? '' : strval($dbnum);
             $host = parse_config($config, sprintf('<replica%s_db_host>', $r));
             $name = parse_config($config, sprintf('<replica%s_db_name>', $r));
             $user = parse_config($config, sprintf('<replica%s_db_user>', $r));
@@ -201,11 +201,11 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'user', $clause);
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('user', 'BoincUser', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'user', 'BoincUser', $fields, $where_clause, $order_clause
@@ -255,7 +255,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'team', $clause);
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('team', 'BoincTeam', $where_clause, $order_clause);
     }
@@ -280,7 +280,7 @@ 
         $db = BoincDb::get();
         return $db->max('team', $field);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'team', 'BoincTeam', $fields, $where_clause, $order_clause
@@ -318,11 +318,11 @@ 
         $db = BoincDb::get();
         return $db->delete($this, 'host');
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('host', 'BoincHost', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'host', 'BoincHost', $fields, $where_clause, $order_clause
@@ -444,7 +444,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'app', $clause);
     }
-    static function sum($field, $clause=null) {
+    static function sum($field, $clause = null) {
         $db = BoincDb::get();
         return $db->sum('app', $field, $clause);
     }
@@ -502,11 +502,11 @@ 
         $db = BoincDb::get();
         return $db->insert('profile', $clause);
     }
-    static function enum($where_clause=null, $order_clause=null) {
+    static function enum($where_clause = null, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('profile', 'BoincProfile', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause=null, $order_clause=null) {
+    static function enum_fields($fields, $where_clause = null, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields('profile', 'BoincProfile', $fields, $where_clause, $order_clause);
     }
@@ -901,12 +901,12 @@ 
         return $db->enum('consent', 'BoincConsent', $where_clause);
     }
 
-    static function insert ($clause) {
+    static function insert($clause) {
         $db = BoincDb::get();
         return $db->insert('consent', $clause);
     }
 
-    static function update ($clause) {
+    static function update($clause) {
         $db = BoincDb::get();
         return $db->update_aux('consent', $clause);
     }
@@ -931,17 +931,17 @@ 
         return $db->lookup('consent_type', 'BoincConsentType', $clause);
     }
 
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('consent_type', 'BoincConsentType', $where_clause, $order_clause);
     }
 
-    static function insert ($clause) {
+    static function insert($clause) {
         $db = BoincDb::get();
         return $db->insert('consent_type', $clause);
     }
 
-    static function update ($clause) {
+    static function update($clause) {
         $db = BoincDb::get();
         return $db->update_aux('consent_type', $clause);
     }
@@ -967,7 +967,7 @@ 
         return $db->lookup('latest_consent', 'BoincLatestConsent', $clause);
     }
 
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('latest_consent', 'BoincLatestConsent', $where_clause, $order_clause);
     }
@@ -978,7 +978,7 @@ 
 // apply this to any user-supplied strings used in queries
 //
 function boinc_real_escape_string($x) {
-    if (version_compare(phpversion(),"4.3.0")>=0) {
+    if (version_compare(phpversion(), "4.3.0") >= 0) {
         return BoincDb::escape_string($x);
     } else {
         $x = str_replace("'", "\'", $x);