BOINC / boinc

html/user/host_stats.php

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

@@ -155,7 +155,7 @@
         show_type($vers, $stats);
     }
     foreach ($data->darwin as $vers=>$state) {
-        show_type("Darwin $vers", $state);
+        show_type("darwin $vers", $state);
     }
     show_type("Linux total", $data->linux);
     foreach ($data->other as $vers=>$stats) {

Spacing +2 added lines, -2 removed lines

@@ -22,14 +22,14 @@
 require_once("../inc/util.inc");
 require_once("../inc/cache.inc");
 
-$min_credit = .1;   // only count hosts with this much RAC
+$min_credit = .1; // only count hosts with this much RAC
 $total_rac = 0;
 
 define("CACHE_PERIOD", 7*86400);
 
 function show_type($type, $stats) {
     global $total_rac;
-    $pct = $total_rac?number_format(100*$stats->rac/$total_rac, 4):0;
+    $pct = $total_rac ?number_format(100*$stats->rac/$total_rac, 4) : 0;
     row_array(array($type, $stats->nhosts, "$pct %"));
 }
 

html/user/stats.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 start_table();
 echo "
     <tr><td>"
-    . tra("Leader boards for %1",PROJECT).":
+    . tra("Leader boards for %1", PROJECT).":
     <ul>
     <li><a href=\"top_users.php\">" . tra("Participants")."</a>
 ";
@@ -37,7 +37,7 @@ 
 
 if (!DISABLE_TEAMS) {
     echo "
-        <li><a href=\"top_teams.php\">" . tra("Teams"). "</a>
+        <li><a href=\"top_teams.php\">" . tra("Teams")."</a>
     ";
     if ($credit_by_app) {
         echo "<ul><li><a href=per_app_list.php?is_team=1>Per application</a></ul>\n";

drupal/sites/default/boinc/modules/boincuser/boincuser_delete/includes/boincuser_delete.helpers.inc

Spacing +10 added lines, -10 removed lines

@@ -9,11 +9,11 @@ 
  * Helper functions
  */
 function _boincuser_delete_goto_admindelete($form, &$form_state) {
-  drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
+  drupal_goto('/admin/boinc/user_delete/'.$form['#uid']);
 }
 
 function _boincuser_delete_cancel($form, &$form_state) {
-  drupal_goto('/user/' . $form['#uid'] . '/edit');
+  drupal_goto('/user/'.$form['#uid'].'/edit');
 }
 
 /**
@@ -24,9 +24,9 @@ 
     return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), NULL, 'boinc:delete-user-account'));
   }
 
-  $given_hash = md5($current_pass . $boinc_user->email_addr);
+  $given_hash = md5($current_pass.$boinc_user->email_addr);
 
-  if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
+  if ((!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash)) {
     return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:delete-user-account'));
   }
 
@@ -40,7 +40,7 @@ 
 /**
  * Delete the user function.
  */
-function _boincuser_delete_deleteuser($account, $action=NULL) {
+function _boincuser_delete_deleteuser($account, $action = NULL) {
   require_boinc('user_util');
   require_boinc('delete_account');
 
@@ -74,11 +74,11 @@ 
       //  * erase signature
       $myarray = array(
         'status'    => 0,
-        'name'      => 'deleted_' . time() . '_' . random_string(),
-        'mail'      => 'deleted_' . time() . '_' . random_string(),
-        'pass'      => 'deleted_' . time() . '_' . random_string(),
+        'name'      => 'deleted_'.time().'_'.random_string(),
+        'mail'      => 'deleted_'.time().'_'.random_string(),
+        'pass'      => 'deleted_'.time().'_'.random_string(),
         'signature' => '',
-        'init'      => 'deleted_' . time() . '_' . random_string(),
+        'init'      => 'deleted_'.time().'_'.random_string(),
       );
       user_save($account, $myarray);
       break;
@@ -130,7 +130,7 @@ 
 
   if (!empty($mids)) {
     // Delete recipient entries in {pm_index} of the messages the user wrote.
-    db_query('DELETE FROM {pm_index} WHERE mid IN (' . db_placeholders($mids) . ')', $mids);
+    db_query('DELETE FROM {pm_index} WHERE mid IN ('.db_placeholders($mids).')', $mids);
   }
 
   // Delete recipient entries of that user.

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

@@ -21,13 +21,13 @@ 
  */
 function _boincuser_delete_validatepasswd($boinc_user, $current_pass) {
   if (!$current_pass) {
-    return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), NULL, 'boinc:delete-user-account'));
+    return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), null, 'boinc:delete-user-account'));
   }
 
   $given_hash = md5($current_pass . $boinc_user->email_addr);
 
   if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
-    return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:delete-user-account'));
+    return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), null, 'boinc:delete-user-account'));
   }
 
   return true;
@@ -40,7 +40,7 @@ 
 /**
  * Delete the user function.
  */
-function _boincuser_delete_deleteuser($account, $action=NULL) {
+function _boincuser_delete_deleteuser($account, $action=null) {
   require_boinc('user_util');
   require_boinc('delete_account');
 

Indentation +56 added lines, -56 removed lines

@@ -9,28 +9,28 @@ 
  * Helper functions
  */
 function _boincuser_delete_goto_admindelete($form, &$form_state) {
-  drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
+    drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
 }
 
 function _boincuser_delete_cancel($form, &$form_state) {
-  drupal_goto('/user/' . $form['#uid'] . '/edit');
+    drupal_goto('/user/' . $form['#uid'] . '/edit');
 }
 
 /**
  * Validation user password function.
  */
 function _boincuser_delete_validatepasswd($boinc_user, $current_pass) {
-  if (!$current_pass) {
+    if (!$current_pass) {
     return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), NULL, 'boinc:delete-user-account'));
-  }
+    }
 
-  $given_hash = md5($current_pass . $boinc_user->email_addr);
+    $given_hash = md5($current_pass . $boinc_user->email_addr);
 
-  if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
+    if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
     return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:delete-user-account'));
-  }
+    }
 
-  return true;
+    return true;
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -41,56 +41,56 @@ 
  * Delete the user function.
  */
 function _boincuser_delete_deleteuser($account, $action=NULL) {
-  require_boinc('user_util');
-  require_boinc('delete_account');
+    require_boinc('user_util');
+    require_boinc('delete_account');
 
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+    $boinc_user = BoincUser::lookup_id($account->boincuser_id);
 
-  // watchdog message
-  watchdog('boincuser_delete', 'Deleting account drupal UID: %uid, BOINC id: %boincuser_id., BOINC displayname: %displayname',
-  array(
+    // watchdog message
+    watchdog('boincuser_delete', 'Deleting account drupal UID: %uid, BOINC id: %boincuser_id., BOINC displayname: %displayname',
+    array(
     '%uid' =>  $account->uid,
     '%boincuser_id' => $account->boincuser_id,
     '%displayname' => $account->boincuser_name,
-  ), WATCHDOG_NOTICE);
+    ), WATCHDOG_NOTICE);
 
-  // delete the account - This will delete the boinc user from the
-  // boinc project database, and then delete the Drupal user using the
-  // hook_user() functions.
+    // delete the account - This will delete the boinc user from the
+    // boinc project database, and then delete the Drupal user using the
+    // hook_user() functions.
 
-  switch ($action) {
+    switch ($action) {
     case 'soft_obfuscate':
       obfuscate_account($boinc_user);
-      _boincuser_delete_comment_reassign($account);
-      _boincuser_delete_node_reassign($account);
-      _boincuser_delete_privatemsg_delete($account);
-      _boincuser_delete_friends($account);
-      // delete the user's profile
-      $profile = content_profile_load('profile', $account->uid);
-      node_delete($profile->nid);
-      // Drupal account -
-      //  * 'block'/disable the account
-      //  * set name, mail, pass, and init to deleted
-      //  * erase signature
-      $myarray = array(
+        _boincuser_delete_comment_reassign($account);
+        _boincuser_delete_node_reassign($account);
+        _boincuser_delete_privatemsg_delete($account);
+        _boincuser_delete_friends($account);
+        // delete the user's profile
+        $profile = content_profile_load('profile', $account->uid);
+        node_delete($profile->nid);
+        // Drupal account -
+        //  * 'block'/disable the account
+        //  * set name, mail, pass, and init to deleted
+        //  * erase signature
+        $myarray = array(
         'status'    => 0,
         'name'      => 'deleted_' . time() . '_' . random_string(),
         'mail'      => 'deleted_' . time() . '_' . random_string(),
         'pass'      => 'deleted_' . time() . '_' . random_string(),
         'signature' => '',
         'init'      => 'deleted_' . time() . '_' . random_string(),
-      );
-      user_save($account, $myarray);
-      break;
+        );
+        user_save($account, $myarray);
+        break;
     case 'hard_wipe':
       wipe_account($boinc_user);
-      user_delete(array(), $account->uid);
-      break;
+        user_delete(array(), $account->uid);
+        break;
     default:
       watchdog('boincuser_delete', 'Delete action is %action, which is not \'soft_obfuscate\' or \'hard_wipe\'.', array(
         '%action' => $action,
-      ), WATCHDOG_ERROR);
-  }
+        ), WATCHDOG_ERROR);
+    }
 }
 
 /**
@@ -99,8 +99,8 @@ 
  * Copied from node.module, node_user()
  */
 function _boincuser_delete_node_reassign($account) {
-  db_query('UPDATE {node} SET uid = 0 WHERE uid = %d', $account->uid);
-  db_query('UPDATE {node_revisions} SET uid = 0 WHERE uid = %d', $account->uid);
+    db_query('UPDATE {node} SET uid = 0 WHERE uid = %d', $account->uid);
+    db_query('UPDATE {node_revisions} SET uid = 0 WHERE uid = %d', $account->uid);
 }
 
 /**
@@ -109,11 +109,11 @@ 
  * Copied from comment.module, comment_user()
  */
 function _boincuser_delete_comment_reassign($account) {
-  // bug in comment module, remove user name from comments.
-  db_query("UPDATE {comments} SET comments.name='' WHERE uid =%d", $account->uid);
+    // bug in comment module, remove user name from comments.
+    db_query("UPDATE {comments} SET comments.name='' WHERE uid =%d", $account->uid);
 
-  db_query('UPDATE {comments} SET uid = 0 WHERE uid = %d', $account->uid);
-  db_query('UPDATE {node_comment_statistics} SET last_comment_uid = 0 WHERE last_comment_uid = %d', $account->uid);
+    db_query('UPDATE {comments} SET uid = 0 WHERE uid = %d', $account->uid);
+    db_query('UPDATE {node_comment_statistics} SET last_comment_uid = 0 WHERE last_comment_uid = %d', $account->uid);
 }
 
 /**
@@ -122,23 +122,23 @@ 
  * Copied from privatemsg module, case 'delete' in privatemsg_user().
  */
 function _boincuser_delete_privatemsg_delete($account) {
-  // Load all mids of the messages the user wrote.
-  $result = db_query("SELECT mid FROM {pm_message} WHERE author = %d", $account->uid);
-  $mids = array();
-  while ($row = db_fetch_array($result)) {
+    // Load all mids of the messages the user wrote.
+    $result = db_query("SELECT mid FROM {pm_message} WHERE author = %d", $account->uid);
+    $mids = array();
+    while ($row = db_fetch_array($result)) {
     $mids[] = $row['mid'];
-  }
+    }
 
-  // Delete messages the user wrote.
-  db_query('DELETE FROM {pm_message} WHERE author = %d', $account->uid);
+    // Delete messages the user wrote.
+    db_query('DELETE FROM {pm_message} WHERE author = %d', $account->uid);
 
-  if (!empty($mids)) {
+    if (!empty($mids)) {
     // Delete recipient entries in {pm_index} of the messages the user wrote.
     db_query('DELETE FROM {pm_index} WHERE mid IN (' . db_placeholders($mids) . ')', $mids);
-  }
+    }
 
-  // Delete recipient entries of that user.
-  db_query('DELETE FROM {pm_index} WHERE uid = %d', $account->uid);
+    // Delete recipient entries of that user.
+    db_query('DELETE FROM {pm_index} WHERE uid = %d', $account->uid);
 }
 
 /**
@@ -147,6 +147,6 @@ 
  * Copied from flag_friend, flag_friend_user()
  */
 function _boincuser_delete_friends($account) {
-  // remove any friend relationships if an account is removed
+    // remove any friend relationships if an account is removed
     db_query("DELETE FROM {flag_friend} WHERE uid = %d OR friend_uid = %d", $account->uid, $account->uid);
 }
\ No newline at end of file

Switch Indentation +60 added lines, -60 removed lines

@@ -9,28 +9,28 @@ 
  * Helper functions
  */
 function _boincuser_delete_goto_admindelete($form, &$form_state) {
-  drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
+drupal_goto('/admin/boinc/user_delete/' . $form['#uid']);
 }
 
 function _boincuser_delete_cancel($form, &$form_state) {
-  drupal_goto('/user/' . $form['#uid'] . '/edit');
+drupal_goto('/user/' . $form['#uid'] . '/edit');
 }
 
 /**
  * Validation user password function.
  */
 function _boincuser_delete_validatepasswd($boinc_user, $current_pass) {
-  if (!$current_pass) {
-    return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), NULL, 'boinc:delete-user-account'));
-  }
+if (!$current_pass) {
+return form_set_error('current_pass', bts('Authentication is required when requesting account deletion.', array(), NULL, 'boinc:delete-user-account'));
+}
 
-  $given_hash = md5($current_pass . $boinc_user->email_addr);
+$given_hash = md5($current_pass . $boinc_user->email_addr);
 
-  if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
-    return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:delete-user-account'));
-  }
+if ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
+return form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:delete-user-account'));
+}
 
-  return true;
+return true;
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -41,56 +41,56 @@ 
  * Delete the user function.
  */
 function _boincuser_delete_deleteuser($account, $action=NULL) {
-  require_boinc('user_util');
-  require_boinc('delete_account');
-
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
-
-  // watchdog message
-  watchdog('boincuser_delete', 'Deleting account drupal UID: %uid, BOINC id: %boincuser_id., BOINC displayname: %displayname',
-  array(
-    '%uid' =>  $account->uid,
-    '%boincuser_id' => $account->boincuser_id,
-    '%displayname' => $account->boincuser_name,
-  ), WATCHDOG_NOTICE);
-
-  // delete the account - This will delete the boinc user from the
-  // boinc project database, and then delete the Drupal user using the
-  // hook_user() functions.
-
-  switch ($action) {
-    case 'soft_obfuscate':
-      obfuscate_account($boinc_user);
-      _boincuser_delete_comment_reassign($account);
-      _boincuser_delete_node_reassign($account);
-      _boincuser_delete_privatemsg_delete($account);
-      _boincuser_delete_friends($account);
-      // delete the user's profile
-      $profile = content_profile_load('profile', $account->uid);
-      node_delete($profile->nid);
-      // Drupal account -
-      //  * 'block'/disable the account
-      //  * set name, mail, pass, and init to deleted
-      //  * erase signature
-      $myarray = array(
-        'status'    => 0,
-        'name'      => 'deleted_' . time() . '_' . random_string(),
-        'mail'      => 'deleted_' . time() . '_' . random_string(),
-        'pass'      => 'deleted_' . time() . '_' . random_string(),
-        'signature' => '',
-        'init'      => 'deleted_' . time() . '_' . random_string(),
-      );
-      user_save($account, $myarray);
-      break;
-    case 'hard_wipe':
-      wipe_account($boinc_user);
-      user_delete(array(), $account->uid);
-      break;
-    default:
-      watchdog('boincuser_delete', 'Delete action is %action, which is not \'soft_obfuscate\' or \'hard_wipe\'.', array(
-        '%action' => $action,
-      ), WATCHDOG_ERROR);
-  }
+require_boinc('user_util');
+require_boinc('delete_account');
+
+$boinc_user = BoincUser::lookup_id($account->boincuser_id);
+
+// watchdog message
+watchdog('boincuser_delete', 'Deleting account drupal UID: %uid, BOINC id: %boincuser_id., BOINC displayname: %displayname',
+array(
+'%uid' =>  $account->uid,
+'%boincuser_id' => $account->boincuser_id,
+'%displayname' => $account->boincuser_name,
+), WATCHDOG_NOTICE);
+
+// delete the account - This will delete the boinc user from the
+// boinc project database, and then delete the Drupal user using the
+// hook_user() functions.
+
+switch ($action) {
+case 'soft_obfuscate':
+obfuscate_account($boinc_user);
+_boincuser_delete_comment_reassign($account);
+_boincuser_delete_node_reassign($account);
+_boincuser_delete_privatemsg_delete($account);
+_boincuser_delete_friends($account);
+// delete the user's profile
+$profile = content_profile_load('profile', $account->uid);
+node_delete($profile->nid);
+// Drupal account -
+//  * 'block'/disable the account
+//  * set name, mail, pass, and init to deleted
+//  * erase signature
+$myarray = array(
+'status'    => 0,
+'name'      => 'deleted_' . time() . '_' . random_string(),
+'mail'      => 'deleted_' . time() . '_' . random_string(),
+'pass'      => 'deleted_' . time() . '_' . random_string(),
+'signature' => '',
+'init'      => 'deleted_' . time() . '_' . random_string(),
+);
+user_save($account, $myarray);
+break;
+case 'hard_wipe':
+wipe_account($boinc_user);
+user_delete(array(), $account->uid);
+break;
+default:
+watchdog('boincuser_delete', 'Delete action is %action, which is not \'soft_obfuscate\' or \'hard_wipe\'.', array(
+'%action' => $action,
+), WATCHDOG_ERROR);
+}
 }
 
 /**

drupal/sites/all/features/boinc_standard/boinc_standard.pages_default.inc

Indentation +327 added lines, -327 removed lines

@@ -4,113 +4,113 @@ 
  * Implementation of hook_default_page_manager_pages().
  */
 function boinc_standard_default_page_manager_pages() {
-  $page = new stdClass;
-  $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
-  $page->api_version = 1;
-  $page->name = 'about_us';
-  $page->task = 'page';
-  $page->admin_title = 'About Us';
-  $page->admin_description = '';
-  $page->path = 'about.fail';
-  $page->access = array(
+    $page = new stdClass;
+    $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
+    $page->api_version = 1;
+    $page->name = 'about_us';
+    $page->task = 'page';
+    $page->admin_title = 'About Us';
+    $page->admin_description = '';
+    $page->path = 'about.fail';
+    $page->access = array(
     'type' => 'none',
     'settings' => NULL,
-  );
-  $page->menu = array();
-  $page->arguments = array();
-  $page->conf = array();
-  $page->default_handlers = array();
-  $pages['about_us'] = $page;
+    );
+    $page->menu = array();
+    $page->arguments = array();
+    $page->conf = array();
+    $page->default_handlers = array();
+    $pages['about_us'] = $page;
 
-  $page = new stdClass;
-  $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
-  $page->api_version = 1;
-  $page->name = 'account_dashboard';
-  $page->task = 'page';
-  $page->admin_title = 'Dashboard';
-  $page->admin_description = '';
-  $page->path = 'dashboard';
-  $page->access = array(
+    $page = new stdClass;
+    $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
+    $page->api_version = 1;
+    $page->name = 'account_dashboard';
+    $page->task = 'page';
+    $page->admin_title = 'Dashboard';
+    $page->admin_description = '';
+    $page->path = 'dashboard';
+    $page->access = array(
     'plugins' => array(
-      1 => array(
+        1 => array(
         'name' => 'role',
         'settings' => array(
-          'rids' => array(
+            'rids' => array(
             0 => 2,
-          ),
+            ),
         ),
         'context' => 'logged-in-user',
         'not' => FALSE,
-      ),
+        ),
     ),
     'logic' => 'and',
     'type' => 'none',
     'settings' => NULL,
-  );
-  $page->menu = array(
+    );
+    $page->menu = array(
     'type' => 'none',
     'title' => 'Dashboard',
     'name' => 'navigation',
     'weight' => '0',
     'parent' => array(
-      'type' => 'normal',
-      'title' => 'Account',
-      'name' => 'navigation',
-      'weight' => '0',
+        'type' => 'normal',
+        'title' => 'Account',
+        'name' => 'navigation',
+        'weight' => '0',
     ),
-  );
-  $page->arguments = array();
-  $page->conf = array();
-  $page->default_handlers = array();
-  $handler = new stdClass;
-  $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
-  $handler->api_version = 1;
-  $handler->name = 'page_account_dashboard_panel_context';
-  $handler->task = 'page';
-  $handler->subtask = 'account_dashboard';
-  $handler->handler = 'panel_context';
-  $handler->weight = 0;
-  $handler->conf = array(
+    );
+    $page->arguments = array();
+    $page->conf = array();
+    $page->default_handlers = array();
+    $handler = new stdClass;
+    $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
+    $handler->api_version = 1;
+    $handler->name = 'page_account_dashboard_panel_context';
+    $handler->task = 'page';
+    $handler->subtask = 'account_dashboard';
+    $handler->handler = 'panel_context';
+    $handler->weight = 0;
+    $handler->conf = array(
     'title' => 'Landing page',
     'no_blocks' => FALSE,
     'pipeline' => 'ipe',
     'css_id' => '',
     'css' => '',
     'contexts' => array(
-      0 => array(
+        0 => array(
         'name' => 'user',
         'id' => 1,
         'identifier' => 'User',
         'keyword' => 'user',
         'context_settings' => array(
-          'type' => 'current',
-          'user' => '',
-          'uid' => '',
+            'type' => 'current',
+            'user' => '',
+            'uid' => '',
+        ),
         ),
-      ),
     ),
     'relationships' => array(),
     'access' => array(
-      'plugins' => array(),
-      'logic' => 'and',
+        'plugins' => array(),
+        'logic' => 'and',
     ),
-  );
-  $display = new panels_display;
-  $display->layout = 'one_sidebar_second';
-  $display->layout_settings = array();
-  $display->panel_settings = array(
+    );
+    $display = new panels_display;
+    $display->layout = 'one_sidebar_second';
+    $display->layout_settings = array();
+    $display->panel_settings = array(
     'style_settings' => array(
-      'default' => NULL,
-      'content' => NULL,
-      'sidebar_first' => NULL,
+        'default' => NULL,
+        'content' => NULL,
+        'sidebar_first' => NULL,
     ),
-  );
-  $display->cache = array();
-  $display->title = 'Dashboard';
-  $display->storage_type = 'page_manager';
-  $display->storage_id = 'page_account_dashboard_panel_context';
-  $display->content = array();
-  $display->panels = array();
+    );
+    $display->cache = array();
+    $display->title = 'Dashboard';
+    $display->storage_type = 'page_manager';
+    $display->storage_id = 'page_account_dashboard_panel_context';
+    $display->content = array();
+    $display->panels = array();
     $pane = new stdClass;
     $pane->pid = 'new-1';
     $pane->panel = 'content';
@@ -119,16 +119,16 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'override_title' => 1,
-      'override_title_text' => 'My stats',
+        'override_title' => 1,
+        'override_title_text' => 'My stats',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-primary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-primary container shadow',
     );
     $pane->extras = array();
     $pane->position = 0;
@@ -144,11 +144,11 @@ 
     $pane->configuration = array();
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-primary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-primary container shadow',
     );
     $pane->extras = array();
     $pane->position = 1;
@@ -161,31 +161,31 @@ 
     $pane->subtype = 'custom';
     $pane->shown = TRUE;
     $pane->access = array(
-      'plugins' => array(
+        'plugins' => array(
         1 => array(
-          'name' => 'perm',
-          'settings' => array(
+            'name' => 'perm',
+            'settings' => array(
             'perm' => 'edit any profile content',
-          ),
-          'context' => 'context_user_1',
-          'not' => FALSE,
+            ),
+            'context' => 'context_user_1',
+            'not' => FALSE,
+        ),
         ),
-      ),
     );
     $pane->configuration = array(
-      'admin_title' => 'Moderation overview',
-      'title' => '',
-      'body' => '<?php print boinccore_moderation_overview_panel(); ?>',
-      'format' => '3',
-      'substitute' => 1,
+        'admin_title' => 'Moderation overview',
+        'title' => '',
+        'body' => '<?php print boinccore_moderation_overview_panel(); ?>',
+        'format' => '3',
+        'substitute' => 1,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 0;
@@ -199,16 +199,16 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'override_title' => 0,
-      'override_title_text' => '',
+        'override_title' => 0,
+        'override_title_text' => '',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 1;
@@ -222,23 +222,23 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'admin_title' => 'Team summary',
-      'title' => '',
-      'body' => '<?php 
+        'admin_title' => 'Team summary',
+        'title' => '',
+        'body' => '<?php 
 if (module_exists(\'boincteam\')) {
   echo boincteam_dashboard_panel();
 }
 ?>',
-      'format' => '3',
-      'substitute' => 1,
+        'format' => '3',
+        'substitute' => 1,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => 'team-dashboard-pane',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => 'team-dashboard-pane',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 2;
@@ -252,9 +252,9 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'admin_title' => 'User activity summary',
-      'title' => '',
-      'body' => '<?php
+        'admin_title' => 'User activity summary',
+        'title' => '',
+        'body' => '<?php
 
 global $user;
 $uid = $user->uid;
@@ -263,16 +263,16 @@ 
 echo \'<div class="item-count-wrapper"><div class="item-count">\' . $account->post_count . \'</div></div>\';
 
 ?>',
-      'format' => '3',
-      'substitute' => 1,
+        'format' => '3',
+        'substitute' => 1,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 3;
@@ -286,74 +286,74 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'override_pager_settings' => 0,
-      'use_pager' => 0,
-      'nodes_per_page' => '6',
-      'pager_id' => '',
-      'offset' => '0',
-      'more_link' => 1,
-      'feed_icons' => 0,
-      'panel_args' => 0,
-      'link_to_view' => 0,
-      'args' => '',
-      'url' => '',
-      'display' => 'block_1',
-      'context' => array(
+        'override_pager_settings' => 0,
+        'use_pager' => 0,
+        'nodes_per_page' => '6',
+        'pager_id' => '',
+        'offset' => '0',
+        'more_link' => 1,
+        'feed_icons' => 0,
+        'panel_args' => 0,
+        'link_to_view' => 0,
+        'args' => '',
+        'url' => '',
+        'display' => 'block_1',
+        'context' => array(
         0 => 'context_user_1.uid',
-      ),
-      'override_title' => 0,
-      'override_title_text' => '',
+        ),
+        'override_title' => 0,
+        'override_title_text' => '',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 4;
     $display->content['new-7'] = $pane;
     $display->panels['sidebar_first'][4] = 'new-7';
-  $display->hide_title = PANELS_TITLE_FIXED;
-  $display->title_pane = 'new-1';
-  $handler->conf['display'] = $display;
-  $page->default_handlers[$handler->name] = $handler;
-  $pages['account_dashboard'] = $page;
+    $display->hide_title = PANELS_TITLE_FIXED;
+    $display->title_pane = 'new-1';
+    $handler->conf['display'] = $display;
+    $page->default_handlers[$handler->name] = $handler;
+    $pages['account_dashboard'] = $page;
 
-  $page = new stdClass;
-  $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
-  $page->api_version = 1;
-  $page->name = 'boinc_user';
-  $page->task = 'page';
-  $page->admin_title = 'User profile template (boinc)';
-  $page->admin_description = '';
-  $page->path = 'account/%user';
-  $page->access = array(
+    $page = new stdClass;
+    $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
+    $page->api_version = 1;
+    $page->name = 'boinc_user';
+    $page->task = 'page';
+    $page->admin_title = 'User profile template (boinc)';
+    $page->admin_description = '';
+    $page->path = 'account/%user';
+    $page->access = array(
     'type' => 'none',
     'settings' => NULL,
-  );
-  $page->menu = array();
-  $page->arguments = array(
+    );
+    $page->menu = array();
+    $page->arguments = array(
     'user' => array(
-      'id' => 1,
-      'identifier' => 'User: ID',
-      'name' => 'uid',
-      'settings' => array(),
+        'id' => 1,
+        'identifier' => 'User: ID',
+        'name' => 'uid',
+        'settings' => array(),
     ),
-  );
-  $page->conf = array();
-  $page->default_handlers = array();
-  $handler = new stdClass;
-  $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
-  $handler->api_version = 1;
-  $handler->name = 'page_boinc_user_panel_context_2';
-  $handler->task = 'page';
-  $handler->subtask = 'boinc_user';
-  $handler->handler = 'panel_context';
-  $handler->weight = 1;
-  $handler->conf = array(
+    );
+    $page->conf = array();
+    $page->default_handlers = array();
+    $handler = new stdClass;
+    $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
+    $handler->api_version = 1;
+    $handler->name = 'page_boinc_user_panel_context_2';
+    $handler->task = 'page';
+    $handler->subtask = 'boinc_user';
+    $handler->handler = 'panel_context';
+    $handler->weight = 1;
+    $handler->conf = array(
     'title' => 'Panel',
     'no_blocks' => 0,
     'pipeline' => 'standard',
@@ -362,37 +362,37 @@ 
     'contexts' => array(),
     'relationships' => array(),
     'access' => array(
-      'plugins' => array(
+        'plugins' => array(
         0 => array(
-          'name' => 'php',
-          'settings' => array(
+            'name' => 'php',
+            'settings' => array(
             'description' => 'if user status then show profile',
             'php' => '$account = $contexts[\'argument_uid_1\']->data;
 return ($account->status);
 ',
-          ),
-          'not' => FALSE,
+            ),
+            'not' => FALSE,
+        ),
         ),
-      ),
-      'logic' => 'and',
+        'logic' => 'and',
     ),
-  );
-  $display = new panels_display;
-  $display->layout = 'one_sidebar_second';
-  $display->layout_settings = array();
-  $display->panel_settings = array(
+    );
+    $display = new panels_display;
+    $display->layout = 'one_sidebar_second';
+    $display->layout_settings = array();
+    $display->panel_settings = array(
     'style_settings' => array(
-      'default' => NULL,
-      'content' => NULL,
-      'sidebar_first' => NULL,
+        'default' => NULL,
+        'content' => NULL,
+        'sidebar_first' => NULL,
     ),
-  );
-  $display->cache = array();
-  $display->title = 'Account';
-  $display->storage_type = 'page_manager';
-  $display->storage_id = 'page_boinc_user_panel_context_2';
-  $display->content = array();
-  $display->panels = array();
+    );
+    $display->cache = array();
+    $display->title = 'Account';
+    $display->storage_type = 'page_manager';
+    $display->storage_id = 'page_boinc_user_panel_context_2';
+    $display->content = array();
+    $display->panels = array();
     $pane = new stdClass;
     $pane->pid = 'new-1';
     $pane->panel = 'content';
@@ -401,19 +401,19 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'context' => array(
+        'context' => array(
         0 => 'argument_uid_1',
-      ),
-      'override_title' => 0,
-      'override_title_text' => '',
+        ),
+        'override_title' => 0,
+        'override_title_text' => '',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-primary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-primary container shadow',
     );
     $pane->extras = array();
     $pane->position = 0;
@@ -427,16 +427,16 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'override_title' => 0,
-      'override_title_text' => '',
+        'override_title' => 0,
+        'override_title_text' => '',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 0;
@@ -450,23 +450,23 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'admin_title' => 'Team summary',
-      'title' => '',
-      'body' => '<?php 
+        'admin_title' => 'Team summary',
+        'title' => '',
+        'body' => '<?php 
 if (module_exists(\'boincteam\')) {
   echo boincteam_dashboard_panel(%user:uid);
 }
 ?>',
-      'format' => '3',
-      'substitute' => 1,
+        'format' => '3',
+        'substitute' => 1,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => 'team-dashboard-pane',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => 'team-dashboard-pane',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 1;
@@ -480,9 +480,9 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'admin_title' => 'User activity summary',
-      'title' => '',
-      'body' => '<?php
+        'admin_title' => 'User activity summary',
+        'title' => '',
+        'body' => '<?php
 
 $uid = arg(1);
 $account = user_load($uid);
@@ -490,16 +490,16 @@ 
 echo \'<div class="item-count-wrapper"><div class="item-count">\' . $account->post_count . \'</div></div>\';
 
 ?>',
-      'format' => '3',
-      'substitute' => 0,
+        'format' => '3',
+        'substitute' => 0,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 2;
@@ -513,31 +513,31 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'override_pager_settings' => 0,
-      'use_pager' => 0,
-      'nodes_per_page' => '6',
-      'pager_id' => '',
-      'offset' => '0',
-      'more_link' => 0,
-      'feed_icons' => 0,
-      'panel_args' => 0,
-      'link_to_view' => 0,
-      'args' => '',
-      'url' => '',
-      'display' => 'block_1',
-      'context' => array(
+        'override_pager_settings' => 0,
+        'use_pager' => 0,
+        'nodes_per_page' => '6',
+        'pager_id' => '',
+        'offset' => '0',
+        'more_link' => 0,
+        'feed_icons' => 0,
+        'panel_args' => 0,
+        'link_to_view' => 0,
+        'args' => '',
+        'url' => '',
+        'display' => 'block_1',
+        'context' => array(
         0 => 'argument_uid_1.uid',
-      ),
-      'override_title' => 0,
-      'override_title_text' => '',
+        ),
+        'override_title' => 0,
+        'override_title_text' => '',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 3;
@@ -551,66 +551,66 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'admin_title' => 'Project list',
-      'title' => 'Projects',
-      'body' => '<?php echo boincuser_get_projects_table(%user:uid); ?>',
-      'format' => '3',
-      'substitute' => 1,
+        'admin_title' => 'Project list',
+        'title' => 'Projects',
+        'body' => '<?php echo boincuser_get_projects_table(%user:uid); ?>',
+        'format' => '3',
+        'substitute' => 1,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow',
     );
     $pane->extras = array();
     $pane->position = 4;
     $display->content['new-6'] = $pane;
     $display->panels['sidebar_first'][4] = 'new-6';
-  $display->hide_title = PANELS_TITLE_FIXED;
-  $display->title_pane = '0';
-  $handler->conf['display'] = $display;
-  $page->default_handlers[$handler->name] = $handler;
-  $pages['boinc_user'] = $page;
+    $display->hide_title = PANELS_TITLE_FIXED;
+    $display->title_pane = '0';
+    $handler->conf['display'] = $display;
+    $page->default_handlers[$handler->name] = $handler;
+    $pages['boinc_user'] = $page;
 
-  $page = new stdClass;
-  $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
-  $page->api_version = 1;
-  $page->name = 'home';
-  $page->task = 'page';
-  $page->admin_title = 'Home page';
-  $page->admin_description = '';
-  $page->path = 'home';
-  $page->access = array(
+    $page = new stdClass;
+    $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
+    $page->api_version = 1;
+    $page->name = 'home';
+    $page->task = 'page';
+    $page->admin_title = 'Home page';
+    $page->admin_description = '';
+    $page->path = 'home';
+    $page->access = array(
     'type' => 'none',
     'settings' => NULL,
-  );
-  $page->menu = array(
+    );
+    $page->menu = array(
     'type' => 'normal',
     'title' => 'Home',
     'name' => 'navigation',
     'weight' => '0',
     'parent' => array(
-      'type' => 'none',
-      'title' => '',
-      'name' => 'navigation',
-      'weight' => '0',
+        'type' => 'none',
+        'title' => '',
+        'name' => 'navigation',
+        'weight' => '0',
     ),
-  );
-  $page->arguments = array();
-  $page->conf = array();
-  $page->default_handlers = array();
-  $handler = new stdClass;
-  $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
-  $handler->api_version = 1;
-  $handler->name = 'page_home_panel_context';
-  $handler->task = 'page';
-  $handler->subtask = 'home';
-  $handler->handler = 'panel_context';
-  $handler->weight = 0;
-  $handler->conf = array(
+    );
+    $page->arguments = array();
+    $page->conf = array();
+    $page->default_handlers = array();
+    $handler = new stdClass;
+    $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
+    $handler->api_version = 1;
+    $handler->name = 'page_home_panel_context';
+    $handler->task = 'page';
+    $handler->subtask = 'home';
+    $handler->handler = 'panel_context';
+    $handler->weight = 0;
+    $handler->conf = array(
     'title' => 'Landing page',
     'no_blocks' => FALSE,
     'pipeline' => 'ipe',
@@ -618,23 +618,23 @@ 
     'css' => '',
     'contexts' => array(),
     'relationships' => array(),
-  );
-  $display = new panels_display;
-  $display->layout = 'one_sidebar_second';
-  $display->layout_settings = array();
-  $display->panel_settings = array(
+    );
+    $display = new panels_display;
+    $display->layout = 'one_sidebar_second';
+    $display->layout_settings = array();
+    $display->panel_settings = array(
     'style_settings' => array(
-      'default' => NULL,
-      'content' => NULL,
-      'sidebar_first' => NULL,
+        'default' => NULL,
+        'content' => NULL,
+        'sidebar_first' => NULL,
     ),
-  );
-  $display->cache = array();
-  $display->title = '';
-  $display->storage_type = 'page_manager';
-  $display->storage_id = 'page_home_panel_context';
-  $display->content = array();
-  $display->panels = array();
+    );
+    $display->cache = array();
+    $display->title = '';
+    $display->storage_type = 'page_manager';
+    $display->storage_id = 'page_home_panel_context';
+    $display->content = array();
+    $display->panels = array();
     $pane = new stdClass;
     $pane->pid = 'new-1';
     $pane->panel = 'content';
@@ -642,22 +642,22 @@ 
     $pane->subtype = 'custom';
     $pane->shown = TRUE;
     $pane->access = array(
-      'plugins' => array(),
+        'plugins' => array(),
     );
     $pane->configuration = array(
-      'admin_title' => 'BOINC overview',
-      'title' => '',
-      'body' => '<?php print boincuser_home_page(); ?>',
-      'format' => '3',
-      'substitute' => TRUE,
+        'admin_title' => 'BOINC overview',
+        'title' => '',
+        'body' => '<?php print boincuser_home_page(); ?>',
+        'format' => '3',
+        'substitute' => TRUE,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-primary container shadow',
+        'css_id' => '',
+        'css_class' => 'panel-primary container shadow',
     );
     $pane->extras = array();
     $pane->position = 0;
@@ -671,16 +671,16 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'override_title' => 0,
-      'override_title_text' => '',
+        'override_title' => 0,
+        'override_title_text' => '',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow balance-height-front no-resize',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow balance-height-front no-resize',
     );
     $pane->extras = array();
     $pane->position = 0;
