BOINC / boinc

html/user/prefs_edit.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 $subset = sanitize_tags(get_str("subset"));
 $venue = sanitize_tags(get_str("venue", true));
 $columns = get_str("cols", true);
-$c = $columns?"&cols=$columns":"";
+$c = $columns ? "&cols=$columns" : "";
 check_subset($subset);
 if ($action) {
     check_tokens($user->authenticator);
@@ -116,5 +116,5 @@ 
 echo "<a href=prefs.php?subset=$subset$c>".tra("Back to preferences")."</a>\n";
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/inc/account.inc

Braces +1 added lines, -2 removed lines

@@ -174,8 +174,7 @@
             array("agree_to_terms_of_use", "", false),
         );
         form_checkboxes(tra("Do you agree to the terms of use above?"), $myitems, 'tabindex="0"');
-    }
-    else {
+    } else {
         // error - no terms of use for user to agree to!
     }
 

html/user/user_agreetermsofuse_action.php

Braces +2 added lines, -4 removed lines

@@ -41,14 +41,12 @@
 // Obtain data from cookies
 if (isset($_COOKIE['tempuserid'])) {
     $userid = $_COOKIE['tempuserid'];
-}
-else {
+} else {
     error_page(tra("Website error when attempting to agree to terms of use. Please contact the site administrators."));
 }
 if (isset($_COOKIE['tempperm'])) {
     $perm = $_COOKIE['tempperm'];
-}
-else {
+} else {
     error_page(tra("Website error when attempting to agree to terms of use. Please contact the site administrators."));
 }
 $user = BoincUser::lookup_id_nocache($userid);

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 if ($checkct) {
     $rc1 = consent_to_a_policy($user, $ctid, 1, 0, 'Webform', time());
     if (!$rc1) {
-        error_page("Database error when attempting to INSERT into table consent with ID=$user->id. " . BoincDb::error() . " Please contact site administrators.");
+        error_page("Database error when attempting to INSERT into table consent with ID=$user->id. ".BoincDb::error()." Please contact site administrators.");
     }
 } else {
     error_page("Error: consent type for enrollment not found. Please contact site administrators.");

html/user/get_project_config.php

Indentation +4 added lines, -4 removed lines

@@ -81,11 +81,11 @@ 
 }
 
 if ($disable_account_creation || defined('INVITE_CODES')) {
-	echo "    <account_creation_disabled/>\n";
+    echo "    <account_creation_disabled/>\n";
 }
 
 if (defined('INVITE_CODES')) {
-	echo "    <invite_code_required/>\n";
+    echo "    <invite_code_required/>\n";
 }
 
 echo "    <min_passwd_length>$min_passwd_length</min_passwd_length>\n";
@@ -107,10 +107,10 @@ 
 // project has not defined the constant TERMSOFUSE_FILE, then look for
 // the terms_of_use.txt file in the project base directory.
 if (defined('TERMSOFUSE_FILE')) {
-  $tou_file = 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));

Spacing +3 added lines, -3 removed lines

@@ -28,10 +28,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>
@@ -110,7 +110,7 @@ 
   $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 +3 added lines, -4 removed lines

