BOINC / boinc

html/inc/random_compat/random.inc

Spacing +11 added lines, -11 removed lines

@@ -34,8 +34,8 @@ 
     $RandomCompatversion = array_map('intval', explode('.', PHP_VERSION));
     define(
         'PHP_VERSION_ID',
-        $RandomCompatversion[0] * 10000
-        + $RandomCompatversion[1] * 100
+        $RandomCompatversion[0]*10000
+        + $RandomCompatversion[1]*100
         + $RandomCompatversion[2]
     );
     $RandomCompatversion = null;
@@ -54,9 +54,9 @@ 
 
 $RandomCompatDIR = dirname(__FILE__);
 
-require_once $RandomCompatDIR . '/byte_safe_strings.inc';
-require_once $RandomCompatDIR . '/cast_to_int.inc';
-require_once $RandomCompatDIR . '/error_polyfill.inc';
+require_once $RandomCompatDIR.'/byte_safe_strings.inc';
+require_once $RandomCompatDIR.'/cast_to_int.inc';
+require_once $RandomCompatDIR.'/error_polyfill.inc';
 
 if (!is_callable('random_bytes')) {
     /**
@@ -76,9 +76,9 @@ 
     if (extension_loaded('libsodium')) {
         // See random_bytes_libsodium.php
         if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) {
-            require_once $RandomCompatDIR . '/random_bytes_libsodium.inc';
+            require_once $RandomCompatDIR.'/random_bytes_libsodium.inc';
         } elseif (method_exists('Sodium', 'randombytes_buf')) {
-            require_once $RandomCompatDIR . '/random_bytes_libsodium_legacy.inc';
+            require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.inc';
         }
     }
 
@@ -117,7 +117,7 @@ 
             // place, that is not helpful to us here.
 
             // See random_bytes_dev_urandom.php
-            require_once $RandomCompatDIR . '/random_bytes_dev_urandom.inc';
+            require_once $RandomCompatDIR.'/random_bytes_dev_urandom.inc';
         }
         // Unset variables after use
         $RandomCompat_basedir = null;
@@ -159,7 +159,7 @@ 
         extension_loaded('mcrypt')
     ) {
         // See random_bytes_mcrypt.php
-        require_once $RandomCompatDIR . '/random_bytes_mcrypt.inc';
+        require_once $RandomCompatDIR.'/random_bytes_mcrypt.inc';
     }
     $RandomCompatUrandom = null;
 
@@ -184,7 +184,7 @@ 
                 $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
                 if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
                     // See random_bytes_com_dotnet.php
-                    require_once $RandomCompatDIR . '/random_bytes_com_dotnet.inc';
+                    require_once $RandomCompatDIR.'/random_bytes_com_dotnet.inc';
                 }
             } catch (com_exception $e) {
                 // Don't try to use it.
@@ -219,7 +219,7 @@ 
 }
 
 if (!is_callable('random_int')) {
-    require_once $RandomCompatDIR . '/random_int.inc';
+    require_once $RandomCompatDIR.'/random_int.inc';
 }
 
 $RandomCompatDIR = null;

html/inc/random_compat/byte_safe_strings.inc

Spacing +7 added lines, -7 removed lines

@@ -29,7 +29,7 @@ 
 if (!is_callable('RandomCompat_strlen')) {
     if (
         defined('MB_OVERLOAD_STRING') &&
-        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
+        ini_get('mbstring.func_overload')&MB_OVERLOAD_STRING
     ) {
         /**
          * strlen() implementation that isn't brittle to mbstring.func_overload
@@ -51,7 +51,7 @@ 
                 );
             }
 
-            return (int) mb_strlen($binary_string, '8bit');
+            return (int)mb_strlen($binary_string, '8bit');
         }
 
     } else {
@@ -73,7 +73,7 @@ 
                     'RandomCompat_strlen() expects a string'
                 );
             }
-            return (int) strlen($binary_string);
+            return (int)strlen($binary_string);
         }
     }
 }
@@ -83,7 +83,7 @@ 
     if (
         defined('MB_OVERLOAD_STRING')
         &&
-        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
+        ini_get('mbstring.func_overload')&MB_OVERLOAD_STRING
     ) {
         /**
          * substr() implementation that isn't brittle to mbstring.func_overload
@@ -133,7 +133,7 @@ 
                 return '';
             }
 
-            return (string) mb_substr($binary_string, $start, $length, '8bit');
+            return (string)mb_substr($binary_string, $start, $length, '8bit');
         }
 
     } else {
@@ -172,10 +172,10 @@ 
                     );
                 }
 
-                return (string) substr($binary_string, $start, $length);
+                return (string)substr($binary_string, $start, $length);
             }
 
-            return (string) substr($binary_string, $start);
+            return (string)substr($binary_string, $start);
         }
     }
 }

html/inc/token.inc

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     $expiration = $now + $duration;
     $type = BoincDb::escape_string($type);
     $ret = BoincToken::insert("(token,userid,type,create_time,expire_time) values ('$token', $userid, '$type', $now, $expiration)");
-    if ( !$ret ) {
+    if (!$ret) {
         return null;
     }
     return $token;
@@ -39,7 +39,7 @@ 
 
 function is_valid_token($userid, $token, $type) {
     $boincToken = BoincToken::lookup_valid_token($userid, $token, $type);
-    if ( $boincToken == null ) {
+    if ($boincToken == null) {
         return false;
     }
     return true;

html/ops/result_summary.php

Spacing +1 added lines, -1 removed lines

@@ -26,5 +26,5 @@
 admin_show_result_summary();
 
 admin_page_tail();
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/inc/team.inc

Spacing +17 added lines, -17 removed lines

@@ -40,7 +40,7 @@ 
     row2('<b>'.tra('Search criteria (use one or more)').'</b>', '');
     row2(
         tra('Key words').'<br><small>'.tra('Find teams with these words in their names or descriptions').'</small>',
-        '<input class="form-control" type="text" name="keywords" value="' . htmlspecialchars($params->keywords) . '">');
+        '<input class="form-control" type="text" name="keywords" value="'.htmlspecialchars($params->keywords).'">');
     row2_init(tra('Country'), '');
     echo '<select class="form-control" name="country"><option value="" selected>---</option>';
     $country = $params->country;
@@ -48,7 +48,7 @@ 
     echo country_select_options($country);
     echo "</select></td></tr>\n";
     row2(tra('Type of team'), team_type_select($params->type, true));
-    $checked = $params->active?"checked":"";
+    $checked = $params->active ? "checked" : "";
     row2(tra('Show only active teams'), "<input type=checkbox name=active $checked>");
     row2("", "<input class=\"btn btn-primary\" type=submit name=submit value=\"".tra('Search')."\">");
     end_table();
@@ -96,7 +96,7 @@ 
     row2("Created", date_str($team->create_time));
     if (defined("SHOW_NONVALIDATED_TEAMS")) {
         $founder = $team->founder;
-        row2("Founder email validated", $founder->email_validated?"Yes":"No (team will not be exported)");
+        row2("Founder email validated", $founder->email_validated ? "Yes" : "No (team will not be exported)");
     }
     if (strlen($team->url)) {;
         if (strstr($team->url, "http://")) {
@@ -169,7 +169,7 @@ 
     }
     row1(tra('Members'));
     row2(tra('Founder'),
-        $team->founder?user_links($team->founder, BADGE_HEIGHT_MEDIUM):"---"
+        $team->founder ?user_links($team->founder, BADGE_HEIGHT_MEDIUM) : "---"
     );
     if (count($team->admins)) {
         $first = true;
@@ -353,7 +353,7 @@ 
         foreach ($deltas as $delta) {
             $u = BoincUser::lookup_id($delta->userid);
             if ($u->teamid == $teamid) {
-                $new_members[] = $u;  // they might have later quit
+                $new_members[] = $u; // they might have later quit
             }
         }
     }
@@ -436,7 +436,7 @@ 
     if (!$user->teamid) return;
     $user->update("teamid=0");
     $team = BoincTeam::lookup_id($user->teamid);
-    if ($team && $team->ping_user==$user->id) {
+    if ($team && $team->ping_user == $user->id) {
         $team->update("ping_user=-ping_user");
     }
     BoincTeamAdmin::delete("teamid=$user->teamid and userid=$user->id");
@@ -475,34 +475,34 @@ 
     start_table();
     row2(tra('Team name, text version').'
         <br><p class=\"text-muted\">'.tra('Don\'t use HTML tags.').'</p>',
-        '<input class="form-control" name="name" type="text" size="50" value="'.($team?$team->name:"").'">'
+        '<input class="form-control" name="name" type="text" size="50" value="'.($team ? $team->name : "").'">'
     );
     row2(tra('Team name, HTML version').'
         <br><p class=\"text-muted\">
         '.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').'
         '.tra('If you don\'t know HTML, leave this box blank.').'</p>',
-        '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"',"'",($team?$team->name_html:"")).'">'
+        '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"', "'", ($team ? $team->name_html : "")).'">'
     );
     row2(tra('URL of team web page, if any').':<br><font size=-2>('.tra('without "http://"').')
         '.tra('This URL will be linked to from the team\'s page on this site.'),
-        '<input class="form-control" type="text" name="url" size="60" value="'.($team?$team->url:"").'">'
+        '<input class="form-control" type="text" name="url" size="60" value="'.($team ? $team->url : "").'">'
     );
     row2(tra('Description of team').':
         <br><p class=\"text-muted\">
         '.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').'
         </p>',
-        '<textarea class="form-control" name="description" rows=10>'.($team?$team->description:"").'</textarea>'
+        '<textarea class="form-control" name="description" rows=10>'.($team ? $team->description : "").'</textarea>'
     );
 
-    row2(tra('Type of team').':', team_type_select($team?$team->type:null));
+    row2(tra('Type of team').':', team_type_select($team ? $team->type : null));
 
     row2_init(tra('Country'),
         '<select class="form-control" name="country">'
     );
-    echo country_select_options($team?$team->country:null);
+    echo country_select_options($team ? $team->country : null);
 
     echo "</select></td></tr>\n";
-    $x = (!$team || $team->joinable)?"checked":"";
+    $x = (!$team || $team->joinable) ? "checked" : "";
     row2(tra("Accept new members?"), "<input type=checkbox name=joinable $x>");
     // Check if we're using reCaptcha to prevent spam accounts
     //
@@ -566,12 +566,12 @@ 
 //
 function new_transfer_request_ok($team, $now) {
     if ($team->ping_user <= 0) {
-        if ($team->ping_time < $now - 60 * 86400) {
+        if ($team->ping_time < $now - 60*86400) {
             return true;
         }
         return false;
     }
-    if ($team->ping_time < $now - 90 * 86400) {
+    if ($team->ping_time < $now - 90*86400) {
         return true;
     }
     return false;
@@ -606,7 +606,7 @@ 
     if (!is_valid_country($country)) {
         $country = tra('None');
     }
-    $country = BoincDb::escape_string($country);  // for Cote d'Ivoire
+    $country = BoincDb::escape_string($country); // for Cote d'Ivoire
 
     $clause = sprintf(
         "(userid, create_time, name, name_lc, url, type, name_html, description, country, nusers, expavg_time) values(%d, %d, '%s', '%s', '%s', %d, '%s', '%s', '%s', %d, unix_timestamp())",
@@ -629,6 +629,6 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

html/user/edit_email_action.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
             echo tra("Invalid password.");
         } else {
             $passwd_hash = md5($passwd.$email_addr);
-            $database_passwd_hash = password_hash($passwd_hash , PASSWORD_DEFAULT);
+            $database_passwd_hash = password_hash($passwd_hash, PASSWORD_DEFAULT);
             $email_addr = BoincDb::escape_string($email_addr);
             $user->email_addr_change_time = time();
             $result = $user->update(

html/user/recover_email.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         } else {
             echo tra("Email address has been reverted.")."<br /><br />".tra("You need to reset your password:  ")."<a href=\"".secure_url_base()."get_passwd.php\">".secure_url_base()."get_passwd.php</a>";
 
-            $database_passwd_hash = password_hash(random_string() , PASSWORD_DEFAULT);
+            $database_passwd_hash = password_hash(random_string(), PASSWORD_DEFAULT);
             //Change previous_email
             $result = $tmpuser->update(
                 "email_addr=previous_email_addr, previous_email_addr='', email_addr_change_time=0, passwd_hash='$database_passwd_hash', email_validated=0"

html/ops/test_token.php

Spacing +15 added lines, -15 removed lines

@@ -11,39 +11,39 @@
 BoincToken::insert("(token,userid,type,create_time, expire_time) values ('$token', 0, 'T', $now, $now+3600)");
 
 $boincTokens = BoincToken::enum("userid=0");
-foreach($boincTokens as $boincToken) {
-    echo $boincToken->token . "\n";
-    echo $boincToken->userid . "\n";
-    echo $boincToken->type . "\n";
-    echo $boincToken->create_time . "\n";
-    echo $boincToken->expire_time . "\n";
+foreach ($boincTokens as $boincToken) {
+    echo $boincToken->token."\n";
+    echo $boincToken->userid."\n";
+    echo $boincToken->type."\n";
+    echo $boincToken->create_time."\n";
+    echo $boincToken->expire_time."\n";
 }
 
 echo "---------------\n";
 $boincToken = BoincToken::lookup("userid=0");
-echo $boincToken->token . "\n";
-echo $boincToken->userid . "\n";
-echo $boincToken->type . "\n";
-echo $boincToken->create_time . "\n";
-echo $boincToken->expire_time . "\n";
+echo $boincToken->token."\n";
+echo $boincToken->userid."\n";
+echo $boincToken->type."\n";
+echo $boincToken->create_time."\n";
+echo $boincToken->expire_time."\n";
 
 echo "---------------\n";
 $boincToken = BoincToken::lookup_valid_token(0, $token, 'T');
-if ( $boincToken != null ) {
+if ($boincToken != null) {
     echo "Found valid token\n";
 }
 
 echo "---------------\n";
 $boincToken = BoincToken::lookup_valid_token(0, 'notrealtoken', 'T');
-if ( $boincToken == null ) {
+if ($boincToken == null) {
     echo "Successfully didn't find invalid token\n";
 }
 
 echo "---------------\n";
 $user = new BoincUser();
-$user->id=0;
+$user->id = 0;
 $token = create_token($user->id, TOKEN_TYPE_DELETE_ACCOUNT, TOKEN_DURATION_ONE_DAY);
-if ( is_valid_token($user->id, $token, TOKEN_TYPE_DELETE_ACCOUNT) ) {
+if (is_valid_token($user->id, $token, TOKEN_TYPE_DELETE_ACCOUNT)) {
     echo "Successfully created and validated delete account token";
 }
 

html/inc/user_util.inc

Spacing +4 added lines, -4 removed lines

@@ -56,7 +56,7 @@ 
 
 function check_passwd_ui($user, $passwd) {
     $passwd_hash = md5($passwd.$user->email_addr);
-    if(!check_passwd_hash($user, $passwd_hash)) {
+    if (!check_passwd_hash($user, $passwd_hash)) {
         sleep(LOGIN_FAIL_SLEEP_SEC);
         page_head("Password incorrect");
         echo "The password you entered is incorrect. Please go back and try again.\n";
@@ -68,7 +68,7 @@ 
 function is_banned_email_addr($email_addr) {
     global $banned_email_domains;
     if (isset($banned_email_domains)) {
-        foreach($banned_email_domains as $d) {
+        foreach ($banned_email_domains as $d) {
             $x = strstr($email_addr, $d);
             if ($x == $d) return true;
         }
@@ -96,7 +96,7 @@ 
 //
 function make_user(
     $email_addr, $name, $passwd_hash,
-    $country=null, $postal_code=null, $project_prefs=null, $teamid=0
+    $country = null, $postal_code = null, $project_prefs = null, $teamid = 0
 ) {
     if (!is_valid_email_addr($email_addr)) return null;
     if (is_banned_email_addr($email_addr)) return null;
@@ -228,7 +228,7 @@ 
         show_error(tra("Passwords may only include ASCII characters."));
     }
 
-    if (strlen($passwd)<$min_passwd_length) {
+    if (strlen($passwd) < $min_passwd_length) {
         show_error(
             tra("New password is too short: minimum password length is %1 characters.", $min_passwd_length)
         );