BOINC / boinc

drupal/sites/default/boinc/modules/boincimport/includes/import_users.php

Indentation +22 added lines, -22 removed lines

@@ -12,26 +12,26 @@ 
  */
 
 
-  require_once('./includes/bootstrap.inc');
-  drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-  require_boinc('db');
+    require_once('./includes/bootstrap.inc');
+    drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+    require_boinc('db');
   
-  // Parse arguments
-  $import_lurkers = isset($argv[1]) ? $argv[1] : false;
-  $record_offset = isset($argv[2]) ? $argv[2] : 0;
-  $chunk_size = isset($argv[3]) ? $argv[3] : 100;
+    // Parse arguments
+    $import_lurkers = isset($argv[1]) ? $argv[1] : false;
+    $record_offset = isset($argv[2]) ? $argv[2] : 0;
+    $chunk_size = isset($argv[3]) ? $argv[3] : 100;
   
-  // Construct sql conditions
-  $limit = sprintf('LIMIT %d,%d', $record_offset, $chunk_size);
+    // Construct sql conditions
+    $limit = sprintf('LIMIT %d,%d', $record_offset, $chunk_size);
   
-  $count = 0;
+    $count = 0;
   
-  db_set_active('boinc_rw');
-  if ($import_lurkers) {
+    db_set_active('boinc_rw');
+    if ($import_lurkers) {
     $boinc_accounts = db_query('SELECT id FROM user ORDER BY id %s', $limit);
-  }
-  //else $boinc_accounts = db_query('SELECT DISTINCT user AS boinc_id FROM post ORDER BY boinc_id %s', $limit);
-  else {
+    }
+    //else $boinc_accounts = db_query('SELECT DISTINCT user AS boinc_id FROM post ORDER BY boinc_id %s', $limit);
+    else {
     // Need to import any user who is currently ignored in order to keep them
     // ignored... not particularly clean (ignored users are stored in a string)
     $ignored_user_list = array();
@@ -42,7 +42,7 @@ 
       ORDER BY userid ASC"
     );
     while ($ignoring_user = db_fetch_object($ignoring_users)) {
-      $ignored_user_list = $ignored_user_list + array_fill_keys(explode('|', trim($ignoring_user->ignorelist, '|')), 1);
+        $ignored_user_list = $ignored_user_list + array_fill_keys(explode('|', trim($ignoring_user->ignorelist, '|')), 1);
     }
     $ignored_user_list = array_keys($ignored_user_list);
     $boinc_accounts = db_query("
@@ -58,14 +58,14 @@ 
         (SELECT DISTINCT senderid FROM {private_messages})
       ) AS usersToImport ORDER BY id ASC %s", implode(',', $ignored_user_list), $limit
     );
-  }
-  db_set_active('default');
+    }
+    db_set_active('default');
   
-  while ($boinc_account = db_fetch_object($boinc_accounts)) {
+    while ($boinc_account = db_fetch_object($boinc_accounts)) {
     // Grab the BOINC user object and create a Drupal user from it
     if (boincuser_register_make_drupal_user($boinc_account->id)) {
-      $count++;
+        $count++;
+    }
     }
-  }
   
-  echo $count;
+    echo $count;

drupal/sites/default/settings.php

Indentation +6 added lines, -6 removed lines

@@ -114,10 +114,10 @@ 
  */
 require_once('dbconfig.php');
 if (!isset($dbserver) || empty($dbserver))
-  $dbserver='localhost';
+    $dbserver='localhost';
 $db_url = array(
-  'default' => "{$dbtype}://{$dbuser}:".urlencode($dbpass)."@{$dbserver}/{$dbname}",
-  'boinc_rw' => "{$boinc_rw_dbtype}://{$boinc_rw_dbuser}:".urlencode($boinc_rw_dbpass)."@{$boinc_rw_dbserver}/{$boinc_rw_dbname}"
+    'default' => "{$dbtype}://{$dbuser}:".urlencode($dbpass)."@{$dbserver}/{$dbname}",
+    'boinc_rw' => "{$boinc_rw_dbtype}://{$boinc_rw_dbuser}:".urlencode($boinc_rw_dbpass)."@{$boinc_rw_dbserver}/{$boinc_rw_dbname}"
 );
 $db_prefix = '';
 
