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/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:
       
     }
   }

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

Switch Indentation +304 added lines, -304 removed lines

@@ -94,69 +94,69 @@ 
   global $user;
 
   switch($form_id) {
-    case 'user_profile_form':
-      if ( user_access('delete own account') AND ($form['#uid'] == $user->uid) AND (arg(3)=='') ) {
-        $form['delete'] = array(
-          '#type' => 'submit',
-          '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
-          '#weight' => 1009,
-          '#submit' => array('user_edit_delete_submit'),
-          '#prefix' => '<li class="tab">',
-          '#suffix' => '</li>',
-        );
-      }
-      else if ( user_access('administer users') ) {
-        $form['delete'] = array(
-          '#type' => 'submit',
-          '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
-          '#weight' => 1009,
-          '#submit' => array('_boincuser_delete_goto_admindelete'),
-          '#prefix' => '<li class="tab">',
-          '#suffix' => '</li>',
-        );
-      }
-      else {
-        unset($form['delete']);
-      }
-      break;
-    case 'user_confirm_delete':
-
-      $disable_delete = FALSE;
-      // If email address was changed less than 7 days (7 * 86400 s)
-      // ago, it cannot be changed again.
-      $duration = TOKEN_DURATION_ONE_WEEK;
-      if (($form['_account']['#value']->boincuser_email_addr_change_time + $duration) > time()) {
-        drupal_set_message(
-          bts("INFO: Your email address was changed within the past seven (7) days. You may not delete your account until after !time.",
-            array(
-              '!time' => date('F j, Y \a\t G:i T', $form['_account']['#value']->boincuser_email_addr_change_time + $duration),
-            ), NULL, 'boinc:account-credentials-change')
-        , 'info');
-        $disable_delete = TRUE;
-      }
-
-      // Configure radio options
-      $common_acts = bts("All your posts and comments will be attributed to the Anonymous User. Your user profile will be deleted. Your host information will be deleted. And you will be removed from any team you are a member of.", array(), NULL, 'boinc:delete-user-account');
-
-      $deleteoptions = array(
-        'boincuser_delete_softdelete' => bts('<b>Soft delete</b> your account. Your account will be disabled. ', array(), NULL, 'boinc:delete-user-account'),
-        'boincuser_delete_delete' => bts('<b>Delete</b> your account. ', array(), NULL, 'boinc:delete-user-account'),
+  case 'user_profile_form':
+    if ( user_access('delete own account') AND ($form['#uid'] == $user->uid) AND (arg(3)=='') ) {
+      $form['delete'] = array(
+        '#type' => 'submit',
+        '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
+        '#weight' => 1009,
+        '#submit' => array('user_edit_delete_submit'),
+        '#prefix' => '<li class="tab">',
+        '#suffix' => '</li>',
+      );
+    }
+    else if ( user_access('administer users') ) {
+      $form['delete'] = array(
+        '#type' => 'submit',
+        '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
+        '#weight' => 1009,
+        '#submit' => array('_boincuser_delete_goto_admindelete'),
+        '#prefix' => '<li class="tab">',
+        '#suffix' => '</li>',
       );
+    }
+    else {
+      unset($form['delete']);
+    }
+    break;
+  case 'user_confirm_delete':
+
+    $disable_delete = FALSE;
+    // If email address was changed less than 7 days (7 * 86400 s)
+    // ago, it cannot be changed again.
+    $duration = TOKEN_DURATION_ONE_WEEK;
+    if (($form['_account']['#value']->boincuser_email_addr_change_time + $duration) > time()) {
+      drupal_set_message(
+        bts("INFO: Your email address was changed within the past seven (7) days. You may not delete your account until after !time.",
+          array(
+            '!time' => date('F j, Y \a\t G:i T', $form['_account']['#value']->boincuser_email_addr_change_time + $duration),
+          ), NULL, 'boinc:account-credentials-change')
+      , 'info');
+      $disable_delete = TRUE;
+    }
+
+    // Configure radio options
+    $common_acts = bts("All your posts and comments will be attributed to the Anonymous User. Your user profile will be deleted. Your host information will be deleted. And you will be removed from any team you are a member of.", array(), NULL, 'boinc:delete-user-account');
+
+    $deleteoptions = array(
+      'boincuser_delete_softdelete' => bts('<b>Soft delete</b> your account. Your account will be disabled. ', array(), NULL, 'boinc:delete-user-account'),
+      'boincuser_delete_delete' => bts('<b>Delete</b> your account. ', array(), NULL, 'boinc:delete-user-account'),
+    );
 
-      $dtypes = variable_get('boincuser_delete_type', 'user_decides');
-      // Unset the other option if dtype is set. i.e., if dtype is set
-      // to soft delete, unset the hard delete option.  Likewise, add
-      // the 'common_acts' sentences to the option that remains.
-      switch ($dtypes) {
-        case 'soft_obfuscate':
-          unset($deleteoptions['boincuser_delete_delete']);
-          $deleteoptions['boincuser_delete_softdelete'] .= $common_acts;
-          break;
-        case 'hard_wipe':
-          unset($deleteoptions['boincuser_delete_softdelete']);
-          $deleteoptions['boincuser_delete_delete'] .= $common_acts;
-          break;
-      }
+    $dtypes = variable_get('boincuser_delete_type', 'user_decides');
+    // Unset the other option if dtype is set. i.e., if dtype is set
+    // to soft delete, unset the hard delete option.  Likewise, add
+    // the 'common_acts' sentences to the option that remains.
+    switch ($dtypes) {
+    case 'soft_obfuscate':
+    unset($deleteoptions['boincuser_delete_delete']);
+    $deleteoptions['boincuser_delete_softdelete'] .= $common_acts;
+    break;
+    case 'hard_wipe':
+    unset($deleteoptions['boincuser_delete_softdelete']);
+    $deleteoptions['boincuser_delete_delete'] .= $common_acts;
+    break;
+    }
 
       $question = 'Are you sure you want to delete the account <em>' . htmlspecialchars($form['_account']['#value']->boincuser_name) . '</em>?';
       drupal_set_title($question);
@@ -324,56 +324,56 @@ 
   // create token with 1 day/24 hour expiration
   $mytoken = create_token($account->boincuser_id, 'D', 24*60*60);
   switch ($op) {
-    case 'boincuser_delete_softdelete':
-      $myurl = "${base_url}/user/{$account->uid}/odeleteconfirm/$mytoken";
+  case 'boincuser_delete_softdelete':
+    $myurl = "${base_url}/user/{$account->uid}/odeleteconfirm/$mytoken";
       break;
-    case 'boincuser_delete_delete':
-      $myurl = "${base_url}/user/{$account->uid}/deleteconfirm/$mytoken";
-      break;
-  }
-
-  $mysubject = "Instructions for account deletion at {$site_name}";
-  $mymessage = ''
-    . "{$account->boincuser_name},\n"
-    . "\n"
-    . "We have received a request to DELETE your user account at "
-    . "${site_name}. Below in this email is a one-time token you must "
-    . "use. Either click on the link or copy-and-paste the URL into your "
-    . "browser address bar. Then you will be required to enter your password "
-    . "again to confirm your identity.\n"
-    . "\n"
-    . "${myurl}\n"
-    . "\n"
-    . "This one-time token will expire in 24 hours. Afterwards you must "
-    . "re-request deletion of your account in order to generate a new token.\n"
-    . "\n"
-    . "If you did not initiate this request, please login to the "
-    . "${site_name} Web site (${site_url}) and "
-    . "then contact the administrators.\n"
-    . "\n"
-    . "Thanks, \n"
-    . "\n"
-    . "{$site_name} support team";
-
-  // Create array for sending email to user to notify account is being
-  // disabled/deleted. Then send email.
-  $settings = array(
-    'from' => '',
-    'subject' => $mysubject,
-    'message' => $mymessage,
-  );
-  rules_action_mail_to_user($account, $settings);
-
-  drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'),'info');
+case 'boincuser_delete_delete':
+  $myurl = "${base_url}/user/{$account->uid}/deleteconfirm/$mytoken";
+  break;
+}
 
-  $redirect = variable_get('boincuser_delete_redirect', '<front>');
-  // Redirect
-  if (!empty($redirect)) {
-    drupal_goto($redirect);
-  }
-  else {
-    drupal_goto();
-  }
+$mysubject = "Instructions for account deletion at {$site_name}";
+$mymessage = ''
+. "{$account->boincuser_name},\n"
+. "\n"
+. "We have received a request to DELETE your user account at "
+. "${site_name}. Below in this email is a one-time token you must "
+. "use. Either click on the link or copy-and-paste the URL into your "
+. "browser address bar. Then you will be required to enter your password "
+. "again to confirm your identity.\n"
+. "\n"
+. "${myurl}\n"
+. "\n"
+. "This one-time token will expire in 24 hours. Afterwards you must "
+. "re-request deletion of your account in order to generate a new token.\n"
+. "\n"
+. "If you did not initiate this request, please login to the "
+. "${site_name} Web site (${site_url}) and "
+. "then contact the administrators.\n"
+. "\n"
+. "Thanks, \n"
+. "\n"
+. "{$site_name} support team";
+
+// Create array for sending email to user to notify account is being
+// disabled/deleted. Then send email.
+$settings = array(
+'from' => '',
+'subject' => $mysubject,
+'message' => $mymessage,
+);
+rules_action_mail_to_user($account, $settings);
+
+drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'),'info');
+
+$redirect = variable_get('boincuser_delete_redirect', '<front>');
+// Redirect
+if (!empty($redirect)) {
+drupal_goto($redirect);
+}
+else {
+drupal_goto();
+}
 }
 
 