@@ -694,39 +694,39 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'override_pager_settings' => 1,
-      'use_pager' => 0,
-      'nodes_per_page' => '2',
-      'pager_id' => '',
-      'offset' => '0',
-      'more_link' => 1,
-      'feed_icons' => 1,
-      'panel_args' => 0,
-      'link_to_view' => 0,
-      'args' => '',
-      'url' => '',
-      'display' => 'page_2',
-      'override_title' => 1,
-      'override_title_text' => '',
+        'override_pager_settings' => 1,
+        'use_pager' => 0,
+        'nodes_per_page' => '2',
+        'pager_id' => '',
+        'offset' => '0',
+        'more_link' => 1,
+        'feed_icons' => 1,
+        'panel_args' => 0,
+        'link_to_view' => 0,
+        'args' => '',
+        'url' => '',
+        'display' => 'page_2',
+        'override_title' => 1,
+        'override_title_text' => '',
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array(
-      'css_id' => '',
-      'css_class' => 'panel-secondary container shadow balance-height-front',
+        'css_id' => '',
+        'css_class' => 'panel-secondary container shadow balance-height-front',
     );
     $pane->extras = array();
     $pane->position = 1;
     $display->content['new-3'] = $pane;
     $display->panels['sidebar_first'][1] = 'new-3';
-  $display->hide_title = PANELS_TITLE_NONE;
-  $display->title_pane = '0';
-  $handler->conf['display'] = $display;
-  $page->default_handlers[$handler->name] = $handler;
-  $pages['home'] = $page;
+    $display->hide_title = PANELS_TITLE_NONE;
+    $display->title_pane = '0';
+    $handler->conf['display'] = $display;
+    $page->default_handlers[$handler->name] = $handler;
+    $pages['home'] = $page;
 
- return $pages;
+    return $pages;
 
 }

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

@@ -5,7 +5,7 @@ 
  */
 function boinc_standard_default_page_manager_pages() {
   $page = new stdClass;
-  $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
+  $page->disabled = false; /* Edit this to true to make a default page disabled initially */
   $page->api_version = 1;
   $page->name = 'about_us';
   $page->task = 'page';
@@ -14,7 +14,7 @@ 
   $page->path = 'about.fail';
   $page->access = array(
     'type' => 'none',
-    'settings' => NULL,
+    'settings' => null,
   );
   $page->menu = array();
   $page->arguments = array();
@@ -23,7 +23,7 @@ 
   $pages['about_us'] = $page;
 
   $page = new stdClass;
-  $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
+  $page->disabled = false; /* Edit this to true to make a default page disabled initially */
   $page->api_version = 1;
   $page->name = 'account_dashboard';
   $page->task = 'page';
@@ -40,12 +40,12 @@ 
           ),
         ),
         'context' => 'logged-in-user',
-        'not' => FALSE,
+        'not' => false,
       ),
     ),
     'logic' => 'and',
     'type' => 'none',
-    'settings' => NULL,
+    'settings' => null,
   );
   $page->menu = array(
     'type' => 'none',
@@ -63,7 +63,7 @@ 
   $page->conf = array();
   $page->default_handlers = array();
   $handler = new stdClass;
-  $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
+  $handler->disabled = false; /* Edit this to true to make a default handler disabled initially */
   $handler->api_version = 1;
   $handler->name = 'page_account_dashboard_panel_context';
   $handler->task = 'page';
@@ -72,7 +72,7 @@ 
   $handler->weight = 0;
   $handler->conf = array(
     'title' => 'Landing page',
-    'no_blocks' => FALSE,
+    'no_blocks' => false,
     'pipeline' => 'ipe',
     'css_id' => '',
     'css' => '',
@@ -100,9 +100,9 @@ 
   $display->layout_settings = array();
   $display->panel_settings = array(
     'style_settings' => array(
-      'default' => NULL,
-      'content' => NULL,
-      'sidebar_first' => NULL,
+      'default' => null,
+      'content' => null,
+      'sidebar_first' => null,
     ),
   );
   $display->cache = array();
@@ -116,7 +116,7 @@ 
     $pane->panel = 'content';
     $pane->type = 'panels_mini';
     $pane->subtype = 'dashboard_tables';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array(
       'override_title' => 1,
@@ -124,7 +124,7 @@ 
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => '',
@@ -139,12 +139,12 @@ 
     $pane->panel = 'content';
     $pane->type = 'views_panes';
     $pane->subtype = 'subscriptions-panel_pane_1';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array();
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => '',
@@ -159,7 +159,7 @@ 
     $pane->panel = 'sidebar_first';
     $pane->type = 'custom';
     $pane->subtype = 'custom';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array(
       'plugins' => array(
         1 => array(
@@ -168,7 +168,7 @@ 
             'perm' => 'edit any profile content',
           ),
           'context' => 'context_user_1',
-          'not' => FALSE,
+          'not' => false,
         ),
       ),
     );
@@ -181,7 +181,7 @@ 
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => '',
@@ -196,7 +196,7 @@ 
     $pane->panel = 'sidebar_first';
     $pane->type = 'panels_mini';
     $pane->subtype = 'user_mail_summary';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array(
       'override_title' => 0,
@@ -204,7 +204,7 @@ 
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => '',
@@ -219,7 +219,7 @@ 
     $pane->panel = 'sidebar_first';
     $pane->type = 'custom';
     $pane->subtype = 'custom';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array(
       'admin_title' => 'Team summary',
@@ -234,7 +234,7 @@ 
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => 'team-dashboard-pane',
@@ -249,7 +249,7 @@ 
     $pane->panel = 'sidebar_first';
     $pane->type = 'custom';
     $pane->subtype = 'custom';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array(
       'admin_title' => 'User activity summary',
@@ -268,7 +268,7 @@ 
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => '',
@@ -283,7 +283,7 @@ 
     $pane->panel = 'sidebar_first';
     $pane->type = 'views';
     $pane->subtype = 'boinc_friends';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array(
       'override_pager_settings' => 0,
@@ -306,7 +306,7 @@ 
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => '',
@@ -323,7 +323,7 @@ 
   $pages['account_dashboard'] = $page;
 
   $page = new stdClass;
-  $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
+  $page->disabled = false; /* Edit this to true to make a default page disabled initially */
   $page->api_version = 1;
   $page->name = 'boinc_user';
   $page->task = 'page';
@@ -332,7 +332,7 @@ 
   $page->path = 'account/%user';
   $page->access = array(
     'type' => 'none',
-    'settings' => NULL,
+    'settings' => null,
   );
   $page->menu = array();
   $page->arguments = array(
@@ -346,7 +346,7 @@ 
   $page->conf = array();
   $page->default_handlers = array();
   $handler = new stdClass;
-  $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
+  $handler->disabled = false; /* Edit this to true to make a default handler disabled initially */
   $handler->api_version = 1;
   $handler->name = 'page_boinc_user_panel_context_2';
   $handler->task = 'page';
@@ -371,7 +371,7 @@ 
 return ($account->status);
 ',
           ),
-          'not' => FALSE,
+          'not' => false,
         ),
       ),
       'logic' => 'and',
@@ -382,9 +382,9 @@ 
   $display->layout_settings = array();
   $display->panel_settings = array(
     'style_settings' => array(
-      'default' => NULL,
-      'content' => NULL,
-      'sidebar_first' => NULL,
+      'default' => null,
+      'content' => null,
+      'sidebar_first' => null,
     ),
   );
   $display->cache = array();
@@ -398,7 +398,7 @@ 
     $pane->panel = 'content';
     $pane->type = 'panels_mini';
     $pane->subtype = 'user_profile';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array(
       'context' => array(
@@ -409,7 +409,7 @@ 
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => '',
@@ -424,7 +424,7 @@ 
     $pane->panel = 'sidebar_first';
     $pane->type = 'views_panes';
     $pane->subtype = 'boinc_account_stats-panel_pane_2';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array(
       'override_title' => 0,
@@ -432,7 +432,7 @@ 
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => '',
@@ -447,7 +447,7 @@ 
     $pane->panel = 'sidebar_first';
     $pane->type = 'custom';
     $pane->subtype = 'custom';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array(
       'admin_title' => 'Team summary',
@@ -462,7 +462,7 @@ 
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => 'team-dashboard-pane',
@@ -477,7 +477,7 @@ 
     $pane->panel = 'sidebar_first';
     $pane->type = 'custom';
     $pane->subtype = 'custom';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array(
       'admin_title' => 'User activity summary',
@@ -495,7 +495,7 @@ 
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => '',
@@ -510,7 +510,7 @@ 
     $pane->panel = 'sidebar_first';
     $pane->type = 'views';
     $pane->subtype = 'boinc_friends';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array(
       'override_pager_settings' => 0,
@@ -533,7 +533,7 @@ 
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => '',
@@ -548,7 +548,7 @@ 
     $pane->panel = 'sidebar_first';
     $pane->type = 'custom';
     $pane->subtype = 'custom';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array(
       'admin_title' => 'Project list',
@@ -559,7 +559,7 @@ 
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => '',
@@ -576,7 +576,7 @@ 
   $pages['boinc_user'] = $page;
 
   $page = new stdClass;
-  $page->disabled = FALSE; /* Edit this to true to make a default page disabled initially */
+  $page->disabled = false; /* Edit this to true to make a default page disabled initially */
   $page->api_version = 1;
   $page->name = 'home';
   $page->task = 'page';
@@ -585,7 +585,7 @@ 
   $page->path = 'home';
   $page->access = array(
     'type' => 'none',
-    'settings' => NULL,
+    'settings' => null,
   );
   $page->menu = array(
     'type' => 'normal',
@@ -603,7 +603,7 @@ 
   $page->conf = array();
   $page->default_handlers = array();
   $handler = new stdClass;
-  $handler->disabled = FALSE; /* Edit this to true to make a default handler disabled initially */
+  $handler->disabled = false; /* Edit this to true to make a default handler disabled initially */
   $handler->api_version = 1;
   $handler->name = 'page_home_panel_context';
   $handler->task = 'page';
@@ -612,7 +612,7 @@ 
   $handler->weight = 0;
   $handler->conf = array(
     'title' => 'Landing page',
-    'no_blocks' => FALSE,
+    'no_blocks' => false,
     'pipeline' => 'ipe',
     'css_id' => '',
     'css' => '',
@@ -624,9 +624,9 @@ 
   $display->layout_settings = array();
   $display->panel_settings = array(
     'style_settings' => array(
-      'default' => NULL,
-      'content' => NULL,
-      'sidebar_first' => NULL,
+      'default' => null,
+      'content' => null,
+      'sidebar_first' => null,
     ),
   );
   $display->cache = array();
@@ -640,7 +640,7 @@ 
     $pane->panel = 'content';
     $pane->type = 'custom';
     $pane->subtype = 'custom';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array(
       'plugins' => array(),
     );
@@ -649,11 +649,11 @@ 
       'title' => '',
       'body' => '<?php print boincuser_home_page(); ?>',
       'format' => '3',
-      'substitute' => TRUE,
+      'substitute' => true,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => '',
@@ -668,7 +668,7 @@ 
     $pane->panel = 'sidebar_first';
     $pane->type = 'panels_mini';
     $pane->subtype = 'project_stats_overview';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array(
       'override_title' => 0,
@@ -676,7 +676,7 @@ 
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => '',
@@ -691,7 +691,7 @@ 
     $pane->panel = 'sidebar_first';
     $pane->type = 'views';
     $pane->subtype = 'news';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array(
       'override_pager_settings' => 1,
@@ -711,7 +711,7 @@ 
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array(
       'css_id' => '',

html/user/create_profile.php

Spacing +20 added lines, -20 removed lines

@@ -32,7 +32,7 @@ 
 // If $selection is provided, and if it matches one of the entries in the file,
 // it will be selected by default.
 //
-function show_combo_box($name, $filename, $selection=null) {
+function show_combo_box($name, $filename, $selection = null) {
     echo "<select name=\"$name\" class=\"form-control\">\n";
 
     $file = fopen($filename, "r");
@@ -63,14 +63,14 @@ 
 <tr><td colspan=2>
 <table border=0 cellpadding=5
 <tr>
-<td valign=top><a href=\"" . IMAGE_URL . $profile->userid . '.jpg' . "\"><img src=\"" . IMAGE_URL . $profile->userid . '_sm.jpg' . "\"></a>
+<td valign=top><a href=\"" . IMAGE_URL.$profile->userid.'.jpg'."\"><img src=\"".IMAGE_URL.$profile->userid.'_sm.jpg'."\"></a>
 </td>
-<td valign=top>" .tra("%1 Your profile picture is shown to the left.",  $warning) ."
+<td valign=top>" .tra("%1 Your profile picture is shown to the left.", $warning)."
 <p>".
-tra("To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 or less).", "50KB") ."<br />
+tra("To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 or less).", "50KB")."<br />
 <input name=picture type=file><br>
 <p>".
-tra("To remove it from your profile, check this box:") . "
+tra("To remove it from your profile, check this box:")."
 <input type=checkbox name=delete_pic>
 <p>
 </td></tr>";
@@ -78,7 +78,7 @@ 
         end_table();
         echo "</td></tr>";
     } else {
-        rowify(tra("If you would like include a picture with your profile, click the \"Browse\" button and select a JPEG or PNG file. Please select images of %1 or less.", "50KB") . "
+        rowify(tra("If you would like include a picture with your profile, click the \"Browse\" button and select a JPEG or PNG file. Please select images of %1 or less.", "50KB")."
 <p>
 <input name=picture type=file>
         ");
@@ -93,7 +93,7 @@ 
     row1(tra("Language"));
     echo "<tr><td>
         <p>" .
-        tra("Select the language in which your profile is written:") . "
+        tra("Select the language in which your profile is written:")."
         <p>
     ";
     if (isset($profile->language)) {
@@ -110,7 +110,7 @@ 
     if ($recaptcha_public_key) {
         table_row(boinc_recaptcha_get_html($recaptcha_public_key));
     }
-    table_row("<p><input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Create/edit profile") ."\" name=\"submit\">");
+    table_row("<p><input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Create/edit profile")."\" name=\"submit\">");
 }
 
 // Returns an array containing:
@@ -124,7 +124,7 @@ 
 
     // Determine if the filetype uploaded is supported.
     // TODO: Change these to constants.
-    switch($size[2]) {
+    switch ($size[2]) {
     case '2':    // JPEG
         $image = imageCreateFromJPEG($fileName);
         break;
@@ -161,7 +161,7 @@ 
 
 function show_description() {
     echo "
-        <p>" .tra("Your %1 profile %2 lets you share your opinions and background with the %3 community.", "<b>", "</b>", PROJECT) . "
+        <p>" .tra("Your %1 profile %2 lets you share your opinions and background with the %3 community.", "<b>", "</b>", PROJECT)."
         <p>
     ";
 }
@@ -179,14 +179,14 @@ 
     row1(show_profile_heading1());
     rowify(show_profile_question1().bbcode_info());
     show_textarea("response1", $response1);
-    row1( show_profile_heading2());
-    rowify( show_profile_question2().bbcode_info());
+    row1(show_profile_heading2());
+    rowify(show_profile_question2().bbcode_info());
     show_textarea("response2", $response2);
     show_language_selection($profile);
 }
 
 function show_textarea($name, $text) {
-    rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">" . $text . "</textarea>");
+    rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">".$text."</textarea>");
 }
 
 // $profile is null if user doesn't already have a profile.
@@ -232,8 +232,8 @@ 
         $delete_pic = "off";
     }
 
-    if (strlen($response1)==0 &&
-        strlen($response2)==0 &&
+    if (strlen($response1) == 0 &&
+        strlen($response2) == 0 &&
         $delete_pic != "on" &&
         !is_uploaded_file($_FILES['picture']['tmp_name'])
     ) {
@@ -247,7 +247,7 @@ 
         $profile->verification = 0;
     }
 
-    $profile ? $has_picture = $profile->has_picture: $has_picture = false;
+    $profile ? $has_picture = $profile->has_picture : $has_picture = false;
 
     if (is_uploaded_file($_FILES['picture']['tmp_name'])) {
         $has_picture = true;
@@ -262,13 +262,13 @@ 
 
         // Write the original image file to disk.
         // TODO: define a constant for image quality.
-        ImageJPEG($images[0], IMAGE_PATH . $user->id . '.jpg');
-        ImageJPEG($images[1], IMAGE_PATH . $user->id . '_sm.jpg');
+        ImageJPEG($images[0], IMAGE_PATH.$user->id.'.jpg');
+        ImageJPEG($images[1], IMAGE_PATH.$user->id.'_sm.jpg');
     }
     $response1 = sanitize_html($response1);
     $response2 = sanitize_html($response2);
 
-    $has_picture = $has_picture?1:0;
+    $has_picture = $has_picture ? 1 : 0;
     if ($profile) {
         $query = " response1 = '".BoincDb::escape_string($response1)."',"
             ." response2 = '".BoincDb::escape_string($response2)."',"
@@ -310,7 +310,7 @@ 
     page_tail();
 }
 
-function show_profile_form($profile, $warning=null) {
+function show_profile_form($profile, $warning = null) {
     if ($profile) {
         page_head(tra("Edit your profile"), null, null, null, boinc_recaptcha_get_head_extra());
     } else {

html/inc/delete_account.inc

Spacing +8 added lines, -8 removed lines

@@ -42,7 +42,7 @@ 
 if (!defined("DELETE_DELAY")) define("DELETE_DELAY", 2);
 
 function is_delete_account_token_valid($userid, $token) {
-    if (!is_valid_token($userid, $token, TOKEN_TYPE_DELETE_ACCOUNT) ) {
+    if (!is_valid_token($userid, $token, TOKEN_TYPE_DELETE_ACCOUNT)) {
         sleep(LOGIN_FAIL_SLEEP_SEC);
         return false;
     }
@@ -126,7 +126,7 @@ 
 //
 function is_over_but_not_validated($res) {
     if ($res->server_state == RESULT_SERVER_STATE_OVER && $res->outcome == RESULT_OUTCOME_SUCCESS &&
-            ($res->validate_state == VALIDATE_STATE_INIT || $res->validate_state == VALIDATE_STATE_INCONCLUSIVE) ) {
+            ($res->validate_state == VALIDATE_STATE_INIT || $res->validate_state == VALIDATE_STATE_INCONCLUSIVE)) {
         return true;
     }    
     return false;
@@ -144,8 +144,8 @@ 
 //
 function cancel_results_for_user($user) {
     $ress = BoincResult::enum("userid = $user->id");
-    $cancel_clause="server_state=".RESULT_SERVER_STATE_OVER.", outcome=".RESULT_OUTCOME_CLIENT_DETACHED.", validate_state=".VALIDATE_STATE_INVALID;
-    $set_id_clause="hostid=0, userid=0";
+    $cancel_clause = "server_state=".RESULT_SERVER_STATE_OVER.", outcome=".RESULT_OUTCOME_CLIENT_DETACHED.", validate_state=".VALIDATE_STATE_INVALID;
+    $set_id_clause = "hostid=0, userid=0";
     foreach ($ress as $res) {
         if (is_in_progress($res) || is_over_but_not_validated($res)) {
             $res->update($cancel_clause.", ".$set_id_clause);
@@ -168,12 +168,12 @@ 
 
     // delete remote submit user
     //
-    delete_remote_submit_user($user);  // from submit_util.inc
+    delete_remote_submit_user($user); // from submit_util.inc
     
     // remove user's team records
     //
-    user_erase_team_owner($user);      // from team.inc
-    user_quit_team($user);        // from team.inc
+    user_erase_team_owner($user); // from team.inc
+    user_quit_team($user); // from team.inc
     user_erase_team_delta($user); // from team.inc
     
     // Items that do not have logic elsewhere
@@ -199,6 +199,6 @@ 
     BoincConsent::delete_for_user($user->id);
 
     // final action
-    delete_user($user);  //from user_util.inc
+    delete_user($user); //from user_util.inc
     return 0;
 }

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

Braces +1 added lines, -2 removed lines

@@ -53,8 +53,7 @@
             $boincusername = (!empty($account)) ? $account->boincuser_name : variable_get('anonymous', 'Anonymous');
             $replace = TRUE;
           }
-        }
-        elseif ($nid && _quote_variable_get('node_link_display')) {
+        } elseif ($nid && _quote_variable_get('node_link_display')) {
           $node = node_load(array('nid' => $nid));
           if (in_array($node->type, _quote_variable_get('node_types'))) {
             $account = user_load($node->uid);

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

@@ -45,13 +45,13 @@ 
         $nid = arg(2);
         $cid = arg(3);
 
-        $replace = FALSE;
+        $replace = false;
         if ($cid) {
           $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0', $cid));
           if ($comment->uid) {
             $account = user_load($comment->uid);
             $boincusername = (!empty($account)) ? $account->boincuser_name : variable_get('anonymous', 'Anonymous');
-            $replace = TRUE;
+            $replace = true;
           }
         }
         elseif ($nid && _quote_variable_get('node_link_display')) {
@@ -59,7 +59,7 @@ 
           if (in_array($node->type, _quote_variable_get('node_types'))) {
             $account = user_load($node->uid);
             $boincusername = (!empty($account)) ? $account->boincuser_name : variable_get('anonymous', 'Anonymous');
-            $replace = TRUE;
+            $replace = true;
           }
         }
 

Indentation +14 added lines, -14 removed lines

@@ -31,43 +31,43 @@
  */
 
 function boincuser_quote_form_alter(&$form, $form_state, $form_id) {
-  switch ($form_id) {
-  // Comment form
-  case 'comment_form':
+    switch ($form_id) {
+    // Comment form
+    case 'comment_form':
     // If there is a quote as part of the comment body, replace the
     // first instance of quote=author with quote=boincusername. This
     // is done with regexp.
     // Modify for quotes only
     if ((isset($_POST['quote']) || isset($_GET['quote']) && $_GET['quote'])) {
-      // If default_value is already set, then modify it
-      if (isset($form['comment_filter']['comment']['#default_value'])) {
+        // If default_value is already set, then modify it
+        if (isset($form['comment_filter']['comment']['#default_value'])) {
         $nid = arg(2);
         $cid = arg(3);
 
         $replace = FALSE;
         if ($cid) {
-          $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0', $cid));
-          if ($comment->uid) {
+            $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0', $cid));
+            if ($comment->uid) {
             $account = user_load($comment->uid);
             $boincusername = (!empty($account)) ? $account->boincuser_name : variable_get('anonymous', 'Anonymous');
             $replace = TRUE;
-          }
+            }
         }
         elseif ($nid && _quote_variable_get('node_link_display')) {
-          $node = node_load(array('nid' => $nid));
-          if (in_array($node->type, _quote_variable_get('node_types'))) {
+            $node = node_load(array('nid' => $nid));
+            if (in_array($node->type, _quote_variable_get('node_types'))) {
             $account = user_load($node->uid);
             $boincusername = (!empty($account)) ? $account->boincuser_name : variable_get('anonymous', 'Anonymous');
             $replace = TRUE;
-          }
+            }
         }
 
         // Replace the quoted author name (drupal name) with BOINC username.
         if ($replace) {
-          $form['comment_filter']['comment']['#default_value'] = preg_replace("/\[quote=(.*?)\]/", "[quote=${boincusername}]", $form['comment_filter']['comment']['#default_value'], 1);
+            $form['comment_filter']['comment']['#default_value'] = preg_replace("/\[quote=(.*?)\]/", "[quote=${boincusername}]", $form['comment_filter']['comment']['#default_value'], 1);
+        }
         }
-      }
     }
     break;
-  }
+    }
 }

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

Braces +4 added lines, -7 removed lines

@@ -145,7 +145,7 @@ 
 /**
  * Create BOINC account
  */
-function boincuser_register_make_user($params) {    
+function boincuser_register_make_user($params) {
   // Include BOINC user library
   require_boinc('user_util');
   // Create the BOINC user
@@ -343,8 +343,7 @@ 
   if (!$account) {
     global $user;
     $account = user_load($user->id);
-  }
-  elseif (is_numeric($account)) {
+  } elseif (is_numeric($account)) {
     $account = user_load($account);
   }
   
@@ -420,13 +419,11 @@ 
     // (except in cases where password is being reset)
     if (isset($_SESSION['reset_pass'])) {
       unset($_SESSION['reset_pass']);
-    }
-    else {
+    } else {
       $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'));
       }
 

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

Upper-Lower-Casing +67 added lines, -67 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'));
   }
 }
 
@@ -105,7 +105,7 @@ 
   $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
   if (!empty($termsofuse)) {
     if (!$form_state['values']['termsofuse']['agreeTOU']) {
-      form_set_error('termsofuse', bts('ERROR: You must acknowledge our terms of use by clicking the checkbox before registering for an account.', NULL, 'boinc:register-new-user'));
+      form_set_error('termsofuse', bts('ERROR: You must acknowledge our terms of use by clicking the checkbox before registering for an account.', null, 'boinc:register-new-user'));
       return false;
     }
   }
@@ -121,7 +121,7 @@ 
         array(
           '@email' => $lower_email_addr,
           '@project' => variable_get('site_name', 'Drupal-BOINC')
-        ), NULL, 'boinc:register-new-user')
+        ), null, 'boinc:register-new-user')
     );
   }
 
@@ -133,7 +133,7 @@ 
   $boinc_user = BoincUser::lookup_email_addr($lower_email_addr);
   if ($boinc_user) {
     // User already exists
-    form_set_error('mail', bts('An account already exists for @email. Log in or request password assistance to access your @project account.', array('@email' => $lower_email_addr, '@project' => PROJECT), NULL, 'boinc:add-new-user'));
+    form_set_error('mail', bts('An account already exists for @email. Log in or request password assistance to access your @project account.', array('@email' => $lower_email_addr, '@project' => PROJECT), null, 'boinc:add-new-user'));
     return false;
   }
 
@@ -175,7 +175,7 @@ 
 function boincuser_create_drupal_user($boinc_user) {
   require_boinc('forum_db');
   BoincForumPrefs::lookup($boinc_user);
-  $account = NULL;
+  $account = null;
   $module = 'boincuser';
   
   // Verify that this account has not already been imported
@@ -184,7 +184,7 @@ 
     $boinc_user->id)
   );
   if ($already_imported) {
-    return NULL;
+    return null;
   }
   
   // Email is limited to 64 characters...
@@ -198,7 +198,7 @@ 
   if ($already_imported) {
     drupal_set_message(t('An account for @email already exists', array('@email' => $boinc_email)), 'warning');
     watchdog('boincimport', 'An account for @email already exists', array('@email' => $boinc_email), WATCHDOG_WARNING); 
-    return NULL;
+    return null;
   }
   
   // Make sure name is unique
@@ -236,7 +236,7 @@ 
   // Terminate if an error occured during user_save().
   if (!$account) {
     drupal_set_message(t("Error saving user account."), 'error');
-    return NULL;
+    return null;
   }
   
   // Cross reference the Drupal and BOINC accounts
@@ -267,7 +267,7 @@ 
   $profile_opinions = null;
   $profile_image = null;
   $avatar_image = null;
-  $profile_approved = NULL;
+  $profile_approved = null;
   
   // Load the BOINC profile, if available
   if ($boinc_user->has_profile) {
@@ -277,17 +277,17 @@ 
     if ($boinc_profile->has_picture) {
       // Load picture; load validators; determine where to store it in Drupal
       $image_path = "{$image_dir}/{$boinc_user->id}.jpg";
-      $profile_image = get_cck_image_object($image_path, 'field_profile_image', 'profile', TRUE);
+      $profile_image = get_cck_image_object($image_path, 'field_profile_image', 'profile', true);
       // If the user does not have a different image as an avatar, use this one
       if (!$boinc_user->prefs->avatar) {
-        $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
+        $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', true);
       }
     }
     if ($boinc_user->prefs->avatar) {
       $image_path = "{$image_dir}/{$boinc_user->id}_avatar.jpg";
-      $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
+      $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', true);
     }
-    $profile_approved = $boinc_profile->verification ? TRUE : FALSE;
+    $profile_approved = $boinc_profile->verification ? true : false;
   }
   $default_input_format = db_result(db_query("
     SELECT format FROM {filter_formats} WHERE name = '%s'", 'Rich text'));
@@ -320,7 +320,7 @@ 
   node_save($profile_node);
   
   // Mark profile as approved if it has already been vetted somehow
-  if ($profile_approved OR !$boinc_user->has_profile) {
+  if ($profile_approved or !$boinc_user->has_profile) {
     $profile_node->moderate = 0;
     node_save($profile_node);
   }
@@ -341,7 +341,7 @@ 
 /**
  * Convert any BOINC forum thread subscriptions to Drupal flag subscriptions
  */
-function boincuser_pull_subscriptions($account = NULL) {
+function boincuser_pull_subscriptions($account = null) {
   if (!$account) {
     global $user;
     $account = user_load($user->id);
@@ -385,7 +385,7 @@ 
   // Include BOINC database objects library, load BOINC account data
   require_boinc('boinc_db');
   $boinc_user = BoincUser::lookup_email_addr($account->mail);
-  $changing_email = ($edit['mail'] AND $edit['mail'] != $account->mail) ? true : false;
+  $changing_email = ($edit['mail'] and $edit['mail'] != $account->mail) ? true : false;
   $changing_pass = ($edit['pass']) ? true : false;
   if ($changing_email) {
     // E-mail address is set to change; check for an existing BOINC user
@@ -398,7 +398,7 @@ 
 
     $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'));
+      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).
@@ -410,14 +410,14 @@ 
           '!futuredate' => date('F j, Y \a\t H:i T', $boinc_user->email_addr_change_time + $duration),
           '!prev_email_addr' => $boinc_user->previous_email_addr,
         ),
-        NULL, 'boinc:account-credentials-change')
+        null, 'boinc:account-credentials-change')
       );
     }
   }
 
   // If user is changing email or password, require that the current
   // password has been given as well.
-  if (($changing_email OR $changing_pass) AND !user_access('administer users')) {
+  if (($changing_email or $changing_pass) and !user_access('administer users')) {
     // If changing email or password, require current password
     // (except in cases where password is being reset)
     if (isset($_SESSION['reset_pass'])) {
@@ -426,10 +426,10 @@ 
     else {
       $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'));
+        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) ) {
-        form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:account-credentials-change'));
+        form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), null, 'boinc:account-credentials-change'));
       }
 
     }
@@ -437,8 +437,8 @@ 
 
   // If an admin tries to change the email and NOT the password, show
   // error message. BOINC requires both to be changed together.
-  if ($changing_email AND !$changing_pass AND user_access('administer users')) {
-    form_set_error('pass', bts('If changing a user\'s email, you must also change the password simultaneously.', array(), NULL, 'boinc:account-credentials-change'));
+  if ($changing_email and !$changing_pass and user_access('administer users')) {
+    form_set_error('pass', bts('If changing a user\'s email, you must also change the password simultaneously.', array(), null, 'boinc:account-credentials-change'));
   }
   
   // Expansion required to allow account key in place of passwd...?
@@ -457,8 +457,8 @@ 
   $edit = $form_state['values'];
   // The Drupal submit function expects a "name" field, even though
   // it contains an email address and we will not allow a user name
-  if (!$edit['name']) form_set_error('name', bts('Please enter your email address', array(), NULL, 'boinc:forgot-password'));
-  elseif (!valid_email_address($edit['name'])) form_set_error('name', bts('@email is not a well formed email address, please verify', array('@email' => $edit['name']), NULL, 'boinc:forgot-password'));
+  if (!$edit['name']) form_set_error('name', bts('Please enter your email address', array(), null, 'boinc:forgot-password'));
+  elseif (!valid_email_address($edit['name'])) form_set_error('name', bts('@email is not a well formed email address, please verify', array('@email' => $edit['name']), null, 'boinc:forgot-password'));
   else {
     // set email addrress to lower case
     $lower_email_addr = strtolower($edit['name']);
@@ -476,8 +476,8 @@ 
       form_set_error('name', bts('No account exists for @email -- please create an account using a BOINC client -- !instructions',
       array(
           '@email' => $edit['name'],
-          '!instructions' => l(bts('Instructions', array(), NULL, 'boinc:forgot-password'), 'join')
-      ), NULL, 'boinc:forgot-password'));
+          '!instructions' => l(bts('Instructions', array(), null, 'boinc:forgot-password'), 'join')
+      ), null, 'boinc:forgot-password'));
     }
   }
 }
@@ -491,16 +491,16 @@ 
   $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') .
+      '<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') .
+      '    <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" .
@@ -510,18 +510,18 @@ 
       '&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>' .
+      '    <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(
-    '#title' => bts('Log in with authenticator', array(), NULL, 'boinc:authenticator-login-page'),
+    '#title' => bts('Log in with authenticator', array(), null, 'boinc:authenticator-login-page'),
     '#type' => 'textfield',
     '#size' => 60,
     '#maxlength' => 32,
-    '#required' => TRUE,
+    '#required' => true,
     '#description' => null
   );
   
@@ -533,12 +533,12 @@ 
   $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('OK', array(), NULL, 'boinc:form-ok'),
+    '#value' => bts('OK', array(), null, 'boinc:form-ok'),
     '#suffix' => '</li>',
     '#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(
@@ -555,11 +555,11 @@ 
   $authenticator = $form_state['values']['authenticator'];
   if (strlen($authenticator) != 32) {
     // We notify the form API that this field has failed validation.
-    form_set_error('authenticator', bts('That authenticator is not valid.', array(), NULL, 'boinc:authenticator-login-page'));
+    form_set_error('authenticator', bts('That authenticator is not valid.', array(), null, 'boinc:authenticator-login-page'));
   } else {
     require_boinc('boinc_db');
     $boinc_user = BoincUser::lookup("authenticator='".addslashes($authenticator)."'");
-    if (!$boinc_user) form_set_error('authenticator', bts('There is no account with that authenticator.', array(), NULL, 'boinc:authenticator-login-page'));
+    if (!$boinc_user) form_set_error('authenticator', bts('There is no account with that authenticator.', array(), null, 'boinc:authenticator-login-page'));
   }
 }
 
@@ -582,9 +582,9 @@ 
 function boincuser_moderate_profile_reject_form(&$form_state, $uid) {
   $form_state['storage']['reject_profile_uid'] = $uid;
   $form['reason'] = array(
-    '#title' => bts('Reason for rejecting this profile', array(), NULL, 'boinc:moderate-user'),
+    '#title' => bts('Reason for rejecting this profile', array(), null, 'boinc:moderate-user'),
     '#type' => 'textarea',
-    '#description' => bts('This reason will be included in an email to the user. Please write a brief explanation of the problem and how to fix it.', array(), NULL, 'boinc:moderate-user'),
+    '#description' => bts('This reason will be included in an email to the user. Please write a brief explanation of the problem and how to fix it.', array(), null, 'boinc:moderate-user'),
     '#default_value' => '',
   );
   
@@ -596,12 +596,12 @@ 
   $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
+    '#value' => bts('Submit', array(), null, 'boinc:form-submit'),
     '#suffix' => '</li>',
     '#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(
@@ -627,15 +627,15 @@ 
 function boincuser_moderate_user_ban_form(&$form_state, $uid) {
   $form_state['storage']['ban_user_uid'] = $uid;
   $form['reason'] = array(
-    '#title' => bts('Reason for banning this user', array(), NULL, 'boinc:moderate-user'),
+    '#title' => bts('Reason for banning this user', array(), null, 'boinc:moderate-user'),
     '#type' => 'textarea',
-    '#description' => bts('This reason will be included in an email to the user. Please write a brief explanation of why the user is being banned.', array(), NULL, 'boinc:moderate-user'),
+    '#description' => bts('This reason will be included in an email to the user. Please write a brief explanation of why the user is being banned.', array(), null, 'boinc:moderate-user'),
     '#default_value' => '',
   );
   $form['duration'] = array(
-    '#title' => bts('Duration of the ban', array(), NULL, 'boinc:moderate-user'),
+    '#title' => bts('Duration of the ban', array(), null, 'boinc:moderate-user'),
     '#type' => 'textfield',
-    '#description' => bts('The number of days until the ban expires. Set to 0 to ban permanently.', array(), NULL, 'boinc:moderate-user'),
+    '#description' => bts('The number of days until the ban expires. Set to 0 to ban permanently.', array(), null, 'boinc:moderate-user'),
     '#default_value' => '',
   );
   
@@ -647,12 +647,12 @@ 
   $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
+    '#value' => bts('Submit', array(), null, 'boinc:form-submit'),
     '#suffix' => '</li>',
     '#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(
@@ -696,7 +696,7 @@ 
     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');
@@ -707,12 +707,12 @@ 
     '#type'   => 'fieldset',
     '#prefix' => '<div id="termsofuse-wrapper">', // This is our wrapper div.
     '#suffix' => '</div>',
-    '#tree'   => TRUE,
+    '#tree'   => true,
   );
 
   $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>',
   );
@@ -720,14 +720,14 @@ 
   // Terms of use section
   $form['termsofuse']['body'] = array(
     '#weight' => -10,
-    '#value' => bts($termsofuse, array(), NULL, 'project:termsofuse-form'),
+    '#value' => bts($termsofuse, array(), null, 'project:termsofuse-form'),
     '#prefix' => '<div id="register-termsofuse">',
     '#suffix' => '</div>',
   );
 
   $form['termsofuse']['agreeTOU'] = array(
     '#type'   => 'checkbox',
-    '#title'  => bts(variable_get('boinc_weboptions_agreequestion', 'Do you agree with the above terms of use?'), array(), NULL, 'project:termsofuse-form'),
+    '#title'  => bts(variable_get('boinc_weboptions_agreequestion', 'Do you agree with the above terms of use?'), array(), null, 'project:termsofuse-form'),
     '#weight' => -8,
     '#prefix' => '<div id="register-checkbox">',
     '#suffix' => '</div>',
@@ -743,16 +743,16 @@ 
   $form['submit'] = array(
     '#prefix' => '<p><p><p><li class="first tab" id="register-submit">',
     '#type' => 'submit',
-    '#value' => bts('Yes', array(), NULL, 'boinc:form-submit'),
+    '#value' => bts('Yes', array(), null, 'boinc:form-submit'),
     '#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';
     $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>',
     );
   }
 
@@ -768,7 +768,7 @@ 
 function boincuser_termsofuse_form_validate($form, &$form_state) {
   // Check TOU agreement
   if (!$form_state['values']['termsofuse']['agreeTOU']) {
-    form_set_error('termsofuse', bts('ERROR: You must acknowledge our terms of use by clicking the checkbox before registering for an account.', array(), NULL, 'boinc:termsofuse-form'));
+    form_set_error('termsofuse', bts('ERROR: You must acknowledge our terms of use by clicking the checkbox before registering for an account.', array(), null, 'boinc:termsofuse-form'));
   }
 }
 
@@ -777,7 +777,7 @@ 
   if (!boincuser_consentto_termsofuse($user)) {
     form_set_error('termsofuse',
       bts('There was an error in agreeing to the terms of use. The @project administrators have been notified.',
-        array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:termsofuse-form')
+        array('@project' => variable_get('site_name', 'Drupal-BOINC')), null, 'boinc:termsofuse-form')
     );
   }
 
@@ -810,9 +810,9 @@ 
   if (!is_valid_token($boincid, $token, 'E')) {
     drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your email address.',
     array(
-      '!link' => l(bts('changing', array(), NULL, 'boinc:revert-email-change'), "/account/info/edit"),
+      '!link' => l(bts('changing', array(), null, 'boinc:revert-email-change'), "/account/info/edit"),
     ),
-    NULL, 'boinc:revert-email-change'), 'error');
+    null, 'boinc:revert-email-change'), 'error');
     drupal_goto();
   }
 
@@ -827,7 +827,7 @@ 
       array(
         '!prev_email' => $account->boincuser_previous_email_addr,
       ),
-      NULL, 'boinc:revert-email-change').
+      null, 'boinc:revert-email-change').
     '</p>',
   );
 
@@ -844,11 +844,11 @@ 
   );
   $form['buttons']['submit']['#type'] = 'submit';
   $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
-  $form['buttons']['submit']['#value'] = bts('Submit', array(), NULL, 'boinc:form-submit');
+  $form['buttons']['submit']['#value'] = bts('Submit', array(), null, 'boinc:form-submit');
   $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(
@@ -874,7 +874,7 @@ 
         array(
           '@email' => $boinc_user->previous_email_addr,
           '@project' => variable_get('site_name', 'Drupal-BOINC'),
-        ), NULL, 'boinc:add-new-user'));
+        ), null, 'boinc:add-new-user'));
   }
 
 }

