BOINC / boinc

drupal/sites/all/features/teams/teams.features.inc

Indentation +63 added lines, -63 removed lines

@@ -4,152 +4,152 @@
  * Implementation of hook_ctools_plugin_api().
  */
 function teams_ctools_plugin_api() {
-  list($module, $api) = func_get_args();
-  if ($module == "page_manager" && $api == "pages_default") {
+    list($module, $api) = func_get_args();
+    if ($module == "page_manager" && $api == "pages_default") {
     return array("version" => 1);
-  }
-  elseif ($module == "strongarm" && $api == "strongarm") {
+    }
+    elseif ($module == "strongarm" && $api == "strongarm") {
     return array("version" => 1);
-  }
+    }
 }
 
 /**
  * Implementation of hook_node_info().
  */
 function teams_node_info() {
-  $items = array(
+    $items = array(
     'team' => array(
-      'name' => t('Team'),
-      'module' => 'features',
-      'description' => t('A grouping of users, centered on a common interest.'),
-      'has_title' => '1',
-      'title_label' => t('Name'),
-      'has_body' => '1',
-      'body_label' => t('Description'),
-      'min_word_count' => '0',
-      'help' => '',
+        'name' => t('Team'),
+        'module' => 'features',
+        'description' => t('A grouping of users, centered on a common interest.'),
+        'has_title' => '1',
+        'title_label' => t('Name'),
+        'has_body' => '1',
+        'body_label' => t('Description'),
+        'min_word_count' => '0',
+        'help' => '',
     ),
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implementation of hook_rules_defaults().
  */
 function teams_rules_defaults() {
-  return array(
+    return array(
     'rules' => array(
-      'rules_notify_admins_about_error_creating_a_boinc_team' => array(
+        'rules_notify_admins_about_error_creating_a_boinc_team' => array(
         '#type' => 'rule',
         '#set' => 'event_boincteam_create_team_error',
         '#label' => 'Notify admins about error creating a BOINC team',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_team',
-          'teams' => 'teams',
+            '0' => 'boinc_team',
+            'teams' => 'teams',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => '[subject_tag:string] Error creating new team',
-              'message' => '[user:display-name] attempted to create team [team_name:string], but an error was returned. See function \'boincteam_create_form_submit\'. BOINC function \'make_team\' did not return a valid boinc_team object.',
-              '#eval input' => array(
+                'from' => '',
+                'subject' => '[subject_tag:string] Error creating new team',
+                'message' => '[user:display-name] attempted to create team [team_name:string], but an error was returned. See function \'boincteam_create_form_submit\'. BOINC function \'make_team\' did not return a valid boinc_team object.',
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'subject_tag',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'team_name',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_admins',
             '#info' => array(
-              'label' => 'Notify admins via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify admins via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_notify_admins_about_error_creating_a_boinc_team_no_pathauto' => array(
+        ),
+        'rules_notify_admins_about_error_creating_a_boinc_team_no_pathauto' => array(
         '#type' => 'rule',
         '#set' => 'event_boincteam_create_team_nopathauto_error',
         '#label' => 'Notify admins about error creating a BOINC team no pathauto',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_team',
-          'teams' => 'teams',
+            '0' => 'boinc_team',
+            'teams' => 'teams',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => '[subject_tag:string] Error creating BOINC team - no pathauo module',
-              'message' => '[user:display-name] attempted to create team [team_name:string], but no pathauto module detected. See function \'boincteam_create_form_submit\'.',
-              '#eval input' => array(
+                'from' => '',
+                'subject' => '[subject_tag:string] Error creating BOINC team - no pathauo module',
+                'message' => '[user:display-name] attempted to create team [team_name:string], but no pathauto module detected. See function \'boincteam_create_form_submit\'.',
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'subject_tag',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'team_name',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_admins',
             '#info' => array(
-              'label' => 'Notify admins via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify admins via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
+        ),
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_views_api().
  */
 function teams_views_api() {
-  return array(
+    return array(
     'api' => '2',
-  );
+    );
 }

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

Indentation +18 added lines, -18 removed lines

@@ -16,39 +16,39 @@
  */
 
 function boincteam_rules_event_info() {
-  return array(
+    return array(
     'boincteam_create_team_error' => array(
-      'label' => bts('Error creating a new BOINC team - general error.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincteam',
-      'arguments' => rules_events_hook_boincteam_arguments(),
+        'label' => bts('Error creating a new BOINC team - general error.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincteam',
+        'arguments' => rules_events_hook_boincteam_arguments(),
     ),
     'boincteam_create_team_nopathauto_error' => array(
-      'label' => bts('Error creating a new BOINC team - no pathauto module.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincteam',
-      'arguments' => rules_events_hook_boincteam_arguments(),
+        'label' => bts('Error creating a new BOINC team - no pathauto module.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincteam',
+        'arguments' => rules_events_hook_boincteam_arguments(),
     ),
-  );
+    );
 }
 
 /**
  * Arguments suitable for boincteam
  **/
 function rules_events_hook_boincteam_arguments() {
-  return array(
+    return array(
     'team_name' => array(
-      'type' => 'string',
-      'label' => 'team name',
-      'required' => TRUE,
+        'type' => 'string',
+        'label' => 'team name',
+        'required' => TRUE,
     ),
-  ) + rules_events_hook_boincteam_adminnotify_argument();
+    ) + rules_events_hook_boincteam_adminnotify_argument();
 }
 
 function rules_events_hook_boincteam_adminnotify_argument() {
-  return array(
+    return array(
     'subject_tag' => array(
-      'type' => 'string',
-      'label' => 'Subject tag for email filtering',
-      'required' => TRUE,
+        'type' => 'string',
+        'label' => 'Subject tag for email filtering',
+        'required' => TRUE,
     ),
-  ) + rules_events_global_user_argument();
+    ) + rules_events_global_user_argument();
 }
\ No newline at end of file

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

Indentation +331 added lines, -331 removed lines

@@ -14,9 +14,9 @@ 
  * The definition of the create team form
  */
 function boincteam_create_form(&$form_state) {
-  $form = array();
+    $form = array();
   
-  $default = array(
+    $default = array(
     'name' => '',
     'name_html' => '',
     'website' => '',
@@ -24,105 +24,105 @@ 
     'country' => 0,
     'joinable' => TRUE,
     'description' => '',
-  );
+    );
   
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
   
-  // Vocabulary based option sets
-  $form['type_options'] = array(
+    // Vocabulary based option sets
+    $form['type_options'] = array(
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
-  );
-  $vocabs = taxonomy_get_vocabularies(NULL);
-  foreach ($vocabs as $vocab) {
+    );
+    $vocabs = taxonomy_get_vocabularies(NULL);
+    foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
       $team_types = taxonomy_get_tree($vocab->vid);
-      if (module_exists('internationalization')) {
+        if (module_exists('internationalization')) {
         $team_types = i18ntaxonomy_localize_terms($team_types);
-      }
-      foreach ($team_types as $team_type) {
+        }
+        foreach ($team_types as $team_type) {
         $form['type_options']['#value'][$team_type->tid] = $team_type->name;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
-  $form['country_options'] = array(
+    }
+    $form['country_options'] = array(
     '#type' => 'value',
     '#value' => boinccore_get_country_list(),
-  );
+    );
   
-  // Form elements
-  $form['name'] = array(
+    // Form elements
+    $form['name'] = array(
     '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['name_html'] = array(
+    );
+    $form['name_html'] = array(
     '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
     '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['website'] = array(
+    );
+    $form['website'] = array(
     '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
     '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
-  );
-  $form['type'] = array(
+    );
+    $form['type'] = array(
     '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
-  );
-  $form['country'] = array(
+    );
+    $form['country'] = array(
     '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
-  );
-  $form['joinable'] = array(
+    );
+    $form['joinable'] = array(
     '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['joinable'],
     '#size' => 34,
-  );
-  $form['description'] = array(
+    );
+    $form['description'] = array(
     '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
     '#description' => NULL,
-  );
-  $form['format'] = filter_form();
+    );
+    $form['format'] = filter_form();
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save team', array(), NULL, 'boinc:team-form-save'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
-  );
+    );
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -130,41 +130,41 @@ 
  */
 function boincteam_create_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
-  $name = $values['name'];
+    $values = $form_state['values'];
+    $name = $values['name'];
   
-  if (!$name) {
+    if (!$name) {
     form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+    }
+    else {
     require_boinc('boinc_db');
     if (BoincTeam::lookup_name($name)) {
-      form_set_error('name', bts('A team named "@name" already exists.',
+        form_set_error('name', bts('A team named "@name" already exists.',
         array('@name' => $name), NULL, 'boinc:team-create/edit'));
     }
-  }
+    }
   
-  if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
+    if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
     form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
-  }
+    }
 }
 
 /**
  * The create team submit handler
  */
 function boincteam_create_form_submit($form, &$form_state) {
-  global $user;
-  $account = user_load($user->uid);
-  $values = $form_state['values'];
-  //drupal_set_message('<pre>' . print_r($values,true) . '</pre>');
+    global $user;
+    $account = user_load($user->uid);
+    $values = $form_state['values'];
+    //drupal_set_message('<pre>' . print_r($values,true) . '</pre>');
   
-  $input_format = !empty($values['format']) ? $values['format'] : 4;
-  $values['description'] = check_markup($values['description'], $input_format);
+    $input_format = !empty($values['format']) ? $values['format'] : 4;
+    $values['description'] = check_markup($values['description'], $input_format);
   
-  // Create the team in the BOINC db
+    // Create the team in the BOINC db
   
-  require_boinc(array('user','team'));
-  $boinc_team = make_team(
+    require_boinc(array('user','team'));
+    $boinc_team = make_team(
     $account->boincuser_id,
     $values['name'],
     $values['website'],
@@ -172,27 +172,27 @@ 
     $values['name_html'],
     $values['description'],
     $values['country']
-  );
+    );
 
-  if ($boinc_team) {
+    if ($boinc_team) {
     $boinc_user = BoincUser::lookup_id($account->boincuser_id);
     user_join_team($boinc_team, $boinc_user);
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT)));
     rules_invoke_event('boincteam_create_team_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
       reason.', 'error');
     return FALSE;
-  }
+    }
   
-  // Create the team node in Drupal
+    // Create the team node in Drupal
   
-  $teaser = node_teaser($values['description']);
-  $created_time = time();
-  $input_format = variable_get('filter_default_format', 1);
+    $teaser = node_teaser($values['description']);
+    $created_time = time();
+    $input_format = variable_get('filter_default_format', 1);
   
-  $node = array(
+    $node = array(
     'type' => 'team',
     'title' => $values['name'],
     'body' => $values['description'],
@@ -206,21 +206,21 @@ 
     'moderate' => 0,
     'sticky' => 0,
     'format' => $input_format
-  );
+    );
   
-  // Use pathauto function, if available, to clean up the path
-  if (module_exists('pathauto')) {
+    // Use pathauto function, if available, to clean up the path
+    if (module_exists('pathauto')) {
     module_load_include('inc', 'pathauto', 'pathauto');
     $node['path'] = pathauto_cleanstring($values['name']);
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT)));
     rules_invoke_event('boincteam_create_team_nopathauto_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('BOINC team', 'BOINC teams require the Pathauto module. Teams
       cannot be created.', 'error');
-  }
+    }
   
-  /*
+    /*
   // Add special organic group properties
   $node['og_description'] = strip_tags($boincteam->description);
   $node['og_selective'] = OG_OPEN;
@@ -229,26 +229,26 @@ 
   $node['og_private'] = 0;
   */
   
-  $node = (object) $node; // node_save requires an object form
+    $node = (object) $node; // node_save requires an object form
   
-  /*
+    /*
   $node->field_description[]['value'] = $boincteam->description;
   $node->field_url[]['value'] = $boincteam->url;
   $node->field_country[]['value'] = $boincteam->country;
   */
   
-  $node->taxonomy[] = taxonomy_get_term($values['type']);
+    $node->taxonomy[] = taxonomy_get_term($values['type']);
   
-  // Save the team node
-  node_save($node);
+    // Save the team node
+    node_save($node);
   
-  // Save the team IDs to a BOINC <--> Drupal reference table.
-  db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boinc_team->id, $node->nid);
+    // Save the team IDs to a BOINC <--> Drupal reference table.
+    db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boinc_team->id, $node->nid);
   
-  drupal_set_message(t('Team "@name" has been created.', 
+    drupal_set_message(t('Team "@name" has been created.', 
     array('@name' => $values['name'])));
   
-  $form_state['redirect'] = "community/teams/{$node->nid}";
+    $form_state['redirect'] = "community/teams/{$node->nid}";
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -259,17 +259,17 @@ 
  * The definition of the edit team form
  */
 function boincteam_edit_form(&$form_state, $team_id) {
-  $form = array();
+    $form = array();
   
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id));
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id));
   
-  $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
+    $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
   
-  $form_state['storage']['team_id'] = $team_id;
-  $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
+    $form_state['storage']['team_id'] = $team_id;
+    $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
   
-  $default = array(
+    $default = array(
     'name' => $boincteam->name,
     'name_html' => $boincteam->name_html,
     'website' => $boincteam->url,
@@ -277,79 +277,79 @@ 
     'country' => $boincteam->country,
     'joinable' => $boincteam->joinable,
     'description' => $boincteam->description,
-  );
+    );
   
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
   
-  // Vocabulary based option sets
-  $form['type_options'] = array(
+    // Vocabulary based option sets
+    $form['type_options'] = array(
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
-  );
-  $vocabs = taxonomy_get_vocabularies(NULL);
-  foreach ($vocabs as $vocab) {
+    );
+    $vocabs = taxonomy_get_vocabularies(NULL);
+    foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
       $team_types = taxonomy_get_tree($vocab->vid);
-      if (module_exists('internationalization')) {
+        if (module_exists('internationalization')) {
         $team_types = i18ntaxonomy_localize_terms($team_types);
-      }
-      foreach ($team_types as $team_type) {
+        }
+        foreach ($team_types as $team_type) {
         $form['type_options']['#value'][$team_type->tid] = $team_type->name;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
-  $form['country_options'] = array(
+    }
+    $form['country_options'] = array(
     '#type' => 'value',
     '#value' => boinccore_get_country_list(),
-  );
+    );
   
-  // Form elements
-  $form['name'] = array(
+    // Form elements
+    $form['name'] = array(
     '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['name_html'] = array(
+    );
+    $form['name_html'] = array(
     '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
     '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['website'] = array(
+    );
+    $form['website'] = array(
     '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
     '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['type'] = array(
+    );
+    $form['type'] = array(
     '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
     '#disabled' => $is_boinc_wide,
-  );
-  $form['country'] = array(
+    );
+    $form['country'] = array(
     '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
     '#disabled' => $is_boinc_wide,
-  );
-  $form['joinable'] = array(
+    );
+    $form['joinable'] = array(
     '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
@@ -357,49 +357,49 @@ 
     '#default_value' => $default['joinable'],
     '#size' => 34,
     '#disabled' => $is_boinc_wide,
-  );
-  if (!$is_boinc_wide) {
+    );
+    if (!$is_boinc_wide) {
     $form['description'] = array(
-      '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
-      '#type' => 'textarea',
-      '#default_value' => $default['description'],
-      '#size' => 5,
-      '#description' => NULL,
+        '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
+        '#type' => 'textarea',
+        '#default_value' => $default['description'],
+        '#size' => 5,
+        '#description' => NULL,
     );
     $form['format'] = filter_form();
     
     // Form control
     $form['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">'
+        '#value' => '<ul class="form-control tab-list">'
     );
     $form['submit'] = array(
-      '#prefix' => '<li class="first tab">',
-      '#type' => 'submit',
-      '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
-      '#suffix' => '</li>',
+        '#prefix' => '<li class="first tab">',
+        '#type' => 'submit',
+        '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
+        '#suffix' => '</li>',
     );
     $form['form control tabs'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
     );
-  }
-  else {
+    }
+    else {
     $form['description'] = array(
-      '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
-      '#value' => $default['description'],
-      '#suffix' => '</div>',
+        '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
+        '#value' => $default['description'],
+        '#suffix' => '</div>',
     );
     drupal_set_message(
-      bts('This is a BOINC-wide team. Changes can be made at the !site.',
+        bts('This is a BOINC-wide team. Changes can be made at the !site.',
         array('!site' => l(bts('BOINC-wide teams site', array(), NULL, 'boinc:link-to-BOINC-wide-teams-Website'),
-          'http://boinc.berkeley.edu/teams/'
+            'http://boinc.berkeley.edu/teams/'
         )),
         NULL, 'boinc:team-edit-warning-message'),
-      'warning');
-  }
+        'warning');
+    }
   
-  $form['#redirect'] = "community/teams/{$team_id}";
+    $form['#redirect'] = "community/teams/{$team_id}";
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -407,32 +407,32 @@ 
  */
 function boincteam_edit_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
-  $name = $values['name'];
+    $values = $form_state['values'];
+    $name = $values['name'];
   
-  if ($form_state['storage']['is_boinc_wide']) {
+    if ($form_state['storage']['is_boinc_wide']) {
     form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+    }
+    else {
     if (!$name) {
-      form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
+        form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
     }
     else {
-      $team = node_load($form_state['storage']['team_id']);
-      if ($name != $team->title) {
+        $team = node_load($form_state['storage']['team_id']);
+        if ($name != $team->title) {
         // If changing the name ("title" in Drupal terms), check that the new name is available
         require_boinc('boinc_db');
         if (BoincTeam::lookup_name($name)) {
-          form_set_error('name', bts('A team named "@name" already exists.',
+            form_set_error('name', bts('A team named "@name" already exists.',
             array('@name' => $name), NULL, 'boinc:team-create/edit'));
         }
-      }
+        }
     }
   
     if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
-      form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+        form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+    }
     }
-  }
 }
 
 /**
@@ -440,18 +440,18 @@ 
  */
 function boincteam_edit_form_submit($form, &$form_state) {
   
-  $team_id = $form_state['storage']['team_id'];
-  $values = $form_state['values'];
+    $team_id = $form_state['storage']['team_id'];
+    $values = $form_state['values'];
   
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
   
-  $input_format = !empty($values['format']) ? $values['format'] : 4;
-  $values['description'] = check_markup($values['description'], $input_format);
+    $input_format = !empty($values['format']) ? $values['format'] : 4;
+    $values['description'] = check_markup($values['description'], $input_format);
   
-  // Update the team in the BOINC db
-  db_set_active('boinc_rw');
-  db_query("
+    // Update the team in the BOINC db
+    db_set_active('boinc_rw');
+    db_query("
     UPDATE {team} SET
       name = '%s',
       name_lc = '%s',
@@ -471,32 +471,32 @@ 
     $values['country'],
     $values['joinable'],
     $boincteam_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  // Update the team node in Drupal
+    // Update the team node in Drupal
   
-  $team->title = $values['name'];
-  $team->body = $values['description'];
-  $team->teaser = node_teaser($values['description']);
+    $team->title = $values['name'];
+    $team->body = $values['description'];
+    $team->teaser = node_teaser($values['description']);
   
-  /*
+    /*
   $node->field_description[]['value'] = $boincteam->description;
   $node->field_url[]['value'] = $boincteam->url;
   $node->field_country[]['value'] = $boincteam->country;
   */
   
-  // Replace any existing taxonomy with the new one
-  $team->taxonomy = array(taxonomy_get_term($values['type']));
+    // Replace any existing taxonomy with the new one
+    $team->taxonomy = array(taxonomy_get_term($values['type']));
   
-  // Save the team node
-  node_save($team);
+    // Save the team node
+    node_save($team);
   
-  drupal_set_message(t('Details for "@team" have been updated.', 
+    drupal_set_message(t('Details for "@team" have been updated.', 
     array('@team' => $values['name'])));
     
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }
 
 
@@ -508,44 +508,44 @@ 
  * The definition of the add team admin form
  */
 function boincteam_add_admin_form(&$form_state, $team_id) {
-  $form = array();
+    $form = array();
   
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id));
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id));
   
-  $form_state['storage']['team_id'] = $team_id;
+    $form_state['storage']['team_id'] = $team_id;
   
-  $default = array(
+    $default = array(
     'username' => '',
-  );
+    );
   
-  // Form elements
-  $form['username'] = array(
+    // Form elements
+    $form['username'] = array(
     '#title' => bts('Enter BOINC username', array(), NULL, 'boinc:team--add-admin'),
     '#description' => bts('The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.'),
     '#type' => 'textfield',
     '#default_value' => $default['username'],
     '#size' => 34,
     '#autocomplete_path' => "community/teams/${team_id}/user-name-autocomplete",
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Add', array(), NULL, 'boinc:form-add'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
-  );
+    );
   
-  //$form['#redirect'] = "community/teams/{$team_id}";
+    //$form['#redirect'] = "community/teams/{$team_id}";
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -553,45 +553,45 @@ 
  */
 function boincteam_add_admin_form_validate($form, &$form_state) {
 
-  $team_id = $form_state['storage']['team_id'];
-  $values = $form_state['values'];
-  $team = node_load($team_id);
+    $team_id = $form_state['storage']['team_id'];
+    $values = $form_state['values'];
+    $team = node_load($team_id);
   
-  if (!$values['username']) {
+    if (!$values['username']) {
     form_set_error('username', bts('BOINC username is required.', array(), NULL, 'boinc:team-add-admin'));
-  }
-  else {
+    }
+    else {
     // Load user account associated with username
     $account = boincuser_privatemsg_name_lookup($values['username']);
     // Validate the account
     if ((!$account) OR ($account->team != $team_id)) {
-      form_set_error('username', bts('There is no user on your team with name @username.',
+        form_set_error('username', bts('There is no user on your team with name @username.',
         array(
-          '@username' => $account->boincuser_name
+            '@username' => $account->boincuser_name
         ),
-      NULL, 'boinc:team-add-admin'));
+        NULL, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_founder($team_id, $account->uid)) {
-      form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
+        form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
         array(
-          '@user' => $account->boincuser_name,
-          '@team' => $team->title,
+            '@user' => $account->boincuser_name,
+            '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_admin($team_id, $account->uid)) {
-      form_set_error('username', bts('@user is already an admin of @team.',
+        form_set_error('username', bts('@user is already an admin of @team.',
         array(
-          '@user' => $account->boincuser_name,
-          '@team' => $team->title,
+            '@user' => $account->boincuser_name,
+            '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
     }
     else {
-      $form_state['storage']['boincuser_id'] = $account->boincuser_id;
-      $form_state['storage']['boincuser_name'] = $account->boincuser_name;
+        $form_state['storage']['boincuser_id'] = $account->boincuser_id;
+        $form_state['storage']['boincuser_name'] = $account->boincuser_name;
+    }
     }
-  }
 }
 
 /**
@@ -599,17 +599,17 @@ 
  */
 function boincteam_add_admin_form_submit($form, &$form_state) {
   
-  $team_id = $form_state['storage']['team_id'];
-  $boincuser_id = $form_state['storage']['boincuser_id'];
-  $user_name = $form_state['storage']['boincuser_name'];
-  $values = $form_state['values'];
+    $team_id = $form_state['storage']['team_id'];
+    $boincuser_id = $form_state['storage']['boincuser_id'];
+    $user_name = $form_state['storage']['boincuser_name'];
+    $values = $form_state['values'];
   
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
   
-  // Update the team in the BOINC db
-  db_set_active('boinc_rw');
-  db_query("
+    // Update the team in the BOINC db
+    db_set_active('boinc_rw');
+    db_query("
     INSERT INTO {team_admin} SET
       teamid = '%d',
       userid = '%d',
@@ -617,17 +617,17 @@ 
     $boincteam_id,
     $boincuser_id,
     time()
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  // Could assign a role in Drupal here, as needed
+    // Could assign a role in Drupal here, as needed
   
   
-  drupal_set_message(t('@user has been added as an admin.', 
+    drupal_set_message(t('@user has been added as an admin.', 
     array('@user' => $user_name)));
     
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -639,80 +639,80 @@ 
  * Send all team members an email message function
  */
 function boincteam_sendmessagetoteam(&$form_state, $team_id) {
-  global $user;
-  $form = array();
+    global $user;
+    $form = array();
 
-  if (isset($form_state['values'])) {
+    if (isset($form_state['values'])) {
     $subject   = $form_state['values']['subject'];
     $body      = $form_state['values']['body'];
-  }
-  else {
+    }
+    else {
     $subject   = '';
     $body      = '';
-  }
+    }
 
-  // Title
-  $mytitle = bts('Send E-mail To All Team Members', array(), NULL, 'boinc:team-message-form');
-  drupal_set_title($mytitle);
+    // Title
+    $mytitle = bts('Send E-mail To All Team Members', array(), NULL, 'boinc:team-message-form');
+    drupal_set_title($mytitle);
 
-  $form['emailteam']['header'] = array(
+    $form['emailteam']['header'] = array(
     '#value'              => '<h1>' . $mytitle . '</h1>',
     '#weight'             => '-10',
     '#prefix'             => "<div id='sendmessageteammembers-header'>",
     '#suffix'             => "</div>",
-  );
+    );
 
-  $form['emailteam']['instructions'] = array(
+    $form['emailteam']['instructions'] = array(
     '#value'              => bts('This will send an email to all team members. If a team member has opt-ed out of notification e-mails, they will not receive your message. At the bottom of your message, there will be a link allowing team members to send you a Direct Message. This link is added automatically, you do not need to add it below in the Message box. Your email address will not be shown to the recipients.', array(), NULL, 'boinc:team-message-form'),
     '#weight'             => '-8',
     '#prefix'             => "<div id='sendmessageteammembers-instructions'>",
     '#suffix'             => "</div>",
-  );
+    );
 
-  // Subject
-  $form['emailteam']['subject'] = array(
+    // Subject
+    $form['emailteam']['subject'] = array(
     '#type'               => 'textfield',
     '#title'              => bts('Subject', array(), NULL, 'boinc:team-message-form'),
     '#size'               => 50,
     '#maxlength'          => 255,
     '#default_value'      => $subject,
     '#weight'             => -5,
-  );
+    );
 
-  // Body
-  $form['emailteam']['body'] = array(
+    // Body
+    $form['emailteam']['body'] = array(
     '#type'               => 'textarea',
     '#title'              => bts('Message', array(), NULL, 'boinc:team-message-form'),
     '#rows'               => 8,
     '#weight'             => 0,
     '#default_value'      => $body,
     '#resizable'          => TRUE,
-  );
+    );
 
-  // checkbox for 'sent to self'
-  $form['emailteam']['selfsend'] = array(
+    // checkbox for 'sent to self'
+    $form['emailteam']['selfsend'] = array(
     '#type'    => 'checkbox',
     '#title'   => bts('Check this box if you wish to be sent a copy of your message to your email address.', array(), NULL, 'boinc:team-message-form'),
     '#weight'  => 10,
     '#prefix'  => '<div class="clearfix" id="confirm-checkbox">',
     '#suffix'  => '</div>',
-  );
+    );
 
-  // Add a captcha to form
-  if (module_exists('captcha')) {
+    // Add a captcha to form
+    if (module_exists('captcha')) {
     $form['register_captcha'] = array(
         '#type' => 'captcha',
         '#weight' => 1000,
     );
-  }
+    }
 
-  // form buttons
-  $form['emailteam']['form control tabs prefix'] = array(
+    // form buttons
+    $form['emailteam']['form control tabs prefix'] = array(
     '#value'  => '<ul class="form-control tab-list">',
     '#weight' => 1000,
-  );
+    );
 
-  $form['emailteam']['submit'] = array(
+    $form['emailteam']['submit'] = array(
     '#type'               => 'submit',
     '#value'              => bts('Send message', array(), NULL, 'boinc:form-submit'),
     '#submit'             => array('boincteam_sendmessagetoteam_submit'),
@@ -720,130 +720,130 @@ 
     '#weight'             => 1001,
     '#prefix'             => '<li class="first tab">',
     '#suffix'             => '</li>'
-  );
+    );
 
-  $title = bts('Cancel', array(), NULL, 'boinc:form-cancel');
-  $url = "community/teams/{$team_id}";
-  $form['emailteam']['cancel'] = array(
+    $title = bts('Cancel', array(), NULL, 'boinc:form-cancel');
+    $url = "community/teams/{$team_id}";
+    $form['emailteam']['cancel'] = array(
     '#value'              => l($title, $url, array('attributes' => array('id' => 'edit-cancel'))),
     '#weight'             => 1005,
     '#prefix'             => '<li class="tab">',
     '#suffix'             => '</li>'
-  );
+    );
 
-  $form['emailteam']['form control tabs suffix'] = array(
+    $form['emailteam']['form control tabs suffix'] = array(
     '#value'  => '</ul>',
     '#weight' => 1010,
-  );
+    );
 
-  // Add team id information to form_state
-  $form['_team_id'] = array(
+    // Add team id information to form_state
+    $form['_team_id'] = array(
     '#type'  => 'value',
     '#value' => $team_id,
-  );
+    );
 
-  // Add sender user object to form_state
-  $form['_senderuid'] = array(
+    // Add sender user object to form_state
+    $form['_senderuid'] = array(
     '#type'  => 'value',
     '#value' => $user->uid,
-  );
+    );
 
-  // redirect after sending message
-  $form['#redirect'] = "community/teams/{$team_id}";
+    // redirect after sending message
+    $form['#redirect'] = "community/teams/{$team_id}";
 
-  return $form;
+    return $form;
 }
 
 /**
  * Send all team members validation handler
  */
 function boincteam_sendmessagetoteam_validate($form, &$form_state) {
-  $message = $form_state['values'];
-  $message['timestamp'] = time();
-  // Avoid subjects which only consist of a space as these can not be clicked.
-  $message['subject'] = trim($message['subject']);
+    $message = $form_state['values'];
+    $message['timestamp'] = time();
+    // Avoid subjects which only consist of a space as these can not be clicked.
+    $message['subject'] = trim($message['subject']);
 
-  $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, TRUE, TRUE));
-  if (empty($message['subject']) && !empty($trimed_body)) {
+    $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, TRUE, TRUE));
+    if (empty($message['subject']) && !empty($trimed_body)) {
     $message['subject'] = $trimed_body;
     $form_state['values']['subject'] = $message['subject'];
-  }
+    }
 
-  // Check subject line
-  $message['subject'] = trim($message['subject']);
-  if (empty($message['subject'])) {
+    // Check subject line
+    $message['subject'] = trim($message['subject']);
+    if (empty($message['subject'])) {
     form_set_error('subject',
-      bts('Not allowed to send a message without subject', array(), NULL, 'boinc:team-message-form')
+        bts('Not allowed to send a message without subject', array(), NULL, 'boinc:team-message-form')
     );
-  }
+    }
 
-  // Check body
-  if ( ($message['body'] === NULL || $message['body'] === '') ) {
+    // Check body
+    if ( ($message['body'] === NULL || $message['body'] === '') ) {
     form_set_error('body',
-      bts('Not allowed to send an empty message.', array(), NULL, 'boinc:team-message-form')
+        bts('Not allowed to send an empty message.', array(), NULL, 'boinc:team-message-form')
     );
-  }
+    }
 
-  // Check team id
-  if (empty($message['_team_id'])) {
+    // Check team id
+    if (empty($message['_team_id'])) {
     form_set_error('team_id',
-      bts('Error, no team_id supplied.', array(), NULL, 'boinc:team-message-form')
+        bts('Error, no team_id supplied.', array(), NULL, 'boinc:team-message-form')
     );
-  }
+    }
 
-  $form_state['validated_built_message'] = $message;
+    $form_state['validated_built_message'] = $message;
 }
 
 /**
  * Send all team members submit handler
  */
 function boincteam_sendmessagetoteam_submit($form, &$form_state) {
-  module_load_include('inc', 'rules', 'modules/system.rules');
-  global $base_url;
-  global $base_path;
-
-  $suid = $form_state['values']['_senderuid'];
-  $account = user_load(array('uid' => $suid ));
-  $site_url = $base_url . $base_path . "messages/new/" . $suid;
-
-  // Form is validated, now send to all team members. Lookup boinc
-  // id of all team members, and then use user_load() to load user
-  // object. Send message using email.
-  //
-  $boinc_id = boincteam_lookup_id($form_state['values']['_team_id']);
-  // Email addresses, with those who have opt-ed out of notification
-  // emails removed.
-  $member_emails = _boincteam_emails($boinc_id);
-  // Remove sender's email address, unless selfsend is true.
-  if ( !$form_state['values']['selfsend'] ) {
+    module_load_include('inc', 'rules', 'modules/system.rules');
+    global $base_url;
+    global $base_path;
+
+    $suid = $form_state['values']['_senderuid'];
+    $account = user_load(array('uid' => $suid ));
+    $site_url = $base_url . $base_path . "messages/new/" . $suid;
+
+    // Form is validated, now send to all team members. Lookup boinc
+    // id of all team members, and then use user_load() to load user
+    // object. Send message using email.
+    //
+    $boinc_id = boincteam_lookup_id($form_state['values']['_team_id']);
+    // Email addresses, with those who have opt-ed out of notification
+    // emails removed.
+    $member_emails = _boincteam_emails($boinc_id);
+    // Remove sender's email address, unless selfsend is true.
+    if ( !$form_state['values']['selfsend'] ) {
     $pos = array_search($account->mail, $member_emails);
     unset($member_emails[$pos]);
-  }
+    }
 
-  // Add link at bottom of body
-  $mybody = $form_state['validated_built_message']['body'];
-  $mybody .= "\n\n"
-      . "To reply to the sender using a Direct Message (DM), please use this link:\n"
-      . "${site_url}";
+    // Add link at bottom of body
+    $mybody = $form_state['validated_built_message']['body'];
+    $mybody .= "\n\n"
+        . "To reply to the sender using a Direct Message (DM), please use this link:\n"
+        . "${site_url}";
 
-  $emailsettings = array(
+    $emailsettings = array(
     'from'    => '',
     'to'      => "webmaster@{$base_url}",
     'boincteam_headers' => array(
-      'Bcc'     => implode(',', $member_emails),
+        'Bcc'     => implode(',', $member_emails),
     ),
     'subject' => $form_state['validated_built_message']['subject'],
     'message' => $mybody,
-  );
-  rules_action_mail($emailsettings);
+    );
+    rules_action_mail($emailsettings);
 
-  $om = bts(
+    $om = bts(
     'Sent your email message to !number team members.',
     array( '!number' => count($member_emails) ),
     'NULL',
     'boinc:team-message-sent'
-  );
-  drupal_set_message($om, 'info');
+    );
+    drupal_set_message($om, 'info');
 
-  $form_state['redirect'] = "community/teams/{$form_state['values']['_team_id']}";
+    $form_state['redirect'] = "community/teams/{$form_state['values']['_team_id']}";
 }

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

Indentation +429 added lines, -429 removed lines

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

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

Indentation +29 added lines, -29 removed lines

@@ -16,59 +16,59 @@
  */
 
 function boincuser_rules_event_info() {
-  return array(
+    return array(
     'boincuser_change_email_error' => array(
-      'label' => bts('Error from user changing e-mail address.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincuser',
-      'arguments' => rules_events_hook_boincuser_chemail_arguments(),
+        'label' => bts('Error from user changing e-mail address.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincuser',
+        'arguments' => rules_events_hook_boincuser_chemail_arguments(),
     ),
     'boincuser_revert_email_error' => array(
-      'label' => bts('Error from user reverting to previous e-mail address.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincuser',
-      'arguments' => rules_events_hook_boincuser_chemail_arguments(),
+        'label' => bts('Error from user reverting to previous e-mail address.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincuser',
+        'arguments' => rules_events_hook_boincuser_chemail_arguments(),
     ),
     'boincuser_general_consent_error' => array(
-      'label' => bts('Error from user consenting to terms-of-use.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincuser',
-      'arguments' => rules_events_hook_boincuser_adminnotify_argument(),
+        'label' => bts('Error from user consenting to terms-of-use.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincuser',
+        'arguments' => rules_events_hook_boincuser_adminnotify_argument(),
     ),
     'boincuser_general_consent_type_error' => array(
-      'label' => bts('Error dealing with missing consent type.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincuser',
-      'arguments' => rules_events_hook_boincuser_consenttype_argument(),
+        'label' => bts('Error dealing with missing consent type.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincuser',
+        'arguments' => rules_events_hook_boincuser_consenttype_argument(),
     ),
-  );
+    );
 }
 
 /**
  * Arguments suitable for boincuser
  **/
 function rules_events_hook_boincuser_chemail_arguments() {
-  return array(
+    return array(
     'new_email_addr' => array(
-      'type' => 'string',
-      'label' => 'New email address',
-      'required' => TRUE,
+        'type' => 'string',
+        'label' => 'New email address',
+        'required' => TRUE,
     ),
-  ) + rules_events_hook_boincuser_adminnotify_argument();
+    ) + rules_events_hook_boincuser_adminnotify_argument();
 }
 
 function rules_events_hook_boincuser_consenttype_argument() {
-  return array(
+    return array(
     'consent_type' => array(
-      'type' => 'string',
-      'label' => 'Consent type id that caused the error',
-      'required' => TRUE,
+        'type' => 'string',
+        'label' => 'Consent type id that caused the error',
+        'required' => TRUE,
     ),
-  ) + rules_events_hook_boincuser_adminnotify_argument();
+    ) + rules_events_hook_boincuser_adminnotify_argument();
 }
 
 function rules_events_hook_boincuser_adminnotify_argument() {
-  return array(
+    return array(
     'subject_tag' => array(
-      'type' => 'string',
-      'label' => 'Subject tag for email filtering',
-      'required' => TRUE,
+        'type' => 'string',
+        'label' => 'Subject tag for email filtering',
+        'required' => TRUE,
     ),
-  ) + rules_events_global_user_argument();
+    ) + rules_events_global_user_argument();
 }
\ No newline at end of file

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

Indentation +244 added lines, -244 removed lines

@@ -11,12 +11,12 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 if (!function_exists('user_load_by_mail')) {
-  /**
-   * user_load_by_mail will be broken out of user_load
-   */
-  function user_load_by_mail($mail) {
+    /**
+     * user_load_by_mail will be broken out of user_load
+     */
+    function user_load_by_mail($mail) {
     return user_load(array('mail' => $mail));
-  }
+    }
 }
  
 
@@ -28,14 +28,14 @@ 
  * Get an image object from a given file and cck field
  */ 
 function get_cck_image_object($image_path, $field_name, $content_type, $ignore_resolution = FALSE) {
-  $field = content_fields($field_name, $content_type); 
-  $validators = array_merge(filefield_widget_upload_validators($field), imagefield_widget_upload_validators($field));
-  if ($ignore_resolution) {
+    $field = content_fields($field_name, $content_type); 
+    $validators = array_merge(filefield_widget_upload_validators($field), imagefield_widget_upload_validators($field));
+    if ($ignore_resolution) {
     unset($validators['filefield_validate_image_resolution']);
-  }
-  $target_path = filefield_widget_file_path($field);
-  // Create the image object
-  return field_file_save_file($image_path, $validators, $target_path, FILE_EXISTS_REPLACE);
+    }
+    $target_path = filefield_widget_file_path($field);
+    // Create the image object
+    return field_file_save_file($image_path, $validators, $target_path, FILE_EXISTS_REPLACE);
 }
 
 
@@ -47,73 +47,73 @@ 
  * 
  */
 function boincuser_check_credit_requirements() {
-  global $user;
-  if (!$user->uid) {
+    global $user;
+    if (!$user->uid) {
     return FALSE;
-  }
-  $account = user_load($user->uid);
-  $min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
-  $community_role = array_search('community member', user_roles(true));
-  $unrestricted_role = array_search('verified contributor', user_roles(true));
+    }
+    $account = user_load($user->uid);
+    $min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
+    $community_role = array_search('community member', user_roles(true));
+    $unrestricted_role = array_search('verified contributor', user_roles(true));
   
-  // Set user roles based on current penalty status...
-  if ($account->boincuser_penalty_expiration > time()) {
+    // Set user roles based on current penalty status...
+    if ($account->boincuser_penalty_expiration > time()) {
     drupal_set_message(bts(
-      'You are banned from community participation until @date',
-      array('@date' => format_date($account->boincuser_penalty_expiration))
+        'You are banned from community participation until @date',
+        array('@date' => format_date($account->boincuser_penalty_expiration))
     ), 'warning', FALSE);
     if (isset($account->roles[$community_role])) {
-      // Remove from the community role, if not already
-      unset($account->roles[$community_role]);
+        // Remove from the community role, if not already
+        unset($account->roles[$community_role]);
     }
     if (isset($account->roles[$unrestricted_role])) {
-      // Likewise, revoke extra privileges
-      unset($account->roles[$unrestricted_role]);
+        // Likewise, revoke extra privileges
+        unset($account->roles[$unrestricted_role]);
     }
     user_save($account, array('roles' => $account->roles));
-  }
-  else {
+    }
+    else {
     if (!isset($account->roles[$community_role])) {
-      // The user should be a 'community member' role. If the user was
-      // previously banned, this will restore that role.
-      $account->roles[$community_role] = 'community member';
-      user_save($account, array('roles' => $account->roles));
+        // The user should be a 'community member' role. If the user was
+        // previously banned, this will restore that role.
+        $account->roles[$community_role] = 'community member';
+        user_save($account, array('roles' => $account->roles));
     }
 
     // ... and total credit.
     if ($account->boincuser_total_credit >= $min_credit_to_post) {
-      if (!isset($account->roles[$unrestricted_role])) {
+        if (!isset($account->roles[$unrestricted_role])) {
         // This user is now above the credit threshold and is allowed full
         // privileges
         $account->roles[$unrestricted_role] = 'verified contributor';
         user_save($account, array('roles' => $account->roles));
-      }
+        }
     }
     else {
-      drupal_set_message(bts(
+        drupal_set_message(bts(
         'You must earn @count more credits to be able to post comments on this site and create or modify your user profile.',
         array('@count' => $min_credit_to_post - $account->boincuser_total_credit)
-      ), 'warning', FALSE);
-      if (isset($account->roles[$unrestricted_role])) {
+        ), 'warning', FALSE);
+        if (isset($account->roles[$unrestricted_role])) {
         // Either the threshold has been raised or credits have been revoked;
         // this user no longer qualifies for full privileges
         unset($account->roles[$unrestricted_role]);
         user_save($account, array('roles' => $account->roles));
-      }
+        }
     }
 
-  }
+    }
 }
 
 /**
  * Get the cid of the first comment the user has not seen on a given node
  */
 function boincuser_get_first_unread_comment_id($nid, $uid = NULL) {
-  if (!$uid) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  return db_result(db_query("
+    }
+    return db_result(db_query("
     SELECT c.cid
     FROM {node} n
     INNER JOIN {comments} c ON c.nid = n.nid
@@ -124,40 +124,40 @@ 
     ORDER BY c.timestamp ASC
     LIMIT 1",
     $uid, $nid
-  ));
+    ));
 }
 
 /**
  * Choose and set the user of the day
  */
 function boincuser_select_user_of_the_day() {
-  // First get a list of users with recent credit
-  db_set_active('boinc_rw');
-  $users_with_credit = db_query("
+    // First get a list of users with recent credit
+    db_set_active('boinc_rw');
+    $users_with_credit = db_query("
     SELECT
       id
     FROM {user} u
     JOIN {profile} p ON p.userid = u.id
     WHERE expavg_credit > 1
     ORDER BY uotd_time ASC, RAND()"
-  );
-  db_set_active('default');
-  $active_users = array();
-  while ($user_with_credit = db_fetch_object($users_with_credit)) {
+    );
+    db_set_active('default');
+    $active_users = array();
+    while ($user_with_credit = db_fetch_object($users_with_credit)) {
     $active_users[] = $user_with_credit->id;
-  }
-  $active_users = implode(',', $active_users);
-  // Limit to users who have never been user of the day, if there are any
-  $never_been_picked = db_result(db_query("
+    }
+    $active_users = implode(',', $active_users);
+    // Limit to users who have never been user of the day, if there are any
+    $never_been_picked = db_result(db_query("
     SELECT COUNT(*)
     FROM {boincuser} bu
     WHERE bu.uotd_time = 0
     " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '')
-  ));
-  $new_uotd_uid = 0;
-  while (!$new_uotd_uid) {
+    ));
+    $new_uotd_uid = 0;
+    while (!$new_uotd_uid) {
     // Select a user of the day randomly from the pool
-      $new_uotd_uid = db_result(db_query("
+        $new_uotd_uid = db_result(db_query("
       SELECT
         n.uid
       FROM {node} n
@@ -171,31 +171,31 @@ 
       LIMIT 1"
     ));
     if (!$new_uotd_uid) {
-      // Can't find a user with a profile; remove constraints on the pool
-      if ($never_been_picked) {
+        // Can't find a user with a profile; remove constraints on the pool
+        if ($never_been_picked) {
         // Allow users who have been previously selected
         $never_been_picked = FALSE;
-      }
-      elseif ($active_users) {
+        }
+        elseif ($active_users) {
         // Allow users who are not even active (getting desperate)
         $active_users = FALSE;
-      }
-      else {
+        }
+        else {
         // Process failed...
         return FALSE;
-      }
+        }
     }
-  }
-  $uotd = user_load($new_uotd_uid);
-  if ($uotd->uid) {
+    }
+    $uotd = user_load($new_uotd_uid);
+    if ($uotd->uid) {
     db_query("
       UPDATE {boincuser}
       SET uotd_time = '%d'
       WHERE uid = '%d'",
-      time(), $uotd->uid
+        time(), $uotd->uid
     );
-  }
-  return $uotd;
+    }
+    return $uotd;
 }
 
 
@@ -213,71 +213,71 @@ 
  * new and prev email.
  */
 function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) {
-  require_boinc('token');
-  module_load_include('inc', 'rules', 'modules/system.rules');
+    require_boinc('token');
+    module_load_include('inc', 'rules', 'modules/system.rules');
 
-  global $base_url;
-  $site_name = variable_get('site_name', 'Drupal-BOINC');
+    global $base_url;
+    $site_name = variable_get('site_name', 'Drupal-BOINC');
 
-  if (is_null($new_email)) {
+    if (is_null($new_email)) {
     $new_email = $account->mail;
-  }
-  if (is_null($prev_email)) {
+    }
+    if (is_null($prev_email)) {
     $prev_email = $account->boincuser_previous_email_addr;
-  }
-
-  // @todo - set constant in drupal, or use BOINC contsants
-  $duration = TOKEN_DURATION_ONE_WEEK;
-  $changedate = date('F j, Y \a\t G:i T', time());
-  $newdate = date('F j, Y \a\t G:i T', $account->boincuser_email_addr_change_time + $duration);
-  $token = create_token($account->boincuser_id, TOKEN_TYPE_CHANGE_EMAIL, $duration);
-  if ($adminuser) {
+    }
+
+    // @todo - set constant in drupal, or use BOINC contsants
+    $duration = TOKEN_DURATION_ONE_WEEK;
+    $changedate = date('F j, Y \a\t G:i T', time());
+    $newdate = date('F j, Y \a\t G:i T', $account->boincuser_email_addr_change_time + $duration);
+    $token = create_token($account->boincuser_id, TOKEN_TYPE_CHANGE_EMAIL, $duration);
+    if ($adminuser) {
     $graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
-      . "on {$changedate}. If you need to reverse this change, please look for "
-      . "an email send to the email address: {$prev_email}.\n";
-  }
-  else {
+        . "on {$changedate}. If you need to reverse this change, please look for "
+        . "an email send to the email address: {$prev_email}.\n";
+    }
+    else {
     $graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
-      . "on {$changedate}. You will not be able to change your email address "
-      . "until {$newdate}. If you need to reverse this change, please look for "
-      . "an email send to the email address: {$prev_email}.\n";
-  }
-
-  // Send email #1 to current address
-  $mysubject = "Notification of email change at {$site_name}";
-  $mymessage = ''
-      . "{$account->boincuser_name},\n"
-      . "\n"
-      . $graf1
-      . "\n"
-      . "Thanks, \n"
-      . "{$site_name} support team\n";
-
-  $settings = array(
+        . "on {$changedate}. You will not be able to change your email address "
+        . "until {$newdate}. If you need to reverse this change, please look for "
+        . "an email send to the email address: {$prev_email}.\n";
+    }
+
+    // Send email #1 to current address
+    $mysubject = "Notification of email change at {$site_name}";
+    $mymessage = ''
+        . "{$account->boincuser_name},\n"
+        . "\n"
+        . $graf1
+        . "\n"
+        . "Thanks, \n"
+        . "{$site_name} support team\n";
+
+    $settings = array(
     'from' => '',
     'to' => $new_email,
     'subject' => $mysubject,
     'message' => $mymessage,
-  );
-  rules_action_mail_to_user($account, $settings);
-
-  // Send email #2 to previous address.
-  $mymessage = ''
-      . "Your email address has been changed. If you did not intend to take this action, then please click this link to reverse this change, or copy-and-paste the link into your browser location bar. You will need to change your password as well.\n"
-      . "\n"
-      . "{$base_url}/user/{$account->uid}/recoveremail/{$token}\n"
-      . "\n"
-      . "Thanks, \n"
-      . "{$site_name} support team\n";
-
-  $settings = array(
+    );
+    rules_action_mail_to_user($account, $settings);
+
+    // Send email #2 to previous address.
+    $mymessage = ''
+        . "Your email address has been changed. If you did not intend to take this action, then please click this link to reverse this change, or copy-and-paste the link into your browser location bar. You will need to change your password as well.\n"
+        . "\n"
+        . "{$base_url}/user/{$account->uid}/recoveremail/{$token}\n"
+        . "\n"
+        . "Thanks, \n"
+        . "{$site_name} support team\n";
+
+    $settings = array(
     'from' => '',
     'to' => $prev_email,
     'subject' => $mysubject,
     'message' => $mymessage,
-  );
+    );
 
-  rules_action_mail($settings);
+    rules_action_mail($settings);
 }
 
 /**
@@ -287,32 +287,32 @@ 
  *
  */
 function create_proper_drupalname($requested_name) {
-  if (!$requested_name) {
+    if (!$requested_name) {
     // If the name is empty, set it
     $requested_name = 'anonymous';
-  }
-  $same_name_tally = 1;
-
-  // Remove extra spaces
-  $name2 = preg_replace("/ {2,}/", " ", trim($requested_name));
-  // Remove any non-valid characters
-  $cleaned_name = preg_replace('/[^a-zA-Z0-9_ \.-]/s', '_', $name2);
-  // Truncate name
-  $name_length = strlen($cleaned_name);
-  if ($name_length > 56) {
+    }
+    $same_name_tally = 1;
+
+    // Remove extra spaces
+    $name2 = preg_replace("/ {2,}/", " ", trim($requested_name));
+    // Remove any non-valid characters
+    $cleaned_name = preg_replace('/[^a-zA-Z0-9_ \.-]/s', '_', $name2);
+    // Truncate name
+    $name_length = strlen($cleaned_name);
+    if ($name_length > 56) {
     // Name is limited to 60 characters, but we want to leave space to add a
     // tally if needed (for users with duplicate names); Limit to 56 chars and
     // replace the middle of the string with "..." if too long
     $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length-56)+3);
-  }
+    }
 
-  // Determine if there are duplicate names, if so append a number to end.
-  $unique_name = $cleaned_name;
-  while (db_result(db_query("SELECT uid FROM {users} WHERE name = '{$unique_name}' LIMIT 1"))) {
+    // Determine if there are duplicate names, if so append a number to end.
+    $unique_name = $cleaned_name;
+    while (db_result(db_query("SELECT uid FROM {users} WHERE name = '{$unique_name}' LIMIT 1"))) {
     $same_name_tally++;
     $unique_name = "{$cleaned_name}_{$same_name_tally}";
-  }
-  return $unique_name;
+    }
+    return $unique_name;
 }
 
 
@@ -326,9 +326,9 @@ 
  *
  */
 function boincuser_check_termsofuse($user) {
-  require_boinc('consent');
-  $boinc_user = boincuser_load($user->uid, TRUE);
-  return check_user_consent($boinc_user, CONSENT_TYPE_ENROLL);
+    require_boinc('consent');
+    $boinc_user = boincuser_load($user->uid, TRUE);
+    return check_user_consent($boinc_user, CONSENT_TYPE_ENROLL);
 }
 
 /**
@@ -339,33 +339,33 @@ 
  *
  */
 function boincuser_consentto_termsofuse($user) {
-  require_boinc('consent');
-  $boinc_user = boincuser_load($user->uid, TRUE);
+    require_boinc('consent');
+    $boinc_user = boincuser_load($user->uid, TRUE);
 
-  list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
-  if ($checkct) {
+    list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
+    if ($checkct) {
     $rc1 = consent_to_a_policy($boinc_user, $ctid, 1, 0, 'Webform', time());
     if (!$rc1) {
-      drupal_set_message(
+        drupal_set_message(
         bts("ERROR: Database error when attempting to INSERT into table consent with ID=@id. The @project administrators have been notified.",
         array(
-          '@id' => $boinc_user->id,
-          '@project' => variable_get('site_name', 'Drupal-BOINC'), NULL, 'boinc:add-new-user'
+            '@id' => $boinc_user->id,
+            '@project' => variable_get('site_name', 'Drupal-BOINC'), NULL, 'boinc:add-new-user'
         ),
         'NULL', 'boinc:consent-termsofuse'),
-      'error');
-      rules_invoke_event('boincuser_general_consent_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
+        'error');
+        rules_invoke_event('boincuser_general_consent_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
     }
     return $rc1;
-  }
-  else {
+    }
+    else {
     drupal_set_message(
-      bts('ERROR: Consent type for enrollment not found. The @project administrators have been nofitifed.',
+        bts('ERROR: Consent type for enrollment not found. The @project administrators have been nofitifed.',
         array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:consent-termsofuse'),
     'error');
     rules_invoke_event('boincuser_general_consent_type_error', CONSENT_TYPE_ENROLL, variable_get('boinc_admin_mailing_list_subject_tag', ''));
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
@@ -374,16 +374,16 @@ 
  */
 function _boincuser_ignore_paths($path, $paths_to_ignore) {
 
-  foreach ($paths_to_ignore as $pi) {
+    foreach ($paths_to_ignore as $pi) {
     // @todo Currently this function uses {} as PHP regexp
     // delimiters. Curly brace is not really allowed un URLs, but a
     // more robust function would first check for these curly braces
     // in the path_to_ignore patterms, just in case.
     if (preg_match('{' . $pi . '}', $path)) {
-      return TRUE;
+        return TRUE;
     }
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
@@ -391,20 +391,20 @@ 
  * Drupal's recover email path.
  */
 function _boincuser_redirect_recover_email() {
-  $params = array(
+    $params = array(
     'boincid' => isset($_GET['id']) ? $_GET['id'] : '',
     'token' => isset($_GET['token']) ? $_GET['token'] : ''
-  );
+    );
 
-  // If boincid or token is not present, then go to the home page.
-  if (empty($params['boincid']) or empty($params['token'])) {
+    // If boincid or token is not present, then go to the home page.
+    if (empty($params['boincid']) or empty($params['token'])) {
     $redirect = '';
-  }
-  else {
+    }
+    else {
     $uid = boincuser_lookup_uid($params['boincid']);
     $redirect = "/user/${uid}/recoveremail/${params['token']}";
-  }
-  drupal_goto($redirect);
+    }
+    drupal_goto($redirect);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -415,17 +415,17 @@ 
  * Require BOINC library
  */
 function require_boinc($libraries) {
-  if ($include_dir = boinc_get_path('html_inc')) {
+    if ($include_dir = boinc_get_path('html_inc')) {
     $working_dir = getcwd();
     chdir($include_dir);
     if (!is_array($libraries)) {
-      $libraries = array($libraries);
+        $libraries = array($libraries);
     }
     foreach ($libraries as $library) {
-      require_once("{$library}.inc");
+        require_once("{$library}.inc");
     }
     chdir($working_dir);
-  }
+    }
 }
 
 /**
@@ -433,7 +433,7 @@ 
  * The path from the BOINC html root must be included (e.g. user/file.php)
  */
 function include_boinc($file) {
-  if ($include_dir = boinc_get_path()) {
+    if ($include_dir = boinc_get_path()) {
     $include_dir .= '/html';
     $workingDir = getcwd();
     $path = dirname($file);
@@ -441,84 +441,84 @@ 
     chdir("{$include_dir}/{$path}");
     include($file);
     chdir($workingDir);
-  }
+    }
 }
 
 /**
  * Get the BOINC include path
  */
 function boinc_get_path($type = 'root') {
-  $dir = "boinc_{$type}_dir";
-  if ($include_dir = variable_get("boinc_{$type}_dir", '')) {
+    $dir = "boinc_{$type}_dir";
+    if ($include_dir = variable_get("boinc_{$type}_dir", '')) {
     return $include_dir;
-  }
-  else {
+    }
+    else {
     // Don't show errors on blacklisted pages
     $page_blacklist = array(
-      'admin/boinc/environment'
+        'admin/boinc/environment'
     );
     if (!in_array($_GET['q'], $page_blacklist)) {
-      watchdog('boincuser', 'The BOINC environment is not configured. Please
+        watchdog('boincuser', 'The BOINC environment is not configured. Please
           !configure_it', array('!configure_it' => l(t('configure it now'),
             'admin/boinc/environment')), WATCHDOG_WARNING);
-      if (user_access('administer site configuration')) {
+        if (user_access('administer site configuration')) {
         drupal_set_message(t('The BOINC environment is not configured. Please
           !configure_it', array('!configure_it' => l(t('configure it now'),
             'admin/boinc/environment'))), 'warning', FALSE);
-      }
-      else {
+        }
+        else {
         drupal_set_message(t('There is a problem with the site. Please contact
           the system administrator.'), 'error', FALSE);
-      }
-      // Redirect home to display the error message and avoid fatal errors
-      // (unless on a blacklisted page)
-      $redirect_blacklist = array(
+        }
+        // Redirect home to display the error message and avoid fatal errors
+        // (unless on a blacklisted page)
+        $redirect_blacklist = array(
         'admin/settings/performance',
         'admin/boinc/environment',
         'home',
         ''
-      );
-      if (!in_array($_GET['q'], $redirect_blacklist)) {
+        );
+        if (!in_array($_GET['q'], $redirect_blacklist)) {
         drupal_goto('');
-      }
+        }
     }
     else {
-      // Clear the messages on the environment config page
-      drupal_get_messages();
+        // Clear the messages on the environment config page
+        drupal_get_messages();
     }
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
  * Get the configured scheduler tags
  */
 function boinc_get_scheduler_tags() {
-  // Don't generate messages for blacklisted pages
-  $page_blacklist = array(
+    // Don't generate messages for blacklisted pages
+    $page_blacklist = array(
     'admin/boinc/environment',
     'admin/boinc/scheduler'
-  );
-  if ($url_config = variable_get('boinc_scheduler_urls', '')) {
+    );
+    if ($url_config = variable_get('boinc_scheduler_urls', '')) {
     return explode("\r\n", $url_config);
-  }
-  elseif (!in_array($_GET['q'], $page_blacklist)) {
+    }
+    elseif (!in_array($_GET['q'], $page_blacklist)) {
     watchdog('boincuser', 'The BOINC scheduling server settings are not yet
         configured. Please !verify for the settings to become effective.',
-          array('!verify' => l(t('verify the default values') . ' <strong>' . 
+            array('!verify' => l(t('verify the default values') . ' <strong>' . 
             t('and') . '</strong> ' . t('save the configuration'),
             'admin/boinc/scheduler', array('html' => TRUE))
-          ), WATCHDOG_WARNING);
+            ), WATCHDOG_WARNING);
     if (user_access('administer site configuration')) {
-      drupal_set_message(t('The BOINC scheduling server settings are not yet
+        drupal_set_message(t('The BOINC scheduling server settings are not yet
           configured. Please !verify for the settings to become effective',
             array('!verify' => l(t('verify the default values') . ' <strong>' . 
-              t('and') . '</strong> ' . t('save the configuration'),
-              'admin/boinc/scheduler', array('html' => TRUE))
+                t('and') . '</strong> ' . t('save the configuration'),
+                'admin/boinc/scheduler', array('html' => TRUE))
             )), 'warning', FALSE);
     }
-  }
-  return array();
+    }
+    return array();
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -530,41 +530,41 @@ 
  * Determine if a BOINC ID matches the logged in user
  */
 function is_current_boinc_user($boinc_id) {
-  global $user;
-  if (!$user->uid) {
+    global $user;
+    if (!$user->uid) {
     return FALSE;
-  }
-  // boincuser_id is not stored in the global user, so load a new instance
-  $drupuser = user_load($user->uid);
-  return ($boinc_id == $drupuser->boincuser_id);
+    }
+    // boincuser_id is not stored in the global user, so load a new instance
+    $drupuser = user_load($user->uid);
+    return ($boinc_id == $drupuser->boincuser_id);
 }
 
 /**
  * Convert a BOINC ID to a Drupal ID
  */
 function boincuser_lookup_uid($boinc_id) {
-  $drupal_id = db_result(db_query("SELECT uid FROM {boincuser} WHERE boinc_id='%d'", $boinc_id));
-  return $drupal_id;
+    $drupal_id = db_result(db_query("SELECT uid FROM {boincuser} WHERE boinc_id='%d'", $boinc_id));
+    return $drupal_id;
 }
 function get_drupal_id($boinc_id) {
-  return boincuser_lookup_uid($boinc_id);
+    return boincuser_lookup_uid($boinc_id);
 }
 
 /**
  * Get a BOINC user object
  */
 function boincuser_load($user_id = NULL, $is_drupal_id = FALSE) {
-  if (!$user_id) {
+    if (!$user_id) {
     global $user;
     $user_id = $user->uid;
     $is_drupal_id = TRUE;
-  }
-  if ($is_drupal_id) {
+    }
+    if ($is_drupal_id) {
     $account = user_load($user_id);
     $user_id = $account->boincuser_id;
-  }
-  require_boinc('boinc_db');
-  return BoincUser::lookup_id($user_id);
+    }
+    require_boinc('boinc_db');
+    return BoincUser::lookup_id($user_id);
 }
 
 /**
@@ -574,10 +574,10 @@ 
  * page, delete button.
  */
 function _boincuser_node_profile_delete_submit($form, &$form_state) {
-  $node = $form['#node'];
-  $deleteurl = 'node/'. $node->nid .'/delete';
-  $afterq = 'destination=account';
-  drupal_goto($deleteurl, $afterq);
+    $node = $form['#node'];
+    $deleteurl = 'node/'. $node->nid .'/delete';
+    $afterq = 'destination=account';
+    drupal_goto($deleteurl, $afterq);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -588,8 +588,8 @@ 
  * Wrapper for boinc_version() function
  */
 function get_boinc_version($x) {
-  require_boinc('host');
-  return function_exists('boinc_version') ? boinc_version($x) : 'err!';
+    require_boinc('host');
+    return function_exists('boinc_version') ? boinc_version($x) : 'err!';
 }
   
 
@@ -598,14 +598,14 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * Generate the friend block header
-  */
+ * Generate the friend block header
+ */
 function boincuser_views_friends_block_header($context = null) {
-  // Get the friend count for the user being viewed
-  $view = views_get_current_view();
-  $account_id = $view->args[0];
-  $friend_count = flag_friend_get_friend_count($account_id);
-  return '<h2 class="pane-title">' . bts('Friends (@count)', 
+    // Get the friend count for the user being viewed
+    $view = views_get_current_view();
+    $account_id = $view->args[0];
+    $friend_count = flag_friend_get_friend_count($account_id);
+    return '<h2 class="pane-title">' . bts('Friends (@count)', 
     array('@count' => $friend_count)) . '</h2>';
 }
 
@@ -614,13 +614,13 @@ 
  * database.
  */
 function _boincuser_user_name_autocomplete($string) {
-  $matches = array();
-  db_set_active('boinc_ro');
-  $result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10);
-  db_set_active('default');
-  while ($user = db_fetch_object($result)) {
-      $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')';
-  }
-
-  drupal_json((object)$matches);
+    $matches = array();
+    db_set_active('boinc_ro');
+    $result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10);
+    db_set_active('default');
+    while ($user = db_fetch_object($result)) {
+        $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')';
+    }
+
+    drupal_json((object)$matches);
 }

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

Indentation +183 added lines, -183 removed lines

@@ -28,13 +28,13 @@ 
 }*/
 
 /**
-  * The BOINC environment form allows paths to be set to connect Drupal to an
-  * existing BOINC web interface.
-  */
+ * The BOINC environment form allows paths to be set to connect Drupal to an
+ * existing BOINC web interface.
+ */
 function boincuser_admin_environment(&$form_state) {
-  global $base_url;
-  $form = array();
-  $default = array(
+    global $base_url;
+    $form = array();
+    $default = array(
     'boinc_root_dir' => variable_get('boinc_root_dir', ''),
     'boinc_config_xml_dir' => variable_get('boinc_config_xml_dir', ''),
     'boinc_html_inc_dir' => variable_get('boinc_html_inc_dir', ''),
@@ -47,303 +47,303 @@ 
     'boinc_admin_mailing_list_subject_tag' => variable_get('boinc_admin_mailing_list_subject_tag', ''),
     'boinc_debug_mode' => variable_get('boinc_debug_mode', 0),
     'boinc_project_config_keywords' => variable_get('boinc_project_config_keywords', ''),
-  );
-  //drupal_set_message(print_r($default, true));
-  //drupal_set_message(print_r($form_state, true));
-  // Show overrides if the root dir is set and others have not been detected
-  $show_overrides = FALSE;
-  if ($default['boinc_root_dir']) {
+    );
+    //drupal_set_message(print_r($default, true));
+    //drupal_set_message(print_r($form_state, true));
+    // Show overrides if the root dir is set and others have not been detected
+    $show_overrides = FALSE;
+    if ($default['boinc_root_dir']) {
     foreach ($default as $key => $dir) {
-      switch ($key) {
-      case 'boinc_config_xml_dir':
+        switch ($key) {
+        case 'boinc_config_xml_dir':
       case 'boinc_html_inc_dir':
       case 'boinc_project_config_dir':
       case 'boinc_user_image_dir':
         // If any of these values are not set, show the overrides section
         if (!$dir) {
-          $default[$key] = $form_state['values'][$key];
-          $show_overrides = TRUE;
-          break;
+            $default[$key] = $form_state['values'][$key];
+            $show_overrides = TRUE;
+            break;
         }
         break;
-      default:
+        default:
       }
-      if ($show_overrides) {
+        if ($show_overrides) {
         break;
-      }
+        }
+    }
     }
-  }
-  // Define the form
-  $form['boinc_root_dir'] = array(
+    // Define the form
+    $form['boinc_root_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC project root directory'),
     '#default_value' => $default['boinc_root_dir'], 
     '#description' => t('The filesystem path to the BOINC project root. This
       directory should contain config.xml as well as the html subdirectory,
       which itself contains inc/, project/, and user_profile/.'),
-  );
-  $form['overrides'] = array(
+    );
+    $form['overrides'] = array(
     '#title' => t('Overrides'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => TRUE,
     '#collapsed' => !$show_overrides,
     '#attributes' => array('class' => 'advanced-settings')
-  );
-  $form['overrides']['boinc_config_xml_dir'] = array(
+    );
+    $form['overrides']['boinc_config_xml_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC config.xml directory'),
     '#default_value' => $default['boinc_config_xml_dir'],
     '#description' => t('The filesystem path that contains config.xml'),
-  );
-  $form['overrides']['boinc_html_inc_dir'] = array(
+    );
+    $form['overrides']['boinc_html_inc_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC web includes directory'),
     '#default_value' => $default['boinc_html_inc_dir'],
     '#description' => t('The filesystem path to the html/inc/ directory that
       contains util.inc'),
-  );
-  $form['overrides']['boinc_project_config_dir'] = array(
+    );
+    $form['overrides']['boinc_project_config_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC project config directory'),
     '#default_value' => $default['boinc_project_config_dir'],
     '#description' => t('The filesystem path to the project/ directory that
       contains project.inc'),
-  );
-  $form['overrides']['boinc_user_image_dir'] = array(
+    );
+    $form['overrides']['boinc_user_image_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC user profile image directory'),
     '#default_value' => $default['boinc_user_image_dir'],
     '#description' => t('The filesystem directory that contains user images'),
-  );
-  $form['boinc_server_status_url'] = array(
+    );
+    $form['boinc_server_status_url'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC server status page URL (optional)'),
     '#default_value' => $default['boinc_server_status_url'],
     '#description' => t('An absolute URL or path relative to the site base to the server status page (e.g. %full_url or just %relative_url).',
-      array(
+        array(
         '%full_url' => $base_url . '/server_status.php',
         '%relative_url' => 'server_status.php',
-      )
+        )
     ),
-  );
-  $form['boinc_app_list_url'] = array(
+    );
+    $form['boinc_app_list_url'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC applications page URL (optional)'),
     '#default_value' => $default['boinc_app_list_url'],
     '#description' => t('An absolute URL or path relative to the site base to the applications page (e.g. %full_url or just %relative_url).',
-      array(
+        array(
         '%full_url' => $base_url . '/apps.php',
         '%relative_url' => 'apps.php',
-      )
+        )
     ),
-  );
-  $form['boinc_host_sched_logs_dir'] = array(
+    );
+    $form['boinc_host_sched_logs_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC host scheduler log directory (optional)'),
     '#default_value' => $default['boinc_host_sched_logs_dir'],
     '#description' => t('The filesystem directory that contains host scheduler logs'),
-  );
-  $form['boinc_admin_mailing_list'] = array(
+    );
+    $form['boinc_admin_mailing_list'] = array(
     '#type' => 'textfield',
     '#title' => t('Admin mailing list'),
     '#default_value' => $default['boinc_admin_mailing_list'],
     '#description' => t('Enter an email-address which will be used to contact admisistrators. If empty, the site email configured in Settings -> Site Information will be used.'),
-  );
-  $form['boinc_admin_mailing_list_subject_tag'] = array(
+    );
+    $form['boinc_admin_mailing_list_subject_tag'] = array(
     '#type' => 'textfield',
     '#title' => t('Admin mailing list - subject tag'),
     '#default_value' => $default['boinc_admin_mailing_list_subject_tag'],
     '#description' => t('Text which will appear at the beginning of the subject for any admin notification emails. If empty, no tag will be included. Examples: [drupal-error].'),
-  );
-  $form['boinc_debug_mode'] = array(
+    );
+    $form['boinc_debug_mode'] = array(
     '#type' => 'checkbox',
     '#title' => t('Show debug messages in system log'),
     '#default_value' => $default['boinc_debug_mode']
-  );
-  $form['boinc_project_config_keywords'] = array(
+    );
+    $form['boinc_project_config_keywords'] = array(
     '#type' => 'textarea',
     '#title' => t('Project/Job Keywords for get_project_config RPC'),
     '#default_value' => $default['boinc_project_config_keywords'],
     '#description' => t('XML from this text box will be appended to the XML output from the get_project_config RPC. There is no check for XML validity! See !link for more details. It is okay to leave this blank.',
     array(
-      '!link' => l('BOINC wiki page', 'https://boinc.berkeley.edu/trac/wiki/JobKeywords')
+        '!link' => l('BOINC wiki page', 'https://boinc.berkeley.edu/trac/wiki/JobKeywords')
     )),
-  );
-  return system_settings_form($form);
+    );
+    return system_settings_form($form);
 }
 
 /**
-  * Validate the BOINC environment form.
-  */
+ * Validate the BOINC environment form.
+ */
 function boincuser_admin_environment_validate($form, &$form_state) {
-  $values = $form_state['values'];
-  if (!$values['boinc_root_dir']) {
+    $values = $form_state['values'];
+    if (!$values['boinc_root_dir']) {
     form_set_error('boinc_root_dir', t('BOINC project root directory must be
       defined!'));
-  }
-  elseif (!is_dir($values['boinc_root_dir'])) {
+    }
+    elseif (!is_dir($values['boinc_root_dir'])) {
     form_set_error('boinc_root_dir', t('BOINC project root not found at %directory',
-      array('%directory' => $values['boinc_root_dir'])
+        array('%directory' => $values['boinc_root_dir'])
     ));
-  }
-  else {
+    }
+    else {
     // By default, try to automatically set specific directories from the root
     if (!$values['boinc_config_xml_dir']) {
-      $values['boinc_config_xml_dir'] = $values['boinc_root_dir'];
-      form_set_value($form['overrides']['boinc_config_xml_dir'], $values['boinc_config_xml_dir'], $form_state);
+        $values['boinc_config_xml_dir'] = $values['boinc_root_dir'];
+        form_set_value($form['overrides']['boinc_config_xml_dir'], $values['boinc_config_xml_dir'], $form_state);
     }
     if (!$values['boinc_html_inc_dir']) {
-      $values['boinc_html_inc_dir'] = "{$values['boinc_root_dir']}/html/inc";
-      form_set_value($form['overrides']['boinc_html_inc_dir'], $values['boinc_html_inc_dir'], $form_state);
+        $values['boinc_html_inc_dir'] = "{$values['boinc_root_dir']}/html/inc";
+        form_set_value($form['overrides']['boinc_html_inc_dir'], $values['boinc_html_inc_dir'], $form_state);
     }
     if (!$values['boinc_project_config_dir']) {
-      $values['boinc_project_config_dir'] = "{$values['boinc_root_dir']}/html/project";
-      form_set_value($form['overrides']['boinc_project_config_dir'], $values['boinc_project_config_dir'], $form_state);
+        $values['boinc_project_config_dir'] = "{$values['boinc_root_dir']}/html/project";
+        form_set_value($form['overrides']['boinc_project_config_dir'], $values['boinc_project_config_dir'], $form_state);
     }
     if (!$values['boinc_user_image_dir']) {
-      $values['boinc_user_image_dir'] = "{$values['boinc_root_dir']}/html/user_profile/images";
-      form_set_value($form['overrides']['boinc_user_image_dir'], $values['boinc_user_image_dir'], $form_state);
+        $values['boinc_user_image_dir'] = "{$values['boinc_root_dir']}/html/user_profile/images";
+        form_set_value($form['overrides']['boinc_user_image_dir'], $values['boinc_user_image_dir'], $form_state);
     }
     // Validate that required BOINC content is found
     if (!is_readable("{$values['boinc_config_xml_dir']}/config.xml")) {
-      form_set_error('boinc_config_xml_dir', t('@file not found in %directory',
+        form_set_error('boinc_config_xml_dir', t('@file not found in %directory',
         array(
-          '@file' => 'config.xml',
-          '%directory' => "{$values['boinc_config_xml_dir']}/"
+            '@file' => 'config.xml',
+            '%directory' => "{$values['boinc_config_xml_dir']}/"
         )
-      ));
+        ));
     }
     if (!is_readable("{$values['boinc_html_inc_dir']}/util.inc")) {
-      form_set_error('boinc_html_inc_dir', t('@file not found in %directory',
+        form_set_error('boinc_html_inc_dir', t('@file not found in %directory',
         array(
-          '@file' => 'util.inc',
-          '%directory' => "{$values['boinc_html_inc_dir']}/"
+            '@file' => 'util.inc',
+            '%directory' => "{$values['boinc_html_inc_dir']}/"
         )
-      ));
+        ));
     }
     if (!is_readable("{$values['boinc_project_config_dir']}/project.inc")) {
-      form_set_error('boinc_project_config_dir', t('@file not found in %directory',
+        form_set_error('boinc_project_config_dir', t('@file not found in %directory',
         array(
-          '@file' => 'project.inc',
-          '%directory' => "{$values['boinc_project_config_dir']}/"
+            '@file' => 'project.inc',
+            '%directory' => "{$values['boinc_project_config_dir']}/"
         )
-      ));
+        ));
     }
     if (!is_dir($values['boinc_user_image_dir'])) {
-      form_set_error('boinc_user_image_dir', t('Profile image directory not found
+        form_set_error('boinc_user_image_dir', t('Profile image directory not found
         at %directory', array('%directory' => $values['boinc_user_image_dir'])
-      ));
+        ));
     }
     if ($values['boinc_host_sched_logs_dir']
         AND !is_dir($values['boinc_host_sched_logs_dir'])
-      ) {
-      form_set_error('boinc_host_sched_logs_dir', t('Host scheduler log
+        ) {
+        form_set_error('boinc_host_sched_logs_dir', t('Host scheduler log
         directory not found at %directory',
         array('%directory' => $values['boinc_host_sched_logs_dir'])
-      ));
+        ));
+    }
     }
-  }
 }
 
 /**
-  * Handle post-validation submission of BOINC environment form.
-  */
+ * Handle post-validation submission of BOINC environment form.
+ */
 function boincuser_admin_environment_submit($form, &$form_state) {
-  unset($_SESSION['boinc_env']);
-  drupal_set_message(t('BOINC environment settings have been updated.'));
+    unset($_SESSION['boinc_env']);
+    drupal_set_message(t('BOINC environment settings have been updated.'));
 }
 
 /**
-  * The BOINC scheduler form provides options for how scheduler tags are
-  * inserted into the front page
-  */
+ * The BOINC scheduler form provides options for how scheduler tags are
+ * inserted into the front page
+ */
 function boincuser_admin_scheduler(&$form_state) {
-  $form = array();
-  $config_cgi_url = '';
-  if ($config_xml_dir = variable_get('boinc_config_xml_dir', '')) {
+    $form = array();
+    $config_cgi_url = '';
+    if ($config_xml_dir = variable_get('boinc_config_xml_dir', '')) {
     // Get the cgi_url option from the config file as the default scheduler URL
     $xml = new DOMDocument();
     if ($xml->load("{$config_xml_dir}/config.xml")) {
-      $config = xml_to_array($xml);
-      if (isset($config['boinc']['config']['cgi_url']['@value'])) {
+        $config = xml_to_array($xml);
+        if (isset($config['boinc']['config']['cgi_url']['@value'])) {
         $config_cgi_url = rtrim(trim($config['boinc']['config']['cgi_url']['@value']), '/');
         $config_cgi_url .= '/cgi';
-      }
+        }
     }
-  }
-  $default = array(
+    }
+    $default = array(
     'boinc_scheduler_urls' => variable_get('boinc_scheduler_urls', $config_cgi_url),
     'boinc_scheduler_tag_format_old' => variable_get('boinc_scheduler_tag_format_old', 1),
     'boinc_scheduler_tag_format_new' => variable_get('boinc_scheduler_tag_format_new', 1)
-  );
+    );
   
-  // Define the form
-  $form['boinc_scheduler_urls'] = array(
+    // Define the form
+    $form['boinc_scheduler_urls'] = array(
     '#type' => 'textarea',
     '#title' => t('Scheduling server URLs'),
     '#default_value' => $default['boinc_scheduler_urls'],
     '#cols' => 60,
     '#rows' => 5,
     '#description' => t('If there are multiple URLs, please enter one per line.'),
-  );
-  $form['boinc_scheduler_tag_format_old'] = array(
+    );
+    $form['boinc_scheduler_tag_format_old'] = array(
     '#type' => 'checkbox',
     '#title' => t('Old format (@scheduler tag)', array('@scheduler' => '<scheduler>')),
     '#default_value' => $default['boinc_scheduler_tag_format_old']
-  );
-  $form['boinc_scheduler_tag_format_new'] = array(
+    );
+    $form['boinc_scheduler_tag_format_new'] = array(
     '#type' => 'checkbox',
     '#title' => t('New format (@link tag)', array('@link' => '<link>')),
     '#default_value' => $default['boinc_scheduler_tag_format_new']
-  );
+    );
   
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 
 /**
-  * Validate the BOINC scheduler form.
-  */
+ * Validate the BOINC scheduler form.
+ */
 function boincuser_admin_scheduler_validate($form, &$form_state) {
-  $values = $form_state['values'];
-  if (!$values['boinc_scheduler_urls']) {
+    $values = $form_state['values'];
+    if (!$values['boinc_scheduler_urls']) {
     form_set_error('boinc_scheduler_urls', t('At least one scheduling server
       URL must be specified.'));
-  }
-  else {
+    }
+    else {
     $urls = explode("\r\n", $values['boinc_scheduler_urls']);
     foreach ($urls as $key => $url) {
-      if (!$url) {
+        if (!$url) {
         unset($urls[$key]);
         continue;
-      }
-      if (!filter_var($url, FILTER_VALIDATE_URL)) {
+        }
+        if (!filter_var($url, FILTER_VALIDATE_URL)) {
         form_set_error('boinc_scheduler_urls', t('@url is not a valid URL
           format.', array('@url' => $url)));
         break;
-      }
+        }
     }
     $form_state['values']['boinc_scheduler_urls'] = implode("\r\n", $urls);
-  }
+    }
 }
 
 /**
-  * Handle post-validation submission of BOINC scheduler form.
-  */
+ * Handle post-validation submission of BOINC scheduler form.
+ */
 function boincuser_admin_scheduler_submit($form, &$form_state) {
-  drupal_set_message(t('BOINC scheduling server settings have been updated.'));
+    drupal_set_message(t('BOINC scheduling server settings have been updated.'));
 }
 
 
 /**
-  * Drupal-BOINC Web site related options.
-  */
+ * Drupal-BOINC Web site related options.
+ */
 function boincuser_admin_weboptions(&$form_state) {
-  global $base_url;
-  $form = array();
+    global $base_url;
+    $form = array();
 
-  //form defaults
-  $default = array(
+    //form defaults
+    $default = array(
     'boinc_weboptions_enableaccountcreateRPC' => variable_get('boinc_weboptions_enableaccountcreateRPC', TRUE),
     'boinc_weboptions_registrationtitle' => variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'),
     'boinc_weboptions_termsofuse' => variable_get('boinc_weboptions_termsofuse', ''),
@@ -357,65 +357,65 @@ 
     'boinc_weboptions_rulespolicies' => variable_get('boinc_weboptions_rulespolicies', ''),
     'boinc_other_frontpage' => variable_get('boinc_other_frontpage', ''),
     'boinc_weboptions_blacklisted_usernames' => variable_get('boinc_weboptions_blacklisted_usernames', "admin\nadministrator\nmoderator"),
-  );
+    );
 
-  // Define the form
-  $form['registrationtitle'] = array(
+    // Define the form
+    $form['registrationtitle'] = array(
     '#value' => '<h3>BOINC Registration</h3>',
-  );
+    );
 
-  $form['boinc_weboptions_enableaccountcreateRPC'] = array(
+    $form['boinc_weboptions_enableaccountcreateRPC'] = array(
     '#type' => 'checkbox',
     '#title' => t('Enable create_account.php RPC'),
     '#default_value' => $default['boinc_weboptions_enableaccountcreateRPC'],
     '#description' => t('If checked, users will be able to create an account remotely using the create_account.php RPC. This option is independent of the user regsitration option found in ') . l(t('User management -> User settings'), '/admin/user/settings') . '. If enabled, user <b>may not be able to see and agree to the terms-of-use</b> to your site\'s privacy and data retention policies!',
-  );
+    );
 
-  $form['boinc_weboptions_registrationtitle'] = array(
+    $form['boinc_weboptions_registrationtitle'] = array(
     '#type' => 'textfield',
     '#title' => t('Title of regsistration page'),
     '#description' => t('Title text presented above the terms of use text.'),
     '#default_value' => $default['boinc_weboptions_registrationtitle'],
-  );
+    );
 
-  $form['boinc_weboptions_termsofuse'] = array(
+    $form['boinc_weboptions_termsofuse'] = array(
     '#type' => 'textarea',
     '#title' => t('Terms of Use Message for User Registration Page'),
     '#default_value' => $default['boinc_weboptions_termsofuse'],
     '#cols' => 60,
     '#rows' => 8,
     '#description' => t('Text to be displayed on site\'s user registration page. Privacy policy and other data retention information goes here. If empty, there will be no terms of use message, and the title above and checkbox below will not be shown.'),
-  );
+    );
 
-  $form['boinc_weboptions_overrideboinctou'] = array(
+    $form['boinc_weboptions_overrideboinctou'] = array(
     '#type' => 'checkbox',
     '#title' => t('Override BOINC terms of use.'),
     '#default_value' => $default['boinc_weboptions_overrideboinctou'],
     '#description' => t('Override the BOINC terms_of_use.txt file for get_profject_config.php RPC. If TRUE, the get_project_config.php RPC will use the above terms of use text entered above. Otherwise, the original terms_of_use.txt text file in the project directory is used. And you will need to be responsible for keeping both the text file and the above terms of use text up-to-date and in sync with each other.'),
-  );
+    );
 
-  $form['boinc_weboptions_agreequestion'] = array(
+    $form['boinc_weboptions_agreequestion'] = array(
     '#type' => 'textfield',
     '#title' => t('Terms of use agreement question'),
     '#description' => t('This text is presented to the user as the question next to the \'I agree\' checkbox.'),
     '#default_value' => $default['boinc_weboptions_agreequestion'],
-  );
+    );
 
-  $form['boinc_weboptions_registrationtitle2'] = array(
+    $form['boinc_weboptions_registrationtitle2'] = array(
     '#type' => 'textfield',
     '#title' => t('Instructions for username/email/password questions'),
     '#description' => t('Title text presented below terms of use and above username/email/password textfields.'),
     '#default_value' => $default['boinc_weboptions_registrationtitle2'],
-  );
+    );
 
-  $form['boinc_weboptions_existinguser_tou'] = array(
+    $form['boinc_weboptions_existinguser_tou'] = array(
     '#type' => 'checkbox',
     '#title' => t('Are existing users forced to agree to the Terms of Use?'),
     '#default_value' => $default['boinc_weboptions_existinguser_tou'],
     '#description' => t('If TRUE, existing users are forced to agree to a terms of use (if present) when the login and the system has detected they have not agreed. Otherwise they may login as normal. This option has no affect on whether or not new users must agree to the terms of use.'),
-  );
+    );
 
-  $form['boinc_weboptions_pathstoignore'] = array(
+    $form['boinc_weboptions_pathstoignore'] = array(
     '#type' => 'textarea',
     '#title' => t('Paths to ignore the Terms of Use page'),
     '#default_value' => $default['boinc_weboptions_pathstoignore'],
@@ -424,80 +424,80 @@ 
     '#description' => t('A list of Drupal URLs/paths to ignore for Terms of Use (ToU). If the option above \'Are existing users forced to agree to the Terms of Use?\' is activated, then some paths need to be ignored when checking if a user has agreed to the ToU. A good example is the logout path, "logout", or else users will not be able to logout!
 <p>There is a default list of paths that must be ignored or else the site will not function. They are not included in this box. Here you may provide additional paths to be ignored, for example the privacy policy page may be accessible so that users may read it before agreeing to the site\'s ToU.
 <p>Paths should be entered one per line. All paths should be <em>lower-case</em> and  should not include a leading \'/\'. Example: account/info/edit will allow the user to visit ' . $base_url . '/account/info/edit without first agreeing to the ToU. Regexp are allowed. Example: account/* will allow the user to visit any path starting with ' . $base_url . '/account/.'),
-  );
+    );
 
-  $form['pathtitle'] = array(
+    $form['pathtitle'] = array(
     '#value' => '<h3>Path Options</h3>',
-  );
+    );
 
-  $form['boinc_weboptions_accountfinish'] = array (
+    $form['boinc_weboptions_accountfinish'] = array (
     '#type' => 'textfield',
     '#title' => t('Path to a custom account_finish.php page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s landing page for users create an account using the BOINC client manager. They will be directed to this page after the account is created. If blank, a default account_finish page will be used.<br>Examples: account_finish, content/welcome, node/123'),
     '#default_value' => $default['boinc_weboptions_accountfinish'],
-  );
-  $form['boinc_weboptions_moderationpage'] = array (
+    );
+    $form['boinc_weboptions_moderationpage'] = array (
     '#type' => 'textfield',
     '#title' => t('Path to the site\'s content moderation info page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s page for account/content moderation information. This will be used on the default account_finish page. If blank, no link to a moderation page will be provided. If a path is provided to the custom account_finish.php page (above), this field will be ignored.<br>Examples: moderation, content/moderation, node/456'),
     '#default_value' => $default['boinc_weboptions_moderationpage'],
-  );
-  $form['boinc_weboptions_rulespolicies'] = array (
+    );
+    $form['boinc_weboptions_rulespolicies'] = array (
     '#type' => 'textfield',
     '#title' => t('Path to the site\'s rule and policies page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s rules and policies page. This will be used on the Join page shown to new users. If blank, no link to a rules and policies page will be provided.<br>Examples: rules-and-policies, node/789'),
     '#default_value' => $default['boinc_weboptions_rulespolicies'],
-  );
-  $form['boinc_other_frontpage'] = array (
+    );
+    $form['boinc_other_frontpage'] = array (
     '#type' => 'textarea',
     '#title' => bts('Message for site\'s Home Page', array(), NULL, 'boinc:admin-boinc-other-options'),
     '#default_value' => $default['boinc_other_frontpage'],
     '#cols' => 60,
     '#rows' => 8,
     '#description' => bts('Text to be displayed on the site\'s Home landing page.', array(), NULL, 'boinc:admin-boinc-other-options'),
-  );
+    );
 
-  $form['Othertitle'] = array(
+    $form['Othertitle'] = array(
     '#value' => '<h3>Other Options</h3>',
-  );
+    );
 
-  $form['boinc_weboptions_blacklisted_usernames'] = array (
+    $form['boinc_weboptions_blacklisted_usernames'] = array (
     '#type' => 'textarea',
     '#title' => t('BOINC username blacklist'),
     '#default_value' => $default['boinc_weboptions_blacklisted_usernames'],
     '#cols' => 60,
     '#rows' => 7,
     '#description' => t('Username blacklist: List of names that users will not be able to choose as their BOINC username. This will only affect Web registration and when a user changes their name using the Web site. Names should be entered one per line.<p>All names should be <em>lower-case</em>. The comparison made is case-insensitive.<p>If you wish to <em>disable</em> this feature, remove all names from this textbox; the blacklist will be empty.'),
-  );
+    );
 
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 
 /**
-  * Validate BOINC other form
-  */
+ * Validate BOINC other form
+ */
 function boincuser_admin_weboptions_validate($form, &$form_state) {
-  $values = $form_state['values'];
+    $values = $form_state['values'];
 
-  $accountfinish = $values['boinc_weboptions_accountfinish'];
-  if ( ($accountfinish) AND (!drupal_lookup_path('source', $accountfinish)) ) {
+    $accountfinish = $values['boinc_weboptions_accountfinish'];
+    if ( ($accountfinish) AND (!drupal_lookup_path('source', $accountfinish)) ) {
     form_set_error('boinc weboptions_accountfinish', t('Path to custom account finish page not found. Please provide a valid path, or leave blank to unset.'));
-  }
+    }
 
-  $moderationpage = $values['boinc_weboptions_moderationpage'];
-  if ( ($moderationpage) AND (!drupal_lookup_path('source', $moderationpage)) ) {
+    $moderationpage = $values['boinc_weboptions_moderationpage'];
+    if ( ($moderationpage) AND (!drupal_lookup_path('source', $moderationpage)) ) {
     form_set_error('boinc weboptions_moderationpage', t('Path to moderation page not found. Please provide a valid path, or leave blank to unset.'));
-  }
+    }
 
-  $rulespolicies = $values['boinc_weboptions_rulespolicies'];
-  if ( ($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies)) ) {
+    $rulespolicies = $values['boinc_weboptions_rulespolicies'];
+    if ( ($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies)) ) {
     form_set_error('boinc weboptions_rulespolicies', t('Path to rules and policies page not found. Please provide a valid path, or leave blank to unset.'));
-  }
+    }
 }
 
 /**
-  * Submit BOINC other form
-  */
+ * Submit BOINC other form
+ */
 function boincuser_admin_weboptions_submit($form, &$form_state) {
-  drupal_set_message( bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options') );
+    drupal_set_message( bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options') );
 }

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

Indentation +270 added lines, -270 removed lines

@@ -20,15 +20,15 @@ 
  * Implementation of hook_perm().
  */
 function boincuser_delete_perm() {
-  return array('delete own account');
+    return array('delete own account');
 }
 
 /**
  * Implementation of hook_menu().
  */
 function boincuser_delete_menu() {
-  $items = array();
-  $items['admin/boinc/user_delete'] = array(
+    $items = array();
+    $items['admin/boinc/user_delete'] = array(
     'title' => t('Preferences: BOINC user delete'),
     'description' => t('Configure the BOINC user delete action.'),
     'page callback' => 'drupal_get_form',
@@ -36,9 +36,9 @@ 
     'access arguments' => array('administer users'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincuser_delete.admin.inc',
-  );
+    );
 
-  $items['admin/boinc/user_delete/%'] = array(
+    $items['admin/boinc/user_delete/%'] = array(
     'title' => t('Admin delete user'),
     'description' => t('Deletes a user as an admin'),
     'page callback' => 'drupal_get_form',
@@ -46,9 +46,9 @@ 
     'access arguments' => array('administer users'),
     'type' => MENU_CALLBACK,
     'file' => 'boincuser_delete.admin.inc',
-  );
+    );
 
-  $items['user/%user/deleteconfirm/%'] = array(
+    $items['user/%user/deleteconfirm/%'] = array(
     'title' => t('Final confirmation for account deletion'),
     'description' => t('Final confirmation for account deletion'),
     'page callback' => 'drupal_get_form',
@@ -56,9 +56,9 @@ 
     'access callback' => 'boincuser_delete_access',
     'access arguments' => array(1),
     'type' => MENU_CALLBACK,
-  );
+    );
 
-  $items['user/%user/odeleteconfirm/%'] = array(
+    $items['user/%user/odeleteconfirm/%'] = array(
     'title' => t('Final confirmation for account deletion'),
     'description' => t('Final confirmation for account deletion'),
     'page callback' => 'drupal_get_form',
@@ -66,204 +66,204 @@ 
     'access callback' => 'boincuser_delete_access',
     'access arguments' => array(1),
     'type' => MENU_CALLBACK,
-  );
+    );
 
-  return $items;
+    return $items;
 }
 
 /**
  * Checks whether a user can delete an account.
  */
 function boincuser_delete_access($account) {
-  global $user;
-  return ((user_access('administer users') || (user_access('delete own account') && $account->uid == $user->uid)) && $account->uid > 0);
+    global $user;
+    return ((user_access('administer users') || (user_access('delete own account') && $account->uid == $user->uid)) && $account->uid > 0);
 }
 
 /**
  * Implementation of hook_menu_alter().
  */
 function boincuser_delete_menu_alter(&$callbacks) {
-  $callbacks['user/%user/delete']['access callback'] = 'boincuser_delete_access';
-  $callbacks['user/%user/delete']['access arguments'] = array(1);
-  $callbacks['user/%user/delete']['type'] = MENU_CALLBACK;
+    $callbacks['user/%user/delete']['access callback'] = 'boincuser_delete_access';
+    $callbacks['user/%user/delete']['access arguments'] = array(1);
+    $callbacks['user/%user/delete']['type'] = MENU_CALLBACK;
 }
 
 /**
  * Implementation of hook_form_alter().
  */
 function boincuser_delete_form_alter(&$form, $form_state, $form_id) {
-  global $user;
+    global $user;
 
-  switch($form_id) {
+    switch($form_id) {
     case 'user_profile_form':
       if ( user_access('delete own account') AND ($form['#uid'] == $user->uid) AND (arg(3)=='') ) {
         $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>',
+            '#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') ) {
+        }
+        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>',
+            '#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 {
+        }
+        else {
         unset($form['delete']);
-      }
-      break;
+        }
+        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()) {
+        // 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.",
+            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),
+                '!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');
+        // 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(
+        $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) {
+        $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;
+            $deleteoptions['boincuser_delete_softdelete'] .= $common_acts;
+            break;
         case 'hard_wipe':
           unset($deleteoptions['boincuser_delete_softdelete']);
-          $deleteoptions['boincuser_delete_delete'] .= $common_acts;
-          break;
-      }
+            $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);
+        $question = 'Are you sure you want to delete the account <em>' . htmlspecialchars($form['_account']['#value']->boincuser_name) . '</em>?';
+        drupal_set_title($question);
 
-      unset($form['description']);
+        unset($form['description']);
 
-      $form['main'] = array(
+        $form['main'] = array(
         '#type' => 'fieldset',
         '#weight' => 1,
-      );
+        );
 
-      $form['main']['fs1'] = array(
+        $form['main']['fs1'] = array(
         '#type' => 'fieldset',
         '#title' => bts('Instructions', array(), NULL, 'boinc:delete-user-account'),
         '#weight' => 10,
         '#collapsible' => TRUE,
         '#collapsed' => TRUE,
-      );
-      $form['main']['fs1']['help'] = array(
+        );
+        $form['main']['fs1']['help'] = array(
         '#value' => bts(
-          "<p>In order to delete your account, you must provide your password below. You will then be sent an email to the email address on record, with a one-time token that expires in 24-hours. Clicking on this link will bring you to a second form where you must enter your password again. After doing so your account will be deleted.</p>" .
-          "<p>If necessary, you may !link first before deleting your account. But you must wait <b>seven (7) days</b> after an email address change before you may delete your account.</p>",
-          array(
+            "<p>In order to delete your account, you must provide your password below. You will then be sent an email to the email address on record, with a one-time token that expires in 24-hours. Clicking on this link will bring you to a second form where you must enter your password again. After doing so your account will be deleted.</p>" .
+            "<p>If necessary, you may !link first before deleting your account. But you must wait <b>seven (7) days</b> after an email address change before you may delete your account.</p>",
+            array(
             '!link' => l(bts('change your email address', array(), NULL, 'boinc:delete-user-account'), '/account/info/edit'),
-          ), NULL, 'boinc:delete-user-account'),
+            ), NULL, 'boinc:delete-user-account'),
         '#weight' => 11,
         '#prefix' => "<div id='delete-instructions'>",
         '#suffix' => "</div>",
-      );
+        );
 
-      if ($dtypes == 'user_decides') {
+        if ($dtypes == 'user_decides') {
         $form['main']['common'] = array(
-          '#value'  => bts('All choices: ', array(), NULL, 'boinc:delete-user-account') . $common_acts . '<p>' . bts('Disabled means some of your personal data, such as your username and email address, are kept on our systems. Choose \'delete your account\' if you want all personal data to be removed.', array(), NULL, 'boinc:delete-user-account'),
-          '#prefix' => "<div id='delete-instructions'>",
-          '#suffix' => "</div>",
-          '#weight' => 20,
+            '#value'  => bts('All choices: ', array(), NULL, 'boinc:delete-user-account') . $common_acts . '<p>' . bts('Disabled means some of your personal data, such as your username and email address, are kept on our systems. Choose \'delete your account\' if you want all personal data to be removed.', array(), NULL, 'boinc:delete-user-account'),
+            '#prefix' => "<div id='delete-instructions'>",
+            '#suffix' => "</div>",
+            '#weight' => 20,
         );
-      }
+        }
 
-      $form['main']['user_delete_action'] = array(
+        $form['main']['user_delete_action'] = array(
         '#type' => 'radios',
         '#options' => $deleteoptions,
         '#weight' => 21,
-      );
-      if ($disable_delete) {
+        );
+        if ($disable_delete) {
         $form['main']['user_delete_action']['#disabled'] = TRUE;
-      }
+        }
 
-      // Password field
-      if (!$disable_delete) {
+        // Password field
+        if (!$disable_delete) {
         $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(
+            '#type' => 'password',
+            '#title' => bts('Enter your password to delete your account', array(), NULL, 'boinc:delete-user-account'),
+            '#size' => 17,
+            '#attributes' => array(
             'autocomplete' => 'off',
-          ),
-          '#prefix' => "<div id='delete-password-field'>",
-          '#suffix' => "</div>",
-          '#weight' => 25,
+            ),
+            '#prefix' => "<div id='delete-password-field'>",
+            '#suffix' => "</div>",
+            '#weight' => 25,
         );
-      }
+        }
 
-      $form['separator_bottom'] = array(
+        $form['separator_bottom'] = array(
         '#value' => '<div class="separator buttons"></div>',
         '#weight' => 999,
-      );
+        );
 
-      // Configure the action buttons
-      $uid = $form['_account']['#value']->uid;
-      $form['actions']['#weight'] = 1000;
-      $form['actions']['form control tabs prefix'] = array(
+        // Configure the action buttons
+        $uid = $form['_account']['#value']->uid;
+        $form['actions']['#weight'] = 1000;
+        $form['actions']['form control tabs prefix'] = array(
         '#value' => '<ul class="form-control tab-list">',
         '#weight' => 1001,
-      );
-
-      unset($form['actions']['#prefix']);
-      unset($form['actions']['#suffix']);
-      $form['actions']['submit']['#prefix'] = '<li class="first tab">';
-      $form['actions']['submit']['#suffix'] = '</li>';
-      $form['actions']['submit']['#value'] = bts('Submit', array(), NULL, 'boinc:form-submit');
-      $form['actions']['submit']['#weight'] = 1002;
-      if ($disable_delete) {
+        );
+
+        unset($form['actions']['#prefix']);
+        unset($form['actions']['#suffix']);
+        $form['actions']['submit']['#prefix'] = '<li class="first tab">';
+        $form['actions']['submit']['#suffix'] = '</li>';
+        $form['actions']['submit']['#value'] = bts('Submit', array(), NULL, 'boinc:form-submit');
+        $form['actions']['submit']['#weight'] = 1002;
+        if ($disable_delete) {
         $form['actions']['submit']['#disabled'] = TRUE;
         $form['actions']['submit']['#value'] = '';
-      }
+        }
 
-      $form['actions']['cancel']['#prefix'] = '<li class="tab">';
-      $form['actions']['cancel']['#suffix'] = '</li>';
-      $form['actions']['cancel']['#weight'] = 1003;
-      $form['actions']['cancel']['#value'] = l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'account/info/edit');
-      if ($disable_delete) {
+        $form['actions']['cancel']['#prefix'] = '<li class="tab">';
+        $form['actions']['cancel']['#suffix'] = '</li>';
+        $form['actions']['cancel']['#weight'] = 1003;
+        $form['actions']['cancel']['#value'] = l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'account/info/edit');
+        if ($disable_delete) {
         $form['actions']['cancel']['#prefix'] = '<li class="first tab">';
-      }
+        }
 
-      $form['actions']['form control tabs suffix'] = array(
+        $form['actions']['form control tabs suffix'] = array(
         '#value' => '</ul>',
         '#weight' => 1010,
-      );
+        );
 
-      $form['#redirect'] = 'account/' . $uid;
-      $form['#validate'] = array('boincuser_delete_validate');
-      $form['#submit'] = array('boincuser_delete_submit');
-      break;
+        $form['#redirect'] = 'account/' . $uid;
+        $form['#validate'] = array('boincuser_delete_validate');
+        $form['#submit'] = array('boincuser_delete_submit');
+        break;
 
-  } // switch
+    } // switch
 }
 
 
@@ -274,29 +274,29 @@ 
  * password.
  */
 function boincuser_delete_validate($form, &$form_state) {
-  require_boinc('boinc_db');
+    require_boinc('boinc_db');
 
-  if ($form_state['values']['user_delete_action'] == '') {
+    if ($form_state['values']['user_delete_action'] == '') {
     form_set_error('user_delete_action', bts('Please select an action to perform using the radio buttons.', array(), NULL, 'boinc:delete-user-account'));
-  }
+    }
 
-  // check BOINC user exists
-  $account = $form_state['values']['_account'];
-  $boinc_user = boincuser_load($account->uid, TRUE);
-  if (!$boinc_user) {
+    // check BOINC user exists
+    $account = $form_state['values']['_account'];
+    $boinc_user = boincuser_load($account->uid, TRUE);
+    if (!$boinc_user) {
     rules_invoke_event('boincuser_delete_general_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
     return form_set_error('current_pass',
-      bts('There was a problem deleting your account. The @project administrators have been contacted.',
-      array(
+        bts('There was a problem deleting your account. The @project administrators have been contacted.',
+        array(
         '@project' => variable_get('site_name', 'Drupal-BOINC'),
-      )
-      , NULL, 'boinc:delete-user-account')
+        )
+        , NULL, 'boinc:delete-user-account')
     );
-  }
+    }
 
-  if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
+    if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
     return true;
-  }
+    }
 }
 
 /**
@@ -307,46 +307,46 @@ 
  * to delete the account.
  */
 function boincuser_delete_submit($form, &$form_state) {
-  require_boinc('token');
-  global $user;
+    require_boinc('token');
+    global $user;
 
-  $uid = $form_state['values']['_account']->uid;
-  $account = user_load(array('uid' => $uid));
+    $uid = $form_state['values']['_account']->uid;
+    $account = user_load(array('uid' => $uid));
 
-  if (!$account) {
+    if (!$account) {
     rules_invoke_event('boincuser_delete_uid_invalid_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
     drupal_set_message(
-      bts('ERROR: The user account @uid does not exist. The @project administrators have been notified.',
+        bts('ERROR: The user account @uid does not exist. The @project administrators have been notified.',
         array(
-          '@uid' => $uid,
-          '@project' => variable_get('site_name', 'Drupal-BOINC'),
+            '@uid' => $uid,
+            '@project' => variable_get('site_name', 'Drupal-BOINC'),
         ), NULL, 'delete-user-account'),
-      'error');
+        'error');
     watchdog('user', 'Attempted to cancel non-existing user account UID: %uid.', array('%uid' => $uid), WATCHDOG_ERROR);
     return;
-  }
-
-  global $base_url;
-  global $base_path;
-  module_load_include('inc', 'rules', 'modules/system.rules');
-  $site_name = variable_get('site_name', 'Drupal-BOINC');
-  $site_url = $base_url . $base_path . "user/login";
-
-  // Perform the requested operation
-  $op = $form_state['values']['user_delete_action'];
-  // create token with 1 day/24 hour expiration
-  $mytoken = create_token($account->boincuser_id, 'D', 24*60*60);
-  switch ($op) {
+    }
+
+    global $base_url;
+    global $base_path;
+    module_load_include('inc', 'rules', 'modules/system.rules');
+    $site_name = variable_get('site_name', 'Drupal-BOINC');
+    $site_url = $base_url . $base_path . "user/login";
+
+    // Perform the requested operation
+    $op = $form_state['values']['user_delete_action'];
+    // 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";
-      break;
+        break;
     case 'boincuser_delete_delete':
       $myurl = "${base_url}/user/{$account->uid}/deleteconfirm/$mytoken";
-      break;
-  }
+        break;
+    }
 
-  $mysubject = "Instructions for account deletion at {$site_name}";
-  $mymessage = ''
+    $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 "
@@ -368,25 +368,25 @@ 
     . "\n"
     . "{$site_name} support team";
 
-  // Create array for sending email to user to notify account is being
-  // disabled/deleted. Then send email.
-  $settings = array(
+    // 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);
+    );
+    rules_action_mail_to_user($account, $settings);
 
-  drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'),'info');
+    drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'),'info');
 
-  $redirect = variable_get('boincuser_delete_redirect', '<front>');
-  // Redirect
-  if (!empty($redirect)) {
+    $redirect = variable_get('boincuser_delete_redirect', '<front>');
+    // Redirect
+    if (!empty($redirect)) {
     drupal_goto($redirect);
-  }
-  else {
+    }
+    else {
     drupal_goto();
-  }
+    }
 }
 
 
@@ -398,88 +398,88 @@ 
  * The final confirmation form for the user to delete their account.
  */
 function boincuser_delete_finalconfirmation(&$form_state, $token) {
-  require_boinc('token');
+    require_boinc('token');
 
-  global $user;
-  $form = array();
+    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')) {
+    // 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"),
+        '!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);
+    // 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');
+    // This form is for hard/wipe delete
+    $form['_action'] = array('#type' => 'value', '#value' => 'hard_wipe');
 
-  // Instructions
-  $form['main']['fs1'] = array(
+    // 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(
+    );
+    $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(
+    $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(
+    // 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',
+        'autocomplete' => 'off',
     ),
     '#weight' => 25,
-  );
+    );
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -487,133 +487,133 @@ 
  * the soft/obfuscate method.
  */
 function boincuser_delete_softdelconfirmation(&$form_state, $token) {
-  require_boinc('token');
+    require_boinc('token');
 
-  global $user;
-  $form = array();
+    global $user;
+    $form = array();
 
-  // check BOINC user exists
-  $account = user_load(array('uid' => $user->uid));
-  $uid = $user->uid;
-  $boincid = $account->boincuser_id;
+    // 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')) {
+    // 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"),
+        '!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);
+    // 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');
+    // This form is for hard/wipe delete
+    $form['_action'] = array('#type' => 'value', '#value' => 'soft_obfuscate');
 
-  // Instructions
-  $form['main']['fs1'] = array(
+    // 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(
+    );
+    $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(
+    $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(
+    // 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',
+        'autocomplete' => 'off',
     ),
     '#weight' => 25,
-  );
+    );
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $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;
+    //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'])) {
+    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;
+    global $user;
 
-  // Delete the user
-  $account = $form_state['values']['_account'];
-  $action = $form_state['values']['_action'];
-  _boincuser_delete_deleteuser($account, $action);
+    // 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);
+    // 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();
+    // Load the anonymous user
+    $user = drupal_anonymous_user();
 
-  $redirect = variable_get('boincuser_delete_redirect', '<front>');
-  // Redirect
-  if (!empty($redirect)) {
+    $redirect = variable_get('boincuser_delete_redirect', '<front>');
+    // Redirect
+    if (!empty($redirect)) {
     drupal_goto($redirect);
-  }
-  else {
+    }
+    else {
     drupal_goto();
-  }
+    }
 
 }

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

Indentation +8 added lines, -8 removed lines

@@ -16,18 +16,18 @@
  */
 
 function boincuser_delete_rules_event_info() {
-  return array(
+    return array(
     'boincuser_delete_general_error' => array(
-      'label' => bts('Error from user deleting own account.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincuser_Delete',
-      'arguments' => rules_events_hook_boincuser_adminnotify_argument(),
+        'label' => bts('Error from user deleting own account.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincuser_Delete',
+        'arguments' => rules_events_hook_boincuser_adminnotify_argument(),
     ),
     'boincuser_delete_uid_invalid_error' => array(
-      'label' => bts('Error from user deleting own account. User ID is invalid', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincuser_Delete',
-      'arguments' => rules_events_hook_boincuser_adminnotify_argument(),
+        'label' => bts('Error from user deleting own account. User ID is invalid', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincuser_Delete',
+        'arguments' => rules_events_hook_boincuser_adminnotify_argument(),
     ),
-  );
+    );
 }
 
 // function rules_events_hook_boincuser_adminnotify_argument is located in boincuser_rules.inc
\ No newline at end of file