BOINC / boinc

html/inc/random_compat/random_bytes_libsodium_legacy.inc

Spacing +2 added lines, -2 removed lines

@@ -70,10 +70,10 @@
                 $n = ($bytes - $i) > 1073741824
                     ? 1073741824
                     : $bytes - $i;
-                $buf .= Sodium::randombytes_buf((int) $n);
+                $buf .= Sodium::randombytes_buf((int)$n);
             }
         } else {
-            $buf .= Sodium::randombytes_buf((int) $bytes);
+            $buf .= Sodium::randombytes_buf((int)$bytes);
         }
 
         if (is_string($buf)) {

html/inc/random_compat/random_int.inc

Spacing +5 added lines, -5 removed lines

@@ -78,7 +78,7 @@ 
         }
 
         if ($max === $min) {
-            return (int) $min;
+            return (int)$min;
         }
 
         /**
@@ -124,12 +124,12 @@ 
              * type juggling
              */
             while ($range > 0) {
-                if ($bits % 8 === 0) {
+                if ($bits%8 === 0) {
                     ++$bytes;
                 }
                 ++$bits;
                 $range >>= 1;
-                $mask = $mask << 1 | 1;
+                $mask = $mask << 1|1;
             }
             $valueShift = $min;
         }
@@ -167,7 +167,7 @@ 
              */
             $val &= 0;
             for ($i = 0; $i < $bytes; ++$i) {
-                $val |= ord($randomByteString[$i]) << ($i * 8);
+                $val |= ord($randomByteString[$i]) << ($i*8);
             }
 
             /**
@@ -185,6 +185,6 @@ 
              */
         } while (!is_int($val) || $val > $max || $val < $min);
 
-        return (int) $val;
+        return (int)$val;
     }
 }

html/inc/random_compat/cast_to_int.inc

Spacing +2 added lines, -2 removed lines

@@ -60,11 +60,11 @@
             &&
             $number < PHP_INT_MAX
         ) {
-            $number = (int) $number;
+            $number = (int)$number;
         }
 
         if (is_int($number)) {
-            return (int) $number;
+            return (int)$number;
         } elseif (!$fail_open) {
             throw new TypeError(
                 'Expected an integer.'

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/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/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";
 }
 

drupal/sites/default/boinc/modules/boincwork/boincwork.module

Spacing +41 added lines, -41 removed lines

@@ -133,7 +133,7 @@ 
   $items['host/%/set-venue/%'] = array(
     'title' => 'Set host venue',
     'page callback' => 'boincwork_host_set_venue',
-    'page arguments' => array(1,3),
+    'page arguments' => array(1, 3),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
   );
@@ -184,7 +184,7 @@ 
     'title' => 'Account Tasks Table',
     'description' => '',
     'page callback' => 'boincwork_account_task_table',
-    'page arguments' => array(2,3),
+    'page arguments' => array(2, 3),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
   );
@@ -192,7 +192,7 @@ 
     'title' => 'Host Tasks Table',
     'description' => '',
     'page callback' => 'boincwork_host_task_table',
-    'page arguments' => array(1,3,4),
+    'page arguments' => array(1, 3, 4),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
   );
@@ -276,15 +276,15 @@ 
     if ($vars['message']['is_blocked']) {
       $vars['message_actions']['unignore_user'] = array(
         'title' => bts('Stop Ignoring User', array(), NULL, 'boinc:ignore-user-remove'),
-        'href' => 'account/prefs/privacy/ignore_user/remove/'. $author->uid,
-        'query' => 'destination=messages/view/' . $thread_id,
+        'href' => 'account/prefs/privacy/ignore_user/remove/'.$author->uid,
+        'query' => 'destination=messages/view/'.$thread_id,
       );
     }
     else {
       $vars['message_actions']['ignore_user'] = array(
         'title' => bts('Ignore User', array(), NULL, 'boinc:ignore-user-add'),
-        'href' => 'account/prefs/privacy/ignore_user/add/'. $author->uid,
-        'query' => 'destination=messages/view/' . $thread_id,
+        'href' => 'account/prefs/privacy/ignore_user/add/'.$author->uid,
+        'query' => 'destination=messages/view/'.$thread_id,
       );
     }
   }
@@ -297,7 +297,7 @@ 
   // Delete expired hosts in the BOINC database, host_delete table.
   require_boinc('boinc_db');
   $num_deleted = BoincHostDeleted::delete_expired();
-  if ($num_deleted>0) {
+  if ($num_deleted > 0) {
     watchdog('boincwork', "Deleted ${num_deleted} hosts from host_deleted table", WATCHDOG_NOTICE);
   }
 }