Indentation +429 added lines, -429 removed lines

@@ -15,59 +15,59 @@ 
  * Form validation handler for login
  */
 function boincuser_login_validate($form, &$form_state) {
-  /* // SAMPLE: To try validation with Drupal first...
+    /* // SAMPLE: To try validation with Drupal first...
   global $user;
   if (!empty($user->uid)) {
     // Authentication with Drupal was successful
     return;
   }*/
   
-  // Set name for logging purposes
-  $form_state['values']['name'] = $form_state['values']['email'];
+    // Set name for logging purposes
+    $form_state['values']['name'] = $form_state['values']['email'];
   
-  // Bypass BOINC validation if passed the name of user 1
-  $user_1 = user_load(1);
-  if ($form_state['values']['email'] == $user_1->name) {
+    // Bypass BOINC validation if passed the name of user 1
+    $user_1 = user_load(1);
+    if ($form_state['values']['email'] == $user_1->name) {
     user_authenticate($form_state['values']);
     return;
-  }
+    }
   
-  // Call our custom authentication function to check for an existing BOINC user
-  if (!boincuser_login_authenticate($form_state['values'])) {
+    // 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'));
-  }
+    }
 }
 
 /**
  * Custom authentication function to check BOINC account information
  */
 function boincuser_login_authenticate($form_values) {
-  global $boincuser_authenticated;
-  $lower_email_addr = strtolower($form_values['email']);
-  $passwd = $form_values['pass'];
-  $passwd_hash = md5($passwd.$lower_email_addr);
+    global $boincuser_authenticated;
+    $lower_email_addr = strtolower($form_values['email']);
+    $passwd = $form_values['pass'];
+    $passwd_hash = md5($passwd.$lower_email_addr);
   
-  // Include BOINC user library
-  require_boinc('boinc_db');
-  require_boinc('user_util');
+    // Include BOINC user library
+    require_boinc('boinc_db');
+    require_boinc('user_util');
 
-  // Get the BOINC user and check credentials
-  $boinc_user = BoincUser::lookup_email_addr($lower_email_addr);
-  if (!$boinc_user) return false;
+    // Get the BOINC user and check credentials
+    $boinc_user = BoincUser::lookup_email_addr($lower_email_addr);
+    if (!$boinc_user) return false;
 
-  if (!check_passwd_hash($boinc_user, $passwd_hash)) {
+    if (!check_passwd_hash($boinc_user, $passwd_hash)) {
     return false;
-  }
+    }
 
-  // BOINC authentication successful; log in and synchronize accounts
-  boincuser_login_register($boinc_user);
-  // Write session, update timestamp, run user 'login' hook.
-  user_authenticate_finalize($form_values);
-  // Use a global variable to save the fact that we did authentication.
-  $boincuser_authenticated = true;
+    // BOINC authentication successful; log in and synchronize accounts
+    boincuser_login_register($boinc_user);
+    // Write session, update timestamp, run user 'login' hook.
+    user_authenticate_finalize($form_values);
+    // Use a global variable to save the fact that we did authentication.
+    $boincuser_authenticated = true;
 
-  return true;
+    return true;
 }
 
 /**
@@ -75,18 +75,18 @@ 
  * Drupal accounts
  */
 function boincuser_login_register($boinc_user) {
-  global $user;
-  require_boinc('boinc_db');
-  // If a Drupal account already exists, log in
-  $existing_user = user_load(array('mail' => $boinc_user->email_addr));
-  if (!empty($existing_user->uid)) {
+    global $user;
+    require_boinc('boinc_db');
+    // If a Drupal account already exists, log in
+    $existing_user = user_load(array('mail' => $boinc_user->email_addr));
+    if (!empty($existing_user->uid)) {
     $user = $existing_user;
-  } else {
+    } 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'));
+    }
     }
-  }
 }
 
 
@@ -98,113 +98,113 @@ 
  * New user registration validation handler.
  */
 function boincuser_register_validate($form, &$form_state) {
-  // Include BOINC database objects library
-  require_boinc('boinc_db');
+    // Include BOINC database objects library
+    require_boinc('boinc_db');
 
-  // Check terms of use agreement
-  $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-  if (!empty($termsofuse)) {
+    // Check terms of use agreement
+    $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
+    if (!empty($termsofuse)) {
     if (!$form_state['values']['termsofuse']['agreeTOU']) {
-      form_set_error('termsofuse', bts('ERROR: You must acknowledge our terms of use by clicking the checkbox before registering for an account.', NULL, 'boinc:register-new-user'));
-      return false;
+        form_set_error('termsofuse', bts('ERROR: You must acknowledge our terms of use by clicking the checkbox before registering for an account.', NULL, 'boinc:register-new-user'));
+        return false;
+    }
     }
-  }
 
-  // Lower-case the email address
-  $lower_email_addr = strtolower($form_state['values']['mail']);
-  $tmp_user = BoincUser::lookup_prev_email_addr($lower_email_addr);
-  if ($tmp_user) {
+    // Lower-case the email address
+    $lower_email_addr = strtolower($form_state['values']['mail']);
+    $tmp_user = BoincUser::lookup_prev_email_addr($lower_email_addr);
+    if ($tmp_user) {
     // User already exists
     rules_invoke_event('boincuser_change_email_error', $lower_email_addr, variable_get('boinc_admin_mailing_list_subject_tag', ''));
     form_set_error('mail',
-      bts('An account already exists for @email. The @project administrators have been notified.',
+        bts('An account already exists for @email. The @project administrators have been notified.',
         array(
-          '@email' => $lower_email_addr,
-          '@project' => variable_get('site_name', 'Drupal-BOINC')
+            '@email' => $lower_email_addr,
+            '@project' => variable_get('site_name', 'Drupal-BOINC')
         ), NULL, 'boinc:register-new-user')
     );
-  }
+    }
 
-  // Check for an existing BOINC user
-  // This is somewhat redundent as Drupal will also check if the email
-  // is a duplicate. However, in the case where there is no Drupal
-  // account, but a BOINC account exists with this email, the check
-  // will fail.
-  $boinc_user = BoincUser::lookup_email_addr($lower_email_addr);
-  if ($boinc_user) {
+    // Check for an existing BOINC user
+    // This is somewhat redundent as Drupal will also check if the email
+    // is a duplicate. However, in the case where there is no Drupal
+    // account, but a BOINC account exists with this email, the check
+    // will fail.
+    $boinc_user = BoincUser::lookup_email_addr($lower_email_addr);
+    if ($boinc_user) {
     // User already exists
     form_set_error('mail', bts('An account already exists for @email. Log in or request password assistance to access your @project account.', array('@email' => $lower_email_addr, '@project' => PROJECT), NULL, 'boinc:add-new-user'));
     return false;
-  }
+    }
 
-  // Check Drupal name is not a duplicate, and create a proper drupal
-  // name from the boinc username.
-  $form_state['values']['name'] = create_proper_drupalname($form_state['values']['boincuser_name']);
+    // Check Drupal name is not a duplicate, and create a proper drupal
+    // name from the boinc username.
+    $form_state['values']['name'] = create_proper_drupalname($form_state['values']['boincuser_name']);
 
-  return true;
+    return true;
 }
 
 /**
  * Create BOINC account
  */
 function boincuser_register_make_user($params) {    
-  // Include BOINC user library
-  require_boinc('user_util');
-  // Create the BOINC user
-  $boinc_user = make_user($params['email_addr'], $params['name'], $params['passwd_hash'], $params['country'], $params['postal_code']);
-  return $boinc_user;
+    // Include BOINC user library
+    require_boinc('user_util');
+    // Create the BOINC user
+    $boinc_user = make_user($params['email_addr'], $params['name'], $params['passwd_hash'], $params['country'], $params['postal_code']);
+    return $boinc_user;
 }
 
 /**
  * Create Drupal account from existing BOINC account
  */
 function boincuser_register_make_drupal_user($boinc_user) {
-  $account = null;
-  if (is_numeric($boinc_user)) {
+    $account = null;
+    if (is_numeric($boinc_user)) {
     $boinc_user = boincuser_load($boinc_user);
-  }
-  if ($boinc_user) {
+    }
+    if ($boinc_user) {
     $account = boincuser_create_drupal_user($boinc_user);
     if ($account) {
-      boincuser_create_drupal_profile($account, $boinc_user);
+        boincuser_create_drupal_profile($account, $boinc_user);
+    }
     }
-  }
-  return $account;
+    return $account;
 }
 
 function boincuser_create_drupal_user($boinc_user) {
-  require_boinc('forum_db');
-  BoincForumPrefs::lookup($boinc_user);
-  $account = NULL;
-  $module = 'boincuser';
+    require_boinc('forum_db');
+    BoincForumPrefs::lookup($boinc_user);
+    $account = NULL;
+    $module = 'boincuser';
   
-  // Verify that this account has not already been imported
-  $already_imported = db_result(db_query('
+    // Verify that this account has not already been imported
+    $already_imported = db_result(db_query('
     SELECT COUNT(*) FROM {boincuser} WHERE boinc_id = %d',
     $boinc_user->id)
-  );
-  if ($already_imported) {
+    );
+    if ($already_imported) {
     return NULL;
-  }
+    }
   
-  // Email is limited to 64 characters...
-  $boinc_email = substr($boinc_user->email_addr, 0, 64);
+    // Email is limited to 64 characters...
+    $boinc_email = substr($boinc_user->email_addr, 0, 64);
   
-  // Email should be unique
-  $already_imported = db_result(db_query("
+    // Email should be unique
+    $already_imported = db_result(db_query("
     SELECT COUNT(*) FROM {users} WHERE mail = '%s'",
     $boinc_email)
-  );
-  if ($already_imported) {
+    );
+    if ($already_imported) {
     drupal_set_message(t('An account for @email already exists', array('@email' => $boinc_email)), 'warning');
     watchdog('boincimport', 'An account for @email already exists', array('@email' => $boinc_email), WATCHDOG_WARNING); 
     return NULL;
-  }
+    }
   
-  // Make sure name is unique
-  $unique_name = create_proper_drupalname($boinc_user->name);
+    // Make sure name is unique
+    $unique_name = create_proper_drupalname($boinc_user->name);
   
-  $userinfo = array(
+    $userinfo = array(
     'name' => $unique_name,
     'pass' => $boinc_user->passwd_hash,
     'mail' => $boinc_email,
@@ -214,126 +214,126 @@ 
     'status' => 1,
     "authname_{$module}" => $boinc_email,
     'access' => time()
-  );
+    );
   
-  $in_penalty = ($boinc_user->prefs->banished_until > time());
+    $in_penalty = ($boinc_user->prefs->banished_until > time());
   
-  // Add user to community member role (if no current penalty)
-  if (!$in_penalty) {
+    // Add user to community member role (if no current penalty)
+    if (!$in_penalty) {
     $community_role = array_search('community member', user_roles(true)); 
     $userinfo['roles'] = array(
-      $community_role => ''
+        $community_role => ''
     );
-  }
+    }
   
-  // Mark account as imported so a BOINC account is not created on Insert (i.e. user_save)
-  $_SESSION['importedUser'] = true;
-  $account = user_save('', $userinfo);
+    // Mark account as imported so a BOINC account is not created on Insert (i.e. user_save)
+    $_SESSION['importedUser'] = true;
+    $account = user_save('', $userinfo);
   
-  // Drupal overrides the original registration date, so update to the correct date
-  $account = user_save($account, array('created' => $userinfo['created']));
+    // Drupal overrides the original registration date, so update to the correct date
+    $account = user_save($account, array('created' => $userinfo['created']));
   
-  // Terminate if an error occured during user_save().
-  if (!$account) {
+    // Terminate if an error occured during user_save().
+    if (!$account) {
     drupal_set_message(t("Error saving user account."), 'error');
     return NULL;
-  }
+    }
   
-  // Cross reference the Drupal and BOINC accounts
-  boincuser_account_cross_reference($account->uid, $boinc_user->id);
+    // Cross reference the Drupal and BOINC accounts
+    boincuser_account_cross_reference($account->uid, $boinc_user->id);
   
-  if ($in_penalty) {
+    if ($in_penalty) {
     // Import the timestamp of when the penalty period will be over
     $boincuser_record = array(
-      'uid' => $account->uid,
-      'penalty_expiration' => $boinc_user->prefs->banished_until,
+        'uid' => $account->uid,
+        'penalty_expiration' => $boinc_user->prefs->banished_until,
     );
     drupal_write_record('boincuser', $boincuser_record, 'uid');
-  }
+    }
   
-  return $account;
+    return $account;
 }
 
 function boincuser_create_drupal_profile($account, $boinc_user) {
   
-  require_boinc('forum_db');
-  BoincForumPrefs::lookup($boinc_user);
+    require_boinc('forum_db');
+    BoincForumPrefs::lookup($boinc_user);
   
-  $image_dir = boinc_get_path('user_image');
+    $image_dir = boinc_get_path('user_image');
   
-  // Automatically create a content profile
-  $now = time();
-  $profile_background = null;
-  $profile_opinions = null;
-  $profile_image = null;
-  $avatar_image = null;
-  $profile_approved = NULL;
+    // Automatically create a content profile
+    $now = time();
+    $profile_background = null;
+    $profile_opinions = null;
+    $profile_image = null;
+    $avatar_image = null;
+    $profile_approved = NULL;
   
-  // Load the BOINC profile, if available
-  if ($boinc_user->has_profile) {
+    // Load the BOINC profile, if available
+    if ($boinc_user->has_profile) {
     $boinc_profile = BoincProfile::lookup("userid={$boinc_user->id}");
     $profile_background = $boinc_profile->response1;
     $profile_opinions = $boinc_profile->response2;
     if ($boinc_profile->has_picture) {
-      // Load picture; load validators; determine where to store it in Drupal
-      $image_path = "{$image_dir}/{$boinc_user->id}.jpg";
-      $profile_image = get_cck_image_object($image_path, 'field_profile_image', 'profile', TRUE);
-      // If the user does not have a different image as an avatar, use this one
-      if (!$boinc_user->prefs->avatar) {
+        // Load picture; load validators; determine where to store it in Drupal
+        $image_path = "{$image_dir}/{$boinc_user->id}.jpg";
+        $profile_image = get_cck_image_object($image_path, 'field_profile_image', 'profile', TRUE);
+        // If the user does not have a different image as an avatar, use this one
+        if (!$boinc_user->prefs->avatar) {
         $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
-      }
+        }
     }
     if ($boinc_user->prefs->avatar) {
-      $image_path = "{$image_dir}/{$boinc_user->id}_avatar.jpg";
-      $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
+        $image_path = "{$image_dir}/{$boinc_user->id}_avatar.jpg";
+        $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
     }
     $profile_approved = $boinc_profile->verification ? TRUE : FALSE;
-  }
-  $default_input_format = db_result(db_query("
+    }
+    $default_input_format = db_result(db_query("
     SELECT format FROM {filter_formats} WHERE name = '%s'", 'Rich text'));
-  if (!$default_input_format) $default_input_format = 1;
-  
-  // Populate the profile object
-  $profile_node = new stdClass();
-  $profile_node->title = $boinc_user->name;
-  $profile_node->uid = $account->uid;
-  $profile_node->body = '';
-  $profile_node->type = 'profile'; 
-  $profile_node->created = $now;
-  $profile_node->changed = $now;
-  $profile_node->status = 1;
-  $profile_node->promote = 0;
-  $profile_node->sticky = 0;
-  $profile_node->format = $default_input_format;
-  $profile_node->name = $account->name; // Set to link profile to account uid!
-  $profile_node->field_country[]['value'] = $boinc_user->country;
-  $profile_node->field_zip[]['value'] = $boinc_user->postal_code;
-  $profile_node->field_url[]['value'] = $boinc_user->url;
-  $profile_node->field_background[]['value'] = $profile_background;
-  $profile_node->field_opinions[]['value'] = $profile_opinions;
-  $profile_node->field_image[] = $avatar_image;
-  $profile_node->field_profile_image[] = $profile_image;
-  
-  // Save the profile object to the database
-  // This will automatically set the author uid if node->name has been set
-  $profile_node = node_submit($profile_node);
-  node_save($profile_node);
-  
-  // Mark profile as approved if it has already been vetted somehow
-  if ($profile_approved OR !$boinc_user->has_profile) {
+    if (!$default_input_format) $default_input_format = 1;
+  
+    // Populate the profile object
+    $profile_node = new stdClass();
+    $profile_node->title = $boinc_user->name;
+    $profile_node->uid = $account->uid;
+    $profile_node->body = '';
+    $profile_node->type = 'profile'; 
+    $profile_node->created = $now;
+    $profile_node->changed = $now;
+    $profile_node->status = 1;
+    $profile_node->promote = 0;
+    $profile_node->sticky = 0;
+    $profile_node->format = $default_input_format;
+    $profile_node->name = $account->name; // Set to link profile to account uid!
+    $profile_node->field_country[]['value'] = $boinc_user->country;
+    $profile_node->field_zip[]['value'] = $boinc_user->postal_code;
+    $profile_node->field_url[]['value'] = $boinc_user->url;
+    $profile_node->field_background[]['value'] = $profile_background;
+    $profile_node->field_opinions[]['value'] = $profile_opinions;
+    $profile_node->field_image[] = $avatar_image;
+    $profile_node->field_profile_image[] = $profile_image;
+  
+    // Save the profile object to the database
+    // This will automatically set the author uid if node->name has been set
+    $profile_node = node_submit($profile_node);
+    node_save($profile_node);
+  
+    // Mark profile as approved if it has already been vetted somehow
+    if ($profile_approved OR !$boinc_user->has_profile) {
     $profile_node->moderate = 0;
     node_save($profile_node);
-  }
+    }
   
-  return;
+    return;
 }
 
 function boincuser_account_cross_reference($uid, $boinc_id) {
     // Cross reference Drupal account with BOINC
     $reference = db_query("INSERT INTO {boincuser} SET uid=%d, boinc_id=%d", $uid, $boinc_id);
     if (!$reference) {
-      drupal_set_message(t("Error connecting BOINC account."), 'error');
-      return false;
+        drupal_set_message(t("Error connecting BOINC account."), 'error');
+        return false;
     }
     return true;
 }
@@ -342,35 +342,35 @@ 
  * Convert any BOINC forum thread subscriptions to Drupal flag subscriptions
  */
 function boincuser_pull_subscriptions($account = NULL) {
-  if (!$account) {
+    if (!$account) {
     global $user;
     $account = user_load($user->id);
-  }
-  elseif (is_numeric($account)) {
+    }
+    elseif (is_numeric($account)) {
     $account = user_load($account);
-  }
+    }
   
-  // Get any subscriptions for this user
-  db_set_active('boinc_rw');
-  $subscriptions = db_query('
+    // Get any subscriptions for this user
+    db_set_active('boinc_rw');
+    $subscriptions = db_query('
     SELECT threadid FROM {subscriptions}
     WHERE userid = %d', $account->boincuser_id);
-  db_set_active('default');
+    db_set_active('default');
   
-  $flag = flag_get_flag('subscriptions') or die('no "subscriptions" flag defined');
-  $count = 0;
-  while ($thread_id = db_result($subscriptions)) {
+    $flag = flag_get_flag('subscriptions') or die('no "subscriptions" flag defined');
+    $count = 0;
+    while ($thread_id = db_result($subscriptions)) {
     // For each BOINC thread ID subscribed, look up the corresponding node ID
     $nid = db_result(db_query('
       SELECT nid FROM {boincimport_temp_topic}
       WHERE topic_id = %d', $thread_id));
     // Flag this node for the user
     if ($nid > 0) {
-      $flag->flag('flag', $nid, $account);
-      $count++;
+        $flag->flag('flag', $nid, $account);
+        $count++;
+    }
     }
-  }
-  return $count;
+    return $count;
 }
 
 
@@ -382,12 +382,12 @@ 
  * User account update validation handler.
  */
 function boincuser_account_validate($edit, $account) {
-  // Include BOINC database objects library, load BOINC account data
-  require_boinc('boinc_db');
-  $boinc_user = BoincUser::lookup_email_addr($account->mail);
-  $changing_email = ($edit['mail'] AND $edit['mail'] != $account->mail) ? true : false;
-  $changing_pass = ($edit['pass']) ? true : false;
-  if ($changing_email) {
+    // Include BOINC database objects library, load BOINC account data
+    require_boinc('boinc_db');
+    $boinc_user = BoincUser::lookup_email_addr($account->mail);
+    $changing_email = ($edit['mail'] AND $edit['mail'] != $account->mail) ? true : false;
+    $changing_pass = ($edit['pass']) ? true : false;
+    if ($changing_email) {
     // E-mail address is set to change; check for an existing BOINC user
     // Check previous email addresses as well, this user's current
     // email cannot be the same as another user's previous email
@@ -398,50 +398,50 @@ 
 
     $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'));
+        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'))) ) {
-      form_set_error('email_addr_change_time',
+        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(
-          '!futuredate' => date('F j, Y \a\t H:i T', $boinc_user->email_addr_change_time + $duration),
-          '!prev_email_addr' => $boinc_user->previous_email_addr,
+            '!futuredate' => date('F j, Y \a\t H:i T', $boinc_user->email_addr_change_time + $duration),
+            '!prev_email_addr' => $boinc_user->previous_email_addr,
         ),
         NULL, 'boinc:account-credentials-change')
-      );
+        );
+    }
     }
-  }
 
-  // If user is changing email or password, require that the current
-  // password has been given as well.
-  if (($changing_email OR $changing_pass) AND !user_access('administer users')) {
+    // If user is changing email or password, require that the current
+    // password has been given as well.
+    if (($changing_email OR $changing_pass) AND !user_access('administer users')) {
     // If changing email or password, require current password
     // (except in cases where password is being reset)
     if (isset($_SESSION['reset_pass'])) {
-      unset($_SESSION['reset_pass']);
+        unset($_SESSION['reset_pass']);
     }
     else {
-      $given_hash = md5($edit['current_pass'] . strtolower($account->mail));
-      if (!$edit['current_pass']) {
+        $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'));
-      }
+        }
 
     }
-  }
+    }
 
-  // If an admin tries to change the email and NOT the password, show
-  // error message. BOINC requires both to be changed together.
-  if ($changing_email AND !$changing_pass AND user_access('administer users')) {
+    // If an admin tries to change the email and NOT the password, show
+    // error message. BOINC requires both to be changed together.
+    if ($changing_email AND !$changing_pass AND user_access('administer users')) {
     form_set_error('pass', bts('If changing a user\'s email, you must also change the password simultaneously.', array(), NULL, 'boinc:account-credentials-change'));
-  }
+    }
   
-  // Expansion required to allow account key in place of passwd...?
+    // Expansion required to allow account key in place of passwd...?
   
 }
 
@@ -454,12 +454,12 @@ 
  * Password request validation handler.
  */
 function boincuser_request_pass_validate($form, &$form_state) {
-  $edit = $form_state['values'];
-  // The Drupal submit function expects a "name" field, even though
-  // it contains an email address and we will not allow a user name
-  if (!$edit['name']) form_set_error('name', bts('Please enter your email address', array(), NULL, 'boinc:forgot-password'));
-  elseif (!valid_email_address($edit['name'])) form_set_error('name', bts('@email is not a well formed email address, please verify', array('@email' => $edit['name']), NULL, 'boinc:forgot-password'));
-  else {
+    $edit = $form_state['values'];
+    // The Drupal submit function expects a "name" field, even though
+    // it contains an email address and we will not allow a user name
+    if (!$edit['name']) form_set_error('name', bts('Please enter your email address', array(), NULL, 'boinc:forgot-password'));
+    elseif (!valid_email_address($edit['name'])) form_set_error('name', bts('@email is not a well formed email address, please verify', array('@email' => $edit['name']), NULL, 'boinc:forgot-password'));
+    else {
     // set email addrress to lower case
     $lower_email_addr = strtolower($edit['name']);
 
@@ -469,110 +469,110 @@ 
     require_boinc('boinc_db');
     $boinc_user = BoincUser::lookup_email_addr($lower_email_addr);
     if ($boinc_user) {
-      // If the user is in BOINC but not Drupal, bring them over...
-      boincuser_register_make_drupal_user($boinc_user);
+        // If the user is in BOINC but not Drupal, bring them over...
+        boincuser_register_make_drupal_user($boinc_user);
     } else {
-      // If there is no existing BOINC user either, show an error
-      form_set_error('name', bts('No account exists for @email -- please create an account using a BOINC client -- !instructions',
-      array(
-          '@email' => $edit['name'],
-          '!instructions' => l(bts('Instructions', array(), NULL, 'boinc:forgot-password'), 'join')
-      ), NULL, 'boinc:forgot-password'));
-    }
-  }
+        // If there is no existing BOINC user either, show an error
+        form_set_error('name', bts('No account exists for @email -- please create an account using a BOINC client -- !instructions',
+        array(
+            '@email' => $edit['name'],
+            '!instructions' => l(bts('Instructions', array(), NULL, 'boinc:forgot-password'), 'join')
+        ), NULL, 'boinc:forgot-password'));
+    }
+    }
 }
 
 /**
  * The definition of the authenticator login form.
  */
 function boincuser_authloginform() {
-  $headers = apache_request_headers();
-  $project_name = variable_get('site_name', 'Drupal-BOINC');
-  $project_domain = $headers['Host'];
-  $form['heading'] = array(
+    $headers = apache_request_headers();
+    $project_name = variable_get('site_name', 'Drupal-BOINC');
+    $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>'
-  );
-  $form['instructions'] = array(
+    );
+    $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>' .
-      '</p>'
-  );
-  $form['authenticator'] = array(
+        '<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(
     '#title' => bts('Log in with authenticator', array(), NULL, 'boinc:authenticator-login-page'),
     '#type' => 'textfield',
     '#size' => 60,
     '#maxlength' => 32,
     '#required' => TRUE,
     '#description' => null
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('OK', array(), NULL, 'boinc:form-ok'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/password') . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 /**
  * The authenticator login validation handler
  */
 function boincuser_authloginform_validate($form, &$form_state) {
-  $authenticator = $form_state['values']['authenticator'];
-  if (strlen($authenticator) != 32) {
+    $authenticator = $form_state['values']['authenticator'];
+    if (strlen($authenticator) != 32) {
     // We notify the form API that this field has failed validation.
     form_set_error('authenticator', bts('That authenticator is not valid.', array(), NULL, 'boinc:authenticator-login-page'));
-  } else {
+    } else {
     require_boinc('boinc_db');
     $boinc_user = BoincUser::lookup("authenticator='".addslashes($authenticator)."'");
     if (!$boinc_user) form_set_error('authenticator', bts('There is no account with that authenticator.', array(), NULL, 'boinc:authenticator-login-page'));
-  }
+    }
 }
 
 /**
  * The authenticator login submit handler
  */
 function boincuser_authloginform_submit($form, &$form_state) {
-  global $user;
-  $authenticator = $form_state['values']['authenticator'];
-  require_boinc('boinc_db');
-  $boinc_user = BoincUser::lookup("authenticator='".addslashes($authenticator)."'");
-  if (!$user = user_load(get_drupal_id($boinc_user->id))) drupal_set_message(t('An unresolved error occurred while logging into this account.'));
-  else $form_state['redirect'] = 'account/info/edit';
+    global $user;
+    $authenticator = $form_state['values']['authenticator'];
+    require_boinc('boinc_db');
+    $boinc_user = BoincUser::lookup("authenticator='".addslashes($authenticator)."'");
+    if (!$user = user_load(get_drupal_id($boinc_user->id))) drupal_set_message(t('An unresolved error occurred while logging into this account.'));
+    else $form_state['redirect'] = 'account/info/edit';
 }
 
 
@@ -580,44 +580,44 @@ 
  * The definition of the moderator reject user profile form.
  */
 function boincuser_moderate_profile_reject_form(&$form_state, $uid) {
-  $form_state['storage']['reject_profile_uid'] = $uid;
-  $form['reason'] = array(
+    $form_state['storage']['reject_profile_uid'] = $uid;
+    $form['reason'] = array(
     '#title' => bts('Reason for rejecting this profile', array(), NULL, 'boinc:moderate-user'),
     '#type' => 'textarea',
     '#description' => bts('This reason will be included in an email to the user. Please write a brief explanation of the problem and how to fix it.', array(), NULL, 'boinc:moderate-user'),
     '#default_value' => '',
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 /**
  * The moderator reject user profile submit handler
  */
 function boincuser_moderate_profile_reject_form_submit($form, &$form_state) {
-  $uid = $form_state['storage']['reject_profile_uid'];
-  $reason = $form_state['values']['reason'];
-  boincuser_moderate_profile_reject($uid, $reason);
+    $uid = $form_state['storage']['reject_profile_uid'];
+    $reason = $form_state['values']['reason'];
+    boincuser_moderate_profile_reject($uid, $reason);
 }
 
 
@@ -625,52 +625,52 @@ 
  * The definition of the ban user form.
  */
 function boincuser_moderate_user_ban_form(&$form_state, $uid) {
-  $form_state['storage']['ban_user_uid'] = $uid;
-  $form['reason'] = array(
+    $form_state['storage']['ban_user_uid'] = $uid;
+    $form['reason'] = array(
     '#title' => bts('Reason for banning this user', array(), NULL, 'boinc:moderate-user'),
     '#type' => 'textarea',
     '#description' => bts('This reason will be included in an email to the user. Please write a brief explanation of why the user is being banned.', array(), NULL, 'boinc:moderate-user'),
     '#default_value' => '',
-  );
-  $form['duration'] = array(
+    );
+    $form['duration'] = array(
     '#title' => bts('Duration of the ban', array(), NULL, 'boinc:moderate-user'),
     '#type' => 'textfield',
     '#description' => bts('The number of days until the ban expires. Set to 0 to ban permanently.', array(), NULL, 'boinc:moderate-user'),
     '#default_value' => '',
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 /**
  * The ban user submit handler
  */
 function boincuser_moderate_user_ban_form_submit($form, &$form_state) {
-  $uid = $form_state['storage']['ban_user_uid'];
-  $reason = $form_state['values']['reason'];
-  $duration = $form_state['values']['duration'];
-  if ($duration) $duration = $duration * 24*60*60;
-  boincuser_moderate_user_ban($uid, $reason, $duration);
+    $uid = $form_state['storage']['ban_user_uid'];
+    $reason = $form_state['values']['reason'];
+    $duration = $form_state['values']['duration'];
+    if ($duration) $duration = $duration * 24*60*60;
+    boincuser_moderate_user_ban($uid, $reason, $duration);
 }
 
 
@@ -678,10 +678,10 @@ 
  * Hack to fix submission of the flag friend unfriend form
  */
 function boincuser_fix_unfriend_form_submit($form, &$form_state) {
-  // Leaving action as "unfriend" causes problems
-  if ($form_state['values']['action'] == 'unfriend') {
+    // Leaving action as "unfriend" causes problems
+    if ($form_state['values']['action'] == 'unfriend') {
     $form_state['values']['action'] = 'unflag';
-  }
+    }
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -689,102 +689,102 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 function boincuser_termsofuse_form() {
-  global $user;
+    global $user;
 
-  // If user has already signed terms of use, and got to this form in error, send them to site home.
-  if (boincuser_check_termsofuse($user)) {
+    // If user has already signed terms of use, and got to this form in error, send them to site home.
+    if (boincuser_check_termsofuse($user)) {
     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');
-  $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
+    $form = array();
+    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
-  $form['termsofuse'] = array(
+    // Fieldset to hold all of the form as a container
+    $form['termsofuse'] = array(
     '#type'   => 'fieldset',
     '#prefix' => '<div id="termsofuse-wrapper">', // This is our wrapper div.
     '#suffix' => '</div>',
     '#tree'   => TRUE,
-  );
+    );
 
-  $form['termsofuse']['title1'] = array(
+    $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>',
     '#prefix' => '<div id="register-title1">',
     '#suffix' => '</div>',
-  );
+    );
 
-  // Terms of use section
-  $form['termsofuse']['body'] = array(
+    // Terms of use section
+    $form['termsofuse']['body'] = array(
     '#weight' => -10,
     '#value' => bts($termsofuse, array(), NULL, 'project:termsofuse-form'),
     '#prefix' => '<div id="register-termsofuse">',
     '#suffix' => '</div>',
-  );
+    );
 
-  $form['termsofuse']['agreeTOU'] = array(
+    $form['termsofuse']['agreeTOU'] = array(
     '#type'   => 'checkbox',
     '#title'  => bts(variable_get('boinc_weboptions_agreequestion', 'Do you agree with the above terms of use?'), array(), NULL, 'project:termsofuse-form'),
     '#weight' => -8,
     '#prefix' => '<div id="register-checkbox">',
     '#suffix' => '</div>',
-  );
+    );
 
-  $form['termsofuse']['spacer'] = array(
+    $form['termsofuse']['spacer'] = array(
     '#prefix' => '<div class="clearfix" id="register-title2">',
     '#value'  => '&nbsp;',
     '#suffix' => '</div>',
-  );
+    );
 
-  // Form Control
-  $form['submit'] = array(
+    // Form Control
+    $form['submit'] = array(
     '#prefix' => '<p><p><p><li class="first tab" id="register-submit">',
     '#type' => 'submit',
     '#value' => bts('Yes', array(), NULL, 'boinc:form-submit'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('NO - LOGOUT', array(), NULL, 'boinc:form-cancel'), '/logout') . '</li>',
-  );
-  if (module_exists('boincuser_delete')) {
+    );
+    if (module_exists('boincuser_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>',
     );
-  }
+    }
 
-  // Set form redirect
-  $form['#redirect'] = $_REQUEST['destination'];
+    // Set form redirect
+    $form['#redirect'] = $_REQUEST['destination'];
 
-  // Add the current user's data into the form
-  $form['#account'] = $user;
+    // Add the current user's data into the form
+    $form['#account'] = $user;
 
-  return $form;
+    return $form;
 }
 
 function boincuser_termsofuse_form_validate($form, &$form_state) {
-  // Check TOU agreement
-  if (!$form_state['values']['termsofuse']['agreeTOU']) {
+    // Check TOU agreement
+    if (!$form_state['values']['termsofuse']['agreeTOU']) {
     form_set_error('termsofuse', bts('ERROR: You must acknowledge our terms of use by clicking the checkbox before registering for an account.', array(), NULL, 'boinc:termsofuse-form'));
-  }
+    }
 }
 
 function boincuser_termsofuse_form_submit($form, &$form_state) {
-  $user = $form['#account'];
-  if (!boincuser_consentto_termsofuse($user)) {
+    $user = $form['#account'];
+    if (!boincuser_consentto_termsofuse($user)) {
     form_set_error('termsofuse',
-      bts('There was an error in agreeing to the terms of use. The @project administrators have been notified.',
+        bts('There was an error in agreeing to the terms of use. The @project administrators have been notified.',
         array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:termsofuse-form')
     );
-  }
+    }
 
-  // Delete session messages
-  if ($_SESSION['messages']['warning']) {
+    // Delete session messages
+    if ($_SESSION['messages']['warning']) {
     unset($_SESSION['messages']['warning']);
-  }
+    }
 }
 
 /**
@@ -793,89 +793,89 @@ 
  * removed after used.
  */
 function boincuser_revertemail(&$form_state, $token) {
-  require_boinc('token');
-  require_boinc('util');
+    require_boinc('token');
+    require_boinc('util');
 
-  global $user;
-  $form = array();
+    global $user;
+    $form = array();
 
-  // drupal JS for dynamic password validation
-  _user_password_dynamic_validation();
+    // drupal JS for dynamic password validation
+    _user_password_dynamic_validation();
 
-  // check BOINC user exists
-  $account = user_load(array('uid' => $user->uid));
-  $uid = $user->uid;
-  $boincid = $account->boincuser_id;
-  // check $token is valid
-  if (!is_valid_token($boincid, $token, 'E')) {
+    // check BOINC user exists
+    $account = user_load(array('uid' => $user->uid));
+    $uid = $user->uid;
+    $boincid = $account->boincuser_id;
+    // check $token is valid
+    if (!is_valid_token($boincid, $token, 'E')) {
     drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your email address.',
     array(
-      '!link' => l(bts('changing', array(), NULL, 'boinc:revert-email-change'), "/account/info/edit"),
+        '!link' => l(bts('changing', array(), NULL, 'boinc:revert-email-change'), "/account/info/edit"),
     ),
     NULL, 'boinc:revert-email-change'), 'error');
     drupal_goto();
-  }
+    }
 
-  // Attach account and token to this form.
-  $form['_account'] = array('#type' => 'value', '#value' => $account);
-  $form['_token'] = array('#type' => 'value', '#value' => $token);
+    // Attach account and token to this form.
+    $form['_account'] = array('#type' => 'value', '#value' => $account);
+    $form['_token'] = array('#type' => 'value', '#value' => $token);
 
-  // Instructions
-  $form['main']['instructions1'] = array(
+    // Instructions
+    $form['main']['instructions1'] = array(
     '#value' => '<p>'.
     bts('In order to change your email back to your previous email address, <strong>!prev_email</strong>, you must also change your password.',
-      array(
+        array(
         '!prev_email' => $account->boincuser_previous_email_addr,
-      ),
-      NULL, 'boinc:revert-email-change').
+        ),
+        NULL, 'boinc:revert-email-change').
     '</p>',
-  );
+    );
 
-  $form['main']['pass'] = array(
+    $form['main']['pass'] = array(
     '#type' => 'password_confirm',
     '#description' => 'Enter a new password in both fields',
     '#size' => 17,
-  );
-
-  // Wrap action buttons for styling consistency
-  $form['buttons']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
-  );
-  $form['buttons']['submit']['#type'] = 'submit';
-  $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
-  $form['buttons']['submit']['#value'] = bts('Submit', array(), NULL, 'boinc:form-submit');
-  $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>',
-      '#weight' => 1005,
-  );
-  $form['buttons']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
-  );
-
-  return $form;
+    );
+
+    // Wrap action buttons for styling consistency
+    $form['buttons']['form control tabs prefix'] = array(
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
+    );
+    $form['buttons']['submit']['#type'] = 'submit';
+    $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
+    $form['buttons']['submit']['#value'] = bts('Submit', array(), NULL, 'boinc:form-submit');
+    $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>',
+        '#weight' => 1005,
+    );
+    $form['buttons']['form control tabs suffix'] = array(
+        '#value' => '</ul>',
+        '#weight' => 1010,
+    );
+
+    return $form;
 }
 
 /**
  * Validation handler for revertemail form
  */
 function boincuser_revertemail_validate($form, &$form_state) {
-  // Load account and boincuser
-  $account = $form_state['values']['_account'];
-  $boinc_user = BoincUser::lookup_id_nocache($account->boincuser_id);
+    // Load account and boincuser
+    $account = $form_state['values']['_account'];
+    $boinc_user = BoincUser::lookup_id_nocache($account->boincuser_id);
 
-  if (BoincUser::lookup_email_addr($boinc_user->previous_email_addr)) {
+    if (BoincUser::lookup_email_addr($boinc_user->previous_email_addr)) {
     rules_invoke_event('boincuser_revert_email_error', $boinc_user->previous_email_addr, variable_get('boinc_admin_mailing_list_subject_tag', ''));
     form_set_error('mail',
-      bts('An account already exists for @email. Previous email address cannot be used because another account is using it as their email address. The @project administrators have been notified.',
+        bts('An account already exists for @email. Previous email address cannot be used because another account is using it as their email address. The @project administrators have been notified.',
         array(
-          '@email' => $boinc_user->previous_email_addr,
-          '@project' => variable_get('site_name', 'Drupal-BOINC'),
+            '@email' => $boinc_user->previous_email_addr,
+            '@project' => variable_get('site_name', 'Drupal-BOINC'),
         ), NULL, 'boinc:add-new-user'));
-  }
+    }
 
 }
 
@@ -883,25 +883,25 @@ 
  * Submit handler for revertemail form
  */
 function boincuser_revertemail_submit($form, &$form_state) {
-  require_boinc('password_compat/password');
+    require_boinc('password_compat/password');
 
-  // Load account and boincuser
-  $account = $form_state['values']['_account'];
-  $boinc_user = BoincUser::lookup_id_nocache($account->boincuser_id);
+    // Load account and boincuser
+    $account = $form_state['values']['_account'];
+    $boinc_user = BoincUser::lookup_id_nocache($account->boincuser_id);
 
-  $pem = strtolower($boinc_user->previous_email_addr);
+    $pem = strtolower($boinc_user->previous_email_addr);
 
-  // Set new password based on previous email address and entered
-  // password.
-  $new_passwd_hash = password_hash( md5($form_state['values']['pass'].$pem), PASSWORD_DEFAULT);
+    // Set new password based on previous email address and entered
+    // password.
+    $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}'");
+    $boinc_user->update("email_addr='${pem}', previous_email_addr='', email_addr_change_time=0, passwd_hash='${new_passwd_hash}'");
 
-  // Set email in drupal database to previous email
-  user_save($account, array('mail' => $pem));
+    // Set email in drupal database to previous email
+    user_save($account, array('mail' => $pem));
 
-  // delete the token
-  $result = delete_token($account->boincuser_id, $form_state['values']['_token'], 'E');
+    // delete the token
+    $result = delete_token($account->boincuser_id, $form_state['values']['_token'], 'E');
 
-  drupal_goto('account');
+    drupal_goto('account');
 }

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

Braces +15 added lines, -25 removed lines

@@ -418,11 +418,9 @@ 
 
         if ($edit['boincuser_name']) {
           $myname = $edit['boincuser_name'];
-        }
-        else if ($edit['name']) {
+        } else if ($edit['name']) {
           $myname = $edit['name'];
-        }
-        else {
+        } else {
           $myname = 'noname';
         }
 
@@ -434,8 +432,7 @@ 
         // If the 'pass' variable is already a hash, then don't hash it again.
         if ($edit['boinchash_flag']) {
           $user_params['passwd_hash'] = $edit['pass'];
-        }
-        else {
+        } else {
           // The passwd_hash here is only the md5() hash. This is
           // because BOINC make_user(), called later, will run
           // password_hash() on this md5 hash.
@@ -506,8 +503,7 @@ 
               $prev_email = $account->mail;
               $mytime = (user_access('administer users')) ? $boinc_user->email_addr_change_time : time();
               $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}', previous_email_addr = '{$prev_email}', email_addr_change_time = $mytime";
-            }
-            else {
+            } else {
               $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}'";
             }
 
@@ -750,8 +746,7 @@ 
       case FLAG_FRIEND_APPROVAL:
         if ($action == 'flag') {
           $form['flag_friend_submit']['#value'] = bts('Approve request', array(), NULL, 'boinc:friends-page');
-        }
-        elseif ($action == 'unflag') {
+        } elseif ($action == 'unflag') {
           unset($form['actions']);
           $form['flag_friend_submit']['#value'] = bts('Deny request', array(), NULL, 'boinc:friends-page');
         }
@@ -1527,8 +1522,7 @@ 
         array(
           '!boinccmd' => l('boinccmd --project_attach', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
         ), NULL, 'boinc:join-page') . '</li>';
-    }
-    else {
+    } else {
       $output .= '<li>' . bts("If you're running a command-line version of BOINC,
         please follow the <b>!instructionslink</b> to first <i>create an account</i>, and then <i>attach</i> to this project. Use the same project URL as above.",
         array(
@@ -1563,8 +1557,7 @@ 
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
       ), NULL, 'boinc:join-page') . '</li>';
-    }
-    else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
+    } else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
       $output .= '  <li>' . bts("Read our !rules_and_policies.", array(
         '!rules_and_policies' => l(bts('Rules and Policies', array(), NULL, 'boinc:join-page'), $ruleslink),
       ), NULL, 'boinc:join-page') . '</li>';
@@ -1606,8 +1599,7 @@ 
   ));
   if ($current_uotd->uotd_time < strtotime('today midnight')) {
     $uotd = boincuser_select_user_of_the_day();
-  }
-  else {
+  } else {
     $uotd = user_load($current_uotd->uid);
   }
   $uotd_image = boincuser_get_user_profile_image($uotd->uid, FALSE);
@@ -1618,8 +1610,7 @@ 
   $output .= '  <div>' . bts($site_message, array(), NULL, "project:front page") . ' ' . l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about') . '</div>';
   if ($user->uid) {
     $output .= '  <div>' . l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))) . '</div>';
-  }
-  else {
+  } else {
     $output .= '  <div>' . l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))) . '</div>';
   }
   $output .= '</div>';
