BOINC / boinc

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

Switch Indentation +19 added lines, -19 removed lines

@@ -551,12 +551,12 @@ 
  */
 function boinccore_locale($op = 'groups', $group = NULL) {
   switch ($op) {
-    case 'groups':
-        return array('boinc' => 'BOINC');
-    case 'info':
-      //$info['boinc']['refresh callback'] = 'boinccore_locale_refresh';
-      $info['boinc']['format'] = FALSE;
-      return $info;
+  case 'groups':
+      return array('boinc' => 'BOINC');
+  case 'info':
+    //$info['boinc']['refresh callback'] = 'boinccore_locale_refresh';
+    $info['boinc']['format'] = FALSE;
+    return $info;
   }
 }
 
@@ -1885,19 +1885,19 @@ 
     // Transform arguments before inserting them.
     foreach ($args as $key => $value) {
       switch ($key [0]) {
-        case '@':
-          // Escaped only.
-          $args [$key] = check_plain($value);
-          break;
-
-        case '%':
-        default:
-          // Escaped and placeholder.
-          $args [$key] = theme('placeholder', $value);
-          break;
-
-        case '!':
-          // Pass-through.
+      case '@':
+        // Escaped only.
+        $args [$key] = check_plain($value);
+        break;
+
+      case '%':
+      default:
+        // Escaped and placeholder.
+        $args [$key] = theme('placeholder', $value);
+        break;
+
+      case '!':
+        // Pass-through.
       }
     }
     return strtr($string, $args);

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

Switch Indentation +24 added lines, -24 removed lines

@@ -626,13 +626,13 @@ 
   $sender = user_load($sender->uid);
   
   switch ($status) {
-    case FLAG_FRIEND_FLAGGED:
-      // Sender accepted recipient's friend request
-      $email['subject'] = bts('!name accepted your friend request [!site]', array(
-        '!name' => $sender->boincuser_name,
-        '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        ), NULL, 'boinc:friend-request-email');
-      $email['body'] = bts('!name confirmed you as a friend on !site.
+  case FLAG_FRIEND_FLAGGED:
+    // Sender accepted recipient's friend request
+    $email['subject'] = bts('!name accepted your friend request [!site]', array(
+      '!name' => $sender->boincuser_name,
+      '!site' => variable_get('site_name', 'Drupal-BOINC'),
+      ), NULL, 'boinc:friend-request-email');
+    $email['body'] = bts('!name confirmed you as a friend on !site.
 
 Follow this link to view his or her profile:
 !link
@@ -641,17 +641,17 @@ 
 
 Thanks,
 The !site team', array(
-        '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
-        '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
-        '!link' => url('account/'. $sender->uid, array('absolute' => TRUE)),
-        ), array(), NULL, 'boinc:friend-request-email');
-      break;
+      '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
+      '!site' => variable_get('site_name', 'Drupal-BOINC'),
+      '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
+      '!link' => url('account/'. $sender->uid, array('absolute' => TRUE)),
+      ), array(), NULL, 'boinc:friend-request-email');
+    break;
 
-    case FLAG_FRIEND_PENDING:
-      // Sender is requesting to be recipient's friend
-      $email['subject'] = bts('Friend request from !name [!site]', array('!name' => $sender->boincuser_name, '!site' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:friend-request-email');
-      $email['body'] = bts('!name added you as a friend on !site. You can approve or deny this request. Denying a request will not send a notification, but will remove the request from both of your accounts.
+  case FLAG_FRIEND_PENDING:
+    // Sender is requesting to be recipient's friend
+    $email['subject'] = bts('Friend request from !name [!site]', array('!name' => $sender->boincuser_name, '!site' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:friend-request-email');
+    $email['body'] = bts('!name added you as a friend on !site. You can approve or deny this request. Denying a request will not send a notification, but will remove the request from both of your accounts.
 
 Follow the link below to view this request:
 !link
@@ -660,13 +660,13 @@ 
 
 Thanks,
 The !site team', array(
-        '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
-        '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
-        '!link' => url('goto/friend-requests', array('absolute' => TRUE)),
-        ),
-      array(), NULL, 'boinc:friend-request-email');
-      break;
+      '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
+      '!site' => variable_get('site_name', 'Drupal-BOINC'),
+      '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
+      '!link' => url('goto/friend-requests', array('absolute' => TRUE)),
+      ),
+    array(), NULL, 'boinc:friend-request-email');
+    break;
   }
   return $email;
 }

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

Switch Indentation +58 added lines, -58 removed lines

@@ -1398,72 +1398,72 @@
 
   switch ($op) {
     // Return stored strings
-    case 'mem-report':
-      return $strings;
-
-      // Store string in memory (only supports single strings)
-    case 'mem-store':
-      $strings[$value['msgid']] = $value['msgstr'];
-      return;
-
-      // Called at end of import to inform the user
-    case 'db-report':
-      return array(
-        $headerdone,
-        $report['additions'],
-        $report['updates'],
-        $report['deletes'],
-        $report['skips'],
-      );
+  case 'mem-report':
+    return $strings;
+
+    // Store string in memory (only supports single strings)
+  case 'mem-store':
+    $strings[$value['msgid']] = $value['msgstr'];
+    return;
+
+    // Called at end of import to inform the user
+  case 'db-report':
+    return array(
+      $headerdone,
+      $report['additions'],
+      $report['updates'],
+      $report['deletes'],
+      $report['skips'],
+    );
 
-      // Store the string we got in the database.
-    case 'db-store':
-      // We got header information.
-      if ($value['msgid'] == '') {
-        $languages = language_list();
-        if (($mode != LOCALE_IMPORT_KEEP) || empty($languages[$lang]->plurals)) {
-          // Since we only need to parse the header if we ought to update the
-          // plural formula, only run this if we don't need to keep existing
-          // data untouched or if we don't have an existing plural formula.
-          $header = _locale_import_parse_header($value['msgstr']);
-
-          // Get and store the plural formula if available.
-          if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filename)) {
-            list($nplurals, $plural) = $p;
-            db_query("UPDATE {languages} SET plurals = %d, formula = '%s' WHERE language = '%s'", $nplurals, $plural, $lang);
-          }
+    // Store the string we got in the database.
+  case 'db-store':
+    // We got header information.
+    if ($value['msgid'] == '') {
+      $languages = language_list();
+      if (($mode != LOCALE_IMPORT_KEEP) || empty($languages[$lang]->plurals)) {
+        // Since we only need to parse the header if we ought to update the
+        // plural formula, only run this if we don't need to keep existing
+        // data untouched or if we don't have an existing plural formula.
+        $header = _locale_import_parse_header($value['msgstr']);
+
+        // Get and store the plural formula if available.
+        if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filename)) {
+          list($nplurals, $plural) = $p;
+          db_query("UPDATE {languages} SET plurals = %d, formula = '%s' WHERE language = '%s'", $nplurals, $plural, $lang);
         }
-        $headerdone = TRUE;
       }
+      $headerdone = TRUE;
+    }
 
