BOINC / boinc

drupal/sites/default/boinc/modules/boincteam/includes/boincteam.helpers.inc

Spacing +5 added lines, -5 removed lines

@@ -87,15 +87,15 @@ 
       'teaser' => $teaser,
       'uid' => boincuser_lookup_uid($boincteam->userid),
       'path' => null,
-      'status' => 1,  // published or not - always publish
+      'status' => 1, // published or not - always publish
       'promote' => 0,
       'created' => $boincteam->create_time,
-      'comment' => 0,  // comments disabled
+      'comment' => 0, // comments disabled
       'moderate' => 0,
       'sticky' => 0,
       'format' => $input_format
     );
-    $node = (object) $node; // node_save requires an object form
+    $node = (object)$node; // node_save requires an object form
   }
   
   $node->taxonomy[] = taxonomy_get_term($team_type_tid);
@@ -125,7 +125,7 @@ 
  *   flag send_email=1, meaning their notification privacy will be
  *   respected. This is useful the list of users are to be contacted.
  */
-function _boincteam_userids($boincteamid, $boincid=TRUE, $respectprivacy=TRUE) {
+function _boincteam_userids($boincteamid, $boincid = TRUE, $respectprivacy = TRUE) {
   $sql = 'SELECT user.id as id FROM {user} user WHERE user.teamid=%s';
   if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';
@@ -157,7 +157,7 @@ 
  *   flag send_email=1, meaning their notification privacy will be
  *   respected. This is useful the list of users are to be contacted.
  */
-function _boincteam_emails($boincteamid, $respectprivacy=TRUE) {
+function _boincteam_emails($boincteamid, $respectprivacy = TRUE) {
   $sql = 'SELECT user.email_addr as email_addr FROM {user} user WHERE user.teamid=%s';
   if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';

drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc

Spacing +14 added lines, -14 removed lines

@@ -119,7 +119,7 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>'
   );
   
   return $form;
@@ -163,7 +163,7 @@ 
   
   // Create the team in the BOINC db
   
-  require_boinc(array('user','team'));
+  require_boinc(array('user', 'team'));
   $boinc_team = make_team(
     $account->boincuser_id,
     $values['name'],
@@ -199,10 +199,10 @@ 
     'teaser' => $teaser,
     'uid' => $user->uid,
     'path' => null,
-    'status' => 1,  // published or not - always publish
+    'status' => 1, // published or not - always publish
     'promote' => 0,
     'created' => $created_time,
-    'comment' => 0,  // comments disabled
+    'comment' => 0, // comments disabled
     'moderate' => 0,
     'sticky' => 0,
     'format' => $input_format
@@ -229,7 +229,7 @@ 
   $node['og_private'] = 0;
   */
   
-  $node = (object) $node; // node_save requires an object form
+  $node = (object)$node; // node_save requires an object form
   
   /*
   $node->field_description[]['value'] = $boincteam->description;
@@ -379,12 +379,12 @@ 
       '#suffix' => '</li>',
     );
     $form['form control tabs'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)).'</li>'
     );
   }
   else {
     $form['description'] = array(
-      '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
+      '#prefix' => '<div class="form-item"><label>'.bts('Description', array(), NULL, 'boinc:team-description').':</label></div><div class="form-item">',
       '#value' => $default['description'],
       '#suffix' => '</div>',
     );
@@ -540,7 +540,7 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)).'</li>'
   );
   
   //$form['#redirect'] = "community/teams/{$team_id}";
@@ -656,7 +656,7 @@ 
   drupal_set_title($mytitle);
 
   $form['emailteam']['header'] = array(
-    '#value'              => '<h1>' . $mytitle . '</h1>',
+    '#value'              => '<h1>'.$mytitle.'</h1>',
     '#weight'             => '-10',
     '#prefix'             => "<div id='sendmessageteammembers-header'>",
     '#suffix'             => "</div>",
@@ -778,7 +778,7 @@ 
   }
 
   // Check body
-  if ( ($message['body'] === NULL || $message['body'] === '') ) {
+  if (($message['body'] === NULL || $message['body'] === '')) {
     form_set_error('body',
       bts('Not allowed to send an empty message.', array(), NULL, 'boinc:team-message-form')
     );
@@ -803,8 +803,8 @@ 
   global $base_path;
 
   $suid = $form_state['values']['_senderuid'];
-  $account = user_load(array('uid' => $suid ));
-  $site_url = $base_url . $base_path . "messages/new/" . $suid;
+  $account = user_load(array('uid' => $suid));
+  $site_url = $base_url.$base_path."messages/new/".$suid;
 
   // Form is validated, now send to all team members. Lookup boinc
   // id of all team members, and then use user_load() to load user
@@ -815,7 +815,7 @@ 
   // emails removed.
   $member_emails = _boincteam_emails($boinc_id);
   // Remove sender's email address, unless selfsend is true.
-  if ( !$form_state['values']['selfsend'] ) {
+  if (!$form_state['values']['selfsend']) {
     $pos = array_search($account->mail, $member_emails);
     unset($member_emails[$pos]);
   }
@@ -839,7 +839,7 @@ 
 
   $om = bts(
     'Sent your email message to !number team members.',
-    array( '!number' => count($member_emails) ),
+    array('!number' => count($member_emails)),
     'NULL',
     'boinc:team-message-sent'
   );

drupal/sites/default/boinc/modules/boincuser/includes/boincuser.forms.inc

Spacing +39 added lines, -39 removed lines

@@ -35,7 +35,7 @@ 
   // Call our custom authentication function to check for an existing BOINC user
   if (!boincuser_login_authenticate($form_state['values'])) {
     // Authentication failed; set an error accordingly
-    form_set_error('name', bts('Sorry, unrecognized email address or password.', array(), NULL, 'boinc:forgot-password') . ' ' . l(bts('Have you forgotten your password?', array(), NULL, 'boinc:forgot-password'), 'user/password'));
+    form_set_error('name', bts('Sorry, unrecognized email address or password.', array(), NULL, 'boinc:forgot-password').' '.l(bts('Have you forgotten your password?', array(), NULL, 'boinc:forgot-password'), 'user/password'));
   }
 }
 
@@ -84,7 +84,7 @@ 
   } else {
     // Create a Drupal user from the BOINC user
     if ($user = boincuser_register_make_drupal_user($boinc_user)) {
-      watchdog('user', 'New external user: %email using module %module.', array('%email' => $email_addr, '%module' => $module), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $user->uid .'/edit'));
+      watchdog('user', 'New external user: %email using module %module.', array('%email' => $email_addr, '%module' => $module), WATCHDOG_NOTICE, l(t('edit'), 'user/'.$user->uid.'/edit'));
     }
   }
 }
@@ -394,14 +394,14 @@ 
     // set email address lower-case
     $edit['mail'] = strtolower($edit['mail']);
 
-    $boinc_user_already_exists = ( BoincUser::lookup_email_addr($edit['mail']) || BoincUser::lookup_prev_email_addr($edit['mail']) );
+    $boinc_user_already_exists = (BoincUser::lookup_email_addr($edit['mail']) || BoincUser::lookup_prev_email_addr($edit['mail']));
     if ($boinc_user_already_exists) {
       form_set_error('mail', bts('A BOINC account already exists for @email.', array('@email' => $edit['mail']), NULL, 'boinc:add-new-user'));
     }
 
     // Check email has not been changed in last X days (default X=7).
-    $duration = 86400 * 7;
-    if ( (($boinc_user->email_addr_change_time + $duration) > time()) and (!(user_access('administer users'))) ) {
+    $duration = 86400*7;
+    if ((($boinc_user->email_addr_change_time + $duration) > time()) and (!(user_access('administer users')))) {
       form_set_error('email_addr_change_time',
         bts('Your email address was changed within the past seven (7) days. You must wait until !futuredate to change your email again. If you need to reverse this change, please look for an email sent to !prev_email_addr.',
         array(
@@ -422,11 +422,11 @@ 
       unset($_SESSION['reset_pass']);
     }
     else {
-      $given_hash = md5($edit['current_pass'] . strtolower($account->mail));
+      $given_hash = md5($edit['current_pass'].strtolower($account->mail));
       if (!$edit['current_pass']) {
         form_set_error('current_pass', bts('Authentication is required when changing E-mail address or setting new password.', array(), NULL, 'boinc:account-credentials-change'));
       }
-      elseif ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
+      elseif ((!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash)) {
         form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:account-credentials-change'));
       }
 
@@ -489,29 +489,29 @@ 
   $project_domain = $headers['Host'];
   $form['heading'] = array(
     '#type' => 'markup',
-    '#value' => '<h3>' . bts("If you forgot your account's email address, or you can't receive email there:", array(), NULL, 'boinc:authenticator-login-page') . '</h3>'
+    '#value' => '<h3>'.bts("If you forgot your account's email address, or you can't receive email there:", array(), NULL, 'boinc:authenticator-login-page').'</h3>'
   );
   $form['instructions'] = array(
     '#type' => 'markup',
-    '#value' => '' .
-      '<p>' . bts("If you have run BOINC under the account, you can still access it. Here's how:", array(), NULL, 'boinc:authenticator-login-page') .
-      '  <ul>' .
-      '    <li>' . bts('Go to the BOINC data directory on your computer (see !boinc_wiki for help finding this).', array('!boinc_wiki' => l(bts('BOINC documentation', array(), NULL, 'boinc:authenticator-login-page'), 'http://boinc.berkeley.edu/wiki/BOINC_Data_directory')), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts('Find your account file for this project; it will have a name like %file (where the project URL is %url).', array('%file' => "account_{$project_domain}.xml", '%url' => "http://{$project_domain}"), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts("Open the file in a text editor like Notepad. You'll see something like:", array(), NULL, 'boinc:authenticator-login-page') .
-      '      <pre>' .
-      '&lt;account&gt;' . "\n" .
-      "  &lt;master_url&gt;http://{$project_domain}/&lt;/master_url&gt;" . "\n" .
-      '  &lt;authenticator&gt;8b8496fdd26df7dc0423ecd43c09a56b&lt;/authenticator&gt;' . "\n" .
-      "  &lt;project_name&gt;{$project_name}&lt;/project_name&gt;" . "\n" .
-      '  ...' . "\n" .
-      '&lt;/account&gt;' .
-      '      </pre>' .
-      '    </li>' .
-      '    <li>' . bts('Select and Copy the string between &lt;authenticator&gt; and &lt;/authenticator&gt; (%auth in the above example).', array('%auth' => '8b8496fdd26df7dc0423ecd43c09a56b'), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts('Paste the string into the field below, and click OK.', array(), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts('You will now be logged in to your account; update the email and password of your account.', array(), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '  </ul>' .
+    '#value' => ''.
+      '<p>'.bts("If you have run BOINC under the account, you can still access it. Here's how:", array(), NULL, 'boinc:authenticator-login-page').
+      '  <ul>'.
+      '    <li>'.bts('Go to the BOINC data directory on your computer (see !boinc_wiki for help finding this).', array('!boinc_wiki' => l(bts('BOINC documentation', array(), NULL, 'boinc:authenticator-login-page'), 'http://boinc.berkeley.edu/wiki/BOINC_Data_directory')), NULL, 'boinc:authenticator-login-page').'</li>'.
+      '    <li>'.bts('Find your account file for this project; it will have a name like %file (where the project URL is %url).', array('%file' => "account_{$project_domain}.xml", '%url' => "http://{$project_domain}"), NULL, 'boinc:authenticator-login-page').'</li>'.
+      '    <li>'.bts("Open the file in a text editor like Notepad. You'll see something like:", array(), NULL, 'boinc:authenticator-login-page').
+      '      <pre>'.
+      '&lt;account&gt;'."\n".
+      "  &lt;master_url&gt;http://{$project_domain}/&lt;/master_url&gt;"."\n".
+      '  &lt;authenticator&gt;8b8496fdd26df7dc0423ecd43c09a56b&lt;/authenticator&gt;'."\n".
+      "  &lt;project_name&gt;{$project_name}&lt;/project_name&gt;"."\n".
+      '  ...'."\n".
+      '&lt;/account&gt;'.
+      '      </pre>'.
+      '    </li>'.
+      '    <li>'.bts('Select and Copy the string between &lt;authenticator&gt; and &lt;/authenticator&gt; (%auth in the above example).', array('%auth' => '8b8496fdd26df7dc0423ecd43c09a56b'), NULL, 'boinc:authenticator-login-page').'</li>'.
+      '    <li>'.bts('Paste the string into the field below, and click OK.', array(), NULL, 'boinc:authenticator-login-page').'</li>'.
+      '    <li>'.bts('You will now be logged in to your account; update the email and password of your account.', array(), NULL, 'boinc:authenticator-login-page').'</li>'.
+      '  </ul>'.
       '</p>'
   );
   $form['authenticator'] = array(
@@ -536,7 +536,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/password') . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/password').'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -599,7 +599,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -650,7 +650,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -667,7 +667,7 @@ 
   $uid = $form_state['storage']['ban_user_uid'];
   $reason = $form_state['values']['reason'];
   $duration = $form_state['values']['duration'];
-  if ($duration) $duration = $duration * 24*60*60;
+  if ($duration) $duration = $duration*24*60*60;
   boincuser_moderate_user_ban($uid, $reason, $duration);
 }
 
@@ -694,10 +694,10 @@ 
     drupal_goto();
   }
 
-  drupal_set_message( bts('WARNING: You have not agreed to our terms of use. Please agree to the terms of use before continuing.', array(), NULL, 'boinc:termsofuse-form'), 'warning' );
+  drupal_set_message(bts('WARNING: You have not agreed to our terms of use. Please agree to the terms of use before continuing.', array(), NULL, 'boinc:termsofuse-form'), 'warning');
 
   $form = array();
-  drupal_add_js(drupal_get_path('module', 'boincuser') . '/boincuser.js');
+  drupal_add_js(drupal_get_path('module', 'boincuser').'/boincuser.js');
   $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
 
   // Fieldset to hold all of the form as a container
@@ -710,7 +710,7 @@ 
 
   $form['termsofuse']['title1'] = array(
     '#weight' => -12,
-    '#value' => '<h2>' . bts( variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:termsofuse-form' ) . '</h2>',
+    '#value' => '<h2>'.bts(variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:termsofuse-form').'</h2>',
     '#prefix' => '<div id="register-title1">',
     '#suffix' => '</div>',
   );
@@ -745,12 +745,12 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('NO - LOGOUT', array(), NULL, 'boinc:form-cancel'), '/logout') . '</li>',
+    '#value' => '<li class="tab">'.l(bts('NO - LOGOUT', array(), NULL, 'boinc:form-cancel'), '/logout').'</li>',
   );
   if (module_exists('boincuser_delete')) {
-    $deletelink = '/user/' . $user->uid . '/delete';
+    $deletelink = '/user/'.$user->uid.'/delete';
     $form['deleteaccount'] = array(
-      '#value' => '<li class="tab">' . l(bts('NO - DELETE ACCOUNT', array(), NULL, 'boinc:form-delete-user'), $deletelink) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('NO - DELETE ACCOUNT', array(), NULL, 'boinc:form-delete-user'), $deletelink).'</li>',
     );
   }
 
@@ -843,7 +843,7 @@ 
   $form['buttons']['submit']['#suffix'] = '</li>';
   $form['buttons']['submit']['#weight'] = 1002;
   $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/info/edit') . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/info/edit').'</li>',
       '#weight' => 1005,
   );
   $form['buttons']['form control tabs suffix'] = array(
@@ -887,7 +887,7 @@ 
 
   // Set new password based on previous email address and entered
   // password.
-  $new_passwd_hash = password_hash( md5($form_state['values']['pass'].$pem), PASSWORD_DEFAULT);
+  $new_passwd_hash = password_hash(md5($form_state['values']['pass'].$pem), PASSWORD_DEFAULT);
 
   $boinc_user->update("email_addr='${pem}', previous_email_addr='', email_addr_change_time=0, passwd_hash='${new_passwd_hash}'");
 

html/inc/common_defs.inc

Spacing +56 added lines, -56 removed lines

@@ -27,73 +27,73 @@
 define('BATCH_STATE_RETIRED', 4);
 
 define('ANON_PLATFORM_UNKNOWN', -1);
-define('ANON_PLATFORM_CPU',     -2);
-define('ANON_PLATFORM_NVIDIA',  -3);
-define('ANON_PLATFORM_ATI',     -4);
-define('ANON_PLATFORM_INTEL',   -5);
+define('ANON_PLATFORM_CPU', -2);
+define('ANON_PLATFORM_NVIDIA', -3);
+define('ANON_PLATFORM_ATI', -4);
+define('ANON_PLATFORM_INTEL', -5);
 
-define('RESULT_SERVER_STATE_INACTIVE',       1);
-define('RESULT_SERVER_STATE_UNSENT',         2);
-define('RESULT_SERVER_STATE_IN_PROGRESS',    4);
-define('RESULT_SERVER_STATE_OVER',           5);
+define('RESULT_SERVER_STATE_INACTIVE', 1);
+define('RESULT_SERVER_STATE_UNSENT', 2);
+define('RESULT_SERVER_STATE_IN_PROGRESS', 4);
+define('RESULT_SERVER_STATE_OVER', 5);
 
-define('RESULT_OUTCOME_INIT',             0);
-define('RESULT_OUTCOME_SUCCESS',          1);
-define('RESULT_OUTCOME_COULDNT_SEND',     2);
-define('RESULT_OUTCOME_CLIENT_ERROR',     3);
-define('RESULT_OUTCOME_NO_REPLY',         4);
-define('RESULT_OUTCOME_DIDNT_NEED',       5);
-define('RESULT_OUTCOME_VALIDATE_ERROR',   6);
-define('RESULT_OUTCOME_CLIENT_DETACHED',  7);
+define('RESULT_OUTCOME_INIT', 0);
+define('RESULT_OUTCOME_SUCCESS', 1);
+define('RESULT_OUTCOME_COULDNT_SEND', 2);
+define('RESULT_OUTCOME_CLIENT_ERROR', 3);
+define('RESULT_OUTCOME_NO_REPLY', 4);
+define('RESULT_OUTCOME_DIDNT_NEED', 5);
+define('RESULT_OUTCOME_VALIDATE_ERROR', 6);
+define('RESULT_OUTCOME_CLIENT_DETACHED', 7);
 
-define('VALIDATE_STATE_INIT',        0);
-define('VALIDATE_STATE_VALID',       1);
-define('VALIDATE_STATE_INVALID',     2);
-define('VALIDATE_STATE_NO_CHECK',    3);
-define('VALIDATE_STATE_INCONCLUSIVE',4);
-define('VALIDATE_STATE_TOO_LATE',    5);
+define('VALIDATE_STATE_INIT', 0);
+define('VALIDATE_STATE_VALID', 1);
+define('VALIDATE_STATE_INVALID', 2);
+define('VALIDATE_STATE_NO_CHECK', 3);
+define('VALIDATE_STATE_INCONCLUSIVE', 4);
+define('VALIDATE_STATE_TOO_LATE', 5);
 
-define('WU_ERROR_COULDNT_SEND_RESULT',           1);
-define('WU_ERROR_TOO_MANY_ERROR_RESULTS',        2);
-define('WU_ERROR_TOO_MANY_SUCCESS_RESULTS',      4);
-define('WU_ERROR_TOO_MANY_TOTAL_RESULTS',        8);
-define('WU_ERROR_CANCELLED',                     16);
-define('WU_ERROR_NO_CANONICAL_RESULT',           32);
+define('WU_ERROR_COULDNT_SEND_RESULT', 1);
+define('WU_ERROR_TOO_MANY_ERROR_RESULTS', 2);
+define('WU_ERROR_TOO_MANY_SUCCESS_RESULTS', 4);
+define('WU_ERROR_TOO_MANY_TOTAL_RESULTS', 8);
+define('WU_ERROR_CANCELLED', 16);
+define('WU_ERROR_NO_CANONICAL_RESULT', 32);
 
-define('FILE_DELETE_INIT',       0);
-define('FILE_DELETE_READY',      1);
-define('FILE_DELETE_DONE',       2);
-define('FILE_DELETE_ERROR',      3);
+define('FILE_DELETE_INIT', 0);
+define('FILE_DELETE_READY', 1);
+define('FILE_DELETE_DONE', 2);
+define('FILE_DELETE_ERROR', 3);
 
-define('ASSIMILATE_INIT',       0);
-define('ASSIMILATE_READY',      1);
-define('ASSIMILATE_DONE',       2);
+define('ASSIMILATE_INIT', 0);
+define('ASSIMILATE_READY', 1);
+define('ASSIMILATE_DONE', 2);
 
 // from lib/common_defs.h
 //
-define('RESULT_NEW',                 0);
-define('RESULT_FILES_DOWNLOADING',   1);
-define('RESULT_FILES_DOWNLOADED',    2);
-define('RESULT_COMPUTE_ERROR',       3);
-define('RESULT_FILES_UPLOADING',     4);
-define('RESULT_FILES_UPLOADED',      5);
-define('RESULT_ABORTED',             6);
-define('RESULT_UPLOAD_FAILED',       7);
+define('RESULT_NEW', 0);
+define('RESULT_FILES_DOWNLOADING', 1);
+define('RESULT_FILES_DOWNLOADED', 2);
+define('RESULT_COMPUTE_ERROR', 3);
+define('RESULT_FILES_UPLOADING', 4);
+define('RESULT_FILES_UPLOADED', 5);
+define('RESULT_ABORTED', 6);
+define('RESULT_UPLOAD_FAILED', 7);
 
 // from lib/error_numbers.h
 // returned by some web RPCs
 //
-define('ERR_XML_PARSE',               -112);
-define('ERR_DB_NOT_FOUND',            -136);
-define('ERR_DB_NOT_UNIQUE',           -137);
-define('ERR_DB_CANT_CONNECT',         -138);
-define('ERR_PROJECT_DOWN',            -183);
-define('ERR_BAD_USER_NAME',           -188);
-define('ERR_NO_OPTION',               -191);
-define('ERR_BAD_EMAIL_ADDR',          -205);
-define('ERR_BAD_PASSWD',              -206);
-define('ERR_ACCT_CREATION_DISABLED',  -208);
-define('ERR_ATTACH_FAIL_INIT',        -209);
-define('ERR_ATTACH_FAIL_DOWNLOAD',    -210);
-define('ERR_ACCT_REQUIRE_CONSENT',    -242);
+define('ERR_XML_PARSE', -112);
+define('ERR_DB_NOT_FOUND', -136);
+define('ERR_DB_NOT_UNIQUE', -137);
+define('ERR_DB_CANT_CONNECT', -138);
+define('ERR_PROJECT_DOWN', -183);
+define('ERR_BAD_USER_NAME', -188);
+define('ERR_NO_OPTION', -191);
+define('ERR_BAD_EMAIL_ADDR', -205);
+define('ERR_BAD_PASSWD', -206);
+define('ERR_ACCT_CREATION_DISABLED', -208);
+define('ERR_ATTACH_FAIL_INIT', -209);
+define('ERR_ATTACH_FAIL_DOWNLOAD', -210);
+define('ERR_ACCT_REQUIRE_CONSENT', -242);
 ?>

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

Spacing +34 added lines, -34 removed lines

@@ -311,8 +311,8 @@ 
         // RFC2616 mandates that the decimal part is no more than three digits,
         // so we multiply the qvalue by 1000 to avoid floating point comparisons.
         $langcode = strtolower($match[1]);
-        $qvalue = isset($match[2]) ? (float) $match[2] : 1;
-        $browser_langcodes[$langcode] = (int) ($qvalue * 1000);
+        $qvalue = isset($match[2]) ? (float)$match[2] : 1;
+        $browser_langcodes[$langcode] = (int)($qvalue*1000);
       }
     }
 
@@ -377,7 +377,7 @@ 
     global $base_url;
     global $base_path;
     $site_name = variable_get('site_name', 'Drupal-BOINC');
-    $site_url = $base_url . $base_path;
+    $site_url = $base_url.$base_path;
     $settings = array(
       'from' => '',
       'subject' => "Content at {$site_name} is awaiting moderation",
@@ -432,11 +432,11 @@ 
         $user_info .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
       }
       elseif (is_string($user_image)) {
-        $user_info .= '<img src="' . $user_image . '"/>';
+        $user_info .= '<img src="'.$user_image.'"/>';
       }
       $user_info .= '  </div>';
     }
-    $user_info .= '  <div class="name">' . theme('username', $account) . '</div>';
+    $user_info .= '  <div class="name">'.theme('username', $account).'</div>';
     if ($account->uid) {
       //$user_info .= '  <div class="join-date">Joined: ' . date('j M y', $account->created) . '</div>';
       //$user_info .= '  <div class="post-count">Posts: ' . $account->post_count . '</div>';
@@ -500,7 +500,7 @@ 
     $form['buttons']['preview']['#suffix'] = '</li>';
     $form['buttons']['preview']['#weight'] = 1003;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_url) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_url).'</li>',
       '#weight' => 1004,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -520,7 +520,7 @@ 
     $node = node_load($form['nid']['#value']);
     $community_role = array_search('community member', user_roles(true));
     $unrestricted_role = array_search('verified contributor', user_roles(true));
-    if ( (isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role])) ) {
+    if ((isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role]))) {
       if ($node->type == 'forum') {
         if (module_exists('captcha')) {
           $form['comment_captcha'] = array(
@@ -565,7 +565,7 @@ 
     $form['buttons']['preview_changes']['#suffix'] = '</li>';
     $form['buttons']['preview_changes']['#weight'] = 1004;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "community/forum/{$forum_id}") . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "community/forum/{$forum_id}").'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -576,7 +576,7 @@ 
     // Add captcha for role='community member'
     $community_role = array_search('community member', user_roles(true));
     $unrestricted_role = array_search('verified contributor', user_roles(true));
-    if ( (isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role])) ) {
+    if ((isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role]))) {
       if (module_exists('captcha')) {
         $form['comment_captcha'] = array(
           '#type' => 'captcha',
@@ -668,8 +668,8 @@ 
 function boinccore_link($type, $object, $teaser = FALSE) {
   // Add custom links with this hook
 
-  if ($type=='node') {
-    if ( ($object->type=='forum') OR ($object->type=='team_forum') ) {
+  if ($type == 'node') {
+    if (($object->type == 'forum') OR ($object->type == 'team_forum')) {
       // Add topic moderator controls
       if (user_access('edit any forum topic')) {
         $node_control = "node_control/{$object->nid}";
@@ -730,7 +730,7 @@ 
       }// if user_access('edit any forum topic')
     }
   }
-  else if ($type=='comment') {
+  else if ($type == 'comment') {
     $node = node_load($object->nid);
     $nid = $object->nid;
     $cid = $object->cid;
@@ -752,7 +752,7 @@ 
     if (user_access('administer comments')) {
       $comment_control = "comment_control/{$cid}";
       // Add link to convert comment into a new topic
-      $reply_count = db_result(db_query(' SELECT COUNT(*) FROM comments WHERE pid = %d', $cid ));
+      $reply_count = db_result(db_query(' SELECT COUNT(*) FROM comments WHERE pid = %d', $cid));
       if ($reply_count == 0) {
         $links['convert'] = array(
             'title' => bts('Convert', array(), NULL, 'boinc:forum-convert-comment-to-topic'),
@@ -797,7 +797,7 @@ 
   */
   $message['headers']['Content-Transfer-Encoding'] = 'Quoted-Printable';
   if (is_array($message['body'])) {
-    $message['body'] = array_map( "quoted_printable_encode", $message['body'] );
+    $message['body'] = array_map("quoted_printable_encode", $message['body']);
   } else {
     $message['body'] = quoted_printable_encode($message['body']);
   }
@@ -848,7 +848,7 @@ 
   // If hiding a forum topic (node) and not an administrator, go to
   // the forum page. Otherwise the user will reach an access-denied
   // page.
-  if (($action=="hide") and (!user_access('administer forums'))) {
+  if (($action == "hide") and (!user_access('administer forums'))) {
     drupal_goto("community/forum/{$node->tid}");
   }
   drupal_goto("node/{$nid}");
@@ -890,8 +890,8 @@ 
     $node->created = $comment->timestamp;
     $node->changed = $node->created;
     $node->promote = 0; // Display on front page?
-    $node->sticky = 0;  // Display top of page?
-    $node->status = 1;   // Published?
+    $node->sticky = 0; // Display top of page?
+    $node->status = 1; // Published?
     $node->comment = 2;
     //$node->language = 'en';
     $node->uid = $comment->uid;
@@ -976,16 +976,16 @@ 
     $xml->loadXML($global_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
       $lines = explode("\r", $global_prefs);
-      watchdog('am_set_info', "XML validation error in global_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
-        ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
+      watchdog('am_set_info', "XML validation error in global_prefs: {$errors[0]->message} at line {$errors[0]->line}".
+        ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
     }
   }
   elseif ($project_prefs) {
     $xml->loadXML($project_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
       $lines = explode("\r", $project_prefs);
-      watchdog('am_set_info', "XML validation error in project_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
-        ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
+      watchdog('am_set_info', "XML validation error in project_prefs: {$errors[0]->message} at line {$errors[0]->line}".
+        ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
     }
   }
   if (!$errors) {
@@ -1028,8 +1028,8 @@ 
     $xml = array(
       'error' => array(
         'error_num' => -112,
-        'error_msg' => "{$errors[0]->message} at line {$errors[0]->line}" .
-        ': <br/>' . htmlentities($lines[$errors[0]->line - 1])
+        'error_msg' => "{$errors[0]->message} at line {$errors[0]->line}".
+        ': <br/>'.htmlentities($lines[$errors[0]->line - 1])
       ),
     );
   }
@@ -1137,10 +1137,10 @@ 
           'teaser' => $teaser,
           'uid' => $team_owner_uid,
           'path' => null,
-          'status' => 1,  // published or not - always publish
+          'status' => 1, // published or not - always publish
           'promote' => 0,
           'created' => $created_time,
-          'comment' => 0,  // comments disabled
+          'comment' => 0, // comments disabled
           'moderate' => 0,
           'sticky' => 0,
           'format' => $input_format
@@ -1151,7 +1151,7 @@ 
           module_load_include('inc', 'pathauto', 'pathauto');
           $node['path'] = pathauto_cleanstring($values['name']);
         
-          $node = (object) $node; // node_save requires an object form
+          $node = (object)$node; // node_save requires an object form
           $team_categories = taxonomy_get_term_by_name($values['type']);
           $node->taxonomy[] = $team_categories[0];
           
@@ -1310,7 +1310,7 @@ 
       while ($member = db_fetch_object($result)) {
         $team_members[$member->boinc_id]['country'] = $member->field_country_value;
         $team_members[$member->boinc_id]['url'] = $member->field_url_value;
-        $team_members[$member->boinc_id]['has_profile'] = isset($member->nid) ? 1:  0;
+        $team_members[$member->boinc_id]['has_profile'] = isset($member->nid) ? 1 : 0;
         $xml['users']['user'][] = $team_members[$member->boinc_id];
       }
     } // end if credit_only
@@ -1360,7 +1360,7 @@ 
             if ($profile_nid = content_profile_profile_exists($profile, $account->uid)) {
               $profile_node = node_load($profile_nid);
               if ($profile_node) {
-                $avatar_image = get_cck_image_object(file_directory_path() . '/' . $image_path, 'field_image', 'profile', TRUE);
+                $avatar_image = get_cck_image_object(file_directory_path().'/'.$image_path, 'field_image', 'profile', TRUE);
                 if ($avatar_image) {
                   $profile_node->field_image[0] = $avatar_image;
                   node_save($profile_node);
@@ -1474,7 +1474,7 @@ 
         WHERE (n.status = 1) AND (c.uid = '%d')
         ORDER BY timestamp DESC
         LIMIT %d",
-        $uid, (int) $count
+        $uid, (int)$count
       );
       $xml = array(
         'rpc_response' => array(
@@ -1517,7 +1517,7 @@ 
         WHERE (n.status = 1) AND (n.uid = '%d')
         ORDER BY changed DESC
         LIMIT %d",
-        $uid, (int) $count
+        $uid, (int)$count
       );
       $xml = array(
         'rpc_response' => array(
@@ -1680,7 +1680,7 @@ 
           );
         }
         // Determine which page to display in order to show the given comment
-        $page = floor($comment_offset / $comments_per_page);
+        $page = floor($comment_offset/$comments_per_page);
         if ($page) {
           $params = array('page' => $page);
         }
@@ -2036,7 +2036,7 @@ 
  * Overview of moderation queues
  */               
 function boinccore_moderation_overview_panel() {
-  $output = '<h2 class="pane-title">' . bts('Moderation', array(), NULL, 'boinc:moderate-profiles') . '</h2>';
+  $output = '<h2 class="pane-title">'.bts('Moderation', array(), NULL, 'boinc:moderate-profiles').'</h2>';
   $output .= '<ul class="tab-list action-list">';
   if (module_exists('user_profiles')) {
     $profile_count = db_result(db_query("
@@ -2047,7 +2047,7 @@ 
     $output .= '<li class="tab primary">';
     $output .= l(bts('Unvetted profiles', array(), NULL, 'boinc:moderate-profiles'), 'moderate/profiles');
     $output .= '<div class="item-count-wrapper">';
-    $output .= '<span class="item-count">' . $profile_count . '</span>';
+    $output .= '<span class="item-count">'.$profile_count.'</span>';
     $output .= '</div>';
     $output .= '</li>';
   }
@@ -2065,7 +2065,7 @@ 
   require_boinc('boinc_db');
 
   $num_deleted = BoincToken::delete_expired();
-  if ($num_deleted>0) {
+  if ($num_deleted > 0) {
     watchdog('boinccore', "Deleted ${num_deleted} tokens from table token", WATCHDOG_NOTICE);
   }
 }

drupal/sites/default/boinc/themes/boinc/template.php

Spacing +45 added lines, -45 removed lines

@@ -82,7 +82,7 @@ 
  */
 function boinc_links__system_main_menu($links, $menu, $element) {
   $html = '';
-  $html .= '<ul id="' . $menu['id'] . '" class="' . $menu['class'] . '">' . "\n";
+  $html .= '<ul id="'.$menu['id'].'" class="'.$menu['class'].'">'."\n";
   $item_count = count($links);
   $i = 1;
   foreach ($links as $key => $link) {
@@ -90,7 +90,7 @@ 
     if (strpos($key, 'active-trail')) $classes[] = 'active';
     if ($i == 1) $classes[] = 'first';
     if ($i == $item_count) $classes[] = 'last';
-    $html .= '<li class="' . implode(' ', $classes) .'">';
+    $html .= '<li class="'.implode(' ', $classes).'">';
     if ($link['title'] == 'Home') {
       $link['title'] = bts('Home', array(), NULL, 'boinc:menu-link');
     }
@@ -99,7 +99,7 @@ 
       if ($link['href'] == 'dashboard') {
         $item_count = privatemsg_unread_count();
         if ($item_count) {
-          $link['title'] .= '</a> <a href="' . url('messages') . '" class="compound secondary"><div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
+          $link['title'] .= '</a> <a href="'.url('messages').'" class="compound secondary"><div class="item-count-wrapper"><span class="item-count">'.$item_count.'</span></div>';
           $link['html'] = TRUE;
           $link['attributes']['class'] = 'compound';
         }
@@ -109,7 +109,7 @@ 
     if ($link['href'] == 'moderate') {
       $item_count = boincuser_moderation_queue_count();
       if ($item_count) {
-        $link['title'] .= ' <div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
+        $link['title'] .= ' <div class="item-count-wrapper"><span class="item-count">'.$item_count.'</span></div>';
         $link['html'] = TRUE;
       }
     }
@@ -117,7 +117,7 @@ 
     $html .= '</li>';
     $i++;
   }
-  $html .= '</ul>' . "\n";
+  $html .= '</ul>'."\n";
   return $html;
 }
 
@@ -132,7 +132,7 @@ 
     return '';
   }
   else {
-    return '<li '. ($active ? 'class="active" ' : '') .'>'. $link ."</li>\n";
+    return '<li '.($active ? 'class="active" ' : '').'>'.$link."</li>\n";
   }
 }
 
@@ -197,7 +197,7 @@ 
   if (empty($locality)) {
     $locality = "en";
   }
-  $vars['flag_path'] = base_path() . path_to_theme() . "/images/flags/{$locality}.png";
+  $vars['flag_path'] = base_path().path_to_theme()."/images/flags/{$locality}.png";
 
   $server_status_url = variable_get('boinc_server_status_url', '');
   if (!$server_status_url) {
@@ -219,16 +219,16 @@ 
   if (arg(0) == 'search') { 
     unset($vars['title']);
   }
-  else if ( (arg(0)=='account') AND (is_numeric(arg(1))) AND (empty(arg(2))) ) {
+  else if ((arg(0) == 'account') AND (is_numeric(arg(1))) AND (empty(arg(2)))) {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='account') AND (arg(1)=='profile') ) {
+  else if ((arg(0) == 'account') AND (arg(1) == 'profile')) {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='dashboard') ) {
+  else if ((arg(0) == 'dashboard')) {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='community') AND ( (arg(1)=='teams') OR (arg(1)=='stats') ) ) {
+  else if ((arg(0) == 'community') AND ((arg(1) == 'teams') OR (arg(1) == 'stats'))) {
     unset($vars['title']);
   }
 
@@ -244,7 +244,7 @@ 
               $tab = str_replace('li class="', 'li class="first ', $tab);
           }
           if ($key == $last_key) {
-              $tab = str_replace('li class="', 'li class="last ', $tab) . '</ul>';
+              $tab = str_replace('li class="', 'li class="last ', $tab).'</ul>';
           }
       }
       elseif (strpos($tab, 'li ')) {
@@ -252,7 +252,7 @@ 
               $tab = str_replace('li ', 'li class="first" ', $tab);
           }
           if ($key == $last_key) {
-              $tab = str_replace('li ', 'li class="last" ', $tab) . '</ul>';
+              $tab = str_replace('li ', 'li class="last" ', $tab).'</ul>';
           }
       }
   }
@@ -289,7 +289,7 @@ 
 
   // Optionally, run node-type-specific preprocess functions, like
   // boinc_preprocess_node_page() or boinc_preprocess_node_story().
-  $function = __FUNCTION__ . '_' . $vars['node']->type;
+  $function = __FUNCTION__.'_'.$vars['node']->type;
   if (function_exists($function)) {
     $function($vars, $hook);
   }
@@ -340,7 +340,7 @@ 
   $vars['node']->comment = 0;
   
   $vars['first_page'] = (!isset($_GET['page']) OR ($_GET['page'] < 1));
-  $page_count = max(ceil($vars['comment_count'] / $comments_per_page), 1);
+  $page_count = max(ceil($vars['comment_count']/$comments_per_page), 1);
   $vars['last_page'] = ($page_count == 1 OR ($page_count > 1 AND $_GET['page'] == $page_count - 1));
 
   $links = $vars['links'];
@@ -452,7 +452,7 @@ 
   case 'boinc_host':
       $view = views_get_current_view();
       if (!($view->result)) {
-        $vars['footer'] = '<h3>' . bts ('Host not found in database.', array(), NULL, 'boinc:host-details') . '</h3>';
+        $vars['footer'] = '<h3>'.bts('Host not found in database.', array(), NULL, 'boinc:host-details').'</h3>';
       }
     break;
   case 'boinc_host_list':
@@ -471,10 +471,10 @@ 
 
     if ($result) {
       // Display the stderr output in the footer
-      $vars['footer'] = '<h3>' . bts('Stderr output', array(), NULL, 'boinc:task-details-errorlog') .'</h3>';
-      $vars['footer'] .= '<pre>' . htmlspecialchars($result->result_stderr_out) . '</pre>';
+      $vars['footer'] = '<h3>'.bts('Stderr output', array(), NULL, 'boinc:task-details-errorlog').'</h3>';
+      $vars['footer'] .= '<pre>'.htmlspecialchars($result->result_stderr_out).'</pre>';
     } else {
-      $vars['footer'] = '<h3>' . bts ('Task not found in database.', array(), NULL, 'boinc:task-details') . '</h3>';
+      $vars['footer'] = '<h3>'.bts('Task not found in database.', array(), NULL, 'boinc:task-details').'</h3>';
     }
     break;
   case 'boinc_teams':
@@ -487,7 +487,7 @@ 
     ob_start();
     // Get the workunit ID from the URL
     $result_id = arg(1);
-    require_boinc(array('util','boinc_db'));
+    require_boinc(array('util', 'boinc_db'));
     $wu = BoincWorkunit::lookup_id($result_id);
     if ($wu) {
       // Output from admin defined BOINC project-specific function
@@ -495,7 +495,7 @@ 
       // Output of project_workunit() gets caught in the buffer
       $vars['footer'] = ob_get_clean();
     } else {
-      $vars['footer'] = '<h3>' . bts ('Workunit not found in database.', array(), NULL, 'boinc:workunit-details') . '</h3>';
+      $vars['footer'] = '<h3>'.bts('Workunit not found in database.', array(), NULL, 'boinc:workunit-details').'</h3>';
     }
   default:
   }
@@ -517,7 +517,7 @@ 
       $author_picture .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
     }
     elseif (is_string($user_image)) {
-      $author_picture .= '<img src="' . $user_image . '"/>';
+      $author_picture .= '<img src="'.$user_image.'"/>';
     }
   }
   $author_picture .= '</div>';
@@ -556,14 +556,14 @@ 
   case 'profile':
   case 'user':
     $node = $variables['result']['node'];
-    $variables['url'] = url('account/' . $node->is_uid);
+    $variables['url'] = url('account/'.$node->is_uid);
     $variables['title'] = $node->tos_name;
     $variables['user_image'] = boincuser_get_user_profile_image($node->is_uid);
     $variables['account'] = user_load($node->is_uid);
     break;
   case 'team':
     $node = $variables['result']['node'];
-    $variables['url'] = url('/community/teams/' . $node->entity_id);;
+    $variables['url'] = url('/community/teams/'.$node->entity_id); ;
     break;
   case 'forum':
     $node = $variables['result']['node'];
@@ -581,7 +581,7 @@ 
     // Parent forum topic title
     $variables['parent_title'] = $drupalnode->title;
     // Link to the parent forum topic
-    $variables['parent_topic'] = l($drupalnode->title, drupal_get_path_alias('node/' . $nid) );
+    $variables['parent_topic'] = l($drupalnode->title, drupal_get_path_alias('node/'.$nid));
     // Get the taxonomy for the node, creates a link to the parent forum
     $taxonomy = reset($drupalnode->taxonomy);
     if ($vocab = taxonomy_vocabulary_load($taxonomy->vid)) {
@@ -599,7 +599,7 @@ 
   if (!arg(2)) {
     $message = '';
   }
-  return '<p>' . $message . '</p>';
+  return '<p>'.$message.'</p>';
 }
 
 /**
@@ -615,11 +615,11 @@ 
     
     // Shorten the name when it is too long or it will break many tables.
     if (drupal_strlen($name) > 20) {
-      $name = drupal_substr($name, 0, 15) . '...';
+      $name = drupal_substr($name, 0, 15).'...';
     }
 
     if (user_access('access user profiles')) {
-      $output = l($name, 'account/' . $object->uid, array('attributes' => array('title' => bts('View user profile.', array(), NULL, 'boinc:users-table'))));
+      $output = l($name, 'account/'.$object->uid, array('attributes' => array('title' => bts('View user profile.', array(), NULL, 'boinc:users-table'))));
     }
     else {
       $output = check_plain($name);
@@ -637,7 +637,7 @@ 
       $output = check_plain($object->name);
     }
 
-    $output .= ' (' . bts('not verified', array(), NULL, 'boinc:user-not-found') . ')';
+    $output .= ' ('.bts('not verified', array(), NULL, 'boinc:user-not-found').')';
   }
   else {
     $output = check_plain(variable_get('anonymous', bts('Anonymous', array(), NULL, 'boinc:anonymous-user')));
@@ -650,7 +650,7 @@ 
  * Remove the link under text areas that reads:
  * "More information about formatting options"
  */
-function boinc_filter_tips_more_info () {
+function boinc_filter_tips_more_info() {
   return '';
 }
 
@@ -692,8 +692,8 @@ 
 The !site team', array(
         '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
         '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
-        '!link' => url('account/'. $sender->uid, array('absolute' => TRUE)),
+        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message').': '.$flag->friend_message : '',
+        '!link' => url('account/'.$sender->uid, array('absolute' => TRUE)),
         ), array(), NULL, 'boinc:friend-request-email');
       break;
 
@@ -711,7 +711,7 @@ 
 The !site team', array(
         '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
         '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
+        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message').': '.$flag->friend_message : '',
         '!link' => url('goto/friend-requests', array('absolute' => TRUE)),
         ),
       array(), NULL, 'boinc:friend-request-email');
@@ -724,13 +724,13 @@ 
  * Edit action links
  */
 function phptemplate_links($links, $attributes = array('class' => 'links')) {
-  if ($links){
+  if ($links) {
     // Remove flag-subscriptions link. It will be placed elsewhere.
     if (isset($links['flag-subscriptions'])) {
       unset($links['flag-subscriptions']);
     }
     // Reorder the links however you need them.
-    $links = reorder_links($links, array('comment_edit','quote','comment_add','comment_reply','flag-abuse_comment','flag-abuse_node'), array('comment_delete'));
+    $links = reorder_links($links, array('comment_edit', 'quote', 'comment_add', 'comment_reply', 'flag-abuse_comment', 'flag-abuse_node'), array('comment_delete'));
     // Use the built-in theme_links() function to format the $links array.
     return theme_links($links, $attributes);
   }
@@ -813,7 +813,7 @@ 
   // are the class attribute for the <li> tags.
   $dom = new DOMDocument;
   $dom->loadHTML(mb_convert_encoding($links, 'HTML-ENTITIES', 'UTF-8'));
-  foreach($dom->getElementsByTagName('li') as $node) {
+  foreach ($dom->getElementsByTagName('li') as $node) {
     $key = $node->getAttribute("class");
     $alllinks[$key] = $dom->saveHTML($node);
   }
@@ -826,7 +826,7 @@ 
     "hide", "unhide",
     "comment_delete",
   );
-  foreach(array_keys($alllinks) as $key1) {
+  foreach (array_keys($alllinks) as $key1) {
     // Select string up to first space, if present.
     $class1 = strtok($key1, ' ');
     if (in_array($class1, $selected_classes)) {
@@ -855,7 +855,7 @@ 
     $dom->loadHTML(mb_convert_encoding($alink, 'HTML-ENTITIES', 'UTF-8'));
 
     $myli = $dom->getElementsByTagName('li');
-    if ($myli->length>0) {
+    if ($myli->length > 0) {
       $newclasses = trim(($myli[0]->getAttribute("class"))." first");
       $myli[0]->setAttribute("class", $newclasses);
       $alink = $dom->saveHTML($myli[0]);
@@ -872,13 +872,13 @@ 
 
   $output = '<ul class="menu"><li class="first">';
   if ($user->uid) {
-    $output .= '<a href="' . url('logout') . '">' . bts('Logout', array(), NULL, 'boinc:menu-link') . '</a>';
+    $output .= '<a href="'.url('logout').'">'.bts('Logout', array(), NULL, 'boinc:menu-link').'</a>';
   } else {
-    $output .= '<a href="' . url('user/login', array('query' => drupal_get_destination()) ) . '">' . bts('Login', array(), NULL, 'boinc:menu-link') . '</a>';
+    $output .= '<a href="'.url('user/login', array('query' => drupal_get_destination())).'">'.bts('Login', array(), NULL, 'boinc:menu-link').'</a>';
   }
   $output .= '</li>';
   if (module_exists('global_search') OR module_exists('global_search_solr')) {
-    $output .= '<li class="last"> <a class="search" href="' . url('search/site') . '">' . bts('search', array(), NULL, 'boinc:menu-link') .'</a> </l1>';
+    $output .= '<li class="last"> <a class="search" href="'.url('search/site').'">'.bts('search', array(), NULL, 'boinc:menu-link').'</a> </l1>';
   }
   $output .= '</ul>';
   return $output;
@@ -905,8 +905,8 @@ 
     if ($ignored[$object->uid] == 0) {
       $links['ignore_user'] = array(
         'title' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
-        'href' => 'account/prefs/privacy/ignore_user/add/'. $object->uid,
-        'query' => 'destination='. $_GET['q'],
+        'href' => 'account/prefs/privacy/ignore_user/add/'.$object->uid,
+        'query' => 'destination='.$_GET['q'],
         'attributes' => array(
           'class' => 'ignore-user',
           'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),
@@ -921,8 +921,8 @@ 
     if ($ignored[$object->uid] == 0) {
       $links['ignore_user'] = array(
         'title' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
-        'href' => 'account/prefs/privacy/ignore_user/add/'. $object->uid,
-        'query' => 'destination='. $_GET['q'],
+        'href' => 'account/prefs/privacy/ignore_user/add/'.$object->uid,
+        'query' => 'destination='.$_GET['q'],
         'attributes' => array(
           'class' => 'ignore-user',
           'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),

html/user/register.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
     $config = get_config();
     $disable_acct = parse_bool($config, "disable_account_creation");
-    page_head("Register",  null, null, null, boinc_recaptcha_get_head_extra());
+    page_head("Register", null, null, null, boinc_recaptcha_get_head_extra());
     echo "<h3>Create an account</h3>";
     form_start("create_account_action.php", "post");
     create_account_form(0, "download_software.php");

html/user/download_software.php

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
 function get_platform() {
     global $user_agent;
     if (strstr($user_agent, 'Windows')) {
-        if (strstr($user_agent, 'Win64')||strstr($user_agent, 'WOW64')) {
+        if (strstr($user_agent, 'Win64') || strstr($user_agent, 'WOW64')) {
             return 'windows_x86_64';
         } else {
             return 'windows_intelx86';
@@ -130,7 +130,7 @@ 
         $token,
         $user->id,
         (string)$v->filename,
-        $green?"btn-success":"btn-info",
+        $green ? "btn-success" : "btn-info",
         (string)$v->platform,
         (string)$v->size_mb,
         (string)$v->version_num
@@ -139,7 +139,7 @@ 
 
 function download_button_vbox($v, $project_id, $token, $user) {
     // if no vbox version exists for platform, don't show vbox button
-    if(!$v->vbox_filename) {
+    if (!$v->vbox_filename) {
         return;
     }
     return sprintf(
@@ -356,7 +356,7 @@ 
 $action = get_str("action", true);
 $dev = get_str("dev", true);
 
-$user_agent = get_str("user_agent", true);      // for debugging
+$user_agent = get_str("user_agent", true); // for debugging
 if (!$user_agent) {
     $user_agent = $_SERVER['HTTP_USER_AGENT'];
 }

html/ops/index.php

Spacing +3 added lines, -3 removed lines

@@ -155,7 +155,7 @@ 
 $apps = BoincApp::enum("");
 foreach ($apps as $app) {
     if (in_array($app->id, $show_only)
-       || ( in_array("all", $show_only)
+       || (in_array("all", $show_only)
           && (!$app->deprecated || $show_deprecated)
     )) {
 
@@ -163,7 +163,7 @@ 
             <b>Results for <tt>$app->name</tt>:</b>
             <ul>
 ";
-        for ($i=0; $i<2; $i++) {
+        for ($i = 0; $i < 2; $i++) {
             if ($i) {
                 $secs = 7*86400;
                 $period = "&nbsp;&nbsp;&nbsp;7 days";
@@ -220,5 +220,5 @@ 
 
 admin_page_tail();
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>