@@ -1704,12 +1695,10 @@ 
     if ( ($params['passwd_hash'] == $boinc_user->passwd_hash) or
     password_verify($params['passwd_hash'], $boinc_user->passwd_hash) ) {
       $output = array('authenticator' => $boinc_user->authenticator);
-    }
-    else {
+    } else {
       xml_error(-137);
     }
-  }
-  else {
+  } else {
     // Verify that there isn't somehow a Drupal user already (not possible with proper function)
     if ($existing_user = user_load(array('mail' => $params['email_addr']))) {
       xml_error(-137, 'account error');
@@ -2193,7 +2182,9 @@ 
     'cpid' => $cpid
   );
   $args = array();
-  foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
+  foreach ($get as $arg => $value) {
+      $args[] = "{$arg}=" . rawurlencode($value);
+  }
   $query = '?' . implode('&', $args);
   
   // Load XML from RPC
@@ -2324,8 +2315,7 @@ 
       if ($node->uid == 0 || strlen($node->name) == 0) {
         // @see user_validate_name(). !'0' === TRUE.
         $document->ss_name = '0';
-      }
-      else {
+      } else {
         $document->ss_name = $account->boincuser_name;
         // We want the name to be searchable for keywords.
         $document->tos_name = $account->boincuser_name;

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

@@ -83,7 +83,7 @@ 
     'weight' => 5
   );
   $items['moderate/profile/%/reject'] = array(
-    'title' => bts('Reject profile', array(), NULL, 'boinc:moderate-user'),
+    'title' => bts('Reject profile', array(), null, 'boinc:moderate-user'),
     'description' => 'Reject profile content',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_moderate_profile_reject_form', 2),
@@ -92,7 +92,7 @@ 
     'weight' => 5
   );
   $items['moderate/user/%/ban'] = array(
-    'title' => bts('Ban user', array(), NULL, 'boinc:moderate-ban-user'),
+    'title' => bts('Ban user', array(), null, 'boinc:moderate-ban-user'),
     'description' => 'Ban a user from using community features',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_moderate_user_ban_form', 2),
@@ -123,7 +123,7 @@ 
     'weight' => 5
   );
   $items['user/login/auth'] = array(
-    'title' => bts('Authenticator login', array(), NULL, 'boinc:authenticator-login-page'),
+    'title' => bts('Authenticator login', array(), null, 'boinc:authenticator-login-page'),
     'description' => 'Log in using a user authenticator',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_authloginform'),
@@ -131,7 +131,7 @@ 
     'type' => MENU_CALLBACK,
   );
   $items['user/termsofuse'] = array(
-    'title' => bts('Terms of Use', array(), NULL, 'boinc:termsofuse-form'),
+    'title' => bts('Terms of Use', array(), null, 'boinc:termsofuse-form'),
     'description' => 'A site\'s term of use.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_termsofuse_form'),
@@ -185,19 +185,19 @@ 
     'title' => 'Create Account RPC',
     'description' => 'RPC for creating user accounts.',
     'page callback' => 'boincuser_create_account',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['account_finish.php'] = array(
     'title' => 'Welcome to ' . variable_get('site_name', 'Drupal-BOINC'),
     'description' => 'RPC for after a user has created an account.',
     'page callback' => 'boincuser_account_finish',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK,
   );
   $items['boincuser/autocomplete'] = array(
     'page callback' => '_boincuser_user_name_autocomplete',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK,
   );
   $items['user/%user/recoveremail/%'] = array(
@@ -212,7 +212,7 @@ 
     'title' => t('Recover previous email'),
     'description' => t('redirect'),
     'page callback' => '_boincuser_redirect_recover_email',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK,
   );
   return $items;
@@ -247,7 +247,7 @@ 
   // Check if user has agreed to the terms of use. If not, send the
   // user to the terms-of-use form. This is only makes sense if the
   // termsofuse is enabled, by having text in the termsofuse variable.
-  $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
+  $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', false);
   $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
   if ( (!empty($termsofuse)) and ($user->uid) ) {
     if ( !boincuser_check_termsofuse($user) and ($existinguser_tou) ) {
@@ -296,7 +296,7 @@ 
  * Implementation of hook_user(); add custom actions to standard
  * Drupal user operations
  */
-function boincuser_user($op, &$edit, &$account, $category = NULL) {
+function boincuser_user($op, &$edit, &$account, $category = null) {
   require_boinc('boinc_db');
   require_boinc('user');
   require_boinc('xml');
@@ -345,7 +345,7 @@ 
       $account->boincuser_email_addr_change_time = $boinc_user->email_addr_change_time;
       db_set_active('default');
       // Set Drupal team ID
-      $account->team = NULL;
+      $account->team = null;
       if ($account->boincteam_id) {
         $account->team = db_result(db_query("
           SELECT nid FROM {boincteam} WHERE team_id = %d",
@@ -453,7 +453,7 @@ 
         $boinc_user = boincuser_register_make_user($user_params);
         if (!$boinc_user) {
           // Account exists with this email addr
-          form_set_error('email', bts('Error creating BOINC account.', array(), NULL, 'boinc:add-new-user'));
+          form_set_error('email', bts('Error creating BOINC account.', array(), null, 'boinc:add-new-user'));
           return;
         }
 
@@ -499,9 +499,9 @@ 
         case 'user_account':
           // Ensure that BOINC data is altered
 
-          $changing_email = ($edit['mail'] AND $edit['mail'] != $boinc_user->email_addr) ? true : false;
+          $changing_email = ($edit['mail'] and $edit['mail'] != $boinc_user->email_addr) ? true : false;
           $changing_pass = ($edit['pass']) ? true : false;
-          if ($changing_email OR $changing_pass) {
+          if ($changing_email or $changing_pass) {
             // set email address to lower-case
             $lower_email_addr = strtolower($edit['mail']);
 
@@ -582,13 +582,13 @@ 
  *(forward compatible to Drupal 7).
  */
 function boincuser_user_login(&$edit, $account) {
-  $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
+  $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', false);
   $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
 
   // Use the same code as boincuser_form_alter(), for case
   // 'user_profile_form', if the refering page is the user password
   // reset form, then do not check for terms of use.
-  $reset_pass = (strpos($_SERVER['HTTP_REFERER'], "/user/reset/$account->uid") === FALSE) ? 0 : 1;
+  $reset_pass = (strpos($_SERVER['HTTP_REFERER'], "/user/reset/$account->uid") === false) ? 0 : 1;
   if ($reset_pass) {
     return;
   }
@@ -736,7 +736,7 @@ 
       
       // General friend form overrides
       $form['flag_friend_submit']['#prefix'] = '<li class="first tab">';
-      $form['flag_friend_submit']['#value'] = bts('Send request', array(), NULL, 'boinc:friends-page');
+      $form['flag_friend_submit']['#value'] = bts('Send request', array(), null, 'boinc:friends-page');
       $form['flag_friend_submit']['#type'] = 'submit';
       $form['flag_friend_submit']['#suffix'] = '</li>';
       $form['flag_friend_submit']['#weight'] = 1002;
@@ -745,7 +745,7 @@ 
       case FLAG_FRIEND_BOTH:
       case FLAG_FRIEND_FLAGGED:
         unset($form['actions']);
-        $form['flag_friend_submit']['#value'] = bts('Remove friend', array(), NULL, 'boinc:friends-remove');
+        $form['flag_friend_submit']['#value'] = bts('Remove friend', array(), null, 'boinc:friends-remove');
         // Add in our hack handler to fix the flag_friend module
         $final_handler = array_pop($form['#submit']);
         $form['#submit'][] = 'boincuser_fix_unfriend_form_submit';
@@ -753,21 +753,21 @@ 
         break;
       case FLAG_FRIEND_PENDING:
         unset($form['actions']);
-        $form['flag_friend_submit']['#value'] = bts('Remove request', array(), NULL, 'boinc:friends-page');
+        $form['flag_friend_submit']['#value'] = bts('Remove request', array(), null, 'boinc:friends-page');
         break;
       case FLAG_FRIEND_APPROVAL:
         if ($action == 'flag') {
-          $form['flag_friend_submit']['#value'] = bts('Approve request', array(), NULL, 'boinc:friends-page');
+          $form['flag_friend_submit']['#value'] = bts('Approve request', array(), null, 'boinc:friends-page');
         }
         elseif ($action == 'unflag') {
           unset($form['actions']);
-          $form['flag_friend_submit']['#value'] = bts('Deny request', array(), NULL, 'boinc:friends-page');
+          $form['flag_friend_submit']['#value'] = bts('Deny request', array(), null, 'boinc:friends-page');
         }
         break;
       case FLAG_FRIEND_UNFLAGGED:
       default:
         $user_links[] = array(
-          'title' => bts('Add as friend', array(), NULL, 'boinc:friends-add'),
+          'title' => bts('Add as friend', array(), null, 'boinc:friends-add'),
           'href' => "flag/confirm/flag/friend/{$account->uid}"
         );
       }
@@ -777,7 +777,7 @@ 
     }
     
     $form['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_dest) . '</li>',
+      '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), $cancel_dest) . '</li>',
       '#weight' => 1004,
     );
     $form['form control tabs suffix'] = array(
@@ -800,7 +800,7 @@ 
       '#weight' => 1001,
     );
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
-    $form['buttons']['submit']['#value'] = bts('Save changes', array(), NULL, 'boinc:form-save');
+    $form['buttons']['submit']['#value'] = bts('Save changes', array(), null, 'boinc:form-save');
     $form['buttons']['submit']['#suffix'] = '</li>';
     $form['buttons']['submit']['#weight'] = 1002;
     $form['buttons']['preview']['#prefix'] = '<li class="tab">';
@@ -810,7 +810,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'), "node/{$form['nid']['#value']}") . '</li>',
+      '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
       '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
@@ -838,11 +838,11 @@ 
       '#weight' => 1001,
     );
     $form['actions']['submit']['#prefix'] = '<li class="first tab">';
-    $form['actions']['submit']['#value'] = bts('Delete', array(), NULL, 'boinc:form-delete');
+    $form['actions']['submit']['#value'] = bts('Delete', array(), null, 'boinc:form-delete');
     $form['actions']['submit']['#suffix'] = '</li>';
     $form['actions']['submit']['#weight'] = 1002;
     $form['actions']['cancel'] = array(
-        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
       '#weight' => 1005,
     );
     $form['actions']['form control tabs suffix'] = array(
@@ -862,14 +862,14 @@ 
       '#weight' => 1001,
     );
     $form['privatemsg']['submit']['#prefix'] = '<li class="first tab">';
-    $form['privatemsg']['submit']['#value'] = bts('Send message', array(), NULL, 'boinc:private-message');
+    $form['privatemsg']['submit']['#value'] = bts('Send message', array(), null, 'boinc:private-message');
     $form['privatemsg']['submit']['#suffix'] = '</li>';
     $form['privatemsg']['submit']['#weight'] = 1002;
     $form['privatemsg']['preview']['#prefix'] = '<li class="tab">';
     $form['privatemsg']['preview']['#suffix'] = '</li>';
     $form['privatemsg']['preview']['#weight'] = 1003;
     $form['privatemsg']['cancel'] = 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>',
       '#weight' => 1004,
     );
     $form['privatemsg']['form control tabs suffix'] = array(
@@ -884,18 +884,18 @@ 
   // Login form
   case 'user_login':
   case 'user_login_block':
-      drupal_set_title(bts('Login', array(), NULL, 'boinc:menu-link'));
+      drupal_set_title(bts('Login', array(), null, 'boinc:menu-link'));
     // Replace name with email in login form
     unset($form['name']);
     array_unshift($form, array(
       'email' => array(
         '#type' => 'textfield',
-        '#title' => bts('Email address', array(), NULL, 'boinc:email-address-to-login'),
+        '#title' => bts('Email address', array(), null, 'boinc:email-address-to-login'),
         '#size' => ($form_id == 'user_login_block') ? 15 : 60,
         '#maxlength' => EMAIL_MAX_LENGTH,
-        '#required' => TRUE,
+        '#required' => true,
         '#attributes' => array('tabindex' => '1'),
-        '#description' => bts('Enter your @s email address.', array('@s' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:standard-login-page')
+        '#description' => bts('Enter your @s email address.', array('@s' => variable_get('site_name', 'Drupal-BOINC')), null, 'boinc:standard-login-page')
       ),
       'validation_source' => array(
         '#type' => 'hidden',
@@ -911,7 +911,7 @@ 
     );
     $form['buttons']['submit'] = $form['submit'];
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
-    $form['buttons']['submit']['#value'] = bts('Log in', array(), NULL, 'boinc:standard-login-page');
+    $form['buttons']['submit']['#value'] = bts('Log in', array(), null, 'boinc:standard-login-page');
     $form['buttons']['submit']['#suffix'] = '</li>';
     $form['buttons']['submit']['#weight'] = 1002;
     $form['buttons']['form control tabs suffix'] = array(
@@ -927,7 +927,7 @@ 
     if (isset($form_state['post']['email']) and isset($form_state['post']['pass'])) {
       // Find the local validation function's entry so we can replace it.
       $array_key = array_search('user_login_authenticate_validate', $form['#validate']);
-      if ($array_key === FALSE) {
+      if ($array_key === false) {
         // Could not find it. Some other module must have run form_alter().
         // We will simply add our validation just before the final validator.
         $final_validator = array_pop($form['#validate']);
@@ -955,26 +955,26 @@ 
     }
 
     // Set special message if user has not agreed to TOU
-    $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
+    $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', false);
     $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
     if ( (!boincuser_check_termsofuse($account)) and ($existinguser_tou) and (!empty($termsofuse)) and (!user_access('administer users')) ) {
       drupal_set_message(
         bts('INFO: You have not agreed to the terms of use for @project. You may use this form to change your email address and/or password. Please note: you may not delete your account within seven (7) days of changing your email address.',
         array(
           '@project' => variable_get('site_name','Drupal-BOINC'),
-        ), NULL, 'boinc:account-credentials-change')
+        ), null, 'boinc:account-credentials-change')
       , 'info');
     }
 
     // A bit hackish... but don't require the user to enter his password if
     // coming from the password reset function
-    $reset_pass = (strpos($_SERVER['HTTP_REFERER'], "/user/reset/{$form['#uid']}") === FALSE) ? 0 : 1;
+    $reset_pass = (strpos($_SERVER['HTTP_REFERER'], "/user/reset/{$form['#uid']}") === false) ? 0 : 1;
     if ($reset_pass) {
       $_SESSION['reset_pass'] = 1;
     }
 
     // Adjust form elements already present
-    $form['account']['name']['#title'] = bts('Drupal Username', array(), NULL, 'boinc:drupal-username');
+    $form['account']['name']['#title'] = bts('Drupal Username', array(), null, 'boinc:drupal-username');
     $form['account']['name']['#size'] = 40;
     $form['account']['name']['#attributes']['autocomplete'] = 'off';
     $form['account']['name']['#description'] .= '<p>This is the drupal (internal) username. The title above shows the BOINC username, which is the display name used publicly that the user can change in Community Preferences.';
@@ -985,11 +985,11 @@ 
       // Add BOINC username (aka displayname)
       $form['account']['boincuser_name'] = array(
         '#type' => 'textfield',
-        '#title' => bts('BOINC Username', array(), NULL, 'boinc:user-or-team-name'),
+        '#title' => bts('BOINC Username', array(), null, 'boinc:user-or-team-name'),
         '#default_value' => $account->boincuser_name,
         '#maxlength' => USERNAME_MAX_LENGTH,
-        '#required' => TRUE,
-        '#description' => bts('This is the BOINC (external) username. This is the same setting as found in Account -> Preferences -> Community.', array(), NULL, 'boinc:username-change'),
+        '#required' => true,
+        '#description' => bts('This is the BOINC (external) username. This is the same setting as found in Account -> Preferences -> Community.', array(), null, 'boinc:username-change'),
         '#size' => 40,
       );
     }
@@ -998,23 +998,23 @@ 
     // ago, it cannot be changed again.
     $duration = TOKEN_DURATION_ONE_WEEK;
     if (($account->boincuser_email_addr_change_time + $duration) > time() and (!user_access('administer users'))) {
-      $form['account']['mail']['#required'] = FALSE;
+      $form['account']['mail']['#required'] = false;
       $form['account']['mailhelp'] = array(
         '#value' => bts("You email address was changed within the past seven (7) days. Please look for an email to !prev_email if you need to revert this change. You may change your email address on !time.",
           array(
             '!prev_email' => $account->boincuser_previous_email_addr,
             '!time' => date('F j, Y \a\t G:i T', $account->boincuser_email_addr_change_time + $duration),
-          ), NULL, 'boinc:account-credentials-change'),
+          ), null, 'boinc:account-credentials-change'),
       );
     }
 
-    if (!$reset_pass AND ($user->uid == $account->uid OR !user_access('administer users'))) {
+    if (!$reset_pass and ($user->uid == $account->uid or !user_access('administer users'))) {
       // Add a password authenticator, required to change email or pw
       $form['account']['current_pass'] = array(
         '#type' => 'password',
-        '#title' => bts('Enter your password to save changes', array(), NULL, 'boinc:account-credentials-change'),
+        '#title' => bts('Enter your password to save changes', array(), null, 'boinc:account-credentials-change'),
         '#description' => bts('Enter your current password if changing your email
-          address or password.', array(), NULL, 'boinc:account-credentials-change'),
+          address or password.', array(), null, 'boinc:account-credentials-change'),
         '#size' => 17,
         '#attributes' => array(
           'autocomplete' => 'off',
@@ -1026,35 +1026,35 @@ 
     $form['account']['boincuser_id'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('BOINC user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
+          <label>' . bts('BOINC user ID', array(), null, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->boincuser_id . '</span>
         </div>',
     );
     $form['account']['user_id'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Drupal user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
+          <label>' . bts('Drupal user ID', array(), null, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->uid . '</span>
         </div>',
     );
     $form['account']['account_key'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
+          <label>' . bts('Account key', array(), null, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->boincuser_account_key . '</span>
         </div>',
     );
     $form['account']['weak_account_key'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Weak account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
+          <label>' . bts('Weak account key', array(), null, 'boinc:account-credentials-change') . '</label>
           <span>' . "{$account->boincuser_id}_{$account->boincuser_weak_auth}" . '</span>
         </div>',
     );
     $form['account']['cpid'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Cross-project ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
+          <label>' . bts('Cross-project ID', array(), null, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->boincuser_cpid . '</span>
         </div>',
     );
@@ -1069,14 +1069,14 @@ 
       '#weight' => 1001,
     );
     $form['submit']['#prefix'] = '<li class="first tab">';
-    $form['submit']['#value'] = bts('Save changes', array(), NULL, 'boinc:form-save');
+    $form['submit']['#value'] = bts('Save changes', array(), null, 'boinc:form-save');
     $form['submit']['#suffix'] = '</li>';
     $form['submit']['#weight'] = 1002;
     $form['cancel'] = 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>',
       '#weight' => 1003,
     );
-    if (isset($form['delete']) AND is_array($form['delete'])) {
+    if (isset($form['delete']) and is_array($form['delete'])) {
       $form['delete']['#prefix'] = '<li class="first alt tab">';
       $form['delete']['#suffix'] = '</li>';
       $form['delete']['#weight'] = 1004;
@@ -1138,7 +1138,7 @@ 
 
     // Set form['title'], but hide it
     $form['title']['#default_value'] = $account->boincuser_name;
-    $form['title']['#access'] = FALSE;
+    $form['title']['#access'] = false;
 
     $form['separator_bottom'] = array(
       '#value' => '<div class="separator buttons"></div>',
@@ -1159,7 +1159,7 @@ 
       '#weight' => 1001,
     );
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
-    $form['buttons']['submit']['#value'] = bts('Save changes', array(), NULL, 'boinc:form-save');
+    $form['buttons']['submit']['#value'] = bts('Save changes', array(), null, 'boinc:form-save');
     $form['buttons']['submit']['#suffix'] = '</li>';
     $form['buttons']['submit']['#weight'] = 1002;
     $form['buttons']['preview']['#prefix'] = '<li class="tab">';
@@ -1169,12 +1169,12 @@ 
     $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'), $_GET['q']) . '</li>',
+      '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), $_GET['q']) . '</li>',
       '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
     $form['buttons']['delete']['#suffix'] = '</li>';
-    $form['buttons']['delete']['#value'] = bts('Clear User Profile', array(), NULL, 'boinc:form-save');
+    $form['buttons']['delete']['#value'] = bts('Clear User Profile', array(), null, 'boinc:form-save');
     $form['buttons']['delete']['#weight'] = 1006;
     $form['buttons']['delete']['#submit'] = array('_boincuser_node_profile_delete_submit');
     $form['buttons']['form control tabs suffix'] = array(
@@ -1208,11 +1208,11 @@ 
     array_unshift($form, array(
       'boincuser_name' => array(
         '#type' => 'textfield', 
-        '#title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'), 
+        '#title' => bts('Name', array(), null, 'boinc:user-or-team-name'), 
         '#default_value' => $edit['boincuser_name'], 
         '#maxlength' => USERNAME_MAX_LENGTH, 
-        '#description' => bts('Spaces are allowed; punctuation is not allowed except for periods, hyphens, and underscores.', array(), NULL, 'boinc:user-register'), 
-        '#required' => TRUE
+        '#description' => bts('Spaces are allowed; punctuation is not allowed except for periods, hyphens, and underscores.', array(), null, 'boinc:user-register'), 
+        '#required' => true
       ),
     ));
     // Set name temporarily to dummy value to beat validation
@@ -1232,27 +1232,27 @@ 
         '#type'   => 'fieldset',
         '#prefix' => '<div id="termsofuse-wrapper">', // This is our wrapper div.
         '#suffix' => '</div>',
-        '#tree'   => TRUE,
+        '#tree'   => true,
         '#weight' => -15,
       );
 
       $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:user-register' ) . '</h2>',
+        '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), null, 'project:user-register' ) . '</h2>',
         '#prefix' => '<div id="register-title1">',
         '#suffix' => '</div>',
       );
 
       $form['termsofuse']['body'] = array(
         '#weight' => -10,
-        '#value' => bts($termsofuse, array(), NULL, 'project:user-register'),
+        '#value' => bts($termsofuse, array(), null, 'project:user-register'),
         '#prefix' => '<div id="register-termsofuse">',
         '#suffix' => '</div>',
       );
 
       $form['termsofuse']['agreeTOU'] = array(
         '#type' => 'checkbox',
-        '#title' => bts(variable_get('boinc_weboptions_agreequestion', 'Do you agree with the above terms of use?'), array(), NULL, 'project:user-register'),
+        '#title' => bts(variable_get('boinc_weboptions_agreequestion', 'Do you agree with the above terms of use?'), array(), null, 'project:user-register'),
         '#weight' => -8,
         '#prefix' => '<div id="register-checkbox">',
         '#suffix' => '</div>',
@@ -1261,7 +1261,7 @@ 
 
     $form['title2'] = array(
       '#weight' => -6,
-      '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), NULL, 'project:user-register') . '</h2>',
+      '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), null, 'project:user-register') . '</h2>',
       '#prefix' => '<div id="register-title2">',
       '#suffix' => '</div>',
     );
@@ -1281,26 +1281,26 @@ 
     
   // Request new password form
   case 'user_pass':
-    drupal_set_title(bts('Forgot password', array(), NULL, 'boinc:forgot-password'));
+    drupal_set_title(bts('Forgot password', array(), null, 'boinc:forgot-password'));
     // Replace name/email text box with email only; retain "name" label
     // for compatibility with standard Drupal submit function
     unset($form['name']);
     array_unshift($form, array(
       'name' => array(
         '#type' => 'textfield',
-        '#title' => bts('Email address', array(), NULL, 'boinc:email-address-to-login'),
+        '#title' => bts('Email address', array(), null, 'boinc:email-address-to-login'),
         '#size' => 60,
         '#maxlength' => EMAIL_MAX_LENGTH,
-        '#required' => TRUE,
+        '#required' => true,
         '#description' => bts(
           'Enter your email address to receive instructions for resetting your password (or use the !authenticator_login).',
           array(
             '!authenticator_login' => l(
-              bts('authenticator-based login', array(), NULL, 'boinc:forgot-password'),
+              bts('authenticator-based login', array(), null, 'boinc:forgot-password'),
               'user/login/auth'
             )
           )
-        , NULL, 'boinc:forgot-password'),
+        , null, 'boinc:forgot-password'),
       ),
     ));
     
@@ -1311,11 +1311,11 @@ 
     );
     $form['buttons']['submit'] = $form['submit'];
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
-    $form['buttons']['submit']['#value'] = bts('Send', array(), NULL, 'boinc:form-send');
+    $form['buttons']['submit']['#value'] = bts('Send', array(), null, 'boinc:form-send');
     $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/login') . '</li>',
+      '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), 'user/login') . '</li>',
       '#weight' => 1005,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -1332,7 +1332,7 @@ 
     break;
     
   case 'views_exposed_form':
-      $form['submit']['#value'] = bts('Search', array(), NULL, 'boinc:search-user');
+      $form['submit']['#value'] = bts('Search', array(), null, 'boinc:search-user');
     break;
   }
 }
@@ -1364,7 +1364,7 @@ 
 function boincuser_process_password_confirm($element) {
   // Check if parent element is "account".
   if ($element['#array_parents'][0] == 'account') {
-    $element['pass1']['#title'] = bts('Change password', array(), NULL, 'boinc:forgot-password');
+    $element['pass1']['#title'] = bts('Change password', array(), null, 'boinc:forgot-password');
   }
   return $element;
 }
@@ -1384,7 +1384,7 @@ 
 /**
  * Implementation of hook_token_values
  */
-function boincuser_token_values($type, $object = NULL, $options = array()) {
+function boincuser_token_values($type, $object = null, $options = array()) {
   if ($type == 'user') {
     $account = user_load($object->uid);
     $tokens['display-name'] = $account->boincuser_name;
@@ -1450,13 +1450,13 @@ 
   require_boinc('boinc_db');
   $num_deleted = BoincUserDeleted::delete_expired();
   if ($num_deleted>0) {
-    watchdog('boincuser', "Deleted ${num_deleted} users from user_deleted table", WATCHDOG_NOTICE);
+    watchdog('boincuser', "deleted ${num_deleted} users from user_deleted table", WATCHDOG_NOTICE);
   }
 
   // Delete expired tokens from token table
   $tokens_deleted = BoincToken::delete_expired();
   if ($tokens_deleted>0) {
-    watchdog('boincuser', "Deleted ${tokens_deleted} tokens from token table", WATCHDOG_NOTICE);
+    watchdog('boincuser', "deleted ${tokens_deleted} tokens from token table", WATCHDOG_NOTICE);
   }
 }
 
@@ -1498,8 +1498,8 @@ 
   if (!isset($account->roles[$verified_contributor])) {
     drupal_set_message(bts(
         'You may only create or modify your user profile after earning @count credits.',
-        array('@count' => $min_credit_to_post), NULL, 'boinc:view-profile'
-    ), 'warning', FALSE);
+        array('@count' => $min_credit_to_post), null, 'boinc:view-profile'
+    ), 'warning', false);
   }
 
   // For now, just call the user module profile view function
@@ -1542,35 +1542,35 @@ 
     if ($registration_enabled) {
       $output .= '<li>' . bts('First !create_an_account here at @sitename.',
       array(
-        '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
+        '!create_an_account' => l(bts('create an account', array(), null, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), null, 'boinc:join-page') . '</li>';
     }
-    $output .= '  <li>' . bts("Install BOINC on this device if not already present.", array(), NULL, 'boinc:join-page') . '</li>';
+    $output .= '  <li>' . bts("Install BOINC on this device if not already present.", array(), null, 'boinc:join-page') . '</li>';
     $output .= '  <li>' . bts("Select <i>Tools / Add Project</i>. Choose @sitename from the list, or enter @siteurl.",
     array(
       '@sitename' => $site_name,
       '@siteurl' => $base_url,
-    ), NULL, 'boinc:join-page') . '</li>';
+    ), null, 'boinc:join-page') . '</li>';
     if ($registration_enabled) {
       $output .= '<li>' . bts("If you're running a command-line or pre-5.0 version of BOINC, use <b>!boinccmd</b> to add the project.",
         array(
           '!boinccmd' => l('boinccmd --project_attach', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
-        ), NULL, 'boinc:join-page') . '</li>';
+        ), null, 'boinc:join-page') . '</li>';
     }
     else {
       $output .= '<li>' . bts("If you're running a command-line version of BOINC,
         please follow the <b>!instructionslink</b> to first <i>create an account</i>, and then <i>attach</i> to this project. Use the same project URL as above.",
         array(
           '!instructionslink' => l('instructions', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
-        ), NULL, 'boinc:join-page') . '</li>';
+        ), null, 'boinc:join-page') . '</li>';
     }
     $output .= '<li>' . bts("If you're running a pre-5.0 version of BOINC, please
       upgrade to a more recent version of BOINC to create an account
       at @this_project.",
       array(
         '@this_project' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), null, 'boinc:join-page') . '</li>';
     $output .=  '</ol>';
     break;
   case 'new':
@@ -1590,26 +1590,26 @@ 
     if ($registration_enabled) {
       $output .= '<li>' . bts('First !create_an_account here at @sitename.',
       array(
-        '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
+        '!create_an_account' => l(bts('create an account', array(), null, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), null, 'boinc:join-page') . '</li>';
     }
     else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
       $output .= '  <li>' . bts("Read our !rules_and_policies.", array(
-        '!rules_and_policies' => l(bts('Rules and Policies', array(), NULL, 'boinc:join-page'), $ruleslink),
-      ), NULL, 'boinc:join-page') . '</li>';
+        '!rules_and_policies' => l(bts('Rules and Policies', array(), null, 'boinc:join-page'), $ruleslink),
+      ), null, 'boinc:join-page') . '</li>';
     }
-    $output .= '  <li>' . bts('Download the BOINC desktop software.', array(), NULL, 'boinc:join-page');
+    $output .= '  <li>' . bts('Download the BOINC desktop software.', array(), null, 'boinc:join-page');
     $output .= '    <p>';
     $output .= '      <a class="button" href="http://boinc.berkeley.edu/download.php">Download</a>';
     $output .= '    </p>';
-    $output .= '    ' . bts("For Android devices, download BOINC from the Google Play Store or Amazon App Store.", array(), NULL, 'boinc:join-page');
+    $output .= '    ' . bts("For Android devices, download BOINC from the Google Play Store or Amazon App Store.", array(), null, 'boinc:join-page');
     $output .= '  </li>';
-    $output .= '  <li>' . bts('Run the installer.', array(), NULL, 'boinc:join-page') . '</li>';
+    $output .= '  <li>' . bts('Run the installer.', array(), null, 'boinc:join-page') . '</li>';
     $output .= '  <li>' . bts('Choose @sitename from the list, or enter @siteurl.', array(
       '@sitename' => $site_name,
       '@siteurl' => $base_url,
-    ), NULL, 'boinc:join-page') . '</li>';
+    ), null, 'boinc:join-page') . '</li>';
     $output .=  '</ol>';
   }
   $output .= '</div>';
@@ -1640,17 +1640,17 @@ 
   else {
     $uotd = user_load($current_uotd->uid);
   }
-  $uotd_image = boincuser_get_user_profile_image($uotd->uid, FALSE);
+  $uotd_image = boincuser_get_user_profile_image($uotd->uid, false);
   $output = '<h2 class="pane-title">';
-  $output .= ($user->uid) ? bts('Welcome back!', array(), NULL, 'boinc:front-page') : ($site_name ? bts('What is @this_project?', array('@this_project' => $site_name)) : bts('Welcome!', array(), NULL, 'boinc:front-page'));
+  $output .= ($user->uid) ? bts('Welcome back!', array(), null, 'boinc:front-page') : ($site_name ? bts('What is @this_project?', array('@this_project' => $site_name)) : bts('Welcome!', array(), null, 'boinc:front-page'));
   $output .= '</h2>';
   $output .= '<div class="boinc-overview balance-height-front">';
-  $output .= '  <div>' . bts($site_message, array(), NULL, "project:front page") . ' ' . l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about') . '</div>';
+  $output .= '  <div>' . bts($site_message, array(), null, "project:front page") . ' ' . l(bts('Learn more', array(), null, 'boinc:front-page'), 'about') . '</div>';
   if ($user->uid) {
-    $output .= '  <div>' . l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))) . '</div>';
+    $output .= '  <div>' . l(bts('View account', array(), null, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))) . '</div>';
   }
   else {
-    $output .= '  <div>' . l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))) . '</div>';
+    $output .= '  <div>' . l(bts('Join now', array(), null, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))) . '</div>';
   }
   $output .= '</div>';
   $output .= '<div class="boinc-overview-details">';