-      else {
-        // Some real string to import.
-        $comments = _locale_import_shorten_comments(empty($value['#']) ? array() : $value['#']);
-
-        if (strpos($value['msgid'], "\0")) {
-          // This string has plural versions.
-          $english = explode("\0", $value['msgid'], 2);
-          $entries = array_keys($value['msgstr']);
-          for ($i = 3; $i <= count($entries); $i++) {
-            $english[] = $english[1];
-          }
-          $translation = array_map('_locale_import_append_plural', $value['msgstr'], $entries);
-          $english = array_map('_locale_import_append_plural', $english, $entries);
-          foreach ($translation as $key => $trans) {
-            if ($key == 0) {
-              $plid = 0;
-            }
-            $plid = _boinctranslate_locale_import_one_string_db($report, $lang, $english[$key], $trans, $group, $comments, $mode, $plid, $key);
+    else {
+      // Some real string to import.
+      $comments = _locale_import_shorten_comments(empty($value['#']) ? array() : $value['#']);
+
+      if (strpos($value['msgid'], "\0")) {
+        // This string has plural versions.
+        $english = explode("\0", $value['msgid'], 2);
+        $entries = array_keys($value['msgstr']);
+        for ($i = 3; $i <= count($entries); $i++) {
+          $english[] = $english[1];
+        }
+        $translation = array_map('_locale_import_append_plural', $value['msgstr'], $entries);
+        $english = array_map('_locale_import_append_plural', $english, $entries);
+        foreach ($translation as $key => $trans) {
+          if ($key == 0) {
+            $plid = 0;
           }
+          $plid = _boinctranslate_locale_import_one_string_db($report, $lang, $english[$key], $trans, $group, $comments, $mode, $plid, $key);
         }
+      }
 
-        else {
-          // A simple string to import.
-          $english = $value['msgid'];
-          $translation = $value['msgstr'];
-          _boinctranslate_locale_import_one_string_db($report, $lang, $english, $translation, $group, $comments, $mode);
-        }
+      else {
+        // A simple string to import.
+        $english = $value['msgid'];
+        $translation = $value['msgstr'];
+        _boinctranslate_locale_import_one_string_db($report, $lang, $english, $translation, $group, $comments, $mode);
       }
+    }
   } // end of db-store operation
 }
 

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

Switch Indentation +28 added lines, -28 removed lines

@@ -18,15 +18,15 @@ 
  */
 function boinc_solr_search_block($op = 'list', $delta = 0, $edit = array()) {
   switch ($op) {
-    case 'list':
-      return boinc_solr_search_block_info();
-      break;
-    case 'view':
-      return boinc_solr_search_block_view($delta);
-      break;
-    case 'configure':
-    case 'save':
-    default:
+  case 'list':
+    return boinc_solr_search_block_info();
+    break;
+  case 'view':
+    return boinc_solr_search_block_view($delta);
+    break;
+  case 'configure':
+  case 'save':
+  default:
   }
 }
 
@@ -53,26 +53,26 @@ 
 function boinc_solr_search_block_view($delta = 0) {
   $block = array();
   switch($delta) {
-    case 'boinc_solr_search_0':
-      $items = array(
-          bts('By default a search matches ANY search term. Results with more than one term will be presented higher in the search results.', array(), NULL, 'boinc:search-help-sidebar-block'),
-          bts('You may use \'AND\' to have the search engine return results with ALL search terms.', array(), NULL, 'boinc:search-help-sidebar-block'),
-          bts('For example, searching for \'boinc AND client\' will only contain results with words boinc and client.', array(), NULL, 'boinc:search-help-sidebar-block')
-      );
+  case 'boinc_solr_search_0':
+    $items = array(
+        bts('By default a search matches ANY search term. Results with more than one term will be presented higher in the search results.', array(), NULL, 'boinc:search-help-sidebar-block'),
+        bts('You may use \'AND\' to have the search engine return results with ALL search terms.', array(), NULL, 'boinc:search-help-sidebar-block'),
+        bts('For example, searching for \'boinc AND client\' will only contain results with words boinc and client.', array(), NULL, 'boinc:search-help-sidebar-block')
+    );
 
-      drupal_add_js('misc/collapse.js');
-      // For Drupal 7 the format of the array changes, see https://api.drupal.org/api/drupal/includes%21form.inc/function/theme_fieldset/7.x for details.
-      $collapsible_item = array(
-        '#title' => bts('Search Help', array(), NULL, 'boinc:search-help-sidebar-block'),
-        '#description' => theme_item_list($items),
-        '#collapsible' => TRUE,
-        '#collapsed' => TRUE,
-        '#attributes' => array(
-          'class' => 'search-help-block',
-        ),
-      );
-      $block['content'] = theme('fieldset', $collapsible_item);
-      break;
+    drupal_add_js('misc/collapse.js');
+    // For Drupal 7 the format of the array changes, see https://api.drupal.org/api/drupal/includes%21form.inc/function/theme_fieldset/7.x for details.
+    $collapsible_item = array(
+      '#title' => bts('Search Help', array(), NULL, 'boinc:search-help-sidebar-block'),
+      '#description' => theme_item_list($items),
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
+      '#attributes' => array(
+        'class' => 'search-help-block',
+      ),
+    );
+    $block['content'] = theme('fieldset', $collapsible_item);
+    break;
   }
   return $block;
 }

drupal/sites/default/boinc/modules/boincuser/boincuser.views.inc

Switch Indentation +254 added lines, -254 removed lines

@@ -13,255 +13,255 @@ 
  */
 function boincuser_views_data() {
   
-  // -----------------------------------------------------------------------------------------------
-  // Definition for user table
-  // -----------------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------------------------
+// Definition for user table
+// -----------------------------------------------------------------------------------------------
   
-  $data['user']['table']['group'] = t('BOINC');
+$data['user']['table']['group'] = t('BOINC');
   
-  $data['user']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC user'),
-      'help' => t('BOINC account data for a user'),
-      'database' => 'boinc_ro'
-  );
+$data['user']['table']['base'] = array(
+  'field' => 'id',
+  'title' => t('BOINC user'),
+  'help' => t('BOINC account data for a user'),
+  'database' => 'boinc_ro'
+);
 
-  // Describe each of the individual fields in this table to Views. For
-  // each field, you may define what field, sort, argument, and/or filter
-  // handlers it supports. This will determine where in the Views interface you
-  // may use the field.
+// Describe each of the individual fields in this table to Views. For
+// each field, you may define what field, sort, argument, and/or filter
+// handlers it supports. This will determine where in the Views interface you
+// may use the field.
   
-  // Primary keys allowed as arguments
+// Primary keys allowed as arguments
   
-  $data['user']['id'] = array(
-    'title' => bts('Id', array(), NULL, 'boinc:user-id'),
-    'help' => t('The BOINC ID of the user account.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_boincuser_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['user']['teamid'] = array(
-    'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
-    'help' => t('The ID of the user\'s team.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['user']['id'] = array(
+'title' => bts('Id', array(), NULL, 'boinc:user-id'),
+'help' => t('The BOINC ID of the user account.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'argument' => array(
+  'handler' => 'views_handler_argument_boincuser_id', // custom handler
+  'name field' => 'title', // the field to display in the summary.
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['user']['teamid'] = array(
+'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
+'help' => t('The ID of the user\'s team.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+),
+'argument' => array(
+  'handler' => 'views_handler_argument_boincteam_id', // custom handler
+  'name field' => 'title', // the field to display in the summary.
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // Descriptions of general host fields (alphabetized)
+// Descriptions of general host fields (alphabetized)
   
-  $data['user']['authenticator'] = array(
-    'title' => bts('Account Key', array(), NULL, 'boinc:user-info'),
-    'help' => t('The BOINC account key of the user.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['user']['country'] = array(
-    'title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
-    'help' => t('The country of the user.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['user']['create_time'] = array(
-    'title' => bts('Member since', array(), NULL, 'boinc:user-info'),
-    'help' => t('When the BOINC account was created.'),
-    'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_date'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_date'
-    )
-  );
-  $data['user']['cross_project_id'] = array(
-    'title' => bts('CPID', array(), NULL, 'boinc:user-info'),
-    'help' => t('The cross project user identifier.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['user']['email_addr'] = array(
-      'title' => bts('Email Address', array(), NULL, 'boinc:user-info'),
-    'help' => t('The BOINC account email address.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['user']['expavg_credit'] = array(
-    'title' => bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC'),
-    'help' => t('A decaying average of credit per day for the user.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['user']['name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
-    'help' => t('The BOINC account user name.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )                           
-  );
-  $data['user']['passwd_hash'] = array(
-    'title' => bts('Password Hash', array(), NULL, 'boinc:user-info'),
-    'help' => t('The user password hash'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['user']['postal_code'] = array(
-    'title' => bts('Postal Code', array(), NULL, 'boinc:user-info'),
-    'help' => t('The postal code of the user.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['user']['send_email'] = array(
-    'title' => bts('Send Email', array(), NULL, 'boinc:user-info'),
-    'help' => t('User preference to allow email communications.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['user']['show_hosts'] = array(
-    'title' => bts('Show Hosts', array(), NULL, 'boinc:user-info'),
-    'help' => t('User preference to display owned computers.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['user']['total_credit'] = array(
-    'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
-    'help' => t('The total accumulated BOINC credit for the user.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['user']['url'] = array(
-    'title' => bts('URL', array(), NULL, 'boinc:website-of-user-or-team'),
-    'help' => t('The URL provided by the user'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
+$data['user']['authenticator'] = array(
+'title' => bts('Account Key', array(), NULL, 'boinc:user-info'),
+'help' => t('The BOINC account key of the user.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['user']['country'] = array(
+'title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
+'help' => t('The country of the user.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['user']['create_time'] = array(
+'title' => bts('Member since', array(), NULL, 'boinc:user-info'),
+'help' => t('When the BOINC account was created.'),
+'field' => array(
+  'handler' => 'views_handler_field_date',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_date'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_date'
+)
+);
+$data['user']['cross_project_id'] = array(
+'title' => bts('CPID', array(), NULL, 'boinc:user-info'),
+'help' => t('The cross project user identifier.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['user']['email_addr'] = array(
+  'title' => bts('Email Address', array(), NULL, 'boinc:user-info'),
+'help' => t('The BOINC account email address.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['user']['expavg_credit'] = array(
+'title' => bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC'),
+'help' => t('A decaying average of credit per day for the user.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['user']['name'] = array(
+'title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
+'help' => t('The BOINC account user name.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)                           
+);
+$data['user']['passwd_hash'] = array(
+'title' => bts('Password Hash', array(), NULL, 'boinc:user-info'),
+'help' => t('The user password hash'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['user']['postal_code'] = array(
+'title' => bts('Postal Code', array(), NULL, 'boinc:user-info'),
+'help' => t('The postal code of the user.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['user']['send_email'] = array(
+'title' => bts('Send Email', array(), NULL, 'boinc:user-info'),
+'help' => t('User preference to allow email communications.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['user']['show_hosts'] = array(
+'title' => bts('Show Hosts', array(), NULL, 'boinc:user-info'),
+'help' => t('User preference to display owned computers.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['user']['total_credit'] = array(
+'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
+'help' => t('The total accumulated BOINC credit for the user.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['user']['url'] = array(
+'title' => bts('URL', array(), NULL, 'boinc:website-of-user-or-team'),
+'help' => t('The URL provided by the user'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
   
-  return $data;
+return $data;
 }
 
 /*
@@ -272,17 +272,17 @@ 
  */
 
 function boincuser_views_handlers() {
-  return array(
-    'info' => array(
-      'path' => drupal_get_path('module', 'boincuser') . '/views',
-    ),
-    'handlers' => array(
-      'views_handler_argument_boincuser_id' => array(
-        'parent' => 'views_handler_argument_numeric'
-      ),
-      'views_handler_argument_boincteam_id' => array(
-        'parent' => 'views_handler_argument_numeric'
-      ),
-    )
-  );
+return array(
+'info' => array(
+  'path' => drupal_get_path('module', 'boincuser') . '/views',
+),
+'handlers' => array(
+  'views_handler_argument_boincuser_id' => array(
+    'parent' => 'views_handler_argument_numeric'
+  ),
+  'views_handler_argument_boincteam_id' => array(
+    'parent' => 'views_handler_argument_numeric'
+  ),
+)
+);
 }

html/inc/password_compat/password.inc

Switch Indentation +40 added lines, -40 removed lines

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

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

Switch Indentation +31 added lines, -31 removed lines

@@ -59,37 +59,37 @@
   // 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);
+  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/default/boinc/modules/boincuser/includes/boincuser.forms.inc

Switch Indentation +658 added lines, -658 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) {
-    user_authenticate($form_state['values']);
-    return;
-  }
+// 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'])) {
-    // 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'));
-  }
+// 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)) {
-    return false;
-  }
+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)) {
-    $user = $existing_user;
-  } 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'));
-    }
-  }
+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 {
+// 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'));
+}
+}
 }
 
 
@@ -98,277 +98,277 @@ 
  * New user registration validation handler.
  */
 function boincuser_register_validate($form, &$form_state) {
-  // Include BOINC database objects library
-  require_boinc('boinc_db');
-
-  // Check terms of use agreement
-  $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-  if (!empty($termsofuse)) {
-    if (!$form_state['values']['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;
-    }
-  }
+// Include BOINC database objects library
+require_boinc('boinc_db');
+
+// Check terms of use agreement
+$termsofuse = variable_get('boinc_weboptions_termsofuse', '');
+if (!empty($termsofuse)) {
+if (!$form_state['values']['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;
+}
+}
 
-  // 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
-    form_set_error('mail', bts('An account already exists for @email. Contact the administrators for @project for additional help.',
-      array(
-        '@email' => $lower_email_addr,
-        '@project' => variable_get('site_name', 'Drupal-BOINC'), NULL, 'boinc:add-new-user',
-      )
-    , NULL, 'boinc:register-new-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
+form_set_error('mail', bts('An account already exists for @email. Contact the administrators for @project for additional help.',
+  array(
+    '@email' => $lower_email_addr,
+    '@project' => variable_get('site_name', 'Drupal-BOINC'), NULL, 'boinc:add-new-user',
+  )
+, 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) {
-    // 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 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)) {
-    $boinc_user = boincuser_load($boinc_user);
-  }
-  if ($boinc_user) {
-    $account = boincuser_create_drupal_user($boinc_user);
-    if ($account) {
-      boincuser_create_drupal_profile($account, $boinc_user);
-    }
-  }
-  return $account;
+$account = null;
+if (is_numeric($boinc_user)) {
+$boinc_user = boincuser_load($boinc_user);
+}
+if ($boinc_user) {
+$account = boincuser_create_drupal_user($boinc_user);
+if ($account) {
+  boincuser_create_drupal_profile($account, $boinc_user);
+}
+}
+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) {
-    return NULL;
-  }
+$boinc_user->id)
+);
+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) {
-    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);
-  
-  $userinfo = array(
-    'name' => $unique_name,
-    'pass' => $boinc_user->passwd_hash,
-    'mail' => $boinc_email,
-    'signature' => $boinc_user->prefs->signature,
-    'created' => $boinc_user->create_time,
-    'init' => $boinc_email,
-    'status' => 1,
-    "authname_{$module}" => $boinc_email,
-    'access' => time()
-  );
-  
-  $in_penalty = ($boinc_user->prefs->banished_until > time());
+$boinc_email)
+);
+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;
+}
   
-  // 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 => ''
-    );
-  }
+// Make sure name is unique
+$unique_name = create_proper_drupalname($boinc_user->name);
+  
+$userinfo = array(
+'name' => $unique_name,
+'pass' => $boinc_user->passwd_hash,
+'mail' => $boinc_email,
+'signature' => $boinc_user->prefs->signature,
+'created' => $boinc_user->create_time,
+'init' => $boinc_email,
+'status' => 1,
+"authname_{$module}" => $boinc_email,
+'access' => time()
+);
+  
+$in_penalty = ($boinc_user->prefs->banished_until > time());
+  
+// 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 => ''
+);
+}
   
-  // 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) {
-    drupal_set_message(t("Error saving user account."), 'error');
-    return NULL;
-  }
+// 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) {
-    // Import the timestamp of when the penalty period will be over
-    $boincuser_record = array(
-      'uid' => $account->uid,
-      'penalty_expiration' => $boinc_user->prefs->banished_until,
-    );
-    drupal_write_record('boincuser', $boincuser_record, 'uid');
-  }
+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,
+);
+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);
-  
-  $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;
-  
-  // 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) {
-        $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);
-    }
-    $profile_approved = $boinc_profile->verification ? TRUE : FALSE;
+require_boinc('forum_db');
+BoincForumPrefs::lookup($boinc_user);
+  
+$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;
+  
+// 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) {
+    $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
   }
-  $default_input_format = db_result(db_query("
+}
+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);
+}
+$profile_approved = $boinc_profile->verification ? TRUE : FALSE;
+}
+$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) {
-    $profile_node->moderate = 0;
-    node_save($profile_node);
-  }
+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;
-    }
-    return true;
+// 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;
+}
+return true;
 }
 
 /**
  * Convert any BOINC forum thread subscriptions to Drupal flag subscriptions
  */
 function boincuser_pull_subscriptions($account = NULL) {
-  if (!$account) {
-    global $user;
-    $account = user_load($user->id);
-  }
-  elseif (is_numeric($account)) {
-    $account = user_load($account);
-  }
+if (!$account) {
+global $user;
+$account = user_load($user->id);
+}
+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)) {
-    // For each BOINC thread ID subscribed, look up the corresponding node ID
-    $nid = db_result(db_query('
+$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++;
-    }
-  }
-  return $count;
+// Flag this node for the user
+if ($nid > 0) {
+  $flag->flag('flag', $nid, $account);
+  $count++;
+}
+}
+return $count;
 }
 
 
@@ -380,66 +380,66 @@ 
  * 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) {
-    // 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
-    // address.
-
-    // 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']) );
-    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'))) ) {
-      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,
-        ),
-        NULL, 'boinc:account-credentials-change')
-      );
-    }
-  }
+// 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
+// address.
+
+// 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']) );
+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'));
+}
 
