BOINC / boinc

html/ops/create_forums.php

Spacing +3 added lines, -3 removed lines

@@ -41,10 +41,10 @@ 
     return $db->insert_id();
 }
 
-function create_forum($category, $orderID, $title, $description, $is_dev_blog=0) {
+function create_forum($category, $orderID, $title, $description, $is_dev_blog = 0) {
     $q = "(category, orderID, title, description, is_dev_blog) values ($category, $orderID, '$title', '$description', $is_dev_blog)";
     $db = BoincDb::get();
-    $result = $db->insert("forum",$q);
+    $result = $db->insert("forum", $q);
     if (!$result) {
         $forum = BoincForum::lookup("category=$category and title='$title'");
         if ($forum) return $forum->id;
@@ -72,5 +72,5 @@ 
 create_forum($catid, 4, "Preferences", "Using preferences");
 create_forum($catid, 6, "Web site", "Issues involving this web site");
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/user/get_project_config.php

Spacing +3 added lines, -3 removed lines

@@ -31,10 +31,10 @@ 
 //
 function show_platforms() {
     $xmlFragment = unserialize(get_cached_data(3600, "project_config_platform_xml"));
-    if ($xmlFragment==false){
+    if ($xmlFragment == false) {
         $platforms = BoincDb::get()->enum_fields("platform, DBNAME.app_version, DBNAME.app", "BoincPlatform", "platform.name, platform.user_friendly_name, plan_class", "app_version.platformid = platform.id and app_version.appid = app.id and app_version.deprecated=0 and app.deprecated=0 group by platform.name, plan_class", "");
         $xmlFragment = "    <platforms>";
-        foreach ($platforms as $platform){
+        foreach ($platforms as $platform) {
             $xmlFragment .= "
             <platform>
                 <platform_name>$platform->name</platform_name>
@@ -116,7 +116,7 @@ 
 if (defined('TERMSOFUSE_FILE')) {
   $tou_file = TERMSOFUSE_FILE;
 } else {
-  $tou_file =  "../../terms_of_use.txt";
+  $tou_file = "../../terms_of_use.txt";
 }
 if (file_exists($tou_file)) {
     $terms_of_use = trim(file_get_contents($tou_file));

Braces +2 added lines, -2 removed lines

@@ -31,10 +31,10 @@
 //
 function show_platforms() {
     $xmlFragment = unserialize(get_cached_data(3600, "project_config_platform_xml"));
-    if ($xmlFragment==false){
+    if ($xmlFragment==false) {
         $platforms = BoincDb::get()->enum_fields("platform, DBNAME.app_version, DBNAME.app", "BoincPlatform", "platform.name, platform.user_friendly_name, plan_class", "app_version.platformid = platform.id and app_version.appid = app.id and app_version.deprecated=0 and app.deprecated=0 group by platform.name, plan_class", "");
         $xmlFragment = "    <platforms>";
-        foreach ($platforms as $platform){
+        foreach ($platforms as $platform) {
             $xmlFragment .= "
             <platform>
                 <platform_name>$platform->name</platform_name>

html/inc/boinc_db.inc

Indentation +3 added lines, -3 removed lines

@@ -387,10 +387,10 @@
         $db = BoincDb::get();
         return $db->enum('result', 'BoincResult', $where_clause, $order_clause);
     }
-	static function enum_fields($fields, $where_clause, $order_clause) {
+    static function enum_fields($fields, $where_clause, $order_clause) {
         $db = BoincDb::get();
-		return $db->enum_fields('result', 'BoincResult', $fields, $where_clause, $order_clause);
-	}
+        return $db->enum_fields('result', 'BoincResult', $fields, $where_clause, $order_clause);
+    }
     function update($clause) {
         $db = BoincDb::get();
         return $db->update($this, 'result', $clause);

Spacing +35 added lines, -35 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));
@@ -209,11 +209,11 @@ 
      * @param string|null $order_clause
      * @return list<BoincUser>
      */
-    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
@@ -268,7 +268,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincTeam>
      */
-    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);
     }
@@ -293,7 +293,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
@@ -312,7 +312,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincTeamDelta>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('team_delta', 'BoincTeamDelta', $where_clause, $order_clause);
     }
@@ -341,11 +341,11 @@ 
      * @param string|null $order_clause
      * @return list<BoincHost>
      */
-    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
@@ -383,7 +383,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincResult>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('result', 'BoincResult', $where_clause, $order_clause);
     }
@@ -435,7 +435,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincWorkunit>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('workunit', 'BoincWorkunit', $where_clause, $order_clause);
     }
@@ -468,7 +468,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincApp>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('app', 'BoincApp', $where_clause, $order_clause);
     }
@@ -482,7 +482,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);
     }
@@ -495,7 +495,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincAppVersion>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('app_version', 'BoincAppVersion', $where_clause, $order_clause);
     }
@@ -550,11 +550,11 @@ 
      * @param string|null $order_clause
      * @return list<BoincProfile>
      */
-    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);
     }
@@ -579,7 +579,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincTeamAdmin>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('team_admin', 'BoincTeamAdmin', $where_clause, $order_clause);
     }
@@ -608,7 +608,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincPrivateMessage>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('private_messages', 'BoincPrivateMessage', $where_clause, $order_clause);
     }
@@ -639,7 +639,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincPlatform>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('platform', 'BoincPlatform', $where_clause, $order_clause);
     }
@@ -668,7 +668,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincHostAppVersion>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('host_app_version', 'BoincHostAppVersion', $where_clause, $order_clause);
     }
@@ -733,7 +733,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincBadge>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('badge', 'BoincBadge', $where_clause, $order_clause);
     }
@@ -768,7 +768,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincBadgeUser>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('badge_user', 'BoincBadgeUser', $where_clause, $order_clause);
     }
@@ -803,7 +803,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincBadgeTeam>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('badge_team', 'BoincBadgeTeam', $where_clause, $order_clause);
     }
@@ -842,7 +842,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincCreditUser>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('credit_user', 'BoincCreditUser', $where_clause, $order_clause);
     }
@@ -875,7 +875,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincCreditTeam>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('credit_team', 'BoincCreditTeam', $where_clause, $order_clause);
     }
@@ -914,7 +914,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincToken>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('token', 'BoincToken', $where_clause, $order_clause);
     }
@@ -999,17 +999,17 @@ 
      * @param string|null $order_clause
      * @return list<BoincConsent>
      */
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('consent', 'BoincConsent', $where_clause, $order_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);
     }
@@ -1039,17 +1039,17 @@ 
      * @param string|null $order_clause
      * @return list<BoincConsentType>
      */
-    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);
     }
@@ -1080,7 +1080,7 @@ 
      * @param string|null $order_clause
      * @return list<BoincLatestConsent>
      */
-    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);
     }
@@ -1091,7 +1091,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);

html/inc/db_conn.inc

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 {
@@ -35,7 +35,7 @@ 
         }
         try {
             $this->db_conn = @new mysqli($host, $user, $passwd, $name, $port);
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
         if (mysqli_connect_error()) {
@@ -158,7 +158,7 @@ 
      * @param string|null $order_clause
      * @return list<T>
      */
-    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
         );
@@ -203,15 +203,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');
     }