@@ -385,88 +385,88 @@ 
  * The final confirmation form for the user to delete their account.
  */
 function boincuser_delete_finalconfirmation(&$form_state, $token) {
-  require_boinc('token');
-
-  global $user;
-  $form = array();
-
-  // 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, 'D')) {
-    drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your account be deleted.',
-    array(
-      '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
-    ),
-    NULL, 'boinc:delete-user-account'), 'error');
-    drupal_goto();
-  }
-
-  // Attach account to this form.
-  $form['_account'] = array('#type' => 'value', '#value' => $account);
-
-  // This form is for hard/wipe delete
-  $form['_action'] = array('#type' => 'value', '#value' => 'hard_wipe');
-
-  // Instructions
-  $form['main']['fs1'] = array(
-    '#type' => 'fieldset',
-    '#title' => bts('Instructions', array(), NULL, 'boinc:delete-user-account'),
-    '#weight' => 10,
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
-  );
-  $form['main']['fs1']['instructions1'] = array(
-    '#value' => '<p>'.
-    bts('You are one-step away from deleting your account. Enter your password in the textbox below and click submit. This action is irreversable: once you delete your account, there is no way un-delete.', array(), NULL, 'boinc:delete-user-account').
-    '</p>',
-    '#prefix' => "<div id='delete-instructions'>",
-    '#suffix' => "</div>",
-  );
-
-  $form['main']['fs1']['instructions2'] = array(
-    '#value' => '<p>'.
-    bts('If you wish to cancel, click cancel and you will be taken to your account dashboard.', array(), NULL, 'boinc:delete-user-account').
-    '</p>',
-    '#prefix' => "<div id='delete-instructions'>",
-    '#suffix' => "</div>",
-  );
-
-  // Password field
-  $form['main']['current_pass'] = array(
-    '#type' => 'password',
-    '#title' => bts('Enter your password to delete your account', array(), NULL, 'boinc:delete-user-account'),
-    '#size' => 17,
-    '#attributes' => array(
-      'autocomplete' => 'off',
-    ),
-    '#weight' => 25,
-  );
-
-  // 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/") . '</li>',
-    '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
-    '#value' => '</ul>',
-    '#weight' => 1004,
-  );
+require_boinc('token');
+
+global $user;
+$form = array();
+
+// 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, 'D')) {
+drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your account be deleted.',
+array(
+  '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
+),
+NULL, 'boinc:delete-user-account'), 'error');
+drupal_goto();
+}
 