-  // 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']);
-    }
-    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) ) {
-        form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:account-credentials-change'));
-      }
-
-    }
-  }
+// 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',
+    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,
+    ),
+    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')) {
-    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 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']);
+}
+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) ) {
+    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')) {
+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...?
   
 }
 
@@ -452,125 +452,125 @@ 
  * 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 {
-    // set email addrress to lower case
-    $lower_email_addr = strtolower($edit['name']);
-
-    // First look for an existing Drupal account
-    if ($account = user_load_by_mail($lower_email_addr)) return;
-    // Otherwise, check the BOINC db for this email address
-    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);
-    } 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'));
-    }
-  }
+$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']);
+
+// First look for an existing Drupal account
+if ($account = user_load_by_mail($lower_email_addr)) return;
+// Otherwise, check the BOINC db for this email address
+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);
+} 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'));
+}
+}
 }
 
 /**
  * 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(
-    '#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(
-    '#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(
-    '#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(
-    '#value' => '<ul class="form-control tab-list">',
-    '#weight' => 1001,
-  );
-  $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(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/password') . '</li>',
-    '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
-    '#value' => '</ul>',
-    '#weight' => 1004,
-  );
-  return $form;
+$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(
+'#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(
+'#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(
+'#value' => '<ul class="form-control tab-list">',
+'#weight' => 1001,
+);
+$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(
+'#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/password') . '</li>',
+'#weight' => 1003,
+);
+$form['form control tabs suffix'] = array(
+'#value' => '</ul>',
+'#weight' => 1004,
+);
+return $form;
 }
 
 /**
  * The authenticator login validation handler
  */
 function boincuser_authloginform_validate($form, &$form_state) {
-  $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 {
-    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'));
-  }
+$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 {
+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';
 }
 
 
@@ -578,44 +578,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(
-    '#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(
-    '#value' => '<ul class="form-control tab-list">',
-    '#weight' => 1001,
-  );
-  $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(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
-    '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
-    '#value' => '</ul>',
-    '#weight' => 1004,
-  );
-  return $form;
+$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(
+'#value' => '<ul class="form-control tab-list">',
+'#weight' => 1001,
+);
+$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(
+'#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
+'#weight' => 1003,
+);
+$form['form control tabs suffix'] = array(
+'#value' => '</ul>',
+'#weight' => 1004,
+);
+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);
 }
 
 