@@ -1658,17 +1658,17 @@ 
   $output .= '    <a class="user-of-the-day" href="account/' . $uotd->uid . '">';
   $output .= '      <div class="picture">';
   $output .= theme('imagefield_image', $uotd_image['image'], $uotd_image['alt'],
-    $uotd_image['alt'], array(), FALSE);
+    $uotd_image['alt'], array(), false);
   $output .= '      </div>';
-  $output .= '      <div class="text">' . bts('User of the day', array(), NULL, 'boinc:front-page') . '</div>';
+  $output .= '      <div class="text">' . bts('User of the day', array(), null, 'boinc:front-page') . '</div>';
   $output .= '      <div class="detail">' . $uotd->boincuser_name . '</div>';
   $output .= '    </a>';
   $output .= '    <div class="volunteers">';
-  $output .= '      <div class="text">' . bts('Over 500,000 volunteers and counting.', array(), NULL, 'boinc:front-page') . '</div>';
+  $output .= '      <div class="text">' . bts('Over 500,000 volunteers and counting.', array(), null, 'boinc:front-page') . '</div>';
   $output .= '      <div class="platforms">';
-  $output .= '        <div class="detail platform windows">' . bts('Windows', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform mac">' .  bts('Mac', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform linux">' . bts('Linux', array(), NULL, 'boinc:front-page') . '</div>';
+  $output .= '        <div class="detail platform windows">' . bts('Windows', array(), null, 'boinc:front-page') . '</div>';
+  $output .= '        <div class="detail platform mac">' .  bts('Mac', array(), null, 'boinc:front-page') . '</div>';
+  $output .= '        <div class="detail platform linux">' . bts('Linux', array(), null, 'boinc:front-page') . '</div>';
   $output .= '      </div>';
   $output .= '    </div>';
   $output .= '  </div>';
@@ -1696,12 +1696,12 @@ 
   xml_header();
   
   // Account creation disabled
-  $enablethisRPC = variable_get('boinc_weboptions_enableaccountcreateRPC', TRUE);
+  $enablethisRPC = variable_get('boinc_weboptions_enableaccountcreateRPC', true);
   if (!$enablethisRPC) {
     $mess = bts('Account creation is done through our Web site. Please register at @url', array(
       '@url' => $base_url . '/user/registration',
     ),
-    NULL, 'boinc:create_account');
+    null, 'boinc:create_account');
     xml_error(-208, $mess);
   }
   // Invalid invite code
@@ -1755,7 +1755,7 @@ 
       'init' => $params['email_addr'],
       'roles' => array($unrestricted_role => ''),
       'boincuser_name' => $params['user_name'],
-      'boinchash_flag' => TRUE,
+      'boinchash_flag' => true,
     );
 
     // Create the drupal user. If the drupal user cannot be created,
@@ -1792,20 +1792,20 @@ 
   }
 
   if (strlen($authtoken) != 32) {
-    drupal_set_message(bts('ERROR: There is no account with that authenticator.', array(), NULL, 'boinc:account-finish'), 'error');
+    drupal_set_message(bts('ERROR: There is no account with that authenticator.', array(), null, 'boinc:account-finish'), 'error');
     drupal_goto();
   }
 
   require_boinc('boinc_db');
   $boinc_user = BoincUser::lookup("authenticator='".addslashes($authtoken)."'");
   if (!$boinc_user) {
-    drupal_set_message(bts('ERROR: There is no account with that authenticator.', array(), NULL, 'boinc:account-finish'), 'error');
+    drupal_set_message(bts('ERROR: There is no account with that authenticator.', array(), null, 'boinc:account-finish'), 'error');
     drupal_goto();
   }
   $user = user_load(get_drupal_id($boinc_user->id));
 
   if (!$user) {
-    drupal_set_message(bts('ERROR: There was a problem loading your account. Try logging in with your user name and password.', array(), NULL, 'boinc:account-finish'), 'error');
+    drupal_set_message(bts('ERROR: There was a problem loading your account. Try logging in with your user name and password.', array(), null, 'boinc:account-finish'), 'error');
     drupal_goto();
   }
 
@@ -1826,9 +1826,9 @@ 
   // Check moderation page exists
   $moderationpath = drupal_lookup_path('source', variable_get('boinc_weboptions_moderationpage', '') );
   if ( menu_valid_path(array('link_path' => $moderationpath)) ) {
-    $modsentence = bts('Please note: user profiles are subject to !moderation.', array('!moderation' => l(bts('moderation', array(), NULL, 'boinc:account-finish'), $moderationpath, $options)), NULL, 'boinc:account-finish');
+    $modsentence = bts('Please note: user profiles are subject to !moderation.', array('!moderation' => l(bts('moderation', array(), null, 'boinc:account-finish'), $moderationpath, $options)), null, 'boinc:account-finish');
   } else {
-    $modsentence = bts('Please note: user profiles are subject to moderation.', array(), NULL, 'boinc:account-finish');
+    $modsentence = bts('Please note: user profiles are subject to moderation.', array(), null, 'boinc:account-finish');
   }
 
   $username = $user->boincuser_name;
@@ -1837,73 +1837,73 @@ 
   array(
     '@user_name' => $username,
     '@site_name' => $site_name,
-  ), NULL, 'boinc:account-finish') . "</p>";
+  ), null, 'boinc:account-finish') . "</p>";
 
   $links = array(
     array(
       'data' => bts('Change your username at !community_preferences.', array(
-        '!community_preferences' => l(bts('Community Preferences', array(), NULL, 'boinc:account-fininsh'), 'account/prefs/community', $options),
-      ), NULL, 'boinc:account-finish'),
+        '!community_preferences' => l(bts('Community Preferences', array(), null, 'boinc:account-fininsh'), 'account/prefs/community', $options),
+      ), null, 'boinc:account-finish'),
       'children' => array(
-        bts('Your username is used to identify yourself to other volunteers on this Web site.', array(), NULL, 'boinc:account-finish'),
-        bts('In addition, you may set your account\'s default language and adjust notification settings.', array(), NULL, 'boinc:account-finish'),
+        bts('Your username is used to identify yourself to other volunteers on this Web site.', array(), null, 'boinc:account-finish'),
+        bts('In addition, you may set your account\'s default language and adjust notification settings.', array(), null, 'boinc:account-finish'),
       ),
     ),
     array(
       'data' => bts('Change your !computing_preferences.', array(
-        '!computing_preferences' => l(bts('Computing Preferences', array(), NULL, 'boinc:account-finish'), 'account/prefs', $options),
-      ), NULL, 'boinc:account-finish'),
+        '!computing_preferences' => l(bts('Computing Preferences', array(), null, 'boinc:account-finish'), 'account/prefs', $options),
+      ), null, 'boinc:account-finish'),
       'children' => array(
-        bts('You may adjust how much CPU, RAM, and Disk space the BOINC client is allowed to use for tasks on your computer.', array(), NULL, 'boinc:account-finish'),
+        bts('You may adjust how much CPU, RAM, and Disk space the BOINC client is allowed to use for tasks on your computer.', array(), null, 'boinc:account-finish'),
         bts('By default, you will run @site_name tasks without any additional configuration.', array(
           '@site_name' => $site_name,
-        ), NULL, 'boinc:account-finish'),
+        ), null, 'boinc:account-finish'),
         bts('It is recommended new volunteers leave the default settings until they gain experience running some tasks. Ask questions in the !forums to get advice before making changes to a setting you don\'t understand.', array(
-          '!forums' => l(bts('forums', array(), NULL, 'boinc:account-finish'), 'community/forum', $options),
-        ), NULL, 'boinc:account-finish'),
+          '!forums' => l(bts('forums', array(), null, 'boinc:account-finish'), 'community/forum', $options),
+        ), null, 'boinc:account-finish'),
       ),
     ),
     array(
         'data' => bts('Create a !user_profile.', array(
-          '!user_profile' => l(bts('User Profile', array(), NULL, 'boinc:account-finish'), '/account/profile/edit', $options),
-        ), NULL, 'boinc:account-finish'),
+          '!user_profile' => l(bts('User Profile', array(), null, 'boinc:account-finish'), '/account/profile/edit', $options),
+        ), null, 'boinc:account-finish'),
       'children' => array(
         bts('A user profile will inform other volunteers who you are and why you joined @site_name.', array(
           '@site_name' => $site_name,
-        ), NULL, 'boinc:account-finish'),
+        ), null, 'boinc:account-finish'),
         $modsentence,
       ),
     ),
     array(
       'data' => bts('Join a !team.', array(
-        '!team' => l(bts('Team', array(), NULL, 'boinc:account-finish'), '/community/teams', $options),
-      ), NULL, 'boinc:account-finish'),
+        '!team' => l(bts('Team', array(), null, 'boinc:account-finish'), '/community/teams', $options),
+      ), null, 'boinc:account-finish'),
       'children' => array(
-        bts('You may join a team, made up of other volunteers.', array(), NULL, 'boinc:account-finish'),
+        bts('You may join a team, made up of other volunteers.', array(), null, 'boinc:account-finish'),
       ),
     ),
     array(
       'data' => bts('Go to your !account_dashboard.', array(
-        '!account_dashboard'=> l(bts('Account Dashboard', array(), NULL, 'boinc:account-finish'), 'account/dashboard', $options),
-      ), NULL, 'boinc:account-finish'),
+        '!account_dashboard'=> l(bts('Account Dashboard', array(), null, 'boinc:account-finish'), 'account/dashboard', $options),
+      ), null, 'boinc:account-finish'),
       'children' => array(
-        bts('Your account dashboard has information and links about your computer(s) and task(s) assigned.', array(), NULL, 'boinc:account-finish'),
+        bts('Your account dashboard has information and links about your computer(s) and task(s) assigned.', array(), null, 'boinc:account-finish'),
       ),
     ),
     array(
       'data' => bts('Visit our !help pages.', array(
-        '!help' => l(bts('Help', array(), NULL, 'boinc:account-finish'), '/help', $options)
-      ), NULL, 'boinc:account-finish'),
+        '!help' => l(bts('Help', array(), null, 'boinc:account-finish'), '/help', $options)
+      ), null, 'boinc:account-finish'),
       'children' => array(
         bts('Ask for help in our community\'s !forums.', array(
-          '!forums' => l(bts('forums', array(), NULL, 'boinc:account-finish'), 'community/forum', $options)
-        ), NULL, 'boinc:account-finish'),
+          '!forums' => l(bts('forums', array(), null, 'boinc:account-finish'), 'community/forum', $options)
+        ), null, 'boinc:account-finish'),
       ),
     ),
   );
 
   //List of links
-  $output .= theme_item_list($links, $title = NULL, $type='ul');
+  $output .= theme_item_list($links, $title = null, $type='ul');
 
   return $output;
 }
@@ -1913,20 +1913,20 @@ 
  */
 function boincuser_moderate_community_access() {
   if (user_access('assign community member role')
-  OR user_access('assign all roles')) {
-    return TRUE;
+  or user_access('assign all roles')) {
+    return true;
   }
-  return FALSE;
+  return false;
 }
 
 /**
  * Get the count of items in the moderation queue
  */
 function boincuser_moderation_queue_count($caller = 'user') {
-  $allowed = FALSE;
+  $allowed = false;
   switch ($caller) {
   case 'cron':
-    $allowed = TRUE;
+    $allowed = true;
     break;
   case 'user':
   default:
@@ -1940,7 +1940,7 @@ 
       AND moderate = 1"
     ));
   }
-  return NULL;
+  return null;
 }
 
 /**
@@ -1948,10 +1948,10 @@ 
  * Allow community membership status to be set for users by direct link rather
  * than through the user account info form.
  */