@@ -344,10 +344,10 @@ 
       drupal_prepare_form('boincwork_generalprefs_form', $prefs[$pref_set], $form_state);
     }
 
-    $output .= '<p>' . bts('These apply to all BOINC projects in which you participate.', array(), NULL, 'boinc:account-preferences-computing') . '<br/>';
-    $output .= bts('On computers attached to multiple projects, the most recently modified preferences will be used.', array(), NULL, 'boinc:account-preferences-computing') . '</p>';
-    $output .= '<p>' . bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['prefs']['modified']['#value'])), NULL, 'boinc:account-preferences') . '</p>';
-    $output .= '<h2>' . bts('Combined preferences', array(), NULL, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/computing') . '</h2>';
+    $output .= '<p>'.bts('These apply to all BOINC projects in which you participate.', array(), NULL, 'boinc:account-preferences-computing').'<br/>';
+    $output .= bts('On computers attached to multiple projects, the most recently modified preferences will be used.', array(), NULL, 'boinc:account-preferences-computing').'</p>';
+    $output .= '<p>'.bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['prefs']['modified']['#value'])), NULL, 'boinc:account-preferences').'</p>';
+    $output .= '<h2>'.bts('Combined preferences', array(), NULL, 'boinc:account-preferences').' '.l('('.bts('Switch View', array(), NULL, 'boinc:account-preferences').')', 'account/prefs/computing').'</h2>';
     
     $output .= '<table class="preferences combined">';
     
@@ -357,7 +357,7 @@ 
       $output .= '<tr class="section-heading">';
       $output .= "<td>{$section['name']}</td>";
       foreach ($pref_sets as $pref_set) {
-        $output .= '<td>' . $pref_set . '</td>';
+        $output .= '<td>'.$pref_set.'</td>';
       }
       $output .= '</tr>';
       foreach ($section['elements'] as $name => $setting) {
@@ -405,11 +405,11 @@ 
               $second_pref = $special_map[$name];
               $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref];
               $second_value = isset($second_pref_setting['#options']) ? $second_pref_setting['#options'][$second_pref_setting['#default_value']] : $second_pref_setting['#default_value'];
-              $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
+              $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}".
                 " {$second_value} {$second_pref_setting['#field_suffix']} </td>";
             }
           }
-          else  {
+          else {
             $output .= '<td>---</td>';
           }
         }
@@ -437,12 +437,12 @@ 
       );
       // Show Clear links for established preference sets
       if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
-        $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$pref_set}",
+        $output .= ' </li><li class="tab"> '.l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$pref_set}",
           array(
             'query' => drupal_get_destination(),
             'attributes' => array(
-              'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
-                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-computing-preferences') . '\')'
+              'onclick' => 'return confirm(\''.bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
+                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-computing-preferences').'\')'
             )
           )
         );
@@ -468,8 +468,8 @@ 
         "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location')
       );
       variable_set('jump_use_js_venues-Array', 1);
-      drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-      drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
+      drupal_add_js(drupal_get_path('module', 'jump').'/jump.js');
+      drupal_add_js(drupal_get_path('theme', 'boinc').'/js/prefs.js', 'theme');
       
       $output .= '<div id="venue-selector" class="simple-form-controls">';
       $output .= '  <div class="form-item venue">';
@@ -489,7 +489,7 @@ 
     if (!$current_set['#established']) {
       drupal_set_message(bts(
           "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
-          array( '@venue' => $venue, ),
+          array('@venue' => $venue,),
           NULL, 'boinc:account-preferences'), 'status');
     }
     
@@ -548,8 +548,8 @@ 
       drupal_prepare_form('boincwork_projectprefs_form', $prefs[$pref_set], $form_state);
     }
 
-    $output .= '<p>' . bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['modified']['#value'])), NULL, 'boinc:account-preferences') . '</p>';
-    $output .= '<h2>' . bts('Combined preferences', array(), NULL, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project') . '</h2>';
+    $output .= '<p>'.bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['modified']['#value'])), NULL, 'boinc:account-preferences').'</p>';
+    $output .= '<h2>'.bts('Combined preferences', array(), NULL, 'boinc:account-preferences').' '.l('('.bts('Switch View', array(), NULL, 'boinc:account-preferences').')', 'account/prefs/project').'</h2>';
     
     $output .= '<table class="preferences combined">';
     