@@ -623,52 +623,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(
-    '#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(
-    '#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(
-    '#value' => '<ul class="form-control tab-list">',
-    '#weight' => 1001,
-  );
-  $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(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
-    '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
-    '#value' => '</ul>',
-    '#weight' => 1004,
-  );
-  return $form;
+$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(
+'#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(
+'#value' => '<ul class="form-control tab-list">',
+'#weight' => 1001,
+);
+$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(
+'#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
+'#weight' => 1003,
+);
+$form['form control tabs suffix'] = array(
+'#value' => '</ul>',
+'#weight' => 1004,
+);
+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);
 }
 
 
@@ -676,10 +676,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') {
-    $form_state['values']['action'] = 'unflag';
-  }
+// Leaving action as "unfriend" causes problems
+if ($form_state['values']['action'] == 'unfriend') {
+$form_state['values']['action'] = 'unflag';
+}
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -687,90 +687,90 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 function boincuser_termsofuse_form() {
-  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)) {
-    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' );
+global $user;
 
-  $form = array();
-
-  // Terms of use section
-  $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-  $form['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>',
-  );
-
-  $form['termsofuse'] = array(
-    '#weight' => -10,
-    '#value' => bts($termsofuse, array(), NULL, 'project:termsofuse-form'),
-    '#prefix' => '<div id="register-termsofuse">',
-    '#suffix' => '</div>',
-  );
-
-  $form['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['spacer'] = array(
-    '#prefix' => '<div id="register-title2">',
-    '#value'  => '&nbsp;',
-    '#suffix' => '</div>',
-  );
+// 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();
+}
 