@@ -28,10 +28,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>
@@ -108,8 +108,7 @@ 
 // the terms_of_use.txt file in the project base directory.
 if (defined('TERMSOFUSE_FILE')) {
   $tou_file = TERMSOFUSE_FILE;
-}
-else {
+} else {
   $tou_file =  "../../terms_of_use.txt";
 }
 if (file_exists($tou_file)) {

html/user/am_set_info.php

Spacing +5 added lines, -5 removed lines

@@ -187,7 +187,7 @@ 
 }
 
 if (!is_null($teamid)) {
-    if ($teamid==0) {
+    if ($teamid == 0) {
         user_quit_team($user);
     } else {
         $team = BoincTeam::lookup_id_nocache($teamid);
@@ -240,15 +240,15 @@ 
 // table. If one or more of these consent_xyz parameters are NOT
 // present, the RPC will still return 'success', even though the
 // consent table is not updated.
-if ( (isset($consent_name) and isset($consent_flag) and isset($consent_not_required) and isset($consent_source)) ) {
+if ((isset($consent_name) and isset($consent_flag) and isset($consent_not_required) and isset($consent_source))) {
     list($checkct, $ctid) = check_consent_type($consent_name);
     if ($checkct) {
 
         // Check to see if latest consent of this name is already
         // given.
-        $cr= BoincConsent::lookup("userid={$user->id} AND consent_type_id='${ctid}' ORDER BY consent_time DESC LIMIT 1");
-        if ( (($cr) and ($cr->consent_flag!=$consent_flag)) or
-             (!$cr) ) {
+        $cr = BoincConsent::lookup("userid={$user->id} AND consent_type_id='${ctid}' ORDER BY consent_time DESC LIMIT 1");
+        if ((($cr) and ($cr->consent_flag != $consent_flag)) or
+             (!$cr)) {
 
             $rc = consent_to_a_policy($user, $ctid, $consent_flag, $consent_not_required, $consent_source, time());
             if (!$rc) {

html/user/create_account.php

Braces +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
             // set to 1.
             if ($consent_flag==0) {
                 $rc = consent_to_a_policy($user, $ctid, 0, 1, $source);
-            } else  {
+            } else {
                 $rc = consent_to_a_policy($user, $ctid, 1, 0, $source);
             }
             if (!$rc) {

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
     xml_error(ERR_ACCT_CREATION_DISABLED);
 }
 
-if(defined('INVITE_CODES')) {
+if (defined('INVITE_CODES')) {
     $invite_code = get_str("invite_code");
     if (!preg_match(INVITE_CODES, $invite_code)) {
         xml_error(ERR_ATTACH_FAIL_INIT);
@@ -120,13 +120,13 @@ 
         // clients who do use this flag to continue. I.e., if
         // is_null($consent_flag) returns TRUE, then return an
         // xml_error(-1, ...).
-        if ( (!is_null($consent_flag)) and $source) {
+        if ((!is_null($consent_flag)) and $source) {
             // Record the user giving consent in database - if consent_flag is 0,
             // this is an 'anonymous account' and consent_not_required is
             // set to 1.
-            if ($consent_flag==0) {
+            if ($consent_flag == 0) {
                 $rc = consent_to_a_policy($user, $ctid, 0, 1, $source);
-            } else  {
+            } else {
                 $rc = consent_to_a_policy($user, $ctid, 1, 0, $source);
             }
             if (!$rc) {

html/ops/manage_consent_types.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 // Toggles the enable flag
 function mct_toggle_field($field) {
     $ctid = post_int("consent_type_id");
-    $toggle = post_str("toggle" . $field);
+    $toggle = post_str("toggle".$field);
     if ($toggle == "Click to Enable") {
         $state = 1;
         $action = "Enabled";

Braces +7 added lines, -14 removed lines

@@ -46,8 +46,7 @@ 
     if ($toggle == "Click to Enable") {
         $state = 1;
         $action = "Enabled";
-    }
-    else {
+    } else {
         $state = 0;
         $action = "Disabled";
     }
@@ -91,12 +90,10 @@ 
         if (!in_rops()) {
             if (!($ct->enabled)) {
                 echo "  <td><input class=\"btn btn-default\" name=toggleenabled type=submit value=\"Click to Enable\"></td>";
-            }
-            else {
+            } else {
                 echo "  <td><input class=\"btn btn-default\" name=toggleenabled type=submit value=\"Click to Disable\"></td>";
             }
-        }
-        else {
+        } else {
             echo "  <td>$ct->enabled</td>";
         }
 
@@ -107,12 +104,10 @@ 
         if (!in_rops()) {
             if (!($ct->privacypref)) {
                 echo "  <td><input class=\"btn btn-default\" name=toggleprivacypref type=submit value=\"Click to Enable\"></td>";
-            }
-            else {
+            } else {
                 echo "  <td><input class=\"btn btn-default\" name=toggleprivacypref type=submit value=\"Click to Disable\"></td>";
             }
-        }
-        else {
+        } else {
             echo "  <td>$ct->privacypref</td>";
         }
 
@@ -156,11 +151,9 @@ 
 
 if (post_str("add_consenttype", true)) {
     add_consenttype();
-}
-else if (post_str("toggleenabled", true)) {
+} else if (post_str("toggleenabled", true)) {
     mct_toggle_field("enabled");
-}
-else if (post_str("toggleprivacypref", true)) {
+} else if (post_str("toggleprivacypref", true)) {
     mct_toggle_field("privacypref");
 }
 

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
@@ -199,6 +199,6 @@ 
     BoincConsent::delete_for_user($user->id);
 
     // final action
-    delete_user($user);  //from user_util.inc
+    delete_user($user); //from user_util.inc
     return 0;
 }

html/inc/boinc_db.inc

Spacing +16 added lines, -16 removed lines

@@ -208,11 +208,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
@@ -261,7 +261,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);
     }
@@ -286,7 +286,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
@@ -322,11 +322,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
@@ -445,7 +445,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);
     }
@@ -501,11 +501,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);
     }
@@ -889,12 +889,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);
     }
@@ -918,17 +918,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);
     }
@@ -953,7 +953,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);
     }
@@ -964,7 +964,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);