@@ -125,10 +125,10 @@ 
 // 'boinc_rw' entry as 'boinc_ro'.
 
 if (isset($boinc_ro_dbtype) && isset($boinc_ro_dbuser) && isset($boinc_ro_dbpass) && isset($boinc_ro_dbserver) && isset($boinc_ro_dbname)) {
-  $db_url['boinc_ro'] = "{$boinc_ro_dbtype}://{$boinc_ro_dbuser}:".urlencode($boinc_ro_dbpass)."@{$boinc_ro_dbserver}/{$boinc_ro_dbname}";
+    $db_url['boinc_ro'] = "{$boinc_ro_dbtype}://{$boinc_ro_dbuser}:".urlencode($boinc_ro_dbpass)."@{$boinc_ro_dbserver}/{$boinc_ro_dbname}";
 }
 else {
-  $db_url['boinc_ro'] = $db_url['boinc_rw'];
+    $db_url['boinc_ro'] = $db_url['boinc_rw'];
 }
 
 /**
@@ -216,5 +216,5 @@ 
  */
 
 if (stream_resolve_include_path('settings.local.php')) {
-  include 'settings.local.php';
+    include 'settings.local.php';
 }

Braces +1 added lines, -2 removed lines

@@ -126,8 +126,7 @@
 
 if (isset($boinc_ro_dbtype) && isset($boinc_ro_dbuser) && isset($boinc_ro_dbpass) && isset($boinc_ro_dbserver) && isset($boinc_ro_dbname)) {
   $db_url['boinc_ro'] = "{$boinc_ro_dbtype}://{$boinc_ro_dbuser}:".urlencode($boinc_ro_dbpass)."@{$boinc_ro_dbserver}/{$boinc_ro_dbname}";
-}
-else {
+} else {
   $db_url['boinc_ro'] = $db_url['boinc_rw'];
 }
 

Spacing +8 added lines, -8 removed lines

@@ -114,7 +114,7 @@ 
  */
 require_once('dbconfig.php');
 if (!isset($dbserver) || empty($dbserver))