-  // Form Control
-  $form['submit'] = array(
-    '#prefix' => '<p><p><p><li class="first tab">',
-    '#type' => '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>',
-  );
-  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>',
-    );
-  }
+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();
+
+// Terms of use section
+$termsofuse = variable_get('boinc_weboptions_termsofuse', '');
+$form['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>',
+);
+
+$form['termsofuse'] = array(
+'#weight' => -10,
+'#value' => bts($termsofuse, array(), NULL, 'project:termsofuse-form'),
+'#prefix' => '<div id="register-termsofuse">',
+'#suffix' => '</div>',
+);
+
+$form['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['spacer'] = array(
+'#prefix' => '<div id="register-title2">',
+'#value'  => '&nbsp;',
+'#suffix' => '</div>',
+);
+
+// Form Control
+$form['submit'] = array(
+'#prefix' => '<p><p><p><li class="first tab">',
+'#type' => '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>',
+);
+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>',
+);
+}
 
-  // 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']['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'));
-  }
+// Check TOU agreement
+if (!$form_state['values']['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)) {
-    form_set_error('termsofuse', bts('There was an error in agreeing to the terms of use. Please contact the site administrators.', array(), NULL, 'boinc:termsofuse-form'));
-  }
+$user = $form['#account'];
+if (!boincuser_consentto_termsofuse($user)) {
+form_set_error('termsofuse', bts('There was an error in agreeing to the terms of use. Please contact the site administrators.', array(), NULL, 'boinc:termsofuse-form'));
+}
 
-  // Delete session messages
-  if ($_SESSION['messages']['warning']) {
-    unset($_SESSION['messages']['warning']);
-  }
+// Delete session messages
+if ($_SESSION['messages']['warning']) {
+unset($_SESSION['messages']['warning']);
+}
 }
 
 /**
@@ -779,88 +779,88 @@ 
  * removed after used.
  */
 function boincuser_revertemail(&$form_state, $token) {
-  require_boinc('token');
-  require_boinc('util');
-
-  global $user;
-  $form = array();
-
-  // 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')) {
-    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"),
-    ),
-    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);
-
-  // 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(
-        '!prev_email' => $account->boincuser_previous_email_addr,
-      ),
-      NULL, 'boinc:revert-email-change').
-    '</p>',
-  );
-
-  $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,
-  );
+require_boinc('token');
+require_boinc('util');
+
+global $user;
+$form = array();
+
+// 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')) {
+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"),
+),
+NULL, 'boinc:revert-email-change'), 'error');
+drupal_goto();
+}
 
