BOINC / boinc

drupal/sites/default/boinc/modules/boincuser/boincuser_delete/boincuser_delete.module

Spacing +11 added lines, -11 removed lines

@@ -93,9 +93,9 @@ 
 function boincuser_delete_form_alter(&$form, $form_state, $form_id) {
   global $user;
 
-  switch($form_id) {
+  switch ($form_id) {
     case 'user_profile_form':
-      if ( user_access('delete own account') AND ($form['#uid'] == $user->uid) AND (arg(3)=='') ) {
+      if (user_access('delete own account') AND ($form['#uid'] == $user->uid) AND (arg(3) == '')) {
         $form['delete'] = array(
           '#type' => 'submit',
           '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
@@ -105,7 +105,7 @@ 
           '#suffix' => '</li>',
         );
       }
-      else if ( user_access('administer users') ) {
+      else if (user_access('administer users')) {
         $form['delete'] = array(
           '#type' => 'submit',
           '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
@@ -158,7 +158,7 @@ 
           break;
       }
 
-      $question = 'Are you sure you want to delete the account <em>' . htmlspecialchars($form['_account']['#value']->boincuser_name) . '</em>?';
+      $question = 'Are you sure you want to delete the account <em>'.htmlspecialchars($form['_account']['#value']->boincuser_name).'</em>?';
       drupal_set_title($question);
 
       unset($form['description']);
@@ -177,7 +177,7 @@ 
       );
       $form['main']['fs1']['help'] = array(
         '#value' => bts(
-          "<p>In order to delete your account, you must provide your password below. You will then be sent an email to the email address on record, with a one-time token that expires in 24-hours. Clicking on this link will bring you to a second form where you must enter your password again. After doing so your account will be deleted.</p>" .
+          "<p>In order to delete your account, you must provide your password below. You will then be sent an email to the email address on record, with a one-time token that expires in 24-hours. Clicking on this link will bring you to a second form where you must enter your password again. After doing so your account will be deleted.</p>".
           "<p>If necessary, you may !link first before deleting your account. But you must wait <b>seven (7) days</b> after an email address change before you may delete your account.</p>",
           array(
             '!link' => l(bts('change your email address', array(), NULL, 'boinc:delete-user-account'), '/account/info/edit'),
@@ -189,7 +189,7 @@ 
 
       if ($dtypes == 'user_decides') {
         $form['main']['common'] = array(
-          '#value'  => bts('All choices: ', array(), NULL, 'boinc:delete-user-account') . $common_acts . '<p>' . bts('Disabled means some of your personal data, such as your username and email address, are kept on our systems. Choose \'delete your account\' if you want all personal data to be removed.', array(), NULL, 'boinc:delete-user-account'),
+          '#value'  => bts('All choices: ', array(), NULL, 'boinc:delete-user-account').$common_acts.'<p>'.bts('Disabled means some of your personal data, such as your username and email address, are kept on our systems. Choose \'delete your account\' if you want all personal data to be removed.', array(), NULL, 'boinc:delete-user-account'),
           '#prefix' => "<div id='delete-instructions'>",
           '#suffix' => "</div>",
           '#weight' => 20,
@@ -257,7 +257,7 @@ 
         '#weight' => 1010,
       );
 
-      $form['#redirect'] = 'account/' . $uid;
+      $form['#redirect'] = 'account/'.$uid;
       $form['#validate'] = array('boincuser_delete_validate');
       $form['#submit'] = array('boincuser_delete_submit');
       break;
@@ -317,7 +317,7 @@ 
   global $base_path;
   module_load_include('inc', 'rules', 'modules/system.rules');
   $site_name = variable_get('site_name', 'Drupal-BOINC');
-  $site_url = $base_url . $base_path . "user/login";
+  $site_url = $base_url.$base_path."user/login";
 
   // Perform the requested operation
   $op = $form_state['values']['user_delete_action'];
@@ -364,7 +364,7 @@ 
   );
   rules_action_mail_to_user($account, $settings);
 
-  drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'),'info');
+  drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'), 'info');
 
   $redirect = variable_get('boincuser_delete_redirect', '<front>');
   // Redirect
@@ -458,7 +458,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -548,7 +548,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(

html/inc/account.inc

Spacing +3 added lines, -3 removed lines

@@ -100,7 +100,7 @@ 
             tra("Must be at least %1 characters", $min_passwd_length),
             tra("Password")
         ),
-        "passwd", "", "password",'id="passwd"',passwd_visible_checkbox("passwd")
+        "passwd", "", "password", 'id="passwd"', passwd_visible_checkbox("passwd")
     );
     if (USER_COUNTRY) {
         form_select(
@@ -145,9 +145,9 @@ 
     } else {
         $x = tra("Email address:");
     }
-    form_input_text($x, "email_addr", '', 'text', $attrs='autofocus tabindex="1"');
+    form_input_text($x, "email_addr", '', 'text', $attrs = 'autofocus tabindex="1"');
     form_input_text(
-        tra("Password:").'<br><small><a href="get_passwd.php">' . tra("forgot password?") . "</a></small>",
+        tra("Password:").'<br><small><a href="get_passwd.php">'.tra("forgot password?")."</a></small>",
         "passwd",
         "",
         "password",

html/user/get_project_config.php

Spacing +3 added lines, -3 removed lines

@@ -30,10 +30,10 @@ 
 //
 function show_platforms() {
     $xmlFragment = unserialize(get_cached_data(3600, "project_config_platform_xml"));
-    if ($xmlFragment==false){
+    if ($xmlFragment == false) {
         $platforms = BoincDB::get()->enum_fields("platform, DBNAME.app_version, DBNAME.app", "BoincPlatform", "platform.name, platform.user_friendly_name, plan_class", "app_version.platformid = platform.id and app_version.appid = app.id and app_version.deprecated=0 and app.deprecated=0 group by platform.name, plan_class", "");
         $xmlFragment = "    <platforms>";
-        foreach ($platforms as $platform){
+        foreach ($platforms as $platform) {
             $xmlFragment .= "
             <platform>
                 <platform_name>$platform->name</platform_name>
@@ -115,7 +115,7 @@ 
 if (defined('TERMSOFUSE_FILE')) {
   $tou_file = TERMSOFUSE_FILE;
 } else {
-  $tou_file =  "../../terms_of_use.txt";
+  $tou_file = "../../terms_of_use.txt";
 }
 if (file_exists($tou_file)) {
     $terms_of_use = trim(file_get_contents($tou_file));

html/ops/mass_email_script.php

Spacing +6 added lines, -6 removed lines

@@ -55,7 +55,7 @@ 
 $globals->batch = 1000;
 $globals->lapsed_interval = 60*86400;
 
-for ($i=1; $i<$argc; $i++) {
+for ($i = 1; $i < $argc; $i++) {
     if ($argv[$i] == "--batch") {
         $i++;
         $globals->batch = $argv[$i];
@@ -169,7 +169,7 @@ 
         gmdate('d F Y', $user->create_time),
         number_format($user->total_credit, 0),
         opt_out_url($user),
-        floor((time() - $user->last_rpc_time) / 86400),
+        floor((time() - $user->last_rpc_time)/86400),
     );
     return preg_replace($pat, $rep, $template);
 }
@@ -238,7 +238,7 @@ 
     while ($user = _mysql_fetch_object($result)) {
         handle_user($user);
         $startid = $user->id;
-        fputs($log, $user->id . "\n");
+        fputs($log, $user->id."\n");
         fflush($log);
     }
     _mysql_free_result($result);
@@ -252,7 +252,7 @@ 
     $user = _mysql_fetch_object($result);
     if ($user) {
         handle_user($user);
-        fputs($log, $user->id . "\n");
+        fputs($log, $user->id."\n");
         fflush($log);
     }
     _mysql_free_result($result);
@@ -289,7 +289,7 @@ 
     } else {
         $fid = fopen($id_file, 'r');
         if (!$fid) {
-            echo  $id_file . ' not found - create ID list and run again\n';
+            echo  $id_file.' not found - create ID list and run again\n';
             exit();
         }
         $thisid = 0;
@@ -300,7 +300,7 @@ 
         }
         fclose($fid);
     }
-    echo 'All done!' . "\n";
+    echo 'All done!'."\n";
 }
 
 if (!function_exists('make_php_mailer')) {

drupal/sites/default/settings.php

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');

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/ops/generate_account_ownership_keys.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 require_once("../inc/util.inc");
 require_once("../inc/account_ownership.inc");
 
-if ( !function_exists('openssl_pkey_new') ) {
+if (!function_exists('openssl_pkey_new')) {
     echo "WARNING: OpenSSL functions not available.  Not generating account ownership keys.\n";
     exit(1);
 }
@@ -73,7 +73,7 @@ 
                 throw new Exception('Failed to generate account ownership keypair.');
             }
         } catch (Exception $e) {
-            echo 'Caught exception during account ownership key generation: ',  $e->getMessage(), "\n";
+            echo 'Caught exception during account ownership key generation: ', $e->getMessage(), "\n";
         }
     } else {
         echo "The private and public keys already exist. Repeat the command with the 'overwrite' parameter to replace the existing ownership keys. \n";