@@ -559,7 +559,7 @@ 
       $output .= '<tr class="section-heading">';
       $output .= "<td>{$section['name']}</td>";
       foreach ($pref_sets as $pref_set) {
-        $output .= '<td>' . $pref_set . '</td>';
+        $output .= '<td>'.$pref_set.'</td>';
       }
       $output .= '</tr>';
       foreach ($section['elements'] as $name => $setting) {
@@ -601,12 +601,12 @@ 
       $output .= l($action_text, "account/prefs/project/edit/{$pref_set}");
       // Show Clear links for established preference sets
       if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
-        $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$pref_set}",
+        $output .= ' </li><li class="tab"> '.l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$pref_set}",
           array(
             'query' => drupal_get_destination(),
             'attributes' => array(
-              'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
-                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-preferences-project') . '\')'
+              'onclick' => 'return confirm(\''.bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
+                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-preferences-project').'\')'
             )
           )
         );
@@ -622,7 +622,7 @@ 
     // Set this preference set as the one to use for any new hosts attached
     // to the user account
     boincwork_set_default_venue($venue);
-    drupal_set_message( bts('The primary preference set has been changed to "@set"', array('@set' => $venue), NULL, 'boinc:account-preferences-project') );
+    drupal_set_message(bts('The primary preference set has been changed to "@set"', array('@set' => $venue), NULL, 'boinc:account-preferences-project'));
     drupal_goto('account/prefs/project/combined');
     break;
     
@@ -641,8 +641,8 @@ 
         "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location')
       );
       variable_set('jump_use_js_venues-Array', 1);
-      drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-      drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
+      drupal_add_js(drupal_get_path('module', 'jump').'/jump.js');
+      drupal_add_js(drupal_get_path('theme', 'boinc').'/js/prefs.js', 'theme');
       
       $output .= '<div id="venue-selector" class="simple-form-controls">';
       $output .= '  <div class="form-item venue">';
@@ -662,7 +662,7 @@ 
     if (!$current_set['#established']) {
       drupal_set_message(bts(
           "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
-          array( '@venue' => $venue, ),
+          array('@venue' => $venue,),
           NULL, 'boinc:account-preferences'), 'status');
     }
     
@@ -734,7 +734,7 @@ 
     // Edit preferences link
     $output .= '<tr>';
     $output .= '<td></td>';
-    $output .= '<td>' . l(bts('Edit privacy preferences', array('@project' => PROJECT), NULL, 'boinc:account-preferences-privacy'), "account/prefs/privacy/edit") . '</td>';
+    $output .= '<td>'.l(bts('Edit privacy preferences', array('@project' => PROJECT), NULL, 'boinc:account-preferences-privacy'), "account/prefs/privacy/edit").'</td>';
     $output .= '</tr>';
     
     $output .= '</table>';
@@ -769,15 +769,15 @@ 
   switch ($type) {
   case 'all':
     //include_boinc('user/cert_all.php');
-    require_boinc(array('util','cert','user'));
+    require_boinc(array('util', 'cert', 'user'));
 
     $join = date('j F Y', $boincuser->create_time);
     $today = date('j F Y', time(0));
 
-    if ($border=="no") {
+    if ($border == "no") {
         $border = 0;
     } else {
-        $border=8;
+        $border = 8;
     }
 
     $title_font = "\"Optima,ZapfChancery\"";
@@ -821,7 +821,7 @@ 
         <tr><th align=left>Project</th><th align=left>Cobblestones</th><th align=left>Joined</th></tr>
     ";
     foreach ($boincuser->projects as $p) {
-        if ($p->total_credit<100) continue;
+        if ($p->total_credit < 100) continue;
         show_proj($p);
     }
     echo "
@@ -840,15 +840,15 @@ 
   case 'account':
   default:
     //include_boinc('user/cert1.php');
-    require_boinc(array('util','cert'));
+    require_boinc(array('util', 'cert'));
 
     $join = date('j F Y', $boincuser->create_time);
     $today = date('j F Y', time(0));
 
-    if ($border=="no") {
+    if ($border == "no") {
         $border = 0;
     } else {
-        $border=8;
+        $border = 8;
     }
 
     $credit = credit_string($boincuser->total_credit, false);
@@ -1064,7 +1064,7 @@ 
 
   // If terms of use string exists and override is true, set terms-of-use
   // to Drupal varaible.
-  if ( (!empty($termsofuse) && ($overrideboinctou)) ) {
+  if ((!empty($termsofuse) && ($overrideboinctou))) {
     if (!empty($xml['project_config']['terms_of_use'])) {
       // Remove any existing terms of use
       unset($xml['project_config']['terms_of_use']);
@@ -1111,7 +1111,7 @@ 
  * Page callback for host task table
  */
 function boincwork_host_task_table($host_id = NULL, $tselect = NULL, $app_id = NULL) {
-  require_boinc( array('util', 'result') );
+  require_boinc(array('util', 'result'));
 
   $title = bts('Tasks for computer @host_id', array('@host_id' => $host_id), NULL, 'boinc:host-task-table');
   drupal_set_title($title);