-  return $form;
+// 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(
+'#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(
+    '!prev_email' => $account->boincuser_previous_email_addr,
+  ),
+  NULL, 'boinc:revert-email-change').
+'</p>',
+);
+
+$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;
 }
 
 /**
  * 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);
-
-  if (BoincUser::lookup_email_addr($boinc_user->previous_email_addr)) {
-    form_set_error('mail', bts('An account already exists for @email. Please contact admins for @project. Previous email address cannot be used because another account is using it as their email address.',
-      array(
-        '@email' => $boinc_user->previous_email_addr,
-        '@project' => variable_get('site_name', 'Drupal-BOINC'),
-      ),
-    NULL, 'boinc:add-new-user'));
-  }
+// 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)) {
+form_set_error('mail', bts('An account already exists for @email. Please contact admins for @project. Previous email address cannot be used because another account is using it as their email address.',
+  array(
+    '@email' => $boinc_user->previous_email_addr,
+    '@project' => variable_get('site_name', 'Drupal-BOINC'),
+  ),
+NULL, 'boinc:add-new-user'));
+}
 
 }
 
@@ -868,25 +868,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

Switch Indentation +452 added lines, -452 removed lines

@@ -27,295 +27,295 @@ 
  * with defined URL paths
  */
 function boincuser_menu() {
-  $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(
-    'title' => '',
-    'description' => '',
-    'page callback' => 'boincuser_view_profile',
-    'access callback' => 'user_is_logged_in',
-    'type' => MENU_NORMAL_ITEM
-  );
-  $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(
-    '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(
-    'title' => 'User team',
-    'description' => '',
-    'page callback' => 'boincuser_goto_team',
-    'access callback' => 'user_is_logged_in',
-    'type' => MENU_CALLBACK,
-  );
-  $items['moderate/profile/%user/approve'] = array(
-    'title' => 'Profile approval',
-    'description' => 'Approve profile content',
-    'page callback' => 'boincuser_moderate_profile_approve',
-    'page arguments' => array(2),
-    'access arguments' => array('edit any profile content'),
-    'type' => MENU_CALLBACK,
-    'weight' => 5
-  );
-  $items['moderate/profile/%user/edit'] = array(
-    'title' => 'Profile editor',
-    'description' => 'Edit a user profile',
-    'page callback' => 'boincuser_edit_profile',
-    'page arguments' => array(2),
-    'access arguments' => array('edit any profile content'),
-    'type' => MENU_CALLBACK,
-    'weight' => 5
-  );
-  $items['moderate/profile/%/reject'] = array(
-    '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),
-    'access arguments' => array('edit any profile content'),
-    'type' => MENU_CALLBACK,
-    'weight' => 5
-  );
-  $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(
-    'title' => '',
-    'description' => '',
-    'page callback' => 'join_page',
-    'access arguments' => array('access content'),
-    'type' => MENU_NORMAL_ITEM
-  );
-  $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(
-    '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(
-    '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(
-    '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(
-    'page callback' => 'boincuser_control',
-    'access arguments' => array('access user profiles'),
-    'type' => MENU_CALLBACK
-  );
-  $items['admin/boinc'] = array(
-    'title' => 'BOINC configuration',
-    'position' => 'right',
-    'weight' => -8,
-    'page callback' => 'system_admin_menu_block_page',
-    'access arguments' => array('administer site configuration'),
-    'file' => 'system.admin.inc',
-    'file path' => drupal_get_path('module', 'system'),
-  );
-  $items['admin/boinc/environment'] = array(
-    'title' => 'Environment: General',
-    'description' => 'Set paths to BOINC functions and any other necessary
+$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(
+'title' => '',
+'description' => '',
+'page callback' => 'boincuser_view_profile',
+'access callback' => 'user_is_logged_in',
+'type' => MENU_NORMAL_ITEM
+);
+$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(
+'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(
+'title' => 'User team',
+'description' => '',
+'page callback' => 'boincuser_goto_team',
+'access callback' => 'user_is_logged_in',
+'type' => MENU_CALLBACK,
+);
+$items['moderate/profile/%user/approve'] = array(
+'title' => 'Profile approval',
+'description' => 'Approve profile content',
+'page callback' => 'boincuser_moderate_profile_approve',
+'page arguments' => array(2),
+'access arguments' => array('edit any profile content'),
+'type' => MENU_CALLBACK,
+'weight' => 5
+);
+$items['moderate/profile/%user/edit'] = array(
+'title' => 'Profile editor',
+'description' => 'Edit a user profile',
+'page callback' => 'boincuser_edit_profile',
+'page arguments' => array(2),
+'access arguments' => array('edit any profile content'),
+'type' => MENU_CALLBACK,
+'weight' => 5
+);
+$items['moderate/profile/%/reject'] = array(
+'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),
+'access arguments' => array('edit any profile content'),
+'type' => MENU_CALLBACK,
+'weight' => 5
+);
+$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(
+'title' => '',
+'description' => '',
+'page callback' => 'join_page',
+'access arguments' => array('access content'),
+'type' => MENU_NORMAL_ITEM
+);
+$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(
+'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(
+'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(
+'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(
+'page callback' => 'boincuser_control',
+'access arguments' => array('access user profiles'),
+'type' => MENU_CALLBACK
+);
+$items['admin/boinc'] = array(
+'title' => 'BOINC configuration',
+'position' => 'right',
+'weight' => -8,
+'page callback' => 'system_admin_menu_block_page',
+'access arguments' => array('administer site configuration'),
+'file' => 'system.admin.inc',
+'file path' => drupal_get_path('module', 'system'),
+);
+$items['admin/boinc/environment'] = array(
+'title' => 'Environment: General',
+'description' => 'Set paths to BOINC functions and any other necessary
       variables that establish a BOINC environment.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('boincuser_admin_environment'),
-    'access arguments' => array('administer site configuration'),
-    'type' => MENU_NORMAL_ITEM,
-    'file' => 'boincuser.admin.inc'
-  );
-  $items['admin/boinc/scheduler'] = array(
-    'title' => 'Environment: Scheduling server URLs',
-    'description' => 'Set BOINC scheduler options.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('boincuser_admin_scheduler'),
-    'access arguments' => array('administer site configuration'),
-    'type' => MENU_NORMAL_ITEM,
-    'file' => 'boincuser.admin.inc'
-  );
-  $items['admin/boinc/weboptions'] = array(
-    'title' => 'Environment: Website Options',
-    'description' => 'Set options configuring this Drupal-BOINC Web site.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('boincuser_admin_weboptions'),
-    'access arguments' => array('administer site configuration'),
-    'type' => MENU_NORMAL_ITEM,
-    'file' => 'boincuser.admin.inc'
-  );
+'page callback' => 'drupal_get_form',
+'page arguments' => array('boincuser_admin_environment'),
+'access arguments' => array('administer site configuration'),
+'type' => MENU_NORMAL_ITEM,
+'file' => 'boincuser.admin.inc'
+);
+$items['admin/boinc/scheduler'] = array(
+'title' => 'Environment: Scheduling server URLs',
+'description' => 'Set BOINC scheduler options.',
+'page callback' => 'drupal_get_form',
+'page arguments' => array('boincuser_admin_scheduler'),
+'access arguments' => array('administer site configuration'),
+'type' => MENU_NORMAL_ITEM,
+'file' => 'boincuser.admin.inc'
+);
+$items['admin/boinc/weboptions'] = array(
+'title' => 'Environment: Website Options',
+'description' => 'Set options configuring this Drupal-BOINC Web site.',
+'page callback' => 'drupal_get_form',
+'page arguments' => array('boincuser_admin_weboptions'),
+'access arguments' => array('administer site configuration'),
+'type' => MENU_NORMAL_ITEM,
+'file' => 'boincuser.admin.inc'
+);
   
-  $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(
-    '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(
-    'page callback' => '_boincuser_user_name_autocomplete',
-    'access callback' => TRUE,
-    'type' => MENU_CALLBACK,
-  );
-  $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(
-    'title' => t('Recover previous email'),
-    'description' => t('redirect'),
-    'page callback' => '_boincuser_redirect_recover_email',
-    'access callback' => TRUE,
-    'type' => MENU_CALLBACK,
-  );
-  return $items;
+$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(
+'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(
+'page callback' => '_boincuser_user_name_autocomplete',
+'access callback' => TRUE,
+'type' => MENU_CALLBACK,
+);
+$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(
+'title' => t('Recover previous email'),
+'description' => t('redirect'),
+'page callback' => '_boincuser_redirect_recover_email',
+'access callback' => TRUE,
+'type' => MENU_CALLBACK,
+);
+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/') {
-    return;
-  }
+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')) {
-    // Ensure we have a configured BOINC environment
-    boinc_get_path();
-    boinc_get_scheduler_tags();
-  }
+// 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')) {
-    // Display any persistent team messages
-    boincteam_show_messages();
-  }
+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) ) {
-    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])) {
-        $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',
-        );
-        if (module_exists('boincuser_delete')) {
-          $paths0[] = 'user/' . $user->uid . '/delete';
-          $paths0[] = 'user/' . $user->uid . '/deleteconfirm/*';
-          $paths0[] = 'user/' . $user->uid . '/odeleteconfirm/*';
-        }
+// 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])) {
+    $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',
+    );
+    if (module_exists('boincuser_delete')) {
+      $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);
-        }
+    // 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);
+    }
 