-  return $form;
+// Attach account to this form.
+$form['_account'] = array('#type' => 'value', '#value' => $account);
+
+// This form is for hard/wipe delete
+$form['_action'] = array('#type' => 'value', '#value' => 'hard_wipe');
+
+// Instructions
+$form['main']['fs1'] = array(
+'#type' => 'fieldset',
+'#title' => bts('Instructions', array(), NULL, 'boinc:delete-user-account'),
+'#weight' => 10,
+'#collapsible' => TRUE,
+'#collapsed' => TRUE,
+);
+$form['main']['fs1']['instructions1'] = array(
+'#value' => '<p>'.
+bts('You are one-step away from deleting your account. Enter your password in the textbox below and click submit. This action is irreversable: once you delete your account, there is no way un-delete.', array(), NULL, 'boinc:delete-user-account').
+'</p>',
+'#prefix' => "<div id='delete-instructions'>",
+'#suffix' => "</div>",
+);
+
+$form['main']['fs1']['instructions2'] = array(
+'#value' => '<p>'.
+bts('If you wish to cancel, click cancel and you will be taken to your account dashboard.', array(), NULL, 'boinc:delete-user-account').
+'</p>',
+'#prefix' => "<div id='delete-instructions'>",
+'#suffix' => "</div>",
+);
+
+// Password field
+$form['main']['current_pass'] = array(
+'#type' => 'password',
+'#title' => bts('Enter your password to delete your account', array(), NULL, 'boinc:delete-user-account'),
+'#size' => 17,
+'#attributes' => array(
+  'autocomplete' => 'off',
+),
+'#weight' => 25,
+);
+
+// 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/") . '</li>',
+'#weight' => 1003,
+);
+$form['form control tabs suffix'] = array(
+'#value' => '</ul>',
+'#weight' => 1004,
+);
+
+return $form;
 }
 
 /**
@@ -474,133 +474,133 @@ 
  * the soft/obfuscate method.
  */
 function boincuser_delete_softdelconfirmation(&$form_state, $token) {
-  require_boinc('token');
-
-  global $user;
-  $form = array();
-
-  // 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, 'D')) {
-    drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your account be deleted.',
-    array(
-      '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
-    ),
-    NULL, 'boinc:delete-user-account'), 'error');
-    drupal_goto();
-  }
-
-  // Attach account to this form.
-  $form['_account'] = array('#type' => 'value', '#value' => $account);
-
-  // This form is for hard/wipe delete
-  $form['_action'] = array('#type' => 'value', '#value' => 'soft_obfuscate');
-
-  // Instructions
-  $form['main']['fs1'] = array(
-    '#type' => 'fieldset',
-    '#title' => bts('Instructions', array(), NULL, 'boinc:delete-user-account'),
-    '#weight' => 10,
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
-  );
-  $form['main']['fs1']['instructions1'] = array(
-    '#value' => '<p>'.
-    bts('You are one-step away from deleting your account. Enter your password in the textbox below and click submit. This action is irreversable: once you delete your account, there is no way un-delete.', array(), NULL, 'boinc:delete-user-account').
-    '</p>',
-    '#prefix' => "<div id='delete-instructions'>",
-    '#suffix' => "</div>",
-  );
-
-  $form['main']['fs1']['instructions2'] = array(
-    '#value' => '<p>'.
-    bts('If you wish to cancel, click cancel and you will be taken to your account dashboard.', array(), NULL, 'boinc:delete-user-account').
-    '</p>',
-    '#prefix' => "<div id='delete-instructions'>",
-    '#suffix' => "</div>",
-  );
-
-  // Password field
-  $form['main']['current_pass'] = array(
-    '#type' => 'password',
-    '#title' => bts('Enter your password to delete your account', array(), NULL, 'boinc:delete-user-account'),
-    '#size' => 17,
-    '#attributes' => array(
-      'autocomplete' => 'off',
-    ),
-    '#weight' => 25,
-  );
-
-  // 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/") . '</li>',
-    '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
-    '#value' => '</ul>',
-    '#weight' => 1004,
-  );
+require_boinc('token');
+
+global $user;
+$form = array();
+
+// 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, 'D')) {
+drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your account be deleted.',
+array(
+  '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
+),
+NULL, 'boinc:delete-user-account'), 'error');
+drupal_goto();
+}
 