-function boincuser_control($uid = NULL, $action = NULL) {
-  if (!$uid OR !$account = user_load($uid)) {
+function boincuser_control($uid = null, $action = null) {
+  if (!$uid or !$account = user_load($uid)) {
     // What are you even doing here...
-    return FALSE;
+    return false;
   }
   switch ($action) {
   case 'ban':
@@ -2057,7 +2057,7 @@ 
  */
 function boincuser_moderate_user_ban($uid, $reason = '', $duration = '') {
   if (user_access('assign community member role')
-  OR user_access('assign all roles')) {
+  or user_access('assign all roles')) {
     $account = user_load($uid);
     if ($account->uid) {
       module_load_include('inc', 'rules', 'modules/system.rules');
@@ -2137,7 +2137,7 @@ 
  * User profile image is managed by the content_profile module rather than core
  * Drupal User so must be inserted into comments, etc. (not so by default)
  */
-function boincuser_get_user_profile_image($uid, $avatar = TRUE) {
+function boincuser_get_user_profile_image($uid, $avatar = true) {
   // Though the function name implies otherwise, get the avatar by default
   $image_field = ($avatar) ? 'field_image_fid' : 'field_profile_image_fid';
   $image_fid = db_result(db_query("
@@ -2150,7 +2150,7 @@ 
   if (!$user_image['image']['filepath']) {
     // Load the default image if one does not exist
     $account = user_load($uid);
-    if ($avatar AND module_exists('gravatar') AND user_access('use gravatar', $account) AND $account->gravatar) {
+    if ($avatar and module_exists('gravatar') and user_access('use gravatar', $account) and $account->gravatar) {
       // Use a Gravatar rather than the system default image
       $options = array(
         'size' => 100,
@@ -2178,23 +2178,23 @@ 
  * Generate a table of a user's projects
  */
 function boincuser_get_projects_table($account = null) {
-  if ($account AND is_numeric($account)) {
+  if ($account and is_numeric($account)) {
     $account = user_load($account);
   }
   $projects = boincuser_get_projects($account);
-  if (!$projects) return bts('no projects...', array(), NULL, 'boinc:account-dashboard');
+  if (!$projects) return bts('no projects...', array(), null, 'boinc:account-dashboard');
   
   $output = '';
   $output .= '<table class="user-projects">' . "\n";
   $output .= '<thead>' . "\n";
   $output .= '  <tr>' . "\n";
-  $output .= '    <th>' . bts('Name', array(), NULL, 'boinc:project-name:-1:ignoreoverwrite') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Avg credit', array(), NULL, 'boinc:account-dashboard') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . '</th>' . "\n";
+  $output .= '    <th>' . bts('Name', array(), null, 'boinc:project-name:-1:ignoreoverwrite') . '</th>' . "\n";
+  $output .= '    <th class="numeric">' . bts('Avg credit', array(), null, 'boinc:account-dashboard') . '</th>' . "\n";
+  $output .= '    <th class="numeric">' . bts('Total credit', array(), null, 'boinc:user-or-team-total-credits') . '</th>' . "\n";
   $output .= '  </tr>' . "\n";
   $output .= '</thead>' . "\n";
   $output .= '<tbody>' . "\n";
-  foreach ($projects AS $project) {
+  foreach ($projects as $project) {
     $url = rtrim($project->url, '/') . '/show_user.php?userid=' . $project->id;
     $output .= '  <tr>' . "\n";
     $output .= '    <td>' . l($project->name, $url) . '</td>' . "\n";
@@ -2232,7 +2232,7 @@ 
   if (in_array($result->code, array(200, 304))) {
     return simplexml_load_string($result->data);
   }
-  return NULL;
+  return null;
 }
 
 /**
@@ -2248,7 +2248,7 @@ 
   
   $account_stats = boincuser_get_stats_user_data($account->boincuser_cpid);
   
-  return ($account_stats AND isset($account_stats->project)) ? $account_stats->project : null;
+  return ($account_stats and isset($account_stats->project)) ? $account_stats->project : null;
 }
 
 
@@ -2261,18 +2261,18 @@ 
   $profile = content_profile_load('profile', $account->uid);
   $output = '';
   if ($profile) {
-    $profile_is_approved = ($profile->status AND !$profile->moderate);
+    $profile_is_approved = ($profile->status and !$profile->moderate);
     $user_is_moderator = user_access('edit any profile content');
     $is_own_profile = ($user->uid == $account->uid);
     $profile_moderation_path = "moderate/profile/{$account->uid}";
     $links = array();
     
-    if ($profile->moderate AND $user_is_moderator) {
+    if ($profile->moderate and $user_is_moderator) {
       $links['approve_profile'] = array(
-        'title' => bts('Approve profile', array(), NULL, 'boinc:moderate-user'),
+        'title' => bts('Approve profile', array(), null, 'boinc:moderate-user'),
         'href' => "{$profile_moderation_path}/approve",
         'attributes' => array(
-          'title' => bts('Approve this profile content', array(), NULL, 'boinc:moderate-user'),
+          'title' => bts('Approve this profile content', array(), null, 'boinc:moderate-user'),
           'class' => 'first primary tab',
         )
       );
@@ -2285,10 +2285,10 @@ 
         )
       );*/
       $links['reject_profile'] = array(
-        'title' => bts('Reject profile', array(), NULL, 'boinc:moderate-user'),
+        'title' => bts('Reject profile', array(), null, 'boinc:moderate-user'),
         'href' => "{$profile_moderation_path}/reject",
         'attributes' => array(
-          'title' => bts('Reject this profile content', array(), NULL, 'boinc:moderate-user'),
+          'title' => bts('Reject this profile content', array(), null, 'boinc:moderate-user'),
           'class' => 'tab',
         )
       );
@@ -2342,7 +2342,7 @@ 
 function boincuser_apachesolr_index_documents_alter(array &$documents, $entity, $entity_type, $env_id) {
 
   foreach ($documents as $document) {
-    if ( $document->entity_type=='node' AND $document->bundle=='profile' ) {
+    if ( $document->entity_type=='node' and $document->bundle=='profile' ) {
       // Node information.
       $nid = $document->entity_id;
       $node = node_load($nid);
@@ -2396,7 +2396,7 @@ 
     if ($recipient = user_load(array('uid' => $drupalid))) {
       // Double-check that the loaded user matches both boincuser_id
       // and boincuser_name.
-      if ( ($boincid == $recipient->boincuser_id) AND ($boincname == $recipient->boincuser_name) ) {
+      if ( ($boincid == $recipient->boincuser_id) and ($boincname == $recipient->boincuser_name) ) {
         return $recipient;
       }
     }

Spacing +120 added lines, -120 removed lines

@@ -189,7 +189,7 @@ 
     'type' => MENU_CALLBACK
   );
   $items['account_finish.php'] = array(
-    'title' => 'Welcome to ' . variable_get('site_name', 'Drupal-BOINC'),
+    'title' => 'Welcome to '.variable_get('site_name', 'Drupal-BOINC'),
     'description' => 'RPC for after a user has created an account.',
     'page callback' => 'boincuser_account_finish',
     'access callback' => TRUE,
@@ -249,8 +249,8 @@ 
   // termsofuse is enabled, by having text in the termsofuse variable.
   $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
   $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-  if ( (!empty($termsofuse)) and ($user->uid) ) {
-    if ( !boincuser_check_termsofuse($user) and ($existinguser_tou) ) {
+  if ((!empty($termsofuse)) and ($user->uid)) {
+    if (!boincuser_check_termsofuse($user) and ($existinguser_tou)) {
 
       // Admins are exempt, otherwise the admin may not be able to
       // access the site!
@@ -264,14 +264,14 @@ 
           'user/termsofuse',
           'logout',
           'account/info/edit',
-          'user/' . $user->uid . '/edit',
-          'user/' . $user->uid . '/recoveremail/*',
+          'user/'.$user->uid.'/edit',
+          'user/'.$user->uid.'/recoveremail/*',
           'recover_email.php',
         );
         if (module_exists('boincuser_delete')) {
-          $paths0[] = 'user/' . $user->uid . '/delete';
-          $paths0[] = 'user/' . $user->uid . '/deleteconfirm/*';
-          $paths0[] = 'user/' . $user->uid . '/odeleteconfirm/*';
+          $paths0[] = 'user/'.$user->uid.'/delete';
+          $paths0[] = 'user/'.$user->uid.'/deleteconfirm/*';
+          $paths0[] = 'user/'.$user->uid.'/odeleteconfirm/*';
         }
 
         // Paths added by the admin
@@ -282,7 +282,7 @@ 
         }
 
         // paths to ignore
-        $paths_to_ignore = array_unique( array_merge($paths0, $paths2) );
+        $paths_to_ignore = array_unique(array_merge($paths0, $paths2));
 
         if (!_boincuser_ignore_paths($path, $paths_to_ignore)) {
           drupal_goto('user/termsofuse');
@@ -304,7 +304,7 @@ 
   require_boinc('password_compat/password');
   // Handle BOINC integration for users with UID > 1 (skip anonymous and admin)
   if (isset($account->uid) && ($account->uid > 1)) {
-    switch($op) {
+    switch ($op) {
     case 'load':
       // User loading; insert BOINC data into the user object
       $drupal_user = db_fetch_object(db_query("
@@ -334,11 +334,11 @@ 
       ));
       $account->boincuser_name = $boinc_user->name;
       $account->boincuser_account_key = $boinc_user->authenticator;
-      $account->boincuser_weak_auth = md5($boinc_user->authenticator . $boinc_user->passwd_hash);
+      $account->boincuser_weak_auth = md5($boinc_user->authenticator.$boinc_user->passwd_hash);
       $account->boincuser_total_credit = round($boinc_user->total_credit);
       $account->boincuser_expavg_credit = round($boinc_user->expavg_credit);
       $account->boincuser_expavg_time = round($boinc_user->expavg_time);
-      $account->boincuser_cpid = md5($boinc_user->cross_project_id . $account->mail);
+      $account->boincuser_cpid = md5($boinc_user->cross_project_id.$account->mail);
       $account->boincuser_default_pref_set = $boinc_user->venue;
       $account->boincteam_id = $boinc_user->teamid;
       $account->boincuser_previous_email_addr = $boinc_user->previous_email_addr;
@@ -507,7 +507,7 @@ 
 
             // Set password hash appropriately
             $passwd = ($edit['pass']) ? $edit['pass'] : $edit['current_pass'];
-            $passwd_hash = password_hash( md5($passwd.$lower_email_addr), PASSWORD_DEFAULT );
+            $passwd_hash = password_hash(md5($passwd.$lower_email_addr), PASSWORD_DEFAULT);
             // Algorithm for changing email and/or password
             if ($changing_email) {
               // locally store current email to set as previous email
@@ -594,8 +594,8 @@ 
   }
 
   // Check if user has agreed to terms of use.
-  if ( (!empty($termsofuse)) and ($account->uid) and 
-       (!boincuser_check_termsofuse($account)) and ($existinguser_tou) ) {
+  if ((!empty($termsofuse)) and ($account->uid) and 
+       (!boincuser_check_termsofuse($account)) and ($existinguser_tou)) {
 
     // Admins are exempted.
     $administrator_role = array_search('administrator', user_roles(true));
@@ -609,9 +609,9 @@ 
       $query_for_destination = '';
       $prevdest = $_REQUEST['destination'];
       if ($prevdest) {
-        $query_for_destination = '?destination=' . $prevdest;
+        $query_for_destination = '?destination='.$prevdest;
       }
-      $_REQUEST['destination'] = $path_for_destination . $query_for_destination;
+      $_REQUEST['destination'] = $path_for_destination.$query_for_destination;
 
     }
   }
@@ -644,7 +644,7 @@ 
   // In Drupal 7, these operation cases will all exist as their own hooks,
   // so let's approximate that here so that this function can simply be removed
   // upon migration to 7
-  switch($op) {
+  switch ($op) {
   case 'update':
     boincuser_node_update($node);
   }
@@ -655,7 +655,7 @@ 
  * is updated (forward compatible to Drupal 7)
  */
 function boincuser_node_update($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'profile':
     // Update the BOINC database directly
     $account = user_load($node->uid);
@@ -777,7 +777,7 @@ 
     }
     
     $form['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_dest) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_dest).'</li>',
       '#weight' => 1004,
     );
     $form['form control tabs suffix'] = array(
@@ -810,7 +810,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'), "node/{$form['nid']['#value']}") . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}").'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
@@ -842,7 +842,7 @@ 
     $form['actions']['submit']['#suffix'] = '</li>';
     $form['actions']['submit']['#weight'] = 1002;
     $form['actions']['cancel'] = array(
-        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
+        '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}").'</li>',
       '#weight' => 1005,
     );
     $form['actions']['form control tabs suffix'] = array(
@@ -869,7 +869,7 @@ 
     $form['privatemsg']['preview']['#suffix'] = '</li>';
     $form['privatemsg']['preview']['#weight'] = 1003;
     $form['privatemsg']['cancel'] = 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>',
       '#weight' => 1004,
     );
     $form['privatemsg']['form control tabs suffix'] = array(
@@ -957,11 +957,11 @@ 
     // Set special message if user has not agreed to TOU
     $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
     $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-    if ( (!boincuser_check_termsofuse($account)) and ($existinguser_tou) and (!empty($termsofuse)) and (!user_access('administer users')) ) {
+    if ((!boincuser_check_termsofuse($account)) and ($existinguser_tou) and (!empty($termsofuse)) and (!user_access('administer users'))) {
       drupal_set_message(
         bts('INFO: You have not agreed to the terms of use for @project. You may use this form to change your email address and/or password. Please note: you may not delete your account within seven (7) days of changing your email address.',
         array(
-          '@project' => variable_get('site_name','Drupal-BOINC'),
+          '@project' => variable_get('site_name', 'Drupal-BOINC'),
         ), NULL, 'boinc:account-credentials-change')
       , 'info');
     }
@@ -1026,36 +1026,36 @@ 
     $form['account']['boincuser_id'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('BOINC user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->boincuser_id . '</span>
+          <label>' . bts('BOINC user ID', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->boincuser_id.'</span>
         </div>',
     );
     $form['account']['user_id'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Drupal user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->uid . '</span>
+          <label>' . bts('Drupal user ID', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->uid.'</span>
         </div>',
     );
     $form['account']['account_key'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->boincuser_account_key . '</span>
+          <label>' . bts('Account key', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->boincuser_account_key.'</span>
         </div>',
     );
     $form['account']['weak_account_key'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Weak account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . "{$account->boincuser_id}_{$account->boincuser_weak_auth}" . '</span>
+          <label>' . bts('Weak account key', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . "{$account->boincuser_id}_{$account->boincuser_weak_auth}".'</span>
         </div>',
     );
     $form['account']['cpid'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Cross-project ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->boincuser_cpid . '</span>
+          <label>' . bts('Cross-project ID', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->boincuser_cpid.'</span>
         </div>',
     );
     
@@ -1073,7 +1073,7 @@ 
     $form['submit']['#suffix'] = '</li>';
     $form['submit']['#weight'] = 1002;
     $form['cancel'] = 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>',
       '#weight' => 1003,
     );
     if (isset($form['delete']) AND is_array($form['delete'])) {
@@ -1169,7 +1169,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'), $_GET['q']) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
@@ -1218,11 +1218,11 @@ 
     // Set name temporarily to dummy value to beat validation
     $form['name'] = array(
       '#type' => 'hidden',
-      '#value' => rand() . '.' . time()
+      '#value' => rand().'.'.time()
     );
 
     // Add JS for submit button disabling
-    drupal_add_js(drupal_get_path('module', 'boincuser') . '/boincuser.js');
+    drupal_add_js(drupal_get_path('module', 'boincuser').'/boincuser.js');
 
     // Terms of use section
     $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
@@ -1238,7 +1238,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:user-register' ) . '</h2>',
+        '#value' => '<h2>'.bts(variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:user-register').'</h2>',
         '#prefix' => '<div id="register-title1">',
         '#suffix' => '</div>',
       );
@@ -1261,7 +1261,7 @@ 
 
     $form['title2'] = array(
       '#weight' => -6,
-      '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), NULL, 'project:user-register') . '</h2>',
+      '#value' => '<h2>'.bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), NULL, 'project:user-register').'</h2>',
       '#prefix' => '<div id="register-title2">',
       '#suffix' => '</div>',
     );
@@ -1323,7 +1323,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/login') . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/login').'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -1405,7 +1405,7 @@ 
  */
 function boincuser_token_list($type = 'all') {
   if ($type == 'user' || $type == 'all') {
-    $tokens['user']['display-name']      = t("The user's name that should be displayed");
+    $tokens['user']['display-name'] = t("The user's name that should be displayed");
     return $tokens;
   }
 }
@@ -1417,9 +1417,9 @@ 
   if ($view->args) {
     $account_id = $view->args[0];
   }
-  if ($view->name=="user_activity") {
+  if ($view->name == "user_activity") {
     // Run the following custom query for the user_activity view
-    $view->build_info['query']= "
+    $view->build_info['query'] = "
       SELECT node_revisions.vid AS vid,
         node.nid AS node_nid,
         node.uid AS users_node_uid,
@@ -1459,13 +1459,13 @@ 
   // Delete expired users in the BOINC database, user_delete table.
   require_boinc('boinc_db');
   $num_deleted = BoincUserDeleted::delete_expired();
-  if ($num_deleted>0) {
+  if ($num_deleted > 0) {
     watchdog('boincuser', "Deleted ${num_deleted} users from user_deleted table", WATCHDOG_NOTICE);
   }
 
   // Delete expired tokens from token table
   $tokens_deleted = BoincToken::delete_expired();
-  if ($tokens_deleted>0) {
+  if ($tokens_deleted > 0) {
     watchdog('boincuser', "Deleted ${tokens_deleted} tokens from token table", WATCHDOG_NOTICE);
   }
 }
@@ -1550,38 +1550,38 @@ 
   case 'boinc':
     $output .= '<ol>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts('First !create_an_account here at @sitename.',
+      $output .= '<li>'.bts('First !create_an_account here at @sitename.',
       array(
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), NULL, 'boinc:join-page').'</li>';
     }
-    $output .= '  <li>' . bts("Install BOINC on this device if not already present.", array(), NULL, 'boinc:join-page') . '</li>';
-    $output .= '  <li>' . bts("Select <i>Tools / Add Project</i>. Choose @sitename from the list, or enter @siteurl.",
+    $output .= '  <li>'.bts("Install BOINC on this device if not already present.", array(), NULL, 'boinc:join-page').'</li>';
+    $output .= '  <li>'.bts("Select <i>Tools / Add Project</i>. Choose @sitename from the list, or enter @siteurl.",
     array(
       '@sitename' => $site_name,
       '@siteurl' => $base_url,
-    ), NULL, 'boinc:join-page') . '</li>';
+    ), NULL, 'boinc:join-page').'</li>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts("If you're running a command-line or pre-5.0 version of BOINC, use <b>!boinccmd</b> to add the project.",
+      $output .= '<li>'.bts("If you're running a command-line or pre-5.0 version of BOINC, use <b>!boinccmd</b> to add the project.",
         array(
           '!boinccmd' => l('boinccmd --project_attach', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
-        ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page').'</li>';
     }
     else {
-      $output .= '<li>' . bts("If you're running a command-line version of BOINC,
+      $output .= '<li>'.bts("If you're running a command-line version of BOINC,
         please follow the <b>!instructionslink</b> to first <i>create an account</i>, and then <i>attach</i> to this project. Use the same project URL as above.",
         array(
           '!instructionslink' => l('instructions', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
-        ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page').'</li>';
     }
-    $output .= '<li>' . bts("If you're running a pre-5.0 version of BOINC, please
+    $output .= '<li>'.bts("If you're running a pre-5.0 version of BOINC, please
       upgrade to a more recent version of BOINC to create an account
       at @this_project.",
       array(
         '@this_project' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
-    $output .=  '</ol>';
+      ), NULL, 'boinc:join-page').'</li>';
+    $output .= '</ol>';
     break;
   case 'new':
   default:
@@ -1593,34 +1593,34 @@ 
     //  $ruleslink = drupal_lookup_path('source', $ruleslinkB);
     //}
 
-    $ruleslink = drupal_lookup_path('source', variable_get('boinc_weboptions_rulespolicies', '') );
+    $ruleslink = drupal_lookup_path('source', variable_get('boinc_weboptions_rulespolicies', ''));
 
     // Join page output
     $output .= '<ol>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts('First !create_an_account here at @sitename.',
+      $output .= '<li>'.bts('First !create_an_account here at @sitename.',
       array(
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), NULL, 'boinc:join-page').'</li>';
     }
-    else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
-      $output .= '  <li>' . bts("Read our !rules_and_policies.", array(
+    else if (menu_valid_path(array('link_path' => $ruleslink))) {
+      $output .= '  <li>'.bts("Read our !rules_and_policies.", array(
         '!rules_and_policies' => l(bts('Rules and Policies', array(), NULL, 'boinc:join-page'), $ruleslink),
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), NULL, 'boinc:join-page').'</li>';
     }
-    $output .= '  <li>' . bts('Download the BOINC desktop software.', array(), NULL, 'boinc:join-page');
+    $output .= '  <li>'.bts('Download the BOINC desktop software.', array(), NULL, 'boinc:join-page');
     $output .= '    <p>';
     $output .= '      <a class="button" href="http://boinc.berkeley.edu/download.php">Download</a>';
     $output .= '    </p>';
-    $output .= '    ' . bts("For Android devices, download BOINC from the Google Play Store or Amazon App Store.", array(), NULL, 'boinc:join-page');
+    $output .= '    '.bts("For Android devices, download BOINC from the Google Play Store or Amazon App Store.", array(), NULL, 'boinc:join-page');
     $output .= '  </li>';
-    $output .= '  <li>' . bts('Run the installer.', array(), NULL, 'boinc:join-page') . '</li>';
-    $output .= '  <li>' . bts('Choose @sitename from the list, or enter @siteurl.', array(
+    $output .= '  <li>'.bts('Run the installer.', array(), NULL, 'boinc:join-page').'</li>';
+    $output .= '  <li>'.bts('Choose @sitename from the list, or enter @siteurl.', array(
       '@sitename' => $site_name,
       '@siteurl' => $base_url,
-    ), NULL, 'boinc:join-page') . '</li>';
-    $output .=  '</ol>';
+    ), NULL, 'boinc:join-page').'</li>';
+    $output .= '</ol>';
   }
   $output .= '</div>';
   return $output;
@@ -1633,7 +1633,7 @@ 
   global $user;
   $site_name = variable_get('site_name', 'Drupal-BOINC');
   // get the front page message from database; this is set in the admin interface under BOINC Other
-  $site_message = variable_get('boinc_other_frontpage','');
+  $site_message = variable_get('boinc_other_frontpage', '');
 
   // Determine the user of the day
   $current_uotd = db_fetch_object(db_query("
@@ -1655,30 +1655,30 @@ 
   $output .= ($user->uid) ? bts('Welcome back!', array(), NULL, 'boinc:front-page') : ($site_name ? bts('What is @this_project?', array('@this_project' => $site_name)) : bts('Welcome!', array(), NULL, 'boinc:front-page'));
   $output .= '</h2>';
   $output .= '<div class="boinc-overview balance-height-front">';
-  $output .= '  <div>' . bts($site_message, array(), NULL, "project:front page") . ' ' . l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about') . '</div>';
+  $output .= '  <div>'.bts($site_message, array(), NULL, "project:front page").' '.l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about').'</div>';
   if ($user->uid) {
-    $output .= '  <div>' . l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))) . '</div>';
+    $output .= '  <div>'.l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))).'</div>';
   }
   else {
-    $output .= '  <div>' . l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))) . '</div>';
+    $output .= '  <div>'.l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))).'</div>';
   }
   $output .= '</div>';
   $output .= '<div class="boinc-overview-details">';
   $output .= '  <div class="detail-container">';
-  $output .= '    <a class="user-of-the-day" href="account/' . $uotd->uid . '">';
+  $output .= '    <a class="user-of-the-day" href="account/'.$uotd->uid.'">';
   $output .= '      <div class="picture">';
   $output .= theme('imagefield_image', $uotd_image['image'], $uotd_image['alt'],
     $uotd_image['alt'], array(), FALSE);
   $output .= '      </div>';
-  $output .= '      <div class="text">' . bts('User of the day', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '      <div class="detail">' . $uotd->boincuser_name . '</div>';
+  $output .= '      <div class="text">'.bts('User of the day', array(), NULL, 'boinc:front-page').'</div>';
+  $output .= '      <div class="detail">'.$uotd->boincuser_name.'</div>';
   $output .= '    </a>';
   $output .= '    <div class="volunteers">';
-  $output .= '      <div class="text">' . bts('Over 500,000 volunteers and counting.', array(), NULL, 'boinc:front-page') . '</div>';
+  $output .= '      <div class="text">'.bts('Over 500,000 volunteers and counting.', array(), NULL, 'boinc:front-page').'</div>';
   $output .= '      <div class="platforms">';
-  $output .= '        <div class="detail platform windows">' . bts('Windows', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform mac">' .  bts('Mac', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform linux">' . bts('Linux', array(), NULL, 'boinc:front-page') . '</div>';
+  $output .= '        <div class="detail platform windows">'.bts('Windows', array(), NULL, 'boinc:front-page').'</div>';
+  $output .= '        <div class="detail platform mac">'.bts('Mac', array(), NULL, 'boinc:front-page').'</div>';
+  $output .= '        <div class="detail platform linux">'.bts('Linux', array(), NULL, 'boinc:front-page').'</div>';
   $output .= '      </div>';
   $output .= '    </div>';
   $output .= '  </div>';
@@ -1709,7 +1709,7 @@ 
   $enablethisRPC = variable_get('boinc_weboptions_enableaccountcreateRPC', TRUE);
   if (!$enablethisRPC) {
     $mess = bts('Account creation is done through our Web site. Please register at @url', array(
-      '@url' => $base_url . '/user/registration',
+      '@url' => $base_url.'/user/registration',
     ),
     NULL, 'boinc:create_account');
     xml_error(-208, $mess);
@@ -1741,8 +1741,8 @@ 
   $boinc_user = BoincUser::lookup_email_addr($params['email_addr']);
   if ($boinc_user) {
     // Return authenticator for existing users
-    if ( ($params['passwd_hash'] == $boinc_user->passwd_hash) or
-    password_verify($params['passwd_hash'], $boinc_user->passwd_hash) ) {
+    if (($params['passwd_hash'] == $boinc_user->passwd_hash) or
+    password_verify($params['passwd_hash'], $boinc_user->passwd_hash)) {
       $output = array('authenticator' => $boinc_user->authenticator);
     }
     else {
@@ -1798,7 +1798,7 @@ 
   // Ensure there is a authentication token before continuing
   if (empty($authtoken)) {
     drupal_not_found();
-    return ;
+    return;
   }
 
   if (strlen($authtoken) != 32) {
@@ -1820,8 +1820,8 @@ 
   }
 
   // Lookup path to custom account finish page
-  $customaccountfinishpath = drupal_lookup_path('source', variable_get('boinc_weboptions_accountfinish', '') );
-  if ( menu_valid_path(array('link_path' => $customaccountfinishpath)) ) {
+  $customaccountfinishpath = drupal_lookup_path('source', variable_get('boinc_weboptions_accountfinish', ''));
+  if (menu_valid_path(array('link_path' => $customaccountfinishpath))) {
     $node = menu_get_object('node', 1, $customaccountfinishpath);
     if ($node) {
       return node_page_view($node);
@@ -1830,12 +1830,12 @@ 
 
   // open links in new window
   $options = array(
-    'attributes' => array( 'target' => '_blank' ),
+    'attributes' => array('target' => '_blank'),
   );
 
   // Check moderation page exists
-  $moderationpath = drupal_lookup_path('source', variable_get('boinc_weboptions_moderationpage', '') );
-  if ( menu_valid_path(array('link_path' => $moderationpath)) ) {
+  $moderationpath = drupal_lookup_path('source', variable_get('boinc_weboptions_moderationpage', ''));
+  if (menu_valid_path(array('link_path' => $moderationpath))) {
     $modsentence = bts('Please note: user profiles are subject to !moderation.', array('!moderation' => l(bts('moderation', array(), NULL, 'boinc:account-finish'), $moderationpath, $options)), NULL, 'boinc:account-finish');
   } else {
     $modsentence = bts('Please note: user profiles are subject to moderation.', array(), NULL, 'boinc:account-finish');
@@ -1843,11 +1843,11 @@ 
 
   $username = $user->boincuser_name;
   $site_name = variable_get('site_name', 'Drupal-BOINC');
-  $output = "<p>" . bts('Thank you @user_name for joining @site_name. Your account has been created. Your BOINC client should start working on assigned tasks soon, without any additional action or configuration. Please visit the links below for more information and additional options. (Links will open in a new window.)',
+  $output = "<p>".bts('Thank you @user_name for joining @site_name. Your account has been created. Your BOINC client should start working on assigned tasks soon, without any additional action or configuration. Please visit the links below for more information and additional options. (Links will open in a new window.)',
   array(
     '@user_name' => $username,
     '@site_name' => $site_name,
-  ), NULL, 'boinc:account-finish') . "</p>";
+  ), NULL, 'boinc:account-finish')."</p>";
 
   $links = array(
     array(
@@ -1913,7 +1913,7 @@ 
   );
 
   //List of links
-  $output .= theme_item_list($links, $title = NULL, $type='ul');
+  $output .= theme_item_list($links, $title = NULL, $type = 'ul');
 
   return $output;
 }
@@ -2030,7 +2030,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;
     $moderator = user_load($user->uid);
     $profile->moderate = 0;
     $profile->status = 0;
@@ -2091,7 +2091,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;
       $moderator = user_load($user->uid);
       $settings = array(
         'from' => '',
@@ -2195,25 +2195,25 @@ 
   if (!$projects) return bts('no projects...', array(), NULL, 'boinc:account-dashboard');
   
   $output = '';
-  $output .= '<table class="user-projects">' . "\n";
-  $output .= '<thead>' . "\n";
-  $output .= '  <tr>' . "\n";
-  $output .= '    <th>' . bts('Name', array(), NULL, 'boinc:project-name:-1:ignoreoverwrite') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Avg credit', array(), NULL, 'boinc:account-dashboard') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . '</th>' . "\n";
-  $output .= '  </tr>' . "\n";
-  $output .= '</thead>' . "\n";
-  $output .= '<tbody>' . "\n";
+  $output .= '<table class="user-projects">'."\n";
+  $output .= '<thead>'."\n";
+  $output .= '  <tr>'."\n";
+  $output .= '    <th>'.bts('Name', array(), NULL, 'boinc:project-name:-1:ignoreoverwrite').'</th>'."\n";
+  $output .= '    <th class="numeric">'.bts('Avg credit', array(), NULL, 'boinc:account-dashboard').'</th>'."\n";
+  $output .= '    <th class="numeric">'.bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits').'</th>'."\n";
+  $output .= '  </tr>'."\n";
+  $output .= '</thead>'."\n";
+  $output .= '<tbody>'."\n";
   foreach ($projects AS $project) {
-    $url = rtrim($project->url, '/') . '/show_user.php?userid=' . $project->id;
-    $output .= '  <tr>' . "\n";
-    $output .= '    <td>' . l($project->name, $url) . '</td>' . "\n";
-    $output .= '    <td class="numeric">' . boincwork_format_stats((float) $project->expavg_credit) . '</td>' . "\n"; 
-    $output .= '    <td class="numeric">' . boincwork_format_stats((float) $project->total_credit) . '</td>' . "\n";
-    $output .= '  </tr>' . "\n";
+    $url = rtrim($project->url, '/').'/show_user.php?userid='.$project->id;
+    $output .= '  <tr>'."\n";
+    $output .= '    <td>'.l($project->name, $url).'</td>'."\n";
+    $output .= '    <td class="numeric">'.boincwork_format_stats((float)$project->expavg_credit).'</td>'."\n"; 
+    $output .= '    <td class="numeric">'.boincwork_format_stats((float)$project->total_credit).'</td>'."\n";
+    $output .= '  </tr>'."\n";
   }
-  $output .= '</tbody>' . "\n";
-  $output .= '</table>' . "\n";
+  $output .= '</tbody>'."\n";
+  $output .= '</table>'."\n";
   $more_link = ($account) ? "user/{$account->uid}/stats" : 'account/stats';
   //$output .= "<div class=\"more-link\"><a href=\"{$more_link}\">More stats</a></div>" . "\n";
   return $output;
@@ -2233,8 +2233,8 @@ 
     'cpid' => $cpid
   );
   $args = array();
-  foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
-  $query = '?' . implode('&', $args);
+  foreach ($get as $arg => $value) $args[] = "{$arg}=".rawurlencode($value);
+  $query = '?'.implode('&', $args);
   
   // Load XML from RPC
   $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
@@ -2306,12 +2306,12 @@ 
     $output .= '<ul class="tab-list">';
     $count = 0;
     foreach ($links as $key => $link) {
-      $output .= '<li class="' . (($count == 0) ? 'first primary ' : '') . 'tab">';
+      $output .= '<li class="'.(($count == 0) ? 'first primary ' : '').'tab">';
       $output .= l($link['title'], $link['href'], array('query' => drupal_get_destination()));
       $output .= '</li>';
       $count++;
     }
-    $output .= '<li class="' . (($count) ? '' : 'first ') . 'last tab">' . flag_create_link('abuse_user_meta', $account->uid) . '</li>';
+    $output .= '<li class="'.(($count) ? '' : 'first ').'last tab">'.flag_create_link('abuse_user_meta', $account->uid).'</li>';
     $output .= '</ul>';
   }
   return $output;
@@ -2352,7 +2352,7 @@ 
 function boincuser_apachesolr_index_documents_alter(array &$documents, $entity, $entity_type, $env_id) {
 
   foreach ($documents as $document) {
-    if ( $document->entity_type=='node' AND $document->bundle=='profile' ) {
+    if ($document->entity_type == 'node' AND $document->bundle == 'profile') {
       // Node information.
       $nid = $document->entity_id;
       $node = node_load($nid);
@@ -2402,11 +2402,11 @@ 
   // privatemsg module. We need to convert them back to spaces for the
   // check below.
   $boincname = preg_replace("/\\xc2\\xa0/", " ", $boincname);
-  if ($drupalid>0) {
+  if ($drupalid > 0) {
     if ($recipient = user_load(array('uid' => $drupalid))) {
       // Double-check that the loaded user matches both boincuser_id
       // and boincuser_name.
-      if ( ($boincid == $recipient->boincuser_id) AND ($boincname == $recipient->boincuser_name) ) {
+      if (($boincid == $recipient->boincuser_id) AND ($boincname == $recipient->boincuser_name)) {
         return $recipient;
       }
     }

Indentation +840 added lines, -840 removed lines

@@ -27,44 +27,44 @@ 
  * with defined URL paths
  */
 function boincuser_menu() {
-  $items['account/posts'] = array(
+    $items['account/posts'] = array(
     'title' => 'Recent posts',
     'description' => '',
     'page callback' => 'boincuser_goto_recent_posts',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['account/profile'] = array(
+    );
+    $items['account/profile'] = array(
     'title' => '',
     'description' => '',
     'page callback' => 'boincuser_view_profile',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_NORMAL_ITEM
-  );
-  $items['account/profile/view'] = array(
+    );
+    $items['account/profile/view'] = array(
     'title' => 'View',
     'description' => 'Show a user profile',
     'page callback' => 'boincuser_view_profile',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => 0
-  );
-  $items['account/profile/edit'] = array(
+    );
+    $items['account/profile/edit'] = array(
     'title' => 'Edit',
     'description' => 'Edit a user profile',
     'page callback' => 'boincuser_edit_profile',
     'access arguments' => array('edit own profile content'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 5
-  );
-  $items['account/team'] = array(
+    );
+    $items['account/team'] = array(
     'title' => 'User team',
     'description' => '',
     'page callback' => 'boincuser_goto_team',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['moderate/profile/%user/approve'] = array(
+    );
+    $items['moderate/profile/%user/approve'] = array(
     'title' => 'Profile approval',
     'description' => 'Approve profile content',
     'page callback' => 'boincuser_moderate_profile_approve',
@@ -72,8 +72,8 @@ 
     'access arguments' => array('edit any profile content'),
     'type' => MENU_CALLBACK,
     'weight' => 5
-  );
-  $items['moderate/profile/%user/edit'] = array(
+    );
+    $items['moderate/profile/%user/edit'] = array(
     'title' => 'Profile editor',
     'description' => 'Edit a user profile',
     'page callback' => 'boincuser_edit_profile',
@@ -81,8 +81,8 @@ 
     'access arguments' => array('edit any profile content'),
     'type' => MENU_CALLBACK,
     'weight' => 5
-  );
-  $items['moderate/profile/%/reject'] = array(
+    );
+    $items['moderate/profile/%/reject'] = array(
     'title' => bts('Reject profile', array(), NULL, 'boinc:moderate-user'),
     'description' => 'Reject profile content',
     'page callback' => 'drupal_get_form',
@@ -90,60 +90,60 @@ 
     'access arguments' => array('edit any profile content'),
     'type' => MENU_CALLBACK,
     'weight' => 5
-  );
-  $items['moderate/user/%/ban'] = array(
+    );
+    $items['moderate/user/%/ban'] = array(
     'title' => bts('Ban user', array(), NULL, 'boinc:moderate-ban-user'),
     'description' => 'Ban a user from using community features',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_moderate_user_ban_form', 2),
     'access callback' => 'boincuser_moderate_community_access',
     'type' => MENU_CALLBACK,
-  );
-  $items['join'] = array(
+    );
+    $items['join'] = array(
     'title' => '',
     'description' => '',
     'page callback' => 'join_page',
     'access arguments' => array('access content'),
     'type' => MENU_NORMAL_ITEM
-  );
-  $items['join/new'] = array(
+    );
+    $items['join/new'] = array(
     'title' => bts("I'm new"),
     'page callback' => 'join_page',
     'page arguments' => array(1),
     'access arguments' => array('access content'),
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => 0
-  );
-  $items['join/boinc'] = array(
+    );
+    $items['join/boinc'] = array(
     'title' => bts("I'm a BOINC user"),
     'page callback' => 'join_page',
     'page arguments' => array(1),
     'access arguments' => array('access content'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 5
-  );
-  $items['user/login/auth'] = array(
+    );
+    $items['user/login/auth'] = array(
     'title' => bts('Authenticator login', array(), NULL, 'boinc:authenticator-login-page'),
     'description' => 'Log in using a user authenticator',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_authloginform'),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
-  );
-  $items['user/termsofuse'] = array(
+    );
+    $items['user/termsofuse'] = array(
     'title' => bts('Terms of Use', array(), NULL, 'boinc:termsofuse-form'),
     'description' => 'A site\'s term of use.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_termsofuse_form'),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['user_control'] = array(
+    );
+    $items['user_control'] = array(
     'page callback' => 'boincuser_control',
     'access arguments' => array('access user profiles'),
     'type' => MENU_CALLBACK
-  );
-  $items['admin/boinc'] = array(
+    );
+    $items['admin/boinc'] = array(
     'title' => 'BOINC configuration',
     'position' => 'right',
     'weight' => -8,
@@ -151,8 +151,8 @@ 
     'access arguments' => array('administer site configuration'),
     'file' => 'system.admin.inc',
     'file path' => drupal_get_path('module', 'system'),
-  );
-  $items['admin/boinc/environment'] = array(
+    );
+    $items['admin/boinc/environment'] = array(
     'title' => 'Environment: General',
     'description' => 'Set paths to BOINC functions and any other necessary
       variables that establish a BOINC environment.',
@@ -161,8 +161,8 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincuser.admin.inc'
-  );
-  $items['admin/boinc/scheduler'] = array(
+    );
+    $items['admin/boinc/scheduler'] = array(
     'title' => 'Environment: Scheduling server URLs',
     'description' => 'Set BOINC scheduler options.',
     'page callback' => 'drupal_get_form',
@@ -170,8 +170,8 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincuser.admin.inc'
-  );
-  $items['admin/boinc/weboptions'] = array(
+    );
+    $items['admin/boinc/weboptions'] = array(
     'title' => 'Environment: Website Options',
     'description' => 'Set options configuring this Drupal-BOINC Web site.',
     'page callback' => 'drupal_get_form',
@@ -179,117 +179,117 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincuser.admin.inc'
-  );
+    );
   
-  $items['create_account.php'] = array(
+    $items['create_account.php'] = array(
     'title' => 'Create Account RPC',
     'description' => 'RPC for creating user accounts.',
     'page callback' => 'boincuser_create_account',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK
-  );
-  $items['account_finish.php'] = array(
+    );
+    $items['account_finish.php'] = array(
     'title' => 'Welcome to ' . variable_get('site_name', 'Drupal-BOINC'),
     'description' => 'RPC for after a user has created an account.',
     'page callback' => 'boincuser_account_finish',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK,
-  );
-  $items['boincuser/autocomplete'] = array(
+    );
+    $items['boincuser/autocomplete'] = array(
     'page callback' => '_boincuser_user_name_autocomplete',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK,
-  );
-  $items['user/%user/recoveremail/%'] = array(
+    );
+    $items['user/%user/recoveremail/%'] = array(
     'title' => t('Recover previous email'),
     'description' => t('Form to revert email to previous address.'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_revertemail', 3),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['recover_email.php'] = array(
+    );
+    $items['recover_email.php'] = array(
     'title' => t('Recover previous email'),
     'description' => t('redirect'),
     'page callback' => '_boincuser_redirect_recover_email',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK,
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implementation of hook_init()
  */
 function boincuser_init() {
-  global $user;
-  // Skip this check for charts, which are loaded separately
-  // (may get duplicate or unexpected messages otherwise)
-  if (substr($_GET['q'], 0, 7) == 'charts/') {
+    global $user;
+    // Skip this check for charts, which are loaded separately
+    // (may get duplicate or unexpected messages otherwise)
+    if (substr($_GET['q'], 0, 7) == 'charts/') {
     return;
-  }
+    }
 
-  // If admin user, do some basic site functionality checks
-  if (user_access('administer site configuration')) {
+    // If admin user, do some basic site functionality checks
+    if (user_access('administer site configuration')) {
     // Ensure we have a configured BOINC environment
     boinc_get_path();
     boinc_get_scheduler_tags();
-  }
+    }
   
-  // Check credits for the verified contributor role
-  boincuser_check_credit_requirements();
+    // Check credits for the verified contributor role
+    boincuser_check_credit_requirements();
   
-  if (module_exists('boincteam')) {
+    if (module_exists('boincteam')) {
     // Display any persistent team messages
     boincteam_show_messages();
-  }
+    }
 
-  // Check if user has agreed to the terms of use. If not, send the
-  // user to the terms-of-use form. This is only makes sense if the
-  // termsofuse is enabled, by having text in the termsofuse variable.
-  $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
-  $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-  if ( (!empty($termsofuse)) and ($user->uid) ) {
+    // Check if user has agreed to the terms of use. If not, send the
+    // user to the terms-of-use form. This is only makes sense if the
+    // termsofuse is enabled, by having text in the termsofuse variable.
+    $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
+    $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
+    if ( (!empty($termsofuse)) and ($user->uid) ) {
     if ( !boincuser_check_termsofuse($user) and ($existinguser_tou) ) {
 
-      // Admins are exempt, otherwise the admin may not be able to
-      // access the site!
-      $administrator_role = array_search('administrator', user_roles(true));
-      if (!isset($user->roles[$administrator_role])) {
+        // Admins are exempt, otherwise the admin may not be able to
+        // access the site!
+        $administrator_role = array_search('administrator', user_roles(true));
+        if (!isset($user->roles[$administrator_role])) {
         $path = drupal_get_path_alias($_GET['q']);
 
         // Any paths that should NOT be redirected go here.
         // The site will not function correctly if these are not exempt!
         $paths0 = array(
-          'user/termsofuse',
-          'logout',
-          'account/info/edit',
-          'user/' . $user->uid . '/edit',
-          'user/' . $user->uid . '/recoveremail/*',
-          'recover_email.php',
+            'user/termsofuse',
+            'logout',
+            'account/info/edit',
+            'user/' . $user->uid . '/edit',
+            'user/' . $user->uid . '/recoveremail/*',
+            'recover_email.php',
         );
         if (module_exists('boincuser_delete')) {
-          $paths0[] = 'user/' . $user->uid . '/delete';
-          $paths0[] = 'user/' . $user->uid . '/deleteconfirm/*';
-          $paths0[] = 'user/' . $user->uid . '/odeleteconfirm/*';
+            $paths0[] = 'user/' . $user->uid . '/delete';
+            $paths0[] = 'user/' . $user->uid . '/deleteconfirm/*';
+            $paths0[] = 'user/' . $user->uid . '/odeleteconfirm/*';
         }
 
         // Paths added by the admin
         $paths1 = preg_split('/\r\n|\r|\n/', variable_get('boinc_weboptions_pathstoignore', "moderation\ncontent/moderation\nprivacy"));
         $paths2 = array();
         if (is_array($paths1)) {
-          $paths2 = array_map('strtolower', $paths1);
+            $paths2 = array_map('strtolower', $paths1);
         }
 
         // paths to ignore
         $paths_to_ignore = array_unique( array_merge($paths0, $paths2) );
 
         if (!_boincuser_ignore_paths($path, $paths_to_ignore)) {
-          drupal_goto('user/termsofuse');
+            drupal_goto('user/termsofuse');
+        }
         }
-      }
     }
-  }
+    }
 }
 
 /**
@@ -297,13 +297,13 @@ 
  * Drupal user operations
  */
 function boincuser_user($op, &$edit, &$account, $category = NULL) {
-  require_boinc('boinc_db');
-  require_boinc('user');
-  require_boinc('xml');
+    require_boinc('boinc_db');
+    require_boinc('user');
+    require_boinc('xml');
 
-  require_boinc('password_compat/password');
-  // Handle BOINC integration for users with UID > 1 (skip anonymous and admin)
-  if (isset($account->uid) && ($account->uid > 1)) {
+    require_boinc('password_compat/password');
+    // Handle BOINC integration for users with UID > 1 (skip anonymous and admin)
+    if (isset($account->uid) && ($account->uid > 1)) {
     switch($op) {
     case 'load':
       // User loading; insert BOINC data into the user object
@@ -311,11 +311,11 @@ 
         SELECT boinc_id, penalty_expiration
         FROM {boincuser} WHERE uid = %d",
         $account->uid
-      ));
-      $account->boincuser_id = $drupal_user->boinc_id;
-      $account->boincuser_penalty_expiration = $drupal_user->penalty_expiration;
-      db_set_active('boinc_rw');
-      $boinc_user = db_fetch_object(db_query("
+        ));
+        $account->boincuser_id = $drupal_user->boinc_id;
+        $account->boincuser_penalty_expiration = $drupal_user->penalty_expiration;
+        db_set_active('boinc_rw');
+        $boinc_user = db_fetch_object(db_query("
         SELECT
           name,
           authenticator,
@@ -331,29 +331,29 @@ 
         FROM {user}
         WHERE id = %d",
         $account->boincuser_id
-      ));
-      $account->boincuser_name = $boinc_user->name;
-      $account->boincuser_account_key = $boinc_user->authenticator;
-      $account->boincuser_weak_auth = md5($boinc_user->authenticator . $boinc_user->passwd_hash);
-      $account->boincuser_total_credit = round($boinc_user->total_credit);
-      $account->boincuser_expavg_credit = round($boinc_user->expavg_credit);
-      $account->boincuser_expavg_time = round($boinc_user->expavg_time);
-      $account->boincuser_cpid = md5($boinc_user->cross_project_id . $account->mail);
-      $account->boincuser_default_pref_set = $boinc_user->venue;
-      $account->boincteam_id = $boinc_user->teamid;
-      $account->boincuser_previous_email_addr = $boinc_user->previous_email_addr;
-      $account->boincuser_email_addr_change_time = $boinc_user->email_addr_change_time;
-      db_set_active('default');
-      // Set Drupal team ID
-      $account->team = NULL;
-      if ($account->boincteam_id) {
+        ));
+        $account->boincuser_name = $boinc_user->name;
+        $account->boincuser_account_key = $boinc_user->authenticator;
+        $account->boincuser_weak_auth = md5($boinc_user->authenticator . $boinc_user->passwd_hash);
+        $account->boincuser_total_credit = round($boinc_user->total_credit);
+        $account->boincuser_expavg_credit = round($boinc_user->expavg_credit);
+        $account->boincuser_expavg_time = round($boinc_user->expavg_time);
+        $account->boincuser_cpid = md5($boinc_user->cross_project_id . $account->mail);
+        $account->boincuser_default_pref_set = $boinc_user->venue;
+        $account->boincteam_id = $boinc_user->teamid;
+        $account->boincuser_previous_email_addr = $boinc_user->previous_email_addr;
+        $account->boincuser_email_addr_change_time = $boinc_user->email_addr_change_time;
+        db_set_active('default');
+        // Set Drupal team ID
+        $account->team = NULL;
+        if ($account->boincteam_id) {
         $account->team = db_result(db_query("
           SELECT nid FROM {boincteam} WHERE team_id = %d",
-          $account->boincteam_id
+            $account->boincteam_id
         ));
-      }
-      // Set post count
-      $account->post_count = db_result(db_query("
+        }
+        // Set post count
+        $account->post_count = db_result(db_query("
         SELECT COUNT(*) +
         (
           SELECT COUNT(*) FROM {node}
@@ -366,8 +366,8 @@ 
         WHERE comments.uid = '%d'
         AND node.status = 1",
         $account->uid, $account->uid
-      ));
-      break;
+        ));
+        break;
       
     case 'view':
       // SAMPLE: Add BOINC data to the user profile
@@ -393,74 +393,74 @@ 
         case 'user_account':
           // Validate data before updating user account info
           boincuser_account_validate($edit, $account);
-          break;
+            break;
         
         default:
           
         }
         // We don't want to save validation source, so remove it
         $edit['validation_source'] = null;
-      }
-      break;
+        }
+        break;
       
     case 'insert':
       // New user being added to the system
       $imported = $_SESSION['importedUser'];
-      unset($_SESSION['importedUser']);
+        unset($_SESSION['importedUser']);
       
-      watchdog(
+        watchdog(
         'boincuser',
         'Creating user account for %email_addr',
         array('%email_addr' => $edit['mail']),
         WATCHDOG_NOTICE
-      );
+        );
       
-      // The create_acount RPC will call this block of code when
-      // user_save() is used. If user is registering using the Web
-      // registration form, create a BOINC user and relationships.
-      // Create a BOINC account unless importing from BOINC.
-      if (!$imported) {
+        // The create_acount RPC will call this block of code when
+        // user_save() is used. If user is registering using the Web
+        // registration form, create a BOINC user and relationships.
+        // Create a BOINC account unless importing from BOINC.
+        if (!$imported) {
 
         // set email address lower-case
         $lower_email_addr = strtolower($edit['mail']);
 
         if ($edit['boincuser_name']) {
-          $myname = $edit['boincuser_name'];
+            $myname = $edit['boincuser_name'];
         }
         else if ($edit['name']) {
-          $myname = $edit['name'];
+            $myname = $edit['name'];
         }
         else {
-          $myname = 'noname';
+            $myname = 'noname';
         }
 
         $user_params = array(
-          'email_addr' => $lower_email_addr,
-          'name' => $myname,
+            'email_addr' => $lower_email_addr,
+            'name' => $myname,
         );
 
         // If the 'pass' variable is already a hash, then don't hash it again.
         if ($edit['boinchash_flag']) {
-          $user_params['passwd_hash'] = $edit['pass'];
+            $user_params['passwd_hash'] = $edit['pass'];
         }
         else {
-          // The passwd_hash here is only the md5() hash. This is
-          // because BOINC make_user(), called later, will run
-          // password_hash() on this md5 hash.
-          $user_params['passwd_hash'] = md5($edit['pass'].$lower_email_addr);
+            // The passwd_hash here is only the md5() hash. This is
+            // because BOINC make_user(), called later, will run
+            // password_hash() on this md5 hash.
+            $user_params['passwd_hash'] = md5($edit['pass'].$lower_email_addr);
         }
 
         $boinc_user = boincuser_register_make_user($user_params);
         if (!$boinc_user) {
-          // Account exists with this email addr
-          form_set_error('email', bts('Error creating BOINC account.', array(), NULL, 'boinc:add-new-user'));
-          return;
+            // Account exists with this email addr
+            form_set_error('email', bts('Error creating BOINC account.', array(), NULL, 'boinc:add-new-user'));
+            return;
         }
 
         // Add user to community role by default (not banned)
         $unrestricted_role = array_search('community member', user_roles(true)); 
         $edit['roles'] = array(
-          $unrestricted_role => ''
+            $unrestricted_role => ''
         );
 
         // Disable show_hosts flag, set to TRUE by default
@@ -471,14 +471,14 @@ 
         // Cross reference Drupal account with BOINC
         $reference = db_query("INSERT INTO {boincuser} SET uid='%d', boinc_id='%d'", $account->uid, $boinc_user->id);
         if (!$reference) {
-          drupal_set_message(t('Error connecting BOINC account.'), 'error');
-          return;
+            drupal_set_message(t('Error connecting BOINC account.'), 'error');
+            return;
         }
 
         // if terms of use exist, the user must agree.
         $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
         if (!empty($termsofuse)) {
-          $reference2 = boincuser_consentto_termsofuse($account);
+            $reference2 = boincuser_consentto_termsofuse($account);
         }
 
         // Don't save custom fields to the Drupal user object
@@ -486,10 +486,10 @@ 
         $edit['boinchash_flag'] = null;
         // Set email address to lower case in Drupal users table
         if ($account) {
-          user_save($account, array('mail' => $lower_email_addr));
+            user_save($account, array('mail' => $lower_email_addr));
         }
-      }
-      break;
+        }
+        break;
       
     case 'update':
       if (isset($edit['update_source'])) {
@@ -500,8 +500,8 @@ 
           // Ensure that BOINC data is altered
 
           $changing_email = ($edit['mail'] AND $edit['mail'] != $boinc_user->email_addr) ? true : false;
-          $changing_pass = ($edit['pass']) ? true : false;
-          if ($changing_email OR $changing_pass) {
+            $changing_pass = ($edit['pass']) ? true : false;
+            if ($changing_email OR $changing_pass) {
             // set email address to lower-case
             $lower_email_addr = strtolower($edit['mail']);
 
@@ -510,70 +510,70 @@ 
             $passwd_hash = password_hash( md5($passwd.$lower_email_addr), PASSWORD_DEFAULT );
             // Algorithm for changing email and/or password
             if ($changing_email) {
-              // locally store current email to set as previous email
-              $prev_email = $account->mail;
-              $mytime = (user_access('administer users')) ? $boinc_user->email_addr_change_time : time();
-              $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}', previous_email_addr = '{$prev_email}', email_addr_change_time = $mytime";
+                // locally store current email to set as previous email
+                $prev_email = $account->mail;
+                $mytime = (user_access('administer users')) ? $boinc_user->email_addr_change_time : time();
+                $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}', previous_email_addr = '{$prev_email}', email_addr_change_time = $mytime";
             }
             else {
-              $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}'";
+                $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}'";
             }
 
             // Update user account information
             $result = $boinc_user->update($querypart);
 
             if ($changing_email) {
-              // reload account
-              $account = user_load($account->uid);
-              _boincuser_send_emailchange($account, $lower_email_addr, $prev_email, user_access('administer users'));
+                // reload account
+                $account = user_load($account->uid);
+                _boincuser_send_emailchange($account, $lower_email_addr, $prev_email, user_access('administer users'));
             }
 
             // Change email to edit to lower-case version, this sets
             // email in Drupal database to the lower-case email
             // address.
             $edit['mail'] = strtolower($lower_email_addr);
-          }
+            }
 
-          // Change boinc username
-          if ($edit['boincuser_name'] and ($edit['boincuser_name'] != $boinc_user->name)) {
+            // Change boinc username
+            if ($edit['boincuser_name'] and ($edit['boincuser_name'] != $boinc_user->name)) {
             $boincuser_name = $edit['boincuser_name'];
             $result = $boinc_user->update(
                 "name='{$boincuser_name}'"
             );
-          }
+            }
 
-          break;
+            break;
         case 'user_profile':
           if ($edit['boincuser_name'] != $boinc_user->name) {
             $boincuser_name = $edit['boincuser_name'];
             $result = $boinc_user->update(
                 "name='{$boincuser_name}'"
             );
-          }
-          break;
+            }
+            break;
         default:
         }
         // We don't want to save update source or duplicate custom fields, so
         // remove them before continuing to core Drupal routines
         $edit['update_source'] = null;
         $edit['boincuser_name'] = null;
-      }
-      break;
+        }
+        break;
 
     case 'login':
       // Function is forward compatible to Drupal 7
       boincuser_user_login($edit, $account);
-      break;
+        break;
 
     case 'delete':
       // Function is forward compatible to Drupal 7
       boincuser_user_delete($account);
-      break;
+        break;
 
     default:
       
     }
-  }
+    }
 }
 
 /**
@@ -582,39 +582,39 @@ 
  *(forward compatible to Drupal 7).
  */
 function boincuser_user_login(&$edit, $account) {
-  $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
-  $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-
-  // Use the same code as boincuser_form_alter(), for case
-  // 'user_profile_form', if the refering page is the user password
-  // reset form, then do not check for terms of use.
-  $reset_pass = (strpos($_SERVER['HTTP_REFERER'], "/user/reset/$account->uid") === FALSE) ? 0 : 1;
-  if ($reset_pass) {
+    $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
+    $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
+
+    // Use the same code as boincuser_form_alter(), for case
+    // 'user_profile_form', if the refering page is the user password
+    // reset form, then do not check for terms of use.
+    $reset_pass = (strpos($_SERVER['HTTP_REFERER'], "/user/reset/$account->uid") === FALSE) ? 0 : 1;
+    if ($reset_pass) {
     return;
-  }
+    }
 
-  // Check if user has agreed to terms of use.
-  if ( (!empty($termsofuse)) and ($account->uid) and 
+    // Check if user has agreed to terms of use.
+    if ( (!empty($termsofuse)) and ($account->uid) and 
        (!boincuser_check_termsofuse($account)) and ($existinguser_tou) ) {
 
     // Admins are exempted.
     $administrator_role = array_search('administrator', user_roles(true));
     if (!isset($account->roles[$administrator_role])) {
 
-      // Find and save the current destination and use as an parameter
-      // to send the user back to here he/she came from.
-      $np = ltrim('user/termsofuse', '/');
-      $path_for_destination = rawurlencode($np);
+        // Find and save the current destination and use as an parameter
+        // to send the user back to here he/she came from.
+        $np = ltrim('user/termsofuse', '/');
+        $path_for_destination = rawurlencode($np);
 
-      $query_for_destination = '';
-      $prevdest = $_REQUEST['destination'];
-      if ($prevdest) {
+        $query_for_destination = '';
+        $prevdest = $_REQUEST['destination'];
+        if ($prevdest) {
         $query_for_destination = '?destination=' . $prevdest;
-      }
-      $_REQUEST['destination'] = $path_for_destination . $query_for_destination;
+        }
+        $_REQUEST['destination'] = $path_for_destination . $query_for_destination;
 
     }
-  }
+    }
 }
 
 /**
@@ -623,16 +623,16 @@ 
  */
 function boincuser_user_delete($account) {
 
-  $boincid = $account->boincuser_id;
-  // bug in comment module, remove user name from comments. Find all
-  // comments with uid=0 and clear the field 'name'.
-  $qrc1 = db_query("UPDATE {comments} SET comments.name='' WHERE comments.uid=0");
+    $boincid = $account->boincuser_id;
+    // bug in comment module, remove user name from comments. Find all
+    // comments with uid=0 and clear the field 'name'.
+    $qrc1 = db_query("UPDATE {comments} SET comments.name='' WHERE comments.uid=0");
 
-  // Delete entry in drupal boincuser table.
-  $qrc2 = db_query("DELETE FROM {boincuser} WHERE uid=%d", $account->uid);
-  if (!$qrc2) {
+    // Delete entry in drupal boincuser table.
+    $qrc2 = db_query("DELETE FROM {boincuser} WHERE uid=%d", $account->uid);
+    if (!$qrc2) {
     watchdog('user', 'Error deleting user account, boincuser table UID: %uid.', array('%uid' => $account->uid), WATCHDOG_ERROR);
-  }
+    }
 }
 
 
@@ -641,13 +641,13 @@ 
  * Obsolete in Drupal 7...
  */
 function boincuser_nodeapi(&$node, $op, $a3 = null, $a4 = null) {
-  // In Drupal 7, these operation cases will all exist as their own hooks,
-  // so let's approximate that here so that this function can simply be removed
-  // upon migration to 7
-  switch($op) {
-  case 'update':
+    // In Drupal 7, these operation cases will all exist as their own hooks,
+    // so let's approximate that here so that this function can simply be removed
+    // upon migration to 7
+    switch($op) {
+    case 'update':
     boincuser_node_update($node);
-  }
+    }
 }
 
 /**
@@ -655,8 +655,8 @@ 
  * is updated (forward compatible to Drupal 7)
  */
 function boincuser_node_update($node) {
-  switch($node->type) {
-  case 'profile':
+    switch($node->type) {
+    case 'profile':
     // Update the BOINC database directly
     $account = user_load($node->uid);
     // Save user account data
@@ -668,11 +668,11 @@ 
       UPDATE user
       SET country = '%s', postal_code = '%s', url = '%s', has_profile = 1
       WHERE id = %d",
-      $country, $postal_code, $url, $account->boincuser_id
+        $country, $postal_code, $url, $account->boincuser_id
     );
     db_set_active('default');
     if (!$account_updated) {
-      drupal_set_message(t('Error saving BOINC account info.'), 'error');
+        drupal_set_message(t('Error saving BOINC account info.'), 'error');
     }
     // Save profile data
     $response1 = $node->field_background[0]['value'];
@@ -683,16 +683,16 @@ 
       SET userid = %d, response1 = '%s', response2 = '%s'
       ON DUPLICATE KEY UPDATE
         response1 = '%s', response2 = '%s'",
-      $account->boincuser_id, $response1, $response2,
-      $response1, $response2
+        $account->boincuser_id, $response1, $response2,
+        $response1, $response2
     );
     db_set_active('default');
     if (!$profile_updated) {
-      drupal_set_message(t('Error saving BOINC profile.'), 'error');
+        drupal_set_message(t('Error saving BOINC profile.'), 'error');
     }
     break;
     
-  default:
+    default:
     
   }
 }
@@ -701,21 +701,21 @@ 
 * Implementation of hook_views_api()
 */
 function boincuser_views_api() {
-  return array(
+    return array(
     'api' => 2.0,
     'path' => drupal_get_path('module', 'boincuser')
-  );
+    );
 }
 
 /**
 * Implementation of hook_form_alter()
 */
 function boincuser_form_alter(&$form, $form_state, $form_id) {
-  require_boinc('token');
+    require_boinc('token');
 
-  global $user;
-  switch ($form_id) {
-  case 'flag_confirm':
+    global $user;
+    switch ($form_id) {
+    case 'flag_confirm':
     // The URL seems to be the only way to put any kind of context to this
     // request!
     $action = arg(2);
@@ -724,25 +724,25 @@ 
     
     // Wrap action buttons for styling consistency
     $form['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     
     switch ($flag_type) {
     case 'friend':
       $friend_id = $form['content_id']['#value'];
-      $flag = flag_get_flag('friend');
-      $friend_status = flag_friend_determine_friend_status($flag, $friend_id, $user->uid);
+        $flag = flag_get_flag('friend');
+        $friend_status = flag_friend_determine_friend_status($flag, $friend_id, $user->uid);
       
-      // General friend form overrides
-      $form['flag_friend_submit']['#prefix'] = '<li class="first tab">';
-      $form['flag_friend_submit']['#value'] = bts('Send request', array(), NULL, 'boinc:friends-page');
-      $form['flag_friend_submit']['#type'] = 'submit';
-      $form['flag_friend_submit']['#suffix'] = '</li>';
-      $form['flag_friend_submit']['#weight'] = 1002;
+        // General friend form overrides
+        $form['flag_friend_submit']['#prefix'] = '<li class="first tab">';
+        $form['flag_friend_submit']['#value'] = bts('Send request', array(), NULL, 'boinc:friends-page');
+        $form['flag_friend_submit']['#type'] = 'submit';
+        $form['flag_friend_submit']['#suffix'] = '</li>';
+        $form['flag_friend_submit']['#weight'] = 1002;
       
-      switch ($friend_status) {
-      case FLAG_FRIEND_BOTH:
+        switch ($friend_status) {
+        case FLAG_FRIEND_BOTH:
       case FLAG_FRIEND_FLAGGED:
         unset($form['actions']);
         $form['flag_friend_submit']['#value'] = bts('Remove friend', array(), NULL, 'boinc:friends-remove');
@@ -751,53 +751,53 @@ 
         $form['#submit'][] = 'boincuser_fix_unfriend_form_submit';
         $form['#submit'][] = $final_handler;
         break;
-      case FLAG_FRIEND_PENDING:
+        case FLAG_FRIEND_PENDING:
         unset($form['actions']);
         $form['flag_friend_submit']['#value'] = bts('Remove request', array(), NULL, 'boinc:friends-page');
         break;
-      case FLAG_FRIEND_APPROVAL:
+        case FLAG_FRIEND_APPROVAL:
         if ($action == 'flag') {
-          $form['flag_friend_submit']['#value'] = bts('Approve request', array(), NULL, 'boinc:friends-page');
+            $form['flag_friend_submit']['#value'] = bts('Approve request', array(), NULL, 'boinc:friends-page');
         }
         elseif ($action == 'unflag') {
-          unset($form['actions']);
-          $form['flag_friend_submit']['#value'] = bts('Deny request', array(), NULL, 'boinc:friends-page');
+            unset($form['actions']);
+            $form['flag_friend_submit']['#value'] = bts('Deny request', array(), NULL, 'boinc:friends-page');
         }
         break;
-      case FLAG_FRIEND_UNFLAGGED:
+        case FLAG_FRIEND_UNFLAGGED:
       default:
         $user_links[] = array(
-          'title' => bts('Add as friend', array(), NULL, 'boinc:friends-add'),
-          'href' => "flag/confirm/flag/friend/{$account->uid}"
+            'title' => bts('Add as friend', array(), NULL, 'boinc:friends-add'),
+            'href' => "flag/confirm/flag/friend/{$account->uid}"
         );
-      }
-      break;
+        }
+        break;
       
     default:
     }
     
     $form['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_dest) . '</li>',
-      '#weight' => 1004,
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_dest) . '</li>',
+        '#weight' => 1004,
     );
     $form['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
     
     break;
     
-  // General node edit form
-  case 'news_node_form':
+    // General node edit form
+    case 'news_node_form':
     $form['separator_bottom'] = array(
-      '#value' => '<div class="separator buttons"></div>',
-      '#weight' => 999,
+        '#value' => '<div class="separator buttons"></div>',
+        '#weight' => 999,
     );
     
     // Wrap action buttons for styling consistency
     $form['buttons']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
     $form['buttons']['submit']['#value'] = bts('Save changes', array(), NULL, 'boinc:form-save');
@@ -810,15 +810,15 @@ 
     $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'), "node/{$form['nid']['#value']}") . '</li>',
-      '#weight' => 1005,
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
+        '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
     $form['buttons']['delete']['#suffix'] = '</li>';
     $form['buttons']['delete']['#weight'] = 1006;
     $form['buttons']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
     
     // Preview is ugly, unset until it works
@@ -826,16 +826,16 @@ 
 
     break;
   
-  case 'node_delete_confirm':
+    case 'node_delete_confirm':
     $form['separator_bottom'] = array(
-      '#value' => '<div class="separator buttons"></div>',
-      '#weight' => 999,
+        '#value' => '<div class="separator buttons"></div>',
+        '#weight' => 999,
     );
     
     // Wrap action buttons for styling consistency
     $form['actions']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['actions']['submit']['#prefix'] = '<li class="first tab">';
     $form['actions']['submit']['#value'] = bts('Delete', array(), NULL, 'boinc:form-delete');
@@ -843,23 +843,23 @@ 
     $form['actions']['submit']['#weight'] = 1002;
     $form['actions']['cancel'] = array(
         '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
-      '#weight' => 1005,
+        '#weight' => 1005,
     );
     $form['actions']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
     $form['#redirect'] = 'account/profile';
     break;
     
-  case 'privatemsg_new':
+    case 'privatemsg_new':
     
     $form['privatemsg']['body']['#title'] = '';
     
     // Wrap action buttons for styling consistency
     $form['privatemsg']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['privatemsg']['submit']['#prefix'] = '<li class="first tab">';
     $form['privatemsg']['submit']['#value'] = bts('Send message', array(), NULL, 'boinc:private-message');
@@ -869,26 +869,26 @@ 
     $form['privatemsg']['preview']['#suffix'] = '</li>';
     $form['privatemsg']['preview']['#weight'] = 1003;
     $form['privatemsg']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
-      '#weight' => 1004,
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+        '#weight' => 1004,
     );
     $form['privatemsg']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
     
     unset($form['privatemsg']['recipient_display']);
     
     break;
     
-  // Login form
-  case 'user_login':
+    // Login form
+    case 'user_login':
   case 'user_login_block':
       drupal_set_title(bts('Login', array(), NULL, 'boinc:menu-link'));
     // Replace name with email in login form
     unset($form['name']);
     array_unshift($form, array(
-      'email' => array(
+        'email' => array(
         '#type' => 'textfield',
         '#title' => bts('Email address', array(), NULL, 'boinc:email-address-to-login'),
         '#size' => ($form_id == 'user_login_block') ? 15 : 60,
@@ -896,18 +896,18 @@ 
         '#required' => TRUE,
         '#attributes' => array('tabindex' => '1'),
         '#description' => bts('Enter your @s email address.', array('@s' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:standard-login-page')
-      ),
-      'validation_source' => array(
+        ),
+        'validation_source' => array(
         '#type' => 'hidden',
         '#value' => 'user_login'
-      )
+        )
     ));
     $form['#redirect'] = 'home';
     
     // Wrap action buttons for styling consistency
     $form['buttons']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['buttons']['submit'] = $form['submit'];
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
@@ -915,8 +915,8 @@ 
     $form['buttons']['submit']['#suffix'] = '</li>';
     $form['buttons']['submit']['#weight'] = 1002;
     $form['buttons']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
     unset($form['submit']);
     
@@ -925,23 +925,23 @@ 
     isset($form['buttons']['submit']['#attributes']) ? array_push($form['buttons']['submit']['#attributes'], array('tabindex' => '3')) : $form['buttons']['submit']['#attributes'] = array('tabindex' => '3');
     // If the user login form is being submitted, use BOINC validation handler.
     if (isset($form_state['post']['email']) and isset($form_state['post']['pass'])) {
-      // Find the local validation function's entry so we can replace it.
-      $array_key = array_search('user_login_authenticate_validate', $form['#validate']);
-      if ($array_key === FALSE) {
+        // Find the local validation function's entry so we can replace it.
+        $array_key = array_search('user_login_authenticate_validate', $form['#validate']);
+        if ($array_key === FALSE) {
         // Could not find it. Some other module must have run form_alter().
         // We will simply add our validation just before the final validator.
         $final_validator = array_pop($form['#validate']);
         $form['#validate'][] = 'boincuser_login_validate';
         $form['#validate'][] = $final_validator;
-      } else {
+        } else {
         // Replace the local validation function with BOINC validation
         $form['#validate'][$array_key] = 'boincuser_login_validate';
-      }
+        }
     }
     break;
     
-  // User credentials form
-  case 'user_profile_form':
+    // User credentials form
+    case 'user_profile_form':
 
     // Use the displaly name as the title, not the username
     $account = user_load($form['#uid']);
@@ -949,28 +949,28 @@ 
     
     // Message for admins
     if (user_access('administer users')) {
-      drupal_set_message(
+        drupal_set_message(
         bts('WARNING: You are editing the information for user. Please note: you may change a user\'s password by itself. But to change the user\'s email address you must change both the email address and the password simultaneously.')
-      , 'warning');
+        , 'warning');
     }
 
     // Set special message if user has not agreed to TOU
     $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
     $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
     if ( (!boincuser_check_termsofuse($account)) and ($existinguser_tou) and (!empty($termsofuse)) and (!user_access('administer users')) ) {
-      drupal_set_message(
+        drupal_set_message(
         bts('INFO: You have not agreed to the terms of use for @project. You may use this form to change your email address and/or password. Please note: you may not delete your account within seven (7) days of changing your email address.',
         array(
-          '@project' => variable_get('site_name','Drupal-BOINC'),
+            '@project' => variable_get('site_name','Drupal-BOINC'),
         ), NULL, 'boinc:account-credentials-change')
-      , 'info');
+        , 'info');
     }
 
     // A bit hackish... but don't require the user to enter his password if
     // coming from the password reset function
     $reset_pass = (strpos($_SERVER['HTTP_REFERER'], "/user/reset/{$form['#uid']}") === FALSE) ? 0 : 1;
     if ($reset_pass) {
-      $_SESSION['reset_pass'] = 1;
+        $_SESSION['reset_pass'] = 1;
     }
 
     // Adjust form elements already present
@@ -982,8 +982,8 @@ 
     $form['account']['pass']['#size'] = 17;
 
     if (user_access('administer users')) {
-      // Add BOINC username (aka displayname)
-      $form['account']['boincuser_name'] = array(
+        // Add BOINC username (aka displayname)
+        $form['account']['boincuser_name'] = array(
         '#type' => 'textfield',
         '#title' => bts('BOINC Username', array(), NULL, 'boinc:user-or-team-name'),
         '#default_value' => $account->boincuser_name,
@@ -991,68 +991,68 @@ 
         '#required' => TRUE,
         '#description' => bts('This is the BOINC (external) username. This is the same setting as found in Account -> Preferences -> Community.', array(), NULL, 'boinc:username-change'),
         '#size' => 40,
-      );
+        );
     }
 
     // If email address was changed less than 7 days (7 * 86400 s)
     // ago, it cannot be changed again.
     $duration = TOKEN_DURATION_ONE_WEEK;
     if (($account->boincuser_email_addr_change_time + $duration) > time() and (!user_access('administer users'))) {
-      $form['account']['mail']['#required'] = FALSE;
-      $form['account']['mailhelp'] = array(
+        $form['account']['mail']['#required'] = FALSE;
+        $form['account']['mailhelp'] = array(
         '#value' => bts("You email address was changed within the past seven (7) days. Please look for an email to !prev_email if you need to revert this change. You may change your email address on !time.",
-          array(
+            array(
             '!prev_email' => $account->boincuser_previous_email_addr,
             '!time' => date('F j, Y \a\t G:i T', $account->boincuser_email_addr_change_time + $duration),
-          ), NULL, 'boinc:account-credentials-change'),
-      );
+            ), NULL, 'boinc:account-credentials-change'),
+        );
     }
 
     if (!$reset_pass AND ($user->uid == $account->uid OR !user_access('administer users'))) {
-      // Add a password authenticator, required to change email or pw
-      $form['account']['current_pass'] = array(
+        // Add a password authenticator, required to change email or pw
+        $form['account']['current_pass'] = array(
         '#type' => 'password',
         '#title' => bts('Enter your password to save changes', array(), NULL, 'boinc:account-credentials-change'),
         '#description' => bts('Enter your current password if changing your email
           address or password.', array(), NULL, 'boinc:account-credentials-change'),
         '#size' => 17,
         '#attributes' => array(
-          'autocomplete' => 'off',
+            'autocomplete' => 'off',
         ),
-      );
+        );
     }
     
     // Add account keys, CPID, etc
     $form['account']['boincuser_id'] = array(
-      '#value' => '
+        '#value' => '
         <div class="form-item">
           <label>' . bts('BOINC user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->boincuser_id . '</span>
         </div>',
     );
     $form['account']['user_id'] = array(
-      '#value' => '
+        '#value' => '
         <div class="form-item">
           <label>' . bts('Drupal user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->uid . '</span>
         </div>',
     );
     $form['account']['account_key'] = array(
-      '#value' => '
+        '#value' => '
         <div class="form-item">
           <label>' . bts('Account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->boincuser_account_key . '</span>
         </div>',
     );
     $form['account']['weak_account_key'] = array(
-      '#value' => '
+        '#value' => '
         <div class="form-item">
           <label>' . bts('Weak account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
           <span>' . "{$account->boincuser_id}_{$account->boincuser_weak_auth}" . '</span>
         </div>',
     );
     $form['account']['cpid'] = array(
-      '#value' => '
+        '#value' => '
         <div class="form-item">
           <label>' . bts('Cross-project ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->boincuser_cpid . '</span>
@@ -1060,30 +1060,30 @@ 
     );
     
     $form['account']['separator_bottom'] = array(
-      '#value' => '<div class="separator buttons"></div>'
+        '#value' => '<div class="separator buttons"></div>'
     );
     
     // Wrap action buttons for styling consistency
     $form['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['submit']['#prefix'] = '<li class="first tab">';
     $form['submit']['#value'] = bts('Save changes', array(), NULL, 'boinc:form-save');
     $form['submit']['#suffix'] = '</li>';
     $form['submit']['#weight'] = 1002;
     $form['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
-      '#weight' => 1003,
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+        '#weight' => 1003,
     );
     if (isset($form['delete']) AND is_array($form['delete'])) {
-      $form['delete']['#prefix'] = '<li class="first alt tab">';
-      $form['delete']['#suffix'] = '</li>';
-      $form['delete']['#weight'] = 1004;
+        $form['delete']['#prefix'] = '<li class="first alt tab">';
+        $form['delete']['#suffix'] = '</li>';
+        $form['delete']['#weight'] = 1004;
     }
     $form['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
     
     // Rearrange form elements
@@ -1103,7 +1103,7 @@ 
     // Remove redundant / unnecessary form elements
     unset($form['theme_select']);
     if (!module_exists('boincuser_delete')) {
-      unset($form['delete']);
+        unset($form['delete']);
     }
     
     // These are on the Community preferences form (boincwork module)
@@ -1119,18 +1119,18 @@ 
     
     // Internal fields to indicate where these user changes are taking place
     array_unshift($form, array(
-      'validation_source' => array(
+        'validation_source' => array(
         '#type' => 'hidden',
         '#value' => 'user_account'
-      ),
-      'update_source' => array(
+        ),
+        'update_source' => array(
         '#type' => 'hidden',
         '#value' => 'user_account'
-      )
+        )
     ));
     break;
     
-  case 'profile_node_form':
+    case 'profile_node_form':
     
     // Use the display name as the title, not the username
     $account = user_load($form['uid']['#value']);
@@ -1141,22 +1141,22 @@ 
     $form['title']['#access'] = FALSE;
 
     $form['separator_bottom'] = array(
-      '#value' => '<div class="separator buttons"></div>',
-      '#weight' => 999,
+        '#value' => '<div class="separator buttons"></div>',
+        '#weight' => 999,
     );
     
     if (module_exists('captcha')) {
-      // Add an optional captcha
-      $form['profile_captcha'] = array(
+        // Add an optional captcha
+        $form['profile_captcha'] = array(
         '#type' => 'captcha',
         '#weight' => 1000,
-      );
+        );
     }
     
     // Wrap action buttons for styling consistency
     $form['buttons']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
     $form['buttons']['submit']['#value'] = bts('Save changes', array(), NULL, 'boinc:form-save');
@@ -1169,8 +1169,8 @@ 
     $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'), $_GET['q']) . '</li>',
-      '#weight' => 1005,
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+        '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
     $form['buttons']['delete']['#suffix'] = '</li>';
@@ -1178,8 +1178,8 @@ 
     $form['buttons']['delete']['#weight'] = 1006;
     $form['buttons']['delete']['#submit'] = array('_boincuser_node_profile_delete_submit');
     $form['buttons']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
     
     $form['#after_build'][] = 'boincuser_profile_node_form_after_build';
@@ -1192,33 +1192,33 @@ 
     
     // Internal fields to indicate where these user changes are taking place
     array_unshift($form, array(
-      'validation_source' => array(
+        'validation_source' => array(
         '#type' => 'hidden',
         '#value' => 'user_profile'
-      ),
-      'update_source' => array(
+        ),
+        'update_source' => array(
         '#type' => 'hidden',
         '#value' => 'user_profile'
-      )
+        )
     ));
     break;
   
-  // Registration form
-  case 'user_register':
+    // Registration form
+    case 'user_register':
     array_unshift($form, array(
-      'boincuser_name' => array(
+        'boincuser_name' => array(
         '#type' => 'textfield', 
         '#title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'), 
         '#default_value' => $edit['boincuser_name'], 
         '#maxlength' => USERNAME_MAX_LENGTH, 
         '#description' => bts('Spaces are allowed; punctuation is not allowed except for periods, hyphens, and underscores.', array(), NULL, 'boinc:user-register'), 
         '#required' => TRUE
-      ),
+        ),
     ));
     // Set name temporarily to dummy value to beat validation
     $form['name'] = array(
-      '#type' => 'hidden',
-      '#value' => rand() . '.' . time()
+        '#type' => 'hidden',
+        '#value' => rand() . '.' . time()
     );
 
     // Add JS for submit button disabling
@@ -1228,50 +1228,50 @@ 
     $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
     if (!empty($termsofuse)) {
 
-      $form['termsofuse'] = array(
+        $form['termsofuse'] = array(
         '#type'   => 'fieldset',
         '#prefix' => '<div id="termsofuse-wrapper">', // This is our wrapper div.
         '#suffix' => '</div>',
         '#tree'   => TRUE,
         '#weight' => -15,
-      );
+        );
 
-      $form['termsofuse']['title1'] = array(
+        $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:user-register' ) . '</h2>',
         '#prefix' => '<div id="register-title1">',
         '#suffix' => '</div>',
-      );
+        );
 
-      $form['termsofuse']['body'] = array(
+        $form['termsofuse']['body'] = array(
         '#weight' => -10,
         '#value' => bts($termsofuse, array(), NULL, 'project:user-register'),
         '#prefix' => '<div id="register-termsofuse">',
         '#suffix' => '</div>',
-      );
+        );
 
-      $form['termsofuse']['agreeTOU'] = array(
+        $form['termsofuse']['agreeTOU'] = array(
         '#type' => 'checkbox',
         '#title' => bts(variable_get('boinc_weboptions_agreequestion', 'Do you agree with the above terms of use?'), array(), NULL, 'project:user-register'),
         '#weight' => -8,
         '#prefix' => '<div id="register-checkbox">',
         '#suffix' => '</div>',
-      );
+        );
     }
 
     $form['title2'] = array(
-      '#weight' => -6,
-      '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), NULL, 'project:user-register') . '</h2>',
-      '#prefix' => '<div id="register-title2">',
-      '#suffix' => '</div>',
+        '#weight' => -6,
+        '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), NULL, 'project:user-register') . '</h2>',
+        '#prefix' => '<div id="register-title2">',
+        '#suffix' => '</div>',
     );
 
     if (module_exists('captcha')) {
-      // Add an optional captcha
-      $form['register_captcha'] = array(
+        // Add an optional captcha
+        $form['register_captcha'] = array(
         '#type' => 'captcha',
         '#weight' => 1000,
-      );
+        );
     }
     
     $form['#validate'][] = 'boincuser_register_validate';
@@ -1279,45 +1279,45 @@ 
     $form['submit']['#weight'] = 1001;
     break;
     
-  // Request new password form
-  case 'user_pass':
+    // Request new password form
+    case 'user_pass':
     drupal_set_title(bts('Forgot password', array(), NULL, 'boinc:forgot-password'));
     // Replace name/email text box with email only; retain "name" label
     // for compatibility with standard Drupal submit function
     unset($form['name']);
     array_unshift($form, array(
-      'name' => array(
+        'name' => array(
         '#type' => 'textfield',
         '#title' => bts('Email address', array(), NULL, 'boinc:email-address-to-login'),
         '#size' => 60,
         '#maxlength' => EMAIL_MAX_LENGTH,
         '#required' => TRUE,
         '#description' => bts(
-          'Enter your email address to receive instructions for resetting your password (or use the !authenticator_login).',
-          array(
+            'Enter your email address to receive instructions for resetting your password (or use the !authenticator_login).',
+            array(
             '!authenticator_login' => l(
-              bts('authenticator-based login', array(), NULL, 'boinc:forgot-password'),
-              'user/login/auth'
+                bts('authenticator-based login', array(), NULL, 'boinc:forgot-password'),
+                'user/login/auth'
+            )
             )
-          )
         , NULL, 'boinc:forgot-password'),
-      ),
+        ),
     ));
     
     if (module_exists('captcha')) {
-      // Add an optional captcha
-      $form['register_captcha'] = array(
+        // Add an optional captcha
+        $form['register_captcha'] = array(
         '#type' => 'captcha',
         '#weight' => 0,
         '#prefix' => '<div id="captcha-password-reset">',
         '#suffix' => '</div>'
-      );
+        );
     }
 
     // Wrap action buttons for styling consistency
     $form['buttons']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['buttons']['submit'] = $form['submit'];
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
@@ -1325,26 +1325,26 @@ 
     $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/login') . '</li>',
-      '#weight' => 1005,
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/login') . '</li>',
+        '#weight' => 1005,
     );
     $form['buttons']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
     unset($form['submit']);
     
     // If the form is being submitted, use BOINC validation handler.
     if (isset($form_state['post']['name'])) {
-      // Prepend the BOINC validation function to local validation
-      array_unshift($form['#validate'], 'boincuser_request_pass_validate');
+        // Prepend the BOINC validation function to local validation
+        array_unshift($form['#validate'], 'boincuser_request_pass_validate');
     }
     break;
     
-  case 'views_exposed_form':
+    case 'views_exposed_form':
       $form['submit']['#value'] = bts('Search', array(), NULL, 'boinc:search-user');
     break;
-  }
+    }
 }
 
 /**
@@ -1352,10 +1352,10 @@ 
  * built; this is called from boincuser_form_alter()
  */
 function boincuser_profile_node_form_after_build($form, &$form_state) {
-  // Move to community prefs form
-  $form_state['storage']['avatar'] = $form['field_image'];
-  unset($form['field_image']);
-  return $form;
+    // Move to community prefs form
+    $form_state['storage']['avatar'] = $form['field_image'];
+    unset($form['field_image']);
+    return $form;
 }
 
 /**
@@ -1363,8 +1363,8 @@ 
  * @see http://api.drupal.org/api/drupal/developer--hooks--core.php/function/hook_elements/6
  */
 function boincuser_elements() {
-  $type['password_confirm']['#process'][] = 'boincuser_process_password_confirm';
-  return $type;
+    $type['password_confirm']['#process'][] = 'boincuser_process_password_confirm';
+    return $type;
 }
 
 /**
@@ -1372,11 +1372,11 @@ 
  * profile form
  */
 function boincuser_process_password_confirm($element) {
-  // Check if parent element is "account".
-  if ($element['#array_parents'][0] == 'account') {
+    // Check if parent element is "account".
+    if ($element['#array_parents'][0] == 'account') {
     $element['pass1']['#title'] = bts('Change password', array(), NULL, 'boinc:forgot-password');
-  }
-  return $element;
+    }
+    return $element;
 }
 
 /**
@@ -1384,42 +1384,42 @@ 
  * Register theme functions for use in this module.
  */
 function boincuser_theme($existing, $type, $theme, $path) {
-  return array(
+    return array(
     'boincuser_user_pass' => array(
-      'arguments' => array()
+        'arguments' => array()
     )
-  );
+    );
 }
 
 /**
  * Implementation of hook_token_values
  */
 function boincuser_token_values($type, $object = NULL, $options = array()) {
-  if ($type == 'user') {
+    if ($type == 'user') {
     $account = user_load($object->uid);
     $tokens['display-name'] = $account->boincuser_name;
     return $tokens;
-  }
+    }
 }
 
 /**
  * Implementation of hook_token_list
  */
 function boincuser_token_list($type = 'all') {
-  if ($type == 'user' || $type == 'all') {
+    if ($type == 'user' || $type == 'all') {
     $tokens['user']['display-name']      = t("The user's name that should be displayed");
     return $tokens;
-  }
+    }
 }
 
 /**
  * Implementation of hook_views_pre_execute()
  */
 function boincuser_views_pre_execute(&$view) {
-  if ($view->args) {
+    if ($view->args) {
     $account_id = $view->args[0];
-  }
-  if ($view->name=="user_activity") {
+    }
+    if ($view->name=="user_activity") {
     // Run the following custom query for the user_activity view
     $view->build_info['query']= "
       SELECT node_revisions.vid AS vid,
@@ -1451,25 +1451,25 @@ 
     
     // count_query determines the pager.  Do this so the right item count is returned.
     $view->build_info['count_query'] = $view->build_info['query'];
-  }
+    }
 }
 
 /**
  * Implementation of hook_cron()
  */
 function boincuser_cron() {
-  // Delete expired users in the BOINC database, user_delete table.
-  require_boinc('boinc_db');
-  $num_deleted = BoincUserDeleted::delete_expired();
-  if ($num_deleted>0) {
+    // Delete expired users in the BOINC database, user_delete table.
+    require_boinc('boinc_db');
+    $num_deleted = BoincUserDeleted::delete_expired();
+    if ($num_deleted>0) {
     watchdog('boincuser', "Deleted ${num_deleted} users from user_deleted table", WATCHDOG_NOTICE);
-  }
+    }
 
-  // Delete expired tokens from token table
-  $tokens_deleted = BoincToken::delete_expired();
-  if ($tokens_deleted>0) {
+    // Delete expired tokens from token table
+    $tokens_deleted = BoincToken::delete_expired();
+    if ($tokens_deleted>0) {
     watchdog('boincuser', "Deleted ${tokens_deleted} tokens from token table", WATCHDOG_NOTICE);
-  }
+    }
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1480,17 +1480,17 @@ 
  * Page callback shortcut to recent posts for the logged in user
  */
 function boincuser_goto_recent_posts() {
-  global $user;
-  drupal_goto("account/{$user->uid}/posts");
+    global $user;
+    drupal_goto("account/{$user->uid}/posts");
 }
 
 /**
  * Page callback shortcut to the team of the logged in user
  */
 function boincuser_goto_team() {
-  global $user;
-  $account = user_load($user->uid);
-  drupal_goto("community/teams/{$account->team}");
+    global $user;
+    $account = user_load($user->uid);
+    drupal_goto("community/teams/{$account->team}");
 }
 
 /**
@@ -1499,93 +1499,93 @@ 
  * user profile pages, so use a wrapper for display
  */
 function boincuser_view_profile($account = null) {
-  // Create the user profile page
-  if (!$account) {
+    // Create the user profile page
+    if (!$account) {
     global $user;
     $account = $user;
-  }
+    }
 
-  $min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
-  $verified_contributor = array_search('verified contributor', user_roles(true));
-  if (!isset($account->roles[$verified_contributor])) {
+    $min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
+    $verified_contributor = array_search('verified contributor', user_roles(true));
+    if (!isset($account->roles[$verified_contributor])) {
     drupal_set_message(bts(
         'You may only create or modify your user profile after earning @count credits.',
         array('@count' => $min_credit_to_post), NULL, 'boinc:view-profile'
     ), 'warning', FALSE);
-  }
+    }
 
-  // For now, just call the user module profile view function
-  user_build_content($account);
-  return theme('user_profile', $account);
+    // For now, just call the user module profile view function
+    user_build_content($account);
+    return theme('user_profile', $account);
 }
 
 /**
  * Page callback for editing a user profile
  */
 function boincuser_edit_profile($account = null) {
-  // Create the user profile form
-  if (!$account) {
+    // Create the user profile form
+    if (!$account) {
     global $user;
     $account = $user;
-  }
-  // Render the form
-  module_load_include('pages.inc', 'node', 'node');
-  return content_profile_page_edit('profile', $account);
+    }
+    // Render the form
+    module_load_include('pages.inc', 'node', 'node');
+    return content_profile_page_edit('profile', $account);
 }
 
 /**
-  * Join page menu callback.
-  * Display instructions on joining for new or existing BOINC users
-  */
+ * Join page menu callback.
+ * Display instructions on joining for new or existing BOINC users
+ */
 function join_page($type = null) {
-  global $base_url;
-  /* The paths/links to the rules-and-policies page is hardcoded
+    global $base_url;
+    /* The paths/links to the rules-and-policies page is hardcoded
    * here. An improvement would be admin settings for the Join Page
    * where this path could be set.
    */
-  $ruleslinkA = 'rules-and-policies';
-  $ruleslinkB = 'content/rules-and-policies';
-  $site_name = variable_get('site_name', 'Drupal-BOINC');
-  $registration_enabled = variable_get('user_register', 0);
-  $output = '<div class="join">';
-  switch ($type) {
-  case 'boinc':
+    $ruleslinkA = 'rules-and-policies';
+    $ruleslinkB = 'content/rules-and-policies';
+    $site_name = variable_get('site_name', 'Drupal-BOINC');
+    $registration_enabled = variable_get('user_register', 0);
+    $output = '<div class="join">';
+    switch ($type) {
+    case 'boinc':
     $output .= '<ol>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts('First !create_an_account here at @sitename.',
-      array(
+        $output .= '<li>' . bts('First !create_an_account here at @sitename.',
+        array(
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page') . '</li>';
     }
     $output .= '  <li>' . bts("Install BOINC on this device if not already present.", array(), NULL, 'boinc:join-page') . '</li>';
     $output .= '  <li>' . bts("Select <i>Tools / Add Project</i>. Choose @sitename from the list, or enter @siteurl.",
     array(
-      '@sitename' => $site_name,
-      '@siteurl' => $base_url,
+        '@sitename' => $site_name,
+        '@siteurl' => $base_url,
     ), NULL, 'boinc:join-page') . '</li>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts("If you're running a command-line or pre-5.0 version of BOINC, use <b>!boinccmd</b> to add the project.",
+        $output .= '<li>' . bts("If you're running a command-line or pre-5.0 version of BOINC, use <b>!boinccmd</b> to add the project.",
         array(
-          '!boinccmd' => l('boinccmd --project_attach', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
+            '!boinccmd' => l('boinccmd --project_attach', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
         ), NULL, 'boinc:join-page') . '</li>';
     }
     else {
-      $output .= '<li>' . bts("If you're running a command-line version of BOINC,
+        $output .= '<li>' . bts("If you're running a command-line version of BOINC,
         please follow the <b>!instructionslink</b> to first <i>create an account</i>, and then <i>attach</i> to this project. Use the same project URL as above.",
         array(
-          '!instructionslink' => l('instructions', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
+            '!instructionslink' => l('instructions', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
         ), NULL, 'boinc:join-page') . '</li>';
     }
     $output .= '<li>' . bts("If you're running a pre-5.0 version of BOINC, please
       upgrade to a more recent version of BOINC to create an account
       at @this_project.",
-      array(
+        array(
         '@this_project' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page') . '</li>';
     $output .=  '</ol>';
     break;
-  case 'new':
+    case 'new':
   default:
     // Determine if there is a link to rules-and-policies
     //$ruleslink='';
@@ -1600,16 +1600,16 @@ 
     // Join page output
     $output .= '<ol>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts('First !create_an_account here at @sitename.',
-      array(
+        $output .= '<li>' . bts('First !create_an_account here at @sitename.',
+        array(
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page') . '</li>';
     }
     else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
-      $output .= '  <li>' . bts("Read our !rules_and_policies.", array(
+        $output .= '  <li>' . bts("Read our !rules_and_policies.", array(
         '!rules_and_policies' => l(bts('Rules and Policies', array(), NULL, 'boinc:join-page'), $ruleslink),
-      ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page') . '</li>';
     }
     $output .= '  <li>' . bts('Download the BOINC desktop software.', array(), NULL, 'boinc:join-page');
     $output .= '    <p>';
@@ -1619,73 +1619,73 @@ 
     $output .= '  </li>';
     $output .= '  <li>' . bts('Run the installer.', array(), NULL, 'boinc:join-page') . '</li>';
     $output .= '  <li>' . bts('Choose @sitename from the list, or enter @siteurl.', array(
-      '@sitename' => $site_name,
-      '@siteurl' => $base_url,
+        '@sitename' => $site_name,
+        '@siteurl' => $base_url,
     ), NULL, 'boinc:join-page') . '</li>';
     $output .=  '</ol>';
-  }
-  $output .= '</div>';
-  return $output;
+    }
+    $output .= '</div>';
+    return $output;
 }
 
 /**
-  * Home page content for embedding in Panels page
-  */
+ * Home page content for embedding in Panels page
+ */
 function boincuser_home_page() {
-  global $user;
-  $site_name = variable_get('site_name', 'Drupal-BOINC');
-  // get the front page message from database; this is set in the admin interface under BOINC Other
-  $site_message = variable_get('boinc_other_frontpage','');
+    global $user;
+    $site_name = variable_get('site_name', 'Drupal-BOINC');
+    // get the front page message from database; this is set in the admin interface under BOINC Other
+    $site_message = variable_get('boinc_other_frontpage','');
 
-  // Determine the user of the day
-  $current_uotd = db_fetch_object(db_query("
+    // Determine the user of the day
+    $current_uotd = db_fetch_object(db_query("
     SELECT
       uid,
       uotd_time
     FROM {boincuser}
     ORDER BY uotd_time DESC
     LIMIT 1"
-  ));
-  if ($current_uotd->uotd_time < strtotime('today midnight')) {
+    ));
+    if ($current_uotd->uotd_time < strtotime('today midnight')) {
     $uotd = boincuser_select_user_of_the_day();
-  }
-  else {
+    }
+    else {
     $uotd = user_load($current_uotd->uid);
-  }
-  $uotd_image = boincuser_get_user_profile_image($uotd->uid, FALSE);
-  $output = '<h2 class="pane-title">';
-  $output .= ($user->uid) ? bts('Welcome back!', array(), NULL, 'boinc:front-page') : ($site_name ? bts('What is @this_project?', array('@this_project' => $site_name)) : bts('Welcome!', array(), NULL, 'boinc:front-page'));
-  $output .= '</h2>';
-  $output .= '<div class="boinc-overview balance-height-front">';
-  $output .= '  <div>' . bts($site_message, array(), NULL, "project:front page") . ' ' . l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about') . '</div>';
-  if ($user->uid) {
+    }
+    $uotd_image = boincuser_get_user_profile_image($uotd->uid, FALSE);
+    $output = '<h2 class="pane-title">';
+    $output .= ($user->uid) ? bts('Welcome back!', array(), NULL, 'boinc:front-page') : ($site_name ? bts('What is @this_project?', array('@this_project' => $site_name)) : bts('Welcome!', array(), NULL, 'boinc:front-page'));
+    $output .= '</h2>';
+    $output .= '<div class="boinc-overview balance-height-front">';
+    $output .= '  <div>' . bts($site_message, array(), NULL, "project:front page") . ' ' . l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about') . '</div>';
+    if ($user->uid) {
     $output .= '  <div>' . l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))) . '</div>';
-  }
-  else {
+    }
+    else {
     $output .= '  <div>' . l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))) . '</div>';
-  }
-  $output .= '</div>';
-  $output .= '<div class="boinc-overview-details">';
-  $output .= '  <div class="detail-container">';
-  $output .= '    <a class="user-of-the-day" href="account/' . $uotd->uid . '">';
-  $output .= '      <div class="picture">';
-  $output .= theme('imagefield_image', $uotd_image['image'], $uotd_image['alt'],
+    }
+    $output .= '</div>';
+    $output .= '<div class="boinc-overview-details">';
+    $output .= '  <div class="detail-container">';
+    $output .= '    <a class="user-of-the-day" href="account/' . $uotd->uid . '">';
+    $output .= '      <div class="picture">';
+    $output .= theme('imagefield_image', $uotd_image['image'], $uotd_image['alt'],
     $uotd_image['alt'], array(), FALSE);
-  $output .= '      </div>';
-  $output .= '      <div class="text">' . bts('User of the day', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '      <div class="detail">' . $uotd->boincuser_name . '</div>';
-  $output .= '    </a>';
-  $output .= '    <div class="volunteers">';
-  $output .= '      <div class="text">' . bts('Over 500,000 volunteers and counting.', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '      <div class="platforms">';
-  $output .= '        <div class="detail platform windows">' . bts('Windows', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform mac">' .  bts('Mac', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform linux">' . bts('Linux', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '      </div>';
-  $output .= '    </div>';
-  $output .= '  </div>';
-  $output .= '</div>';
-  return $output;
+    $output .= '      </div>';
+    $output .= '      <div class="text">' . bts('User of the day', array(), NULL, 'boinc:front-page') . '</div>';
+    $output .= '      <div class="detail">' . $uotd->boincuser_name . '</div>';
+    $output .= '    </a>';
+    $output .= '    <div class="volunteers">';
+    $output .= '      <div class="text">' . bts('Over 500,000 volunteers and counting.', array(), NULL, 'boinc:front-page') . '</div>';
+    $output .= '      <div class="platforms">';
+    $output .= '        <div class="detail platform windows">' . bts('Windows', array(), NULL, 'boinc:front-page') . '</div>';
+    $output .= '        <div class="detail platform mac">' .  bts('Mac', array(), NULL, 'boinc:front-page') . '</div>';
+    $output .= '        <div class="detail platform linux">' . bts('Linux', array(), NULL, 'boinc:front-page') . '</div>';
+    $output .= '      </div>';
+    $output .= '    </div>';
+    $output .= '  </div>';
+    $output .= '</div>';
+    return $output;
 }
 
 /**
@@ -1693,81 +1693,81 @@ 
  * Create a new user account based on supplied parameters.
  */
 function boincuser_create_account() {
-  global $base_url;
+    global $base_url;
 
-  require_boinc('boinc_db');
-  require_boinc('user_util');
-  require_boinc('xml');
-  $params = array(
+    require_boinc('boinc_db');
+    require_boinc('user_util');
+    require_boinc('xml');
+    $params = array(
     'email_addr' => isset($_GET['email_addr']) ? $_GET['email_addr'] : '',
     'user_name' => isset($_GET['user_name']) ? $_GET['user_name'] : '',
     'passwd_hash' => isset($_GET['passwd_hash']) ? $_GET['passwd_hash'] : ''
-  );
+    );
   
-  // Begin output
-  xml_header();
+    // Begin output
+    xml_header();
   
-  // Account creation disabled
-  $enablethisRPC = variable_get('boinc_weboptions_enableaccountcreateRPC', TRUE);
-  if (!$enablethisRPC) {
+    // Account creation disabled
+    $enablethisRPC = variable_get('boinc_weboptions_enableaccountcreateRPC', TRUE);
+    if (!$enablethisRPC) {
     $mess = bts('Account creation is done through our Web site. Please register at @url', array(
-      '@url' => $base_url . '/user/registration',
+        '@url' => $base_url . '/user/registration',
     ),
     NULL, 'boinc:create_account');
     xml_error(-208, $mess);
-  }
-  // Invalid invite code
+    }
+    // Invalid invite code
   
-  // Validate input
-  if (user_validate_mail($params['email_addr']) or !is_valid_email_addr($params['email_addr'])) {
+    // Validate input
+    if (user_validate_mail($params['email_addr']) or !is_valid_email_addr($params['email_addr'])) {
     xml_error(-205);
-  }
+    }
 
-  // Make sure user_name is unique and cleaned
-  $unique_name = create_proper_drupalname($params['user_name']);
-  if ($error = user_validate_name($unique_name)) {
+    // Make sure user_name is unique and cleaned
+    $unique_name = create_proper_drupalname($params['user_name']);
+    if ($error = user_validate_name($unique_name)) {
     xml_error(-188, $error);
-  }
-  if (strlen($params['passwd_hash']) != 32) {
+    }
+    if (strlen($params['passwd_hash']) != 32) {
     xml_error(-1, 'password hash length not 32');
-  }
+    }
   
-  // Process input
-  // Check this email against previous email addresses.
-  $tmpuser = BoincUser::lookup_prev_email_addr($params['email_addr']);
-  if ($tmpuser) {
+    // Process input
+    // Check this email against previous email addresses.
+    $tmpuser = BoincUser::lookup_prev_email_addr($params['email_addr']);
+    if ($tmpuser) {
     xml_error(-137);
-  }
+    }
 
-  // Check this email on current email addresses.
-  $boinc_user = BoincUser::lookup_email_addr($params['email_addr']);
-  if ($boinc_user) {
+    // Check this email on current email addresses.
+    $boinc_user = BoincUser::lookup_email_addr($params['email_addr']);
+    if ($boinc_user) {
     // Return authenticator for existing users
     if ( ($params['passwd_hash'] == $boinc_user->passwd_hash) or
     password_verify($params['passwd_hash'], $boinc_user->passwd_hash) ) {
-      $output = array('authenticator' => $boinc_user->authenticator);
+        $output = array('authenticator' => $boinc_user->authenticator);
     }
     else {
-      xml_error(-137);
+        xml_error(-137);
     }
-  }
-  else {
+    }
+    else {
     // Verify that there isn't somehow a Drupal user already (not possible with proper function)
     if ($existing_user = user_load(array('mail' => $params['email_addr']))) {
-      xml_error(-137, 'account error');
+        xml_error(-137, 'account error');
     }
     // Create new account
     $unrestricted_role = array_search('community member', user_roles(true));
 
     $newUser = array(
-      'name' => $unique_name,
-      'pass' => $params['passwd_hash'], // note: passing a hash here requires ALL passwords to be hashed via hook prior to interacting with the hash stored in the db
-      'mail' => $params['email_addr'],
-      'status' => 1,
-      'init' => $params['email_addr'],
-      'roles' => array($unrestricted_role => ''),
-      'boincuser_name' => $params['user_name'],
-      'boinchash_flag' => TRUE,
+        'name' => $unique_name,
+        'pass' => $params['passwd_hash'], // note: passing a hash here requires ALL passwords to be hashed via hook prior to interacting with the hash stored in the db
+        'mail' => $params['email_addr'],
+        'status' => 1,
+        'init' => $params['email_addr'],
+        'roles' => array($unrestricted_role => ''),
+        'boincuser_name' => $params['user_name'],
+        'boinchash_flag' => TRUE,
     );
 
     // Create the drupal user. If the drupal user cannot be created,
@@ -1775,17 +1775,17 @@ 
     // The user is created in the 'insert' op in hook_user.
     $user = user_save(null, $newUser);
     if (!$user) {
-      watchdog('boincuser', 'create_account: Failed to create Drupal user account for @email', array('@email' => $params['email_addr']), WATCHDOG_WARNING);
-      xml_error(-137, 'error creating BOINC account');
+        watchdog('boincuser', 'create_account: Failed to create Drupal user account for @email', array('@email' => $params['email_addr']), WATCHDOG_WARNING);
+        xml_error(-137, 'error creating BOINC account');
     }// if drupal user created.
 
     $output = array('authenticator' => $user->boincuser_account_key);
-  }// if existing user found.
+    }// if existing user found.
 
-  // Output authenticator
-  echo " <account_out>\n";
-  echo "   <authenticator>{$output['authenticator']}</authenticator>\n";
-  echo "</account_out>\n";
+    // Output authenticator
+    echo " <account_out>\n";
+    echo "   <authenticator>{$output['authenticator']}</authenticator>\n";
+    echo "</account_out>\n";
 }
 
 /**
@@ -1793,166 +1793,166 @@ 
  * account is created using the BOINC clinet.
  */
 function boincuser_account_finish() {
-  global $user;
+    global $user;
 
-  $authtoken = isset($_GET['auth']) ? $_GET['auth'] : '';
+    $authtoken = isset($_GET['auth']) ? $_GET['auth'] : '';
 
-  // Ensure there is a authentication token before continuing
-  if (empty($authtoken)) {
+    // Ensure there is a authentication token before continuing
+    if (empty($authtoken)) {
     drupal_not_found();
     return ;
-  }
+    }
 
-  if (strlen($authtoken) != 32) {
+    if (strlen($authtoken) != 32) {
     drupal_set_message(bts('ERROR: There is no account with that authenticator.', array(), NULL, 'boinc:account-finish'), 'error');
     drupal_goto();
-  }
+    }
 
-  require_boinc('boinc_db');
-  $boinc_user = BoincUser::lookup("authenticator='".addslashes($authtoken)."'");
-  if (!$boinc_user) {
+    require_boinc('boinc_db');
+    $boinc_user = BoincUser::lookup("authenticator='".addslashes($authtoken)."'");
+    if (!$boinc_user) {
     drupal_set_message(bts('ERROR: There is no account with that authenticator.', array(), NULL, 'boinc:account-finish'), 'error');
     drupal_goto();
-  }
-  $user = user_load(get_drupal_id($boinc_user->id));
+    }
+    $user = user_load(get_drupal_id($boinc_user->id));
 
-  if (!$user) {
+    if (!$user) {
     drupal_set_message(bts('ERROR: There was a problem loading your account. Try logging in with your user name and password.', array(), NULL, 'boinc:account-finish'), 'error');
     drupal_goto();
-  }
+    }
 
-  // Lookup path to custom account finish page
-  $customaccountfinishpath = drupal_lookup_path('source', variable_get('boinc_weboptions_accountfinish', '') );
-  if ( menu_valid_path(array('link_path' => $customaccountfinishpath)) ) {
+    // Lookup path to custom account finish page
+    $customaccountfinishpath = drupal_lookup_path('source', variable_get('boinc_weboptions_accountfinish', '') );
+    if ( menu_valid_path(array('link_path' => $customaccountfinishpath)) ) {
     $node = menu_get_object('node', 1, $customaccountfinishpath);
     if ($node) {
-      return node_page_view($node);
+        return node_page_view($node);
+    }
     }
-  }
 
-  // open links in new window
-  $options = array(
+    // open links in new window
+    $options = array(
     'attributes' => array( 'target' => '_blank' ),
-  );
+    );
 
-  // Check moderation page exists
-  $moderationpath = drupal_lookup_path('source', variable_get('boinc_weboptions_moderationpage', '') );
-  if ( menu_valid_path(array('link_path' => $moderationpath)) ) {
+    // Check moderation page exists
+    $moderationpath = drupal_lookup_path('source', variable_get('boinc_weboptions_moderationpage', '') );
+    if ( menu_valid_path(array('link_path' => $moderationpath)) ) {
     $modsentence = bts('Please note: user profiles are subject to !moderation.', array('!moderation' => l(bts('moderation', array(), NULL, 'boinc:account-finish'), $moderationpath, $options)), NULL, 'boinc:account-finish');
-  } else {
+    } else {
     $modsentence = bts('Please note: user profiles are subject to moderation.', array(), NULL, 'boinc:account-finish');
-  }
+    }
 
-  $username = $user->boincuser_name;
-  $site_name = variable_get('site_name', 'Drupal-BOINC');
-  $output = "<p>" . bts('Thank you @user_name for joining @site_name. Your account has been created. Your BOINC client should start working on assigned tasks soon, without any additional action or configuration. Please visit the links below for more information and additional options. (Links will open in a new window.)',
-  array(
+    $username = $user->boincuser_name;
+    $site_name = variable_get('site_name', 'Drupal-BOINC');
+    $output = "<p>" . bts('Thank you @user_name for joining @site_name. Your account has been created. Your BOINC client should start working on assigned tasks soon, without any additional action or configuration. Please visit the links below for more information and additional options. (Links will open in a new window.)',
+    array(
     '@user_name' => $username,
     '@site_name' => $site_name,
-  ), NULL, 'boinc:account-finish') . "</p>";
+    ), NULL, 'boinc:account-finish') . "</p>";
 
-  $links = array(
+    $links = array(
     array(
-      'data' => bts('Change your username at !community_preferences.', array(
+        'data' => bts('Change your username at !community_preferences.', array(
         '!community_preferences' => l(bts('Community Preferences', array(), NULL, 'boinc:account-fininsh'), 'account/prefs/community', $options),
-      ), NULL, 'boinc:account-finish'),
-      'children' => array(
+        ), NULL, 'boinc:account-finish'),
+        'children' => array(
         bts('Your username is used to identify yourself to other volunteers on this Web site.', array(), NULL, 'boinc:account-finish'),
         bts('In addition, you may set your account\'s default language and adjust notification settings.', array(), NULL, 'boinc:account-finish'),
-      ),
+        ),
     ),
     array(
-      'data' => bts('Change your !computing_preferences.', array(
+        'data' => bts('Change your !computing_preferences.', array(
         '!computing_preferences' => l(bts('Computing Preferences', array(), NULL, 'boinc:account-finish'), 'account/prefs', $options),
-      ), NULL, 'boinc:account-finish'),
-      'children' => array(
+        ), NULL, 'boinc:account-finish'),
+        'children' => array(
         bts('You may adjust how much CPU, RAM, and Disk space the BOINC client is allowed to use for tasks on your computer.', array(), NULL, 'boinc:account-finish'),
         bts('By default, you will run @site_name tasks without any additional configuration.', array(
-          '@site_name' => $site_name,
+            '@site_name' => $site_name,
         ), NULL, 'boinc:account-finish'),
         bts('It is recommended new volunteers leave the default settings until they gain experience running some tasks. Ask questions in the !forums to get advice before making changes to a setting you don\'t understand.', array(
-          '!forums' => l(bts('forums', array(), NULL, 'boinc:account-finish'), 'community/forum', $options),
+            '!forums' => l(bts('forums', array(), NULL, 'boinc:account-finish'), 'community/forum', $options),
         ), NULL, 'boinc:account-finish'),
-      ),
+        ),
     ),
     array(
         'data' => bts('Create a !user_profile.', array(
-          '!user_profile' => l(bts('User Profile', array(), NULL, 'boinc:account-finish'), '/account/profile/edit', $options),
+            '!user_profile' => l(bts('User Profile', array(), NULL, 'boinc:account-finish'), '/account/profile/edit', $options),
         ), NULL, 'boinc:account-finish'),
-      'children' => array(
+        'children' => array(
         bts('A user profile will inform other volunteers who you are and why you joined @site_name.', array(
-          '@site_name' => $site_name,
+            '@site_name' => $site_name,
         ), NULL, 'boinc:account-finish'),
         $modsentence,
-      ),
+        ),
     ),
     array(
-      'data' => bts('Join a !team.', array(
+        'data' => bts('Join a !team.', array(
         '!team' => l(bts('Team', array(), NULL, 'boinc:account-finish'), '/community/teams', $options),
-      ), NULL, 'boinc:account-finish'),
-      'children' => array(
+        ), NULL, 'boinc:account-finish'),
+        'children' => array(
         bts('You may join a team, made up of other volunteers.', array(), NULL, 'boinc:account-finish'),
-      ),
+        ),
     ),
     array(
-      'data' => bts('Go to your !account_dashboard.', array(
+        'data' => bts('Go to your !account_dashboard.', array(
         '!account_dashboard'=> l(bts('Account Dashboard', array(), NULL, 'boinc:account-finish'), 'account/dashboard', $options),
-      ), NULL, 'boinc:account-finish'),
-      'children' => array(
+        ), NULL, 'boinc:account-finish'),
+        'children' => array(
         bts('Your account dashboard has information and links about your computer(s) and task(s) assigned.', array(), NULL, 'boinc:account-finish'),
-      ),
+        ),
     ),
     array(
-      'data' => bts('Visit our !help pages.', array(
+        'data' => bts('Visit our !help pages.', array(
         '!help' => l(bts('Help', array(), NULL, 'boinc:account-finish'), '/help', $options)
-      ), NULL, 'boinc:account-finish'),
-      'children' => array(
+        ), NULL, 'boinc:account-finish'),
+        'children' => array(
         bts('Ask for help in our community\'s !forums.', array(
-          '!forums' => l(bts('forums', array(), NULL, 'boinc:account-finish'), 'community/forum', $options)
+            '!forums' => l(bts('forums', array(), NULL, 'boinc:account-finish'), 'community/forum', $options)
         ), NULL, 'boinc:account-finish'),
-      ),
+        ),
     ),
-  );
+    );
 
-  //List of links
-  $output .= theme_item_list($links, $title = NULL, $type='ul');
+    //List of links
+    $output .= theme_item_list($links, $title = NULL, $type='ul');
 
-  return $output;
+    return $output;
 }
 
 /**
  * Determine if the user has permission to control community access
  */
 function boincuser_moderate_community_access() {
-  if (user_access('assign community member role')
+    if (user_access('assign community member role')
   OR user_access('assign all roles')) {
     return TRUE;
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
  * Get the count of items in the moderation queue
  */
 function boincuser_moderation_queue_count($caller = 'user') {
-  $allowed = FALSE;
-  switch ($caller) {
-  case 'cron':
+    $allowed = FALSE;
+    switch ($caller) {
+    case 'cron':
     $allowed = TRUE;
     break;
-  case 'user':
+    case 'user':
   default:
     $allowed = user_access('edit any profile content');
-  }
-  if ($allowed) {
+    }
+    if ($allowed) {
     return db_result(db_query("
       SELECT COUNT(*)
       FROM {node}
       WHERE type = 'profile'
       AND moderate = 1"
     ));
-  }
-  return NULL;
+    }
+    return NULL;
 }
 
 /**
@@ -1961,43 +1961,43 @@ 
  * than through the user account info form.
  */
 function boincuser_control($uid = NULL, $action = NULL) {
-  if (!$uid OR !$account = user_load($uid)) {
+    if (!$uid OR !$account = user_load($uid)) {
     // What are you even doing here...
     return FALSE;
-  }
-  switch ($action) {
-  case 'ban':
+    }
+    switch ($action) {
+    case 'ban':
     if (boincuser_moderate_community_access()) {
-      $penalty_period = variable_get('boinc_penalty_period', 7*24*60*60);
-      $boincuser_record = array(
+        $penalty_period = variable_get('boinc_penalty_period', 7*24*60*60);
+        $boincuser_record = array(
         'uid' => $uid,
         'penalty_expiration' => time() + $penalty_period,
-      );
-      drupal_write_record('boincuser', $boincuser_record, 'uid');
-      $community_role = array_search('community member', user_roles(true));
-      if (isset($account->roles[$community_role])) {
+        );
+        drupal_write_record('boincuser', $boincuser_record, 'uid');
+        $community_role = array_search('community member', user_roles(true));
+        if (isset($account->roles[$community_role])) {
         unset($account->roles[$community_role]);
         user_save($account, array('roles' => $account->roles));
-      }
+        }
     }
     break;
-  case 'lift-ban':
+    case 'lift-ban':
     if (boincuser_moderate_community_access()) {
-      $boincuser_record = array(
+        $boincuser_record = array(
         'uid' => $uid,
         'penalty_expiration' => 0,
-      );
-      drupal_write_record('boincuser', $boincuser_record, 'uid');
-      $community_role = array_search('community member', user_roles(true));
-      if (!isset($account->roles[$community_role])) {
+        );
+        drupal_write_record('boincuser', $boincuser_record, 'uid');
+        $community_role = array_search('community member', user_roles(true));
+        if (!isset($account->roles[$community_role])) {
         $account->roles[$community_role] = 'community member';
         user_save($account, array('roles' => $account->roles));
-      }
+        }
     }
     break;
-  default:
+    default:
   }
-  drupal_goto("account/{$account->uid}");
+    drupal_goto("account/{$account->uid}");
 }
 
 /**
@@ -2005,29 +2005,29 @@ 
  * moderation flag.
  */
 function boincuser_moderate_profile_approve($account) {
-  $node = new stdClass;
-  $node->type = 'profile';
-  $node->language = '';
-  $nid = content_profile_profile_exists($node, $account->uid);
-  $profile = node_load($nid);
-  $profile->moderate = 0;
-  $profile->status = 1;
-  node_save($profile);
-  drupal_set_message('This profile has been marked as approved.');
-  drupal_goto();
+    $node = new stdClass;
+    $node->type = 'profile';
+    $node->language = '';
+    $nid = content_profile_profile_exists($node, $account->uid);
+    $profile = node_load($nid);
+    $profile->moderate = 0;
+    $profile->status = 1;
+    node_save($profile);
+    drupal_set_message('This profile has been marked as approved.');
+    drupal_goto();
 }
 
 /**
  * Mark a user profile as rejected and notify the user of the reason.
  */
 function boincuser_moderate_profile_reject($uid, $reason = '') {
-  $account = user_load($uid);
-  $node = new stdClass;
-  $node->type = 'profile';
-  $node->language = '';
-  $nid = content_profile_profile_exists($node, $uid);
-  $profile = node_load($nid);
-  if ($profile->nid) {
+    $account = user_load($uid);
+    $node = new stdClass;
+    $node->type = 'profile';
+    $node->language = '';
+    $nid = content_profile_profile_exists($node, $uid);
+    $profile = node_load($nid);
+    if ($profile->nid) {
     global $user;
     global $base_url;
     global $base_path;
@@ -2038,64 +2038,64 @@ 
     $profile->status = 0;
     node_save($profile);
     $settings = array(
-      'from' => '',
-      'subject' => "Profile moderation at {$site_name}",
-      'message' => ''
-      . "{$account->boincuser_name},\n"
-      . "\n"
-      . "{$moderator->boincuser_name} has rejected your profile at"
-      . " {$site_name} for the following reason: \n"
-      . "\n"
-      . "{$reason}\n"
-      . "\n"
-      . "\n"
-      . "Since it has not been approved, your profile is not visible to other"
-      . " {$site_name} users. Please make the needed changes here:\n"
-      . "\n"
-      . "{$site_url}account/profile \n"
-      . "\n"
-      . "Thanks, \n"
-      . "\n"
-      . "{$site_name} support team",
+        'from' => '',
+        'subject' => "Profile moderation at {$site_name}",
+        'message' => ''
+        . "{$account->boincuser_name},\n"
+        . "\n"
+        . "{$moderator->boincuser_name} has rejected your profile at"
+        . " {$site_name} for the following reason: \n"
+        . "\n"
+        . "{$reason}\n"
+        . "\n"
+        . "\n"
+        . "Since it has not been approved, your profile is not visible to other"
+        . " {$site_name} users. Please make the needed changes here:\n"
+        . "\n"
+        . "{$site_url}account/profile \n"
+        . "\n"
+        . "Thanks, \n"
+        . "\n"
+        . "{$site_name} support team",
     );
     rules_action_mail_to_user($account, $settings);
     drupal_set_message('This profile has been marked as rejected.');
-  }
-  drupal_goto();
+    }
+    drupal_goto();
 }
 
 /**
  * Ban a user and send a notification of the reason.
  */
 function boincuser_moderate_user_ban($uid, $reason = '', $duration = '') {
-  if (user_access('assign community member role')
+    if (user_access('assign community member role')
   OR user_access('assign all roles')) {
     $account = user_load($uid);
     if ($account->uid) {
-      module_load_include('inc', 'rules', 'modules/system.rules');
-      if ($duration === '') {
+        module_load_include('inc', 'rules', 'modules/system.rules');
+        if ($duration === '') {
         $duration = variable_get('boinc_penalty_period', 7*24*60*60);
-      }
-      $penalty_expiration = ($duration > 0) ? time() + $duration : 4294967295;
-      $boincuser_record = array(
+        }
+        $penalty_expiration = ($duration > 0) ? time() + $duration : 4294967295;
+        $boincuser_record = array(
         'uid' => $uid,
         'penalty_expiration' => $penalty_expiration,
-      );
-      drupal_write_record('boincuser', $boincuser_record, 'uid');
+        );
+        drupal_write_record('boincuser', $boincuser_record, 'uid');
       
-      $community_role = array_search('community member', user_roles(true));
-      if (isset($account->roles[$community_role])) {
+        $community_role = array_search('community member', user_roles(true));
+        if (isset($account->roles[$community_role])) {
         unset($account->roles[$community_role]);
         user_save($account, array('roles' => $account->roles));
-      }
+        }
       
-      global $user;
-      global $base_url;
-      global $base_path;
-      $site_name = variable_get('site_name', 'Drupal-BOINC');
-      $site_url = $base_url . $base_path;
-      $moderator = user_load($user->uid);
-      $settings = array(
+        global $user;
+        global $base_url;
+        global $base_path;
+        $site_name = variable_get('site_name', 'Drupal-BOINC');
+        $site_url = $base_url . $base_path;
+        $moderator = user_load($user->uid);
+        $settings = array(
         'from' => '',
         'subject' => "User moderation at {$site_name}",
         'message' => ''
@@ -2116,12 +2116,12 @@ 
         . "Thanks, \n"
         . "\n"
         . "{$site_name} support team",
-      );
-      rules_action_mail_to_user($account, $settings);
-      drupal_set_message('This user has been banned.');
+        );
+        rules_action_mail_to_user($account, $settings);
+        drupal_set_message('This user has been banned.');
     }
-  }
-  drupal_goto();
+    }
+    drupal_goto();
 }
 
 
@@ -2133,15 +2133,15 @@ 
  *
  */
 function boincuser_get_weak_auth($boinc_id = null) {
-  if (!$boinc_id) {
+    if (!$boinc_id) {
     global $user;
     $account = user_load($user->uid);
     $boinc_id = $account->boincuser_id;
-  }
+    }
   
-  $boinc_user = boincuser_load($account->boincuser_id);
+    $boinc_user = boincuser_load($account->boincuser_id);
   
-  return weak_auth($boinc_user);
+    return weak_auth($boinc_user);
 }
 
 /**
@@ -2150,75 +2150,75 @@ 
  * Drupal User so must be inserted into comments, etc. (not so by default)
  */
 function boincuser_get_user_profile_image($uid, $avatar = TRUE) {
-  // Though the function name implies otherwise, get the avatar by default
-  $image_field = ($avatar) ? 'field_image_fid' : 'field_profile_image_fid';
-  $image_fid = db_result(db_query("
+    // Though the function name implies otherwise, get the avatar by default
+    $image_field = ($avatar) ? 'field_image_fid' : 'field_profile_image_fid';
+    $image_fid = db_result(db_query("
     SELECT ctp.%s
     FROM {content_type_profile} ctp
     INNER JOIN {node} n ON ctp.nid = n.nid
     WHERE n.uid = %d AND n.type = '%s'",
     $image_field, $uid, 'profile'));
-  $user_image['image'] = field_file_load($image_fid);
-  if (!$user_image['image']['filepath']) {
+    $user_image['image'] = field_file_load($image_fid);
+    if (!$user_image['image']['filepath']) {
     // Load the default image if one does not exist
     $account = user_load($uid);
     if ($avatar AND module_exists('gravatar') AND user_access('use gravatar', $account) AND $account->gravatar) {
-      // Use a Gravatar rather than the system default image
-      $options = array(
+        // Use a Gravatar rather than the system default image
+        $options = array(
         'size' => 100,
         'rating' => 'G',
-      );
-      // Get the Gravatar URL and see if the image exists
-      $url = gravatar_get_gravatar($account->mail, $options);
-      $headers = @get_headers($url);
-      if (preg_match("|200|", $headers[0])) {
+        );
+        // Get the Gravatar URL and see if the image exists
+        $url = gravatar_get_gravatar($account->mail, $options);
+        $headers = @get_headers($url);
+        if (preg_match("|200|", $headers[0])) {
         return $url;
-      }
+        }
     }
     // Get default image if nothing else works
     $content_node_widget_settings = db_result(db_query("SELECT widget_settings FROM {content_node_field_instance} WHERE field_name = '%s'", ($avatar ? 'field_image' : 'field_profile_image')));
     $content_node_widget_settings = unserialize($content_node_widget_settings);
     $user_image['image'] = $content_node_widget_settings['default_image'];
-  }
-  $user = user_load($uid);
-  // Use boinc username for image alt/title attributes
-  $user_image['alt'] = $user->boincuser_name;
-  return $user_image;
+    }
+    $user = user_load($uid);
+    // Use boinc username for image alt/title attributes
+    $user_image['alt'] = $user->boincuser_name;
+    return $user_image;
 }
 
 /**
  * Generate a table of a user's projects
  */
 function boincuser_get_projects_table($account = null) {
-  if ($account AND is_numeric($account)) {
+    if ($account AND is_numeric($account)) {
     $account = user_load($account);
-  }
-  $projects = boincuser_get_projects($account);
-  if (!$projects) return bts('no projects...', array(), NULL, 'boinc:account-dashboard');
+    }
+    $projects = boincuser_get_projects($account);
+    if (!$projects) return bts('no projects...', array(), NULL, 'boinc:account-dashboard');
   
-  $output = '';
-  $output .= '<table class="user-projects">' . "\n";
-  $output .= '<thead>' . "\n";
-  $output .= '  <tr>' . "\n";
-  $output .= '    <th>' . bts('Name', array(), NULL, 'boinc:project-name:-1:ignoreoverwrite') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Avg credit', array(), NULL, 'boinc:account-dashboard') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . '</th>' . "\n";
-  $output .= '  </tr>' . "\n";
-  $output .= '</thead>' . "\n";
-  $output .= '<tbody>' . "\n";
-  foreach ($projects AS $project) {
+    $output = '';
+    $output .= '<table class="user-projects">' . "\n";
+    $output .= '<thead>' . "\n";
+    $output .= '  <tr>' . "\n";
+    $output .= '    <th>' . bts('Name', array(), NULL, 'boinc:project-name:-1:ignoreoverwrite') . '</th>' . "\n";
+    $output .= '    <th class="numeric">' . bts('Avg credit', array(), NULL, 'boinc:account-dashboard') . '</th>' . "\n";
+    $output .= '    <th class="numeric">' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . '</th>' . "\n";
+    $output .= '  </tr>' . "\n";
+    $output .= '</thead>' . "\n";
+    $output .= '<tbody>' . "\n";
+    foreach ($projects AS $project) {
     $url = rtrim($project->url, '/') . '/show_user.php?userid=' . $project->id;
     $output .= '  <tr>' . "\n";
     $output .= '    <td>' . l($project->name, $url) . '</td>' . "\n";
     $output .= '    <td class="numeric">' . boincwork_format_stats((float) $project->expavg_credit) . '</td>' . "\n"; 
     $output .= '    <td class="numeric">' . boincwork_format_stats((float) $project->total_credit) . '</td>' . "\n";
     $output .= '  </tr>' . "\n";
-  }
-  $output .= '</tbody>' . "\n";
-  $output .= '</table>' . "\n";
-  $more_link = ($account) ? "user/{$account->uid}/stats" : 'account/stats';
-  //$output .= "<div class=\"more-link\"><a href=\"{$more_link}\">More stats</a></div>" . "\n";
-  return $output;
+    }
+    $output .= '</tbody>' . "\n";
+    $output .= '</table>' . "\n";
+    $more_link = ($account) ? "user/{$account->uid}/stats" : 'account/stats';
+    //$output .= "<div class=\"more-link\"><a href=\"{$more_link}\">More stats</a></div>" . "\n";
+    return $output;
 }
 
 /**
@@ -2226,25 +2226,25 @@ 
  */
 function boincuser_get_stats_user_data($cpid = null) {
   
-  // [TODO] Set this stuff in site config!
-  $stats_server = 'stats.gridrepublic.org';
-  $stats_rpc = 'rpc/get_user.php';
+    // [TODO] Set this stuff in site config!
+    $stats_server = 'stats.gridrepublic.org';
+    $stats_rpc = 'rpc/get_user.php';
   
-  // Construct query string
-  $get = array(
+    // Construct query string
+    $get = array(
     'cpid' => $cpid
-  );
-  $args = array();
-  foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
-  $query = '?' . implode('&', $args);
+    );
+    $args = array();
+    foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
+    $query = '?' . implode('&', $args);
   
-  // Load XML from RPC
-  $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
-  $result = drupal_http_request($target_url);
-  if (in_array($result->code, array(200, 304))) {
+    // Load XML from RPC
+    $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
+    $result = drupal_http_request($target_url);
+    if (in_array($result->code, array(200, 304))) {
     return simplexml_load_string($result->data);
-  }
-  return NULL;
+    }
+    return NULL;
 }
 
 /**
@@ -2252,15 +2252,15 @@ 
  */
 function boincuser_get_projects($account = null) {
   
-  // Use the current user by default
-  if (!$account) {
+    // Use the current user by default
+    if (!$account) {
     global $user;
     $account = user_load($user->uid);
-  }
+    }
   
-  $account_stats = boincuser_get_stats_user_data($account->boincuser_cpid);
+    $account_stats = boincuser_get_stats_user_data($account->boincuser_cpid);
   
-  return ($account_stats AND isset($account_stats->project)) ? $account_stats->project : null;
+    return ($account_stats AND isset($account_stats->project)) ? $account_stats->project : null;
 }
 
 
@@ -2268,11 +2268,11 @@ 
  * Get the links to display under the user profile
  */
 function boincuser_get_profile_links($uid) {
-  global $user;
-  $account = user_load($uid);
-  $profile = content_profile_load('profile', $account->uid);
-  $output = '';
-  if ($profile) {
+    global $user;
+    $account = user_load($uid);
+    $profile = content_profile_load('profile', $account->uid);
+    $output = '';
+    if ($profile) {
     $profile_is_approved = ($profile->status AND !$profile->moderate);
     $user_is_moderator = user_access('edit any profile content');
     $is_own_profile = ($user->uid == $account->uid);
@@ -2280,15 +2280,15 @@ 
     $links = array();
     
     if ($profile->moderate AND $user_is_moderator) {
-      $links['approve_profile'] = array(
+        $links['approve_profile'] = array(
         'title' => bts('Approve profile', array(), NULL, 'boinc:moderate-user'),
         'href' => "{$profile_moderation_path}/approve",
         'attributes' => array(
-          'title' => bts('Approve this profile content', array(), NULL, 'boinc:moderate-user'),
-          'class' => 'first primary tab',
+            'title' => bts('Approve this profile content', array(), NULL, 'boinc:moderate-user'),
+            'class' => 'first primary tab',
         )
-      );
-      /*$links['edit_profile'] = array(
+        );
+        /*$links['edit_profile'] = array(
         'title' => bts('Edit profile', array(), NULL, 'boinc:moderate-user'),
         'href' => "{$profile_moderation_path}/edit",
         'attributes' => array(
@@ -2296,27 +2296,27 @@ 
           'class' => 'tab',
         )
       );*/
-      $links['reject_profile'] = array(
+        $links['reject_profile'] = array(
         'title' => bts('Reject profile', array(), NULL, 'boinc:moderate-user'),
         'href' => "{$profile_moderation_path}/reject",
         'attributes' => array(
-          'title' => bts('Reject this profile content', array(), NULL, 'boinc:moderate-user'),
-          'class' => 'tab',
+            'title' => bts('Reject this profile content', array(), NULL, 'boinc:moderate-user'),
+            'class' => 'tab',
         )
-      );
+        );
     }
     $output .= '<ul class="tab-list">';
     $count = 0;
     foreach ($links as $key => $link) {
-      $output .= '<li class="' . (($count == 0) ? 'first primary ' : '') . 'tab">';
-      $output .= l($link['title'], $link['href'], array('query' => drupal_get_destination()));
-      $output .= '</li>';
-      $count++;
+        $output .= '<li class="' . (($count == 0) ? 'first primary ' : '') . 'tab">';
+        $output .= l($link['title'], $link['href'], array('query' => drupal_get_destination()));
+        $output .= '</li>';
+        $count++;
     }
     $output .= '<li class="' . (($count) ? '' : 'first ') . 'last tab">' . flag_create_link('abuse_user_meta', $account->uid) . '</li>';
     $output .= '</ul>';
-  }
-  return $output;
+    }
+    return $output;
 /*
 <ul class="tab-list">
   <li class="primary first tab">
@@ -2353,36 +2353,36 @@ 
  */
 function boincuser_apachesolr_index_documents_alter(array &$documents, $entity, $entity_type, $env_id) {
 
-  foreach ($documents as $document) {
+    foreach ($documents as $document) {
     if ( $document->entity_type=='node' AND $document->bundle=='profile' ) {
-      // Node information.
-      $nid = $document->entity_id;
-      $node = node_load($nid);
-      $account = user_load($node->uid);
-
-      // Use boincuser name and not drupal user name
-      $document->label = apachesolr_clean_text($account->boincuser_name);
-      // Author information
-      if ($node->uid == 0 || strlen($node->name) == 0) {
+        // Node information.
+        $nid = $document->entity_id;
+        $node = node_load($nid);
+        $account = user_load($node->uid);
+
+        // Use boincuser name and not drupal user name
+        $document->label = apachesolr_clean_text($account->boincuser_name);
+        // Author information
+        if ($node->uid == 0 || strlen($node->name) == 0) {
         // @see user_validate_name(). !'0' === TRUE.
         $document->ss_name = '0';
-      }
-      else {
+        }
+        else {
         $document->ss_name = $account->boincuser_name;
         // We want the name to be searchable for keywords.
         $document->tos_name = $account->boincuser_name;
-      }
+        }
 
-      // Rename "Profle" to "User"
-      $document->bundle = "User";
-      $document->bundle_name = "User";
+        // Rename "Profle" to "User"
+        $document->bundle = "User";
+        $document->bundle_name = "User";
 
-      // Replace the Solr document's created field with the date the user 
-      // account was created. This replaces the node creation date typically 
-      // used for indexing nodes.
-      $document->ds_created = apachesolr_date_iso($account->created);
+        // Replace the Solr document's created field with the date the user 
+        // account was created. This replaces the node creation date typically 
+        // used for indexing nodes.
+        $document->ds_created = apachesolr_date_iso($account->created);
+    }
     }
-  }
 
 }
 
@@ -2394,23 +2394,23 @@ 
  * Implementation of hook_privatemsg_name_lookup();
  */
 function boincuser_privatemsg_name_lookup($string) {
-  // Get the BOINC ID from the name string, and lookup the
-  // corresponding drupal user.
-  $boincname = substr($string, 0, strrpos($string, '_'));
-  $boincid = substr($string, strrpos($string, '_') + 1);
-  $drupalid = get_drupal_id($boincid);
-
-  // Name has spaced replaced with special UTF-8 characters in
-  // privatemsg module. We need to convert them back to spaces for the
-  // check below.
-  $boincname = preg_replace("/\\xc2\\xa0/", " ", $boincname);
-  if ($drupalid>0) {
+    // Get the BOINC ID from the name string, and lookup the
+    // corresponding drupal user.
+    $boincname = substr($string, 0, strrpos($string, '_'));
+    $boincid = substr($string, strrpos($string, '_') + 1);
+    $drupalid = get_drupal_id($boincid);
+
+    // Name has spaced replaced with special UTF-8 characters in
+    // privatemsg module. We need to convert them back to spaces for the
+    // check below.
+    $boincname = preg_replace("/\\xc2\\xa0/", " ", $boincname);
+    if ($drupalid>0) {
     if ($recipient = user_load(array('uid' => $drupalid))) {
-      // Double-check that the loaded user matches both boincuser_id
-      // and boincuser_name.
-      if ( ($boincid == $recipient->boincuser_id) AND ($boincname == $recipient->boincuser_name) ) {
+        // Double-check that the loaded user matches both boincuser_id
+        // and boincuser_name.
+        if ( ($boincid == $recipient->boincuser_id) AND ($boincname == $recipient->boincuser_name) ) {
         return $recipient;
-      }
+        }
+    }
     }
-  }
 }