-        // paths to ignore
-        $paths_to_ignore = array_unique( array_merge($paths0, $paths2) );
+    // paths to ignore
+    $paths_to_ignore = array_unique( array_merge($paths0, $paths2) );
 
-        if (!_boincuser_ignore_paths($path, $paths_to_ignore)) {
-          drupal_goto('user/termsofuse');
-        }
-      }
+    if (!_boincuser_ignore_paths($path, $paths_to_ignore)) {
+      drupal_goto('user/termsofuse');
     }
   }
 }
+}
+}
 
 /**
  * Implementation of hook_user(); add custom actions to standard
  * Drupal user operations
  */
 function boincuser_user($op, &$edit, &$account, $category = NULL) {
-  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 ($account->uid > 1) {
-    switch($op) {
-    case 'load':
-      // User loading; insert BOINC data into the user object
-      $drupal_user = db_fetch_object(db_query("
+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 ($account->uid > 1) {
+switch($op) {
+case 'load':
+// User loading; insert BOINC data into the user object
+$drupal_user = db_fetch_object(db_query("
         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->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("
         SELECT
           name,
           authenticator,
@@ -330,30 +330,30 @@ 
           email_addr_change_time
         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->team = db_result(db_query("
+$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->team = db_result(db_query("
           SELECT nid FROM {boincteam} WHERE team_id = %d",
-          $account->boincteam_id
-        ));
-      }
-      // Set post count
-      $account->post_count = db_result(db_query("
+$account->boincteam_id
+));
+}
+// Set post count
+$account->post_count = db_result(db_query("
         SELECT COUNT(*) +
         (
           SELECT COUNT(*) FROM {node}
@@ -365,13 +365,13 @@ 
         INNER JOIN node ON comments.nid = node.nid
         WHERE comments.uid = '%d'
         AND node.status = 1",
-        $account->uid, $account->uid
-      ));
-      break;
+$account->uid, $account->uid
+));
+break;
       
-    case 'view':
-      // SAMPLE: Add BOINC data to the user profile
-      /*$account->content['summary']['boinc_id'] = array(
+case 'view':
+// SAMPLE: Add BOINC data to the user profile
+/*$account->content['summary']['boinc_id'] = array(
         '#type' => 'user_profile_item',
         '#title' => bts('BIONC ID'),
         '#value' => $account->boincuser_id,
@@ -385,174 +385,174 @@ 
         '#attributes' => array('class' => 'boinc-data'),
         '#weight' => 10
       );*/
-      break;
+break;
       
-    case 'validate':
-      if (isset($edit['validation_source'])) {
-        switch ($edit['validation_source']) {
-        case 'user_account':
-          // Validate data before updating user account info
-          boincuser_account_validate($edit, $account);
-          break;
+case 'validate':
+if (isset($edit['validation_source'])) {
+switch ($edit['validation_source']) {
+case 'user_account':
+// Validate data before updating user account info
+boincuser_account_validate($edit, $account);
+break;
         
-        default:
+default:
           
-        }
-        // We don't want to save validation source, so remove it
-        $edit['validation_source'] = null;
-      }
-      break;
+}
+    // We don't want to save validation source, so remove it
+    $edit['validation_source'] = null;
+  }
+  break;
       
-    case 'insert':
-      // New user being added to the system
-      $imported = $_SESSION['importedUser'];
-      unset($_SESSION['importedUser']);
+case 'insert':
+  // New user being added to the system
+  $imported = $_SESSION['importedUser'];
+  unset($_SESSION['importedUser']);
       
-      watchdog(
-        'boincuser',
-        'Creating user account for %email_addr',
-        array('%email_addr' => $edit['mail']),
-        WATCHDOG_NOTICE
-      );
+  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']);
+    // set email address lower-case
+    $lower_email_addr = strtolower($edit['mail']);
 
-        if ($edit['boincuser_name']) {
-          $myname = $edit['boincuser_name'];
-        }
-        else if ($edit['name']) {
-          $myname = $edit['name'];
-        }
-        else {
-          $myname = 'noname';
-        }
+    if ($edit['boincuser_name']) {
+      $myname = $edit['boincuser_name'];
+    }
+    else if ($edit['name']) {
+      $myname = $edit['name'];
+    }
+    else {
+      $myname = 'noname';
+    }
 
-        $user_params = array(
-          'email_addr' => $lower_email_addr,
-          'name' => $myname,
-        );
+    $user_params = array(
+      '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'];
-        }
-        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);
-        }
+    // 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 {
+      // 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;
-        }
+    $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;
+    }
 
-        // Add user to community role by default (not banned)
-        $unrestricted_role = array_search('community member', user_roles(true)); 
-        $edit['roles'] = array(
-          $unrestricted_role => ''
-        );
+    // Add user to community role by default (not banned)
+    $unrestricted_role = array_search('community member', user_roles(true)); 
+    $edit['roles'] = array(
+      $unrestricted_role => ''
+    );
 
-        // Disable show_hosts flag, set to TRUE by default
-        db_set_active('boinc_rw');
-        db_query("UPDATE {user} SET show_hosts=0 WHERE id='%d'", $boinc_user->id);
-        db_set_active('default');
+    // Disable show_hosts flag, set to TRUE by default
+    db_set_active('boinc_rw');
+    db_query("UPDATE {user} SET show_hosts=0 WHERE id='%d'", $boinc_user->id);
+    db_set_active('default');
 
-        // 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;
-        }
+    // 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;
+    }
 
-        // if terms of use exist, the user must agree.
-        $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-        if (!empty($termsofuse)) {
-          $reference2 = boincuser_consentto_termsofuse($account);
-        }
+    // if terms of use exist, the user must agree.
+    $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
+    if (!empty($termsofuse)) {
+      $reference2 = boincuser_consentto_termsofuse($account);
+    }
 
-        // Don't save custom fields to the Drupal user object
-        $edit['boincuser_name'] = null;
-        $edit['boinchash_flag'] = null;
-        // Set email address to lower case in Drupal users table
-        if ($account) {
-          user_save($account, array('mail' => $lower_email_addr));
-        }
-      }
-      break;
+    // Don't save custom fields to the Drupal user object
+    $edit['boincuser_name'] = null;
+    $edit['boinchash_flag'] = null;
+    // Set email address to lower case in Drupal users table
+    if ($account) {
+      user_save($account, array('mail' => $lower_email_addr));
+    }
+  }
+  break;
       