-  $dbserver='localhost';
+  $dbserver = 'localhost';
 $db_url = array(
   'default' => "{$dbtype}://{$dbuser}:".urlencode($dbpass)."@{$dbserver}/{$dbname}",
   'boinc_rw' => "{$boinc_rw_dbtype}://{$boinc_rw_dbuser}:".urlencode($boinc_rw_dbpass)."@{$boinc_rw_dbserver}/{$boinc_rw_dbname}"
@@ -162,14 +162,14 @@ 
  * settings are used there. Settings defined here should not be
  * duplicated there so as to avoid conflict issues.
  */
-ini_set('session.cache_expire',     200000);
-ini_set('session.cache_limiter',    'none');
-ini_set('session.cookie_lifetime',  2000000);
-ini_set('session.gc_maxlifetime',   200000);
-ini_set('session.save_handler',     'user');
+ini_set('session.cache_expire', 200000);
+ini_set('session.cache_limiter', 'none');
+ini_set('session.cookie_lifetime', 2000000);
+ini_set('session.gc_maxlifetime', 200000);
+ini_set('session.save_handler', 'user');
 ini_set('session.use_only_cookies', 1);
-ini_set('session.use_trans_sid',    0);
-ini_set('url_rewriter.tags',        '');
+ini_set('session.use_trans_sid', 0);
+ini_set('url_rewriter.tags', '');
 ini_set('memory_limit', '128M');
 ini_set('post_max_size', '8MB');
 ini_set('upload_max_filesize', '8MB');

html/inc/bootstrap.inc

Spacing +15 added lines, -15 removed lines

@@ -138,12 +138,12 @@ 
         // prefix for links; needed for pages not in top dir
     $user,
         // logged-in user, if any
-    $fixed=false,
+    $fixed = false,
         // if true, navbar is fixed at top of page.
         // NOTE: if you do this, you must set a global var $fixed_navbar
         // to true at compile time
         // (it needs to be set when page_head() is called).
-    $inverse=false
+    $inverse = false
         // white on black?
 ) {
     global $master_url;
@@ -218,7 +218,7 @@ 
 // output a panel.
 // $content_func is a function that generates the panel contents
 //
-function panel($title, $content_func, $class="panel-primary") {
+function panel($title, $content_func, $class = "panel-primary") {
     echo sprintf('<div class="panel %s">
         ', $class
     );
@@ -244,7 +244,7 @@ 
 // are functions that generate the top, left, and right content
 // $left_width is the width of left column in 1/12 units.
 //
-function grid($top_func, $left_func, $right_func, $left_width=6) {
+function grid($top_func, $left_func, $right_func, $left_width = 6) {
     echo '
         <div class="container-fluid">
     ';
@@ -259,7 +259,7 @@ 
             </div>
         ';
     }
-    $right_width = 12-$left_width;
+    $right_width = 12 - $left_width;
     echo '
         <div class="row">
         <div class="col-sm-'.$left_width.'">
@@ -277,7 +277,7 @@ 
     ';
 }
 
-function form_start($action, $method='get') {
+function form_start($action, $method = 'get') {
     echo sprintf(
         '<div class="container">
         <form class="form-horizontal" method="%s" action="%s">'
@@ -301,7 +301,7 @@ 
 define('FORM_LEFT_OFFSET', 'col-sm-offset-4');
 define('FORM_RIGHT_CLASS', 'col-sm-8');
 
-function form_input_text($label, $name, $value='', $type='text', $attrs='', $extra='') {
+function form_input_text($label, $name, $value = '', $type = 'text', $attrs = '', $extra = '') {
     echo sprintf('
         <div class="form-group">
             <label class="control-label %s">%s</label>
@@ -328,7 +328,7 @@ 
     );
 }
 
-function form_input_textarea($label, $name, $value='') {
+function form_input_textarea($label, $name, $value = '') {
     echo sprintf('
         <div class="form-group">
             <label class="control-label %s" for="%s">%s</label>
@@ -377,7 +377,7 @@ 
     );
     $n = 0;
     foreach ($items as $i) {
-        $s = ($flags && $flags[$n])?'selected':'';
+        $s = ($flags && $flags[$n]) ? 'selected' : '';
         echo '<option '.$s.' value="'.$i[0].'">'.$i[1].'</option>
         ';
         $n++;
@@ -387,7 +387,7 @@ 
 
 // $items is list of (name, label, checked)
 //
-function form_checkboxes($label, $items, $attrs='') {
+function form_checkboxes($label, $items, $attrs = '') {
     echo sprintf('
         <div class="form-group">
             <label class="control-label %s">%s</label>
@@ -404,7 +404,7 @@ 
         }
         echo sprintf('<input %s type="checkbox" name="%s" %s> %s
             ',
-            $attrs, $i[0], $i[2]?"checked":"", $i[1]
+            $attrs, $i[0], $i[2] ? "checked" : "", $i[1]
         );
     }
     echo '</div>
@@ -423,7 +423,7 @@ 
         FORM_LEFT_CLASS, $label, FORM_RIGHT_CLASS
     );
     foreach ($items as $i) {
-        $checked = ($selected == $i[0])?"checked":"";
+        $checked = ($selected == $i[0]) ? "checked" : "";
         echo sprintf('<input type="radio" name="%s" value="%s" %s> %s <br>
             ',
             $name, $i[0], $checked, $i[1]
@@ -456,7 +456,7 @@ 
 ';
 }
 
-function form_submit($text, $attrs='') {
+function form_submit($text, $attrs = '') {
     form_general(
         "",
         sprintf('<button %s type="submit" class="btn btn-success">%s</button>',
@@ -465,11 +465,11 @@ 
     );
 }
 
-function form_checkbox($label, $name, $checked=false) {
+function form_checkbox($label, $name, $checked = false) {
     echo sprintf('
         <div class="form-group">
             <input type="checkbox" name="%s" %s> &nbsp; <span class="lead">%s</span>
         </div>
-        ', $name, $checked?"checked":"", $label
+        ', $name, $checked ? "checked" : "", $label
     );
 }

html/user/login_form.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 if (!parse_bool($config, "disable_account_creation")
     && !parse_bool($config, "no_web_account_creation")
 ) {
-    echo tra("or %1 create an account %2.", "<a href=\"create_account_form.php?next_url=$next_url\">","</a>");
+    echo tra("or %1 create an account %2.", "<a href=\"create_account_form.php?next_url=$next_url\">", "</a>");
 }
 
 page_tail();

drupal/sites/default/boinc/modules/boincteam/boincteam.admin.inc

Braces +3 added lines, -6 removed lines

@@ -105,8 +105,7 @@ 
       $drupalnid = boincteam_lookup_nid($result->id);
       if ($drupalnid) {
         $tlink = l($result->name, '/community/teams/' . $drupalnid);
-      }
-      else {
+      } else {
         $tlink = '';
       }
       // only keys no values
@@ -181,8 +180,7 @@ 
         drupal_render($form['link'][$key]),
       );
     }
-  }
-  else {
+  } else {
     $rows[] = array(array('data' => '<div class="error">No teams found</div>', 'colspan' => 5));
   }
   $output .= theme('table', $header, $rows);
@@ -230,8 +228,7 @@ 
   if ($success) {
     $message = 'Info: Delete SPAM Teams utility- ' . count($results) . ' team(s) deleted.';
     drupal_set_message($message, 'info');
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
   $form['help'] = array(
     '#type' => 'fieldset',
     '#title' => t('Help'),
-    '#collapsible' => TRUE,
+    '#collapsible' => true,
   );
 
   $form['help']['text'] = array(
@@ -127,7 +127,7 @@ 
     }
 
     $form['checkboxes'] = array('#type' => 'checkboxes', '#options' => $checkboxes);
-    $form['pager'] = array('#value' => theme('pager', NULL, $limit, 0));
+    $form['pager'] = array('#value' => theme('pager', null, $limit, 0));
 
     return $form;
   }
@@ -235,7 +235,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'Error: An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'Error: An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
     drupal_set_message($message, 'error');
   }
 }
\ No newline at end of file

Indentation +99 added lines, -99 removed lines

@@ -17,15 +17,15 @@ 
  * Utility Form to delete teams suspected of being spammers.
  */
 function boincteam_utility_delete(&$form_state) {
-  $form = array();
+    $form = array();
 
-  $form['help'] = array(
+    $form['help'] = array(
     '#type' => 'fieldset',
     '#title' => t('Help'),
     '#collapsible' => TRUE,
-  );
+    );
 
-  $form['help']['text'] = array(
+    $form['help']['text'] = array(
     '#type' => 'item',
     '#description' => t('This utility page will help in identifying BOINC teams created by SPAMMERs which can be deleted. The search will find BOINC teams that meet the following criteria.
 <ul>
@@ -38,19 +38,19 @@ 
 <p> <i>How teams are deleted</i>: Select the teams to be deleted from the table below. Click "Delete Selected Teams" button to begin a batch operation to delete the teams. If you select teams, and then page through to another page of the table, your selections will be lost. I.e., only the teams select on the current page will be deleted.
 <p> The site must be offline/in maintenance mode before searching for and deleting teams. If not, the delete button below is disabled.
 '),
-  );
+    );
 
-  // This variable name has been changed for Drupal 7/8.
-  $maintenance_mode = variable_get('site_offline');
-  if (!$maintenance_mode) {
+    // This variable name has been changed for Drupal 7/8.
+    $maintenance_mode = variable_get('site_offline');
+    if (!$maintenance_mode) {
     drupal_set_message(t('WARNING: Site is online (not in maintenance mode)! Deleting teams is only allowed when site is offline. Change this setting in ') . l(t('Site maintenance'), '/admin/settings/site-maintenance'), 'warning');
-  }
+    }
 
-  $form['teamdelete'] = array(
+    $form['teamdelete'] = array(
     '#type' => 'fieldset',
     '#title' => t('Teams to delete'),
-  );
-  $form['teamdelete']['deleteall'] = array(
+    );
+    $form['teamdelete']['deleteall'] = array(
     '#type' => 'submit',
     '#disabled' => !($maintenance_mode),
     '#value' => t('Delete Selected Teams'),
@@ -58,101 +58,101 @@ 
     '#attributes' => array(
         'onclick' => 'return confirm(\'' . t('You are about to delete the selected teams suspected of being SPAM. Do you want to continue?') . '\')',
     ),
-  );
-  $form['teamdelete']['results_table'] = array(
+    );
+    $form['teamdelete']['results_table'] = array(
     '#value' => drupal_get_form('boincteam_utility_team_table'),
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 function boincteam_utility_team_table() {
 
-  $limit=50;
-  $sql = "SELECT team.id AS id, team.name AS name, team.nusers AS nusers FROM {team} WHERE team.nusers<2 AND team.total_credit=0 AND team.seti_id=0 AND team.description REGEXP '<a href'";
+    $limit=50;
+    $sql = "SELECT team.id AS id, team.name AS name, team.nusers AS nusers FROM {team} WHERE team.nusers<2 AND team.total_credit=0 AND team.seti_id=0 AND team.description REGEXP '<a href'";
 
-  // @todo - add bts() or t()
-  $resultheader = array(
+    // @todo - add bts() or t()
+    $resultheader = array(
     array(
-      'data' => 'Team ID',
-      'field' => 'id',
-      'sort' => 'asc',
+        'data' => 'Team ID',
+        'field' => 'id',
+        'sort' => 'asc',
     ),
     array(
-      'data' => 'Team Name',
-      'field' => 'name',
+        'data' => 'Team Name',
+        'field' => 'name',
     ),
     array(
-      'data' => 'Num Users',
-      'field' => 'nusers',
+        'data' => 'Num Users',
+        'field' => 'nusers',
     ),
     array(
-      'data' => 'Link to Team',
-      'field' => 'link',
+        'data' => 'Link to Team',
+        'field' => 'link',
     ),
-  );
+    );
 
-  $tablesort = tablesort_sql($resultheader);
-  db_set_active('boinc_rw');
-  $db_res = pager_query($sql . $tablesort, $limit);
-  db_set_active('default');
+    $tablesort = tablesort_sql($resultheader);
+    db_set_active('boinc_rw');
+    $db_res = pager_query($sql . $tablesort, $limit);
+    db_set_active('default');
 
-  $form = array();
-  $form['options'] = array();
-  $checkboxes = array();
-  if ($db_res) {
+    $form = array();
+    $form['options'] = array();
+    $checkboxes = array();
+    if ($db_res) {
     while ($result = db_fetch_object($db_res)) {
-      $drupalnid = boincteam_lookup_nid($result->id);
-      if ($drupalnid) {
+        $drupalnid = boincteam_lookup_nid($result->id);
+        if ($drupalnid) {
         $tlink = l($result->name, '/community/teams/' . $drupalnid);
-      }
-      else {
+        }
+        else {
         $tlink = '';
-      }
-      // only keys no values
-      $checkboxes[$result->id] = '';
+        }
+        // only keys no values
+        $checkboxes[$result->id] = '';
 
-      $form['id'][$result->id] = array(
+        $form['id'][$result->id] = array(
         '#value' => $result->id,
-      );
-      $form['name'][$result->id] = array(
+        );
+        $form['name'][$result->id] = array(
         '#value' => $result->name,
-      );
-      $form['nusers'][$result->id] = array(
+        );
+        $form['nusers'][$result->id] = array(
         '#value' => $result->nusers,
-      );
-      $form['link'][$result->id] = array(
+        );
+        $form['link'][$result->id] = array(
         '#value' => $tlink,
-      );
+        );
     }
 
     $form['checkboxes'] = array('#type' => 'checkboxes', '#options' => $checkboxes);
     $form['pager'] = array('#value' => theme('pager', NULL, $limit, 0));
 
     return $form;
-  }
-  return "<p>No teams matched the criteria for a SPAM team.</p>";
+    }
+    return "<p>No teams matched the criteria for a SPAM team.</p>";
 }
 
 /**
  * Submit handler - also creates the batch job to delete the teams.
  */
 function boincteam_utility_delete_team($form, &$form_state) {
-  $checkedteamids = $form_state['clicked_button']['#post']['checkboxes'];
-  // Use batch to delete teams
-  $operations = array();
-  foreach ($checkedteamids as $id) {
+    $checkedteamids = $form_state['clicked_button']['#post']['checkboxes'];
+    // Use batch to delete teams
+    $operations = array();
+    foreach ($checkedteamids as $id) {
     $operations[] = array('boincteam_utility_batch_process', array($id));
-  }
-  $batch = array(
+    }
+    $batch = array(
     'title' => t('Processing BOINC Teams'),
     'operations' => $operations,
     'init_message' => t('Starting team deletion'),
     'finished' => 'boincteam_utility_batch_finished',
     'file' => drupal_get_path('module', 'boincteam') . '/boincteam.admin.inc',
-  );
-  batch_set($batch);
-  //batch_process('/admin/boinc/utility-team-delete');
+    );
+    batch_set($batch);
+    //batch_process('/admin/boinc/utility-team-delete');
 }
 
 /*
@@ -163,37 +163,37 @@ 
  *     Input form (table)
  */
 function theme_boincteam_utility_team_table($form) {
-  //define table header
-  $header = array(
+    //define table header
+    $header = array(
     theme('table_select_header_cell'), //using that previously empty field
     array('data' => t('Team ID'), 'field' => 'id', 'sort' => 'asc'),
     array('data' => t('Name'), 'field' => 'name'),
     array('data' => t('Num Users'), 'field' => 'nusers'),
     array('data' => t('Link to Team'), 'field' => 'link'),
-  );
-  $rows = array();
-  $output = "";
-  if(!empty($form['checkboxes']['#options'])) {
+    );
+    $rows = array();
+    $output = "";
+    if(!empty($form['checkboxes']['#options'])) {
     foreach (element_children($form['id']) as $key) {
-      $rows[] = array(
+        $rows[] = array(
         drupal_render($form['checkboxes'][$key]),
         drupal_render($form['id'][$key]),
         drupal_render($form['name'][$key]),
         drupal_render($form['nusers'][$key]),
         drupal_render($form['link'][$key]),
-      );
+        );
+    }
     }
-  }
-  else {
+    else {
     $rows[] = array(array('data' => '<div class="error">No teams found</div>', 'colspan' => 5));
-  }
-  $output .= theme('table', $header, $rows);
-  if ($form['pager']['#value']) {
+    }
+    $output .= theme('table', $header, $rows);
+    if ($form['pager']['#value']) {
     $output .= drupal_render($form['pager']);
-  }
+    }
 
-  $output .= drupal_render($form);
-  return $output;
+    $output .= drupal_render($form);
+    return $output;
 }
 
 /**
@@ -202,26 +202,26 @@ 
  * table. It also removes the team's drupal page (node) if found.
  */
 function boincteam_utility_batch_process($id, &$context) {
-  $boincteam = boincteam_load($id);
-  $drupalid = boincteam_lookup_nid($id);
+    $boincteam = boincteam_load($id);
+    $drupalid = boincteam_lookup_nid($id);
 
-  // Delete entry in team table
-  db_set_active('boinc_rw');
-  $sql1='DELETE FROM {team} WHERE id=%d';
-  $db_res = db_query($sql1, $id);
-  db_set_active('default');
+    // Delete entry in team table
+    db_set_active('boinc_rw');
+    $sql1='DELETE FROM {team} WHERE id=%d';
+    $db_res = db_query($sql1, $id);
+    db_set_active('default');
 
-  // Delete entry in boincteam table
-  $sql2='DELETE FROM {boincteam} WHERE id=%d';
-  $db_res = db_query($sql2, $id);
+    // Delete entry in boincteam table
+    $sql2='DELETE FROM {boincteam} WHERE id=%d';
+    $db_res = db_query($sql2, $id);
 
-  // Delete the drupal node (if present)
-  if ($drupalid) {
+    // Delete the drupal node (if present)
+    if ($drupalid) {
     node_delete($drupalid);
-  }
+    }
 
-  $context['results'][] = $id . ' : ' . check_plain($boincteam->name);
-  $context['message'] = t('Processing team @name', array('@name' => $boincteam->name));
+    $context['results'][] = $id . ' : ' . check_plain($boincteam->name);
+    $context['message'] = t('Processing team @name', array('@name' => $boincteam->name));
 }
 
 /**
@@ -229,15 +229,15 @@ 
  * or failure.
  */
 function boincteam_utility_batch_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     $message = 'Info: Delete SPAM Teams utility- ' . count($results) . ' team(s) deleted.';
     drupal_set_message($message, 'info');
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'Error: An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
     drupal_set_message($message, 'error');
-  }
+    }
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -43,7 +43,7 @@ 
   // This variable name has been changed for Drupal 7/8.
   $maintenance_mode = variable_get('site_offline');
   if (!$maintenance_mode) {
-    drupal_set_message(t('WARNING: Site is online (not in maintenance mode)! Deleting teams is only allowed when site is offline. Change this setting in ') . l(t('Site maintenance'), '/admin/settings/site-maintenance'), 'warning');
+    drupal_set_message(t('WARNING: Site is online (not in maintenance mode)! Deleting teams is only allowed when site is offline. Change this setting in ').l(t('Site maintenance'), '/admin/settings/site-maintenance'), 'warning');
   }
 
   $form['teamdelete'] = array(
@@ -56,7 +56,7 @@ 
     '#value' => t('Delete Selected Teams'),
     '#submit' => array('boincteam_utility_delete_team'),
     '#attributes' => array(
-        'onclick' => 'return confirm(\'' . t('You are about to delete the selected teams suspected of being SPAM. Do you want to continue?') . '\')',
+        'onclick' => 'return confirm(\''.t('You are about to delete the selected teams suspected of being SPAM. Do you want to continue?').'\')',
     ),
   );
   $form['teamdelete']['results_table'] = array(
@@ -68,7 +68,7 @@ 
 
 function boincteam_utility_team_table() {
 
-  $limit=50;
+  $limit = 50;
   $sql = "SELECT team.id AS id, team.name AS name, team.nusers AS nusers FROM {team} WHERE team.nusers<2 AND team.total_credit=0 AND team.seti_id=0 AND team.description REGEXP '<a href'";
 
   // @todo - add bts() or t()
@@ -94,7 +94,7 @@ 
 
   $tablesort = tablesort_sql($resultheader);
   db_set_active('boinc_rw');
-  $db_res = pager_query($sql . $tablesort, $limit);
+  $db_res = pager_query($sql.$tablesort, $limit);
   db_set_active('default');
 
   $form = array();
@@ -104,7 +104,7 @@ 
     while ($result = db_fetch_object($db_res)) {
       $drupalnid = boincteam_lookup_nid($result->id);
       if ($drupalnid) {
-        $tlink = l($result->name, '/community/teams/' . $drupalnid);
+        $tlink = l($result->name, '/community/teams/'.$drupalnid);
       }
       else {
         $tlink = '';
@@ -149,7 +149,7 @@ 
     'operations' => $operations,
     'init_message' => t('Starting team deletion'),
     'finished' => 'boincteam_utility_batch_finished',
-    'file' => drupal_get_path('module', 'boincteam') . '/boincteam.admin.inc',
+    'file' => drupal_get_path('module', 'boincteam').'/boincteam.admin.inc',
   );
   batch_set($batch);
   //batch_process('/admin/boinc/utility-team-delete');
@@ -173,7 +173,7 @@ 
   );
   $rows = array();
   $output = "";
-  if(!empty($form['checkboxes']['#options'])) {
+  if (!empty($form['checkboxes']['#options'])) {
     foreach (element_children($form['id']) as $key) {
       $rows[] = array(
         drupal_render($form['checkboxes'][$key]),
@@ -207,12 +207,12 @@ 
 
   // Delete entry in team table
   db_set_active('boinc_rw');
-  $sql1='DELETE FROM {team} WHERE id=%d';
+  $sql1 = 'DELETE FROM {team} WHERE id=%d';
   $db_res = db_query($sql1, $id);
   db_set_active('default');
 
   // Delete entry in boincteam table
-  $sql2='DELETE FROM {boincteam} WHERE id=%d';
+  $sql2 = 'DELETE FROM {boincteam} WHERE id=%d';
   $db_res = db_query($sql2, $id);
 
   // Delete the drupal node (if present)
@@ -220,7 +220,7 @@ 
     node_delete($drupalid);
   }
 
-  $context['results'][] = $id . ' : ' . check_plain($boincteam->name);
+  $context['results'][] = $id.' : '.check_plain($boincteam->name);
   $context['message'] = t('Processing team @name', array('@name' => $boincteam->name));
 }
 
@@ -230,14 +230,14 @@ 
  */
 function boincteam_utility_batch_finished($success, $results, $operations) {
   if ($success) {
-    $message = 'Info: Delete SPAM Teams utility- ' . count($results) . ' team(s) deleted.';
+    $message = 'Info: Delete SPAM Teams utility- '.count($results).' team(s) deleted.';
     drupal_set_message($message, 'info');
   }
   else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'Error: An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'Error: An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
     drupal_set_message($message, 'error');
   }
 }
\ No newline at end of file

html/user/edit_passwd_form.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 page_head(tra("Change password"));
 
 form_start(secure_url_base()."edit_passwd_action.php", "post");
-form_input_text(tra("New password"), "passwd", "", "password",'id="passwd"',passwd_visible_checkbox("passwd"));
+form_input_text(tra("New password"), "passwd", "", "password", 'id="passwd"', passwd_visible_checkbox("passwd"));
 form_submit(tra("Change password"));
 form_end();
 page_tail();

html/ops/delete_user.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 die("Delete this line first\n");
 
-$id = (int) $argv[1];
+$id = (int)$argv[1];
 
 $user = BoincUser::lookup_id($id);
 if (!$user) die("no such user\n");

html/inc/password_compat/password.inc

Switch Indentation +40 added lines, -40 removed lines

@@ -50,47 +50,47 @@ 
             }
             $resultLength = 0;
             switch ($algo) {
-                case PASSWORD_BCRYPT:
-                    $cost = PASSWORD_BCRYPT_DEFAULT_COST;
-                    if (isset($options['cost'])) {
-                        $cost = (int) $options['cost'];
-                        if ($cost < 4 || $cost > 31) {
-                            trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
-                            return null;
-                        }
+            case PASSWORD_BCRYPT:
+                $cost = PASSWORD_BCRYPT_DEFAULT_COST;
+                if (isset($options['cost'])) {
+                    $cost = (int) $options['cost'];
+                    if ($cost < 4 || $cost > 31) {
+                        trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
+                        return null;
                     }
-                    // The length of salt to generate
-                    $raw_salt_len = 16;
-                    // The length required in the final serialization
-                    $required_salt_len = 22;
-                    $hash_format = sprintf("$2y$%02d$", $cost);
-                    // The expected length of the final crypt() output
-                    $resultLength = 60;
-                    break;
-                default:
-                    trigger_error(sprintf("password_hash(): Unknown password hashing algorithm: %s", $algo), E_USER_WARNING);
-                    return null;
+                }
+                // The length of salt to generate
+                $raw_salt_len = 16;
+                // The length required in the final serialization
+                $required_salt_len = 22;
+                $hash_format = sprintf("$2y$%02d$", $cost);
+                // The expected length of the final crypt() output
+                $resultLength = 60;
+                break;
+            default:
+                trigger_error(sprintf("password_hash(): Unknown password hashing algorithm: %s", $algo), E_USER_WARNING);
+                return null;
             }
             $salt_req_encoding = false;
             if (isset($options['salt'])) {
                 switch (gettype($options['salt'])) {
-                    case 'NULL':
-                    case 'boolean':
-                    case 'integer':
-                    case 'double':
-                    case 'string':
+                case 'NULL':
+                case 'boolean':
+                case 'integer':
+                case 'double':
+                case 'string':
+                    $salt = (string) $options['salt'];
+                    break;
+                case 'object':
+                    if (method_exists($options['salt'], '__tostring')) {
                         $salt = (string) $options['salt'];
                         break;
-                    case 'object':
-                        if (method_exists($options['salt'], '__tostring')) {
-                            $salt = (string) $options['salt'];
-                            break;
-                        }
-                    case 'array':
-                    case 'resource':
-                    default:
-                        trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING);
-                        return null;
+                    }
+                case 'array':
+                case 'resource':
+                default:
+                    trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING);
+                    return null;
                 }
                 if (PasswordCompat\binary\_strlen($salt) < $required_salt_len) {
                     trigger_error(sprintf("password_hash(): Provided salt is too short: %d expecting %d", PasswordCompat\binary\_strlen($salt), $required_salt_len), E_USER_WARNING);
@@ -212,12 +212,12 @@ 
                 return true;
             }
             switch ($algo) {
-                case PASSWORD_BCRYPT:
-                    $cost = isset($options['cost']) ? (int) $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
-                    if ($cost !== $info['options']['cost']) {
-                        return true;
-                    }
-                    break;
+            case PASSWORD_BCRYPT:
+                $cost = isset($options['cost']) ? (int) $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
+                if ($cost !== $info['options']['cost']) {
+                    return true;
+                }
+                break;
             }
             return false;
         }

Spacing +11 added lines, -11 removed lines

@@ -38,14 +38,14 @@ 
                 return null;
             }
             if (is_null($password) || is_int($password)) {
-                $password = (string) $password;
+                $password = (string)$password;
             }
             if (!is_string($password)) {
                 trigger_error("password_hash(): Password must be a string", E_USER_WARNING);
                 return null;
             }
             if (!is_int($algo)) {
-                trigger_error("password_hash() expects parameter 2 to be long, " . gettype($algo) . " given", E_USER_WARNING);
+                trigger_error("password_hash() expects parameter 2 to be long, ".gettype($algo)." given", E_USER_WARNING);
                 return null;
             }
             $resultLength = 0;
@@ -53,7 +53,7 @@ 
                 case PASSWORD_BCRYPT:
                     $cost = PASSWORD_BCRYPT_DEFAULT_COST;
                     if (isset($options['cost'])) {
-                        $cost = (int) $options['cost'];
+                        $cost = (int)$options['cost'];
                         if ($cost < 4 || $cost > 31) {
                             trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
                             return null;
@@ -79,11 +79,11 @@ 
                     case 'integer':
                     case 'double':
                     case 'string':
-                        $salt = (string) $options['salt'];
+                        $salt = (string)$options['salt'];
                         break;
                     case 'object':
                         if (method_exists($options['salt'], '__tostring')) {
-                            $salt = (string) $options['salt'];
+                            $salt = (string)$options['salt'];
                             break;
                         }
                     case 'array':
@@ -126,13 +126,13 @@ 
                     if ($read >= $raw_salt_len) {
                         $buffer_valid = true;
                     }
-                    $buffer = str_pad($buffer, $raw_salt_len, "\0") ^ str_pad($local_buffer, $raw_salt_len, "\0");
+                    $buffer = str_pad($buffer, $raw_salt_len, "\0")^str_pad($local_buffer, $raw_salt_len, "\0");
                 }
                 if (!$buffer_valid || PasswordCompat\binary\_strlen($buffer) < $raw_salt_len) {
                     $buffer_length = PasswordCompat\binary\_strlen($buffer);
                     for ($i = 0; $i < $raw_salt_len; $i++) {
                         if ($i < $buffer_length) {
-                            $buffer[$i] = $buffer[$i] ^ chr(mt_rand(0, 255));
+                            $buffer[$i] = $buffer[$i]^chr(mt_rand(0, 255));
                         } else {
                             $buffer .= chr(mt_rand(0, 255));
                         }
@@ -153,7 +153,7 @@ 
             }
             $salt = PasswordCompat\binary\_substr($salt, 0, $required_salt_len);
 
-            $hash = $hash_format . $salt;
+            $hash = $hash_format.$salt;
 
             $ret = crypt($password, $hash);
 
@@ -208,12 +208,12 @@ 
          */
         function password_needs_rehash($hash, $algo, array $options = array()) {
             $info = password_get_info($hash);
-            if ($info['algo'] !== (int) $algo) {
+            if ($info['algo'] !== (int)$algo) {
                 return true;
             }
             switch ($algo) {
                 case PASSWORD_BCRYPT:
-                    $cost = isset($options['cost']) ? (int) $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
+                    $cost = isset($options['cost']) ? (int)$options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
                     if ($cost !== $info['options']['cost']) {
                         return true;
                     }
@@ -242,7 +242,7 @@ 
 
             $status = 0;
             for ($i = 0; $i < PasswordCompat\binary\_strlen($ret); $i++) {
-                $status |= (ord($ret[$i]) ^ ord($hash[$i]));
+                $status |= (ord($ret[$i])^ord($hash[$i]));
             }
 
             return $status === 0;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -299,7 +299,7 @@
          * @return boolean the check result
          */
         function check() {
-            static $pass = NULL;
+            static $pass = null;
 
             if (is_null($pass)) {
                 if (function_exists('crypt')) {

html/inc/random_compat/random_bytes_com_dotnet.inc

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
      *
      * @return string
      */
-    function random_bytes($bytes)
-    {
+    function random_bytes($bytes) {
         try {
             $bytes = RandomCompat_intval($bytes);
         } catch (TypeError $ex) {