-  //set validation and submit to the functions below
-  $form['#validate'][] = 'boincuser_delete_finalconfirmation_validate';
-  $form['#submit'][] = 'boincuser_delete_finalconfirmation_submit';
-  return $form;
+// Attach account to this form.
+$form['_account'] = array('#type' => 'value', '#value' => $account);
+
+// This form is for hard/wipe delete
+$form['_action'] = array('#type' => 'value', '#value' => 'soft_obfuscate');
+
+// Instructions
+$form['main']['fs1'] = array(
+'#type' => 'fieldset',
+'#title' => bts('Instructions', array(), NULL, 'boinc:delete-user-account'),
+'#weight' => 10,
+'#collapsible' => TRUE,
+'#collapsed' => TRUE,
+);
+$form['main']['fs1']['instructions1'] = array(
+'#value' => '<p>'.
+bts('You are one-step away from deleting your account. Enter your password in the textbox below and click submit. This action is irreversable: once you delete your account, there is no way un-delete.', array(), NULL, 'boinc:delete-user-account').
+'</p>',
+'#prefix' => "<div id='delete-instructions'>",
+'#suffix' => "</div>",
+);
+
+$form['main']['fs1']['instructions2'] = array(
+'#value' => '<p>'.
+bts('If you wish to cancel, click cancel and you will be taken to your account dashboard.', array(), NULL, 'boinc:delete-user-account').
+'</p>',
+'#prefix' => "<div id='delete-instructions'>",
+'#suffix' => "</div>",
+);
+
+// Password field
+$form['main']['current_pass'] = array(
+'#type' => 'password',
+'#title' => bts('Enter your password to delete your account', array(), NULL, 'boinc:delete-user-account'),
+'#size' => 17,
+'#attributes' => array(
+  'autocomplete' => 'off',
+),
+'#weight' => 25,
+);
+
+// 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/") . '</li>',
+'#weight' => 1003,
+);
+$form['form control tabs suffix'] = array(
+'#value' => '</ul>',
+'#weight' => 1004,
+);
+
+//set validation and submit to the functions below
+$form['#validate'][] = 'boincuser_delete_finalconfirmation_validate';
+$form['#submit'][] = 'boincuser_delete_finalconfirmation_submit';
+return $form;
 }
 
 /**
  * Validation for final confirmation
  */
 function boincuser_delete_finalconfirmation_validate($form, &$form_state) {
-  $account = $form_state['values']['_account'];
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+$account = $form_state['values']['_account'];
+$boinc_user = BoincUser::lookup_id($account->boincuser_id);
 
-  if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
-    return true;
-  }
+if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
+return true;
+}
 }
 
 /**
  * Submit for final confirmation
  */
 function boincuser_delete_finalconfirmation_submit($form, &$form_state) {
-  global $user;
-
-  // Delete the user
-  $account = $form_state['values']['_account'];
-  $action = $form_state['values']['_action'];
-  _boincuser_delete_deleteuser($account, $action);
-
-  // Destroy the current session:
-  session_destroy();
-  // Only variables can be passed by reference workaround.
-  $null = NULL;
-  user_module_invoke('logout', $null, $user);
-
-  // Load the anonymous user
-  $user = drupal_anonymous_user();
-
-  $redirect = variable_get('boincuser_delete_redirect', '<front>');
-  // Redirect
-  if (!empty($redirect)) {
-    drupal_goto($redirect);
-  }
-  else {
-    drupal_goto();
-  }
+global $user;
+
+// Delete the user
+$account = $form_state['values']['_account'];
+$action = $form_state['values']['_action'];
+_boincuser_delete_deleteuser($account, $action);
+
+// Destroy the current session:
+session_destroy();
+// Only variables can be passed by reference workaround.
+$null = NULL;
+user_module_invoke('logout', $null, $user);
+
+// Load the anonymous user
+$user = drupal_anonymous_user();
+
+$redirect = variable_get('boincuser_delete_redirect', '<front>');
+// Redirect
+if (!empty($redirect)) {
+drupal_goto($redirect);
+}
+else {
+drupal_goto();
+}
 
 }