-    case 'update':
-      if (isset($edit['update_source'])) {
-        require_boinc('boinc_db');
-        $boinc_user = BoincUser::lookup_id($account->boincuser_id);
-        switch ($edit['update_source']) {
-        case 'user_account':
-          // 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) {
-            // set email address to lower-case
-            $lower_email_addr = strtolower($edit['mail']);
-
-            // Set password hash appropriately
-            $passwd = ($edit['pass']) ? $edit['pass'] : $edit['current_pass'];
-            $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";
-            }
-            else {
-              $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'));
-            }
-
-            // 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)) {
-            $boincuser_name = $edit['boincuser_name'];
-            $result = $boinc_user->update(
-                "name='{$boincuser_name}'"
-            );
-          }
-
-          break;
-        case 'user_profile':
-          if ($edit['boincuser_name'] != $boinc_user->name) {
-            $boincuser_name = $edit['boincuser_name'];
-            $result = $boinc_user->update(
-                "name='{$boincuser_name}'"
-            );
-          }
-          break;
-        default:
-        }
+case 'update':
+  if (isset($edit['update_source'])) {
+    require_boinc('boinc_db');
+    $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+    switch ($edit['update_source']) {
+    case 'user_account':
+    // 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) {
+    // set email address to lower-case
+    $lower_email_addr = strtolower($edit['mail']);
+
+    // Set password hash appropriately
+    $passwd = ($edit['pass']) ? $edit['pass'] : $edit['current_pass'];
+    $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";
+    }
+    else {
+    $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'));
+    }
+
+    // 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)) {
+    $boincuser_name = $edit['boincuser_name'];
+    $result = $boinc_user->update(
+    "name='{$boincuser_name}'"
+    );
+    }
+
+    break;
+    case 'user_profile':
+    if ($edit['boincuser_name'] != $boinc_user->name) {
+    $boincuser_name = $edit['boincuser_name'];
+    $result = $boinc_user->update(
+    "name='{$boincuser_name}'"
+    );
+    }
+    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;
@@ -560,17 +560,17 @@ 
       }
       break;
 
-    case 'login':
-      // Function is forward compatible to Drupal 7
-      boincuser_user_login($edit, $account);
-      break;
+case 'login':
+  // Function is forward compatible to Drupal 7
+  boincuser_user_login($edit, $account);
+  break;
 
-    case 'delete':
-      // Function is forward compatible to Drupal 7
-      boincuser_user_delete($account);
-      break;
+case 'delete':
+  // Function is forward compatible to Drupal 7
+  boincuser_user_delete($account);
+  break;
 
-    default:
+default:
       
     }
   }