BOINC / boinc

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

Switch Indentation +28 added lines, -28 removed lines

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

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

Switch Indentation +10 added lines, -10 removed lines

@@ -7,15 +7,15 @@
  */
 
 class views_handler_argument_boincuser_id extends views_handler_argument_numeric {
-  function construct() {
-    parent::construct();
-  }
+function construct() {
+parent::construct();
+}
 
-  function set_argument($arg) {
-    // When setting the ID argument, convert to BOINC ID
-    $id = is_numeric($arg) ? $arg : 0;
-    $boinc_id = db_result(db_query("SELECT boinc_id FROM {boincuser} WHERE uid = %d", $id));
-    $this->argument = $boinc_id;
-    return $this->validate_arg($boinc_id);
-  }
+function set_argument($arg) {
+// When setting the ID argument, convert to BOINC ID
+$id = is_numeric($arg) ? $arg : 0;
+$boinc_id = db_result(db_query("SELECT boinc_id FROM {boincuser} WHERE uid = %d", $id));
+$this->argument = $boinc_id;
+return $this->validate_arg($boinc_id);
+}
 }

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

Switch Indentation +10 added lines, -10 removed lines

@@ -7,15 +7,15 @@
  */
 
 class views_handler_argument_boincteam_id extends views_handler_argument_numeric {
-  function construct() {
-    parent::construct();
-  }
+function construct() {
+parent::construct();
+}
 
-  function set_argument($arg) {
-    // When setting the ID argument, convert to BOINC ID
-    $id = is_numeric($arg) ? $arg : 0;
-    $boinc_id = db_result(db_query("SELECT team_id FROM {boincteam} WHERE nid = %d", $id));
-    $this->argument = $boinc_id;
-    return $this->validate_arg($boinc_id);
-  }
+function set_argument($arg) {
+// When setting the ID argument, convert to BOINC ID
+$id = is_numeric($arg) ? $arg : 0;
+$boinc_id = db_result(db_query("SELECT team_id FROM {boincteam} WHERE nid = %d", $id));
+$this->argument = $boinc_id;
+return $this->validate_arg($boinc_id);
+}
 }

html/inc/password_compat/password.inc

Switch Indentation +40 added lines, -40 removed lines

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

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

Switch Indentation +138 added lines, -138 removed lines

@@ -13,45 +13,45 @@ 
  *   a form array
  */
 function boincuser_delete_settings() {
-  $form = array();
-
-  $default = array(
-    'boincuser_delete_type' => variable_get('boincuser_delete_type', ''),
-    'boincuser_delete_redirect' => variable_get('boincuser_delete_redirect', '<front>'),
-  );
-
-  $form['options'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Options'),
-  );
-  $form['options']['help'] = array(
-    '#value' => t('When a user deletes their account, which option is shown to the user? A soft/obfusate delete, a hard/wipe delete, or let the user chose between the two.'),
-    '#weight' => 11,
-  );
-  $form['options']['boincuser_delete_type'] = array(
-    '#type' => 'radios',
-    '#title' => t('Type of delete'),
-    '#default_value' => $default['boincuser_delete_type'],
-    '#options' => array(
-       'soft_obfuscate' => t('A soft/obfuscate delete. User\'s account is disabled, but some data is deleted.'),
-       'hard_wipe' => t('A hard/wipe delete. User\'s account is deleted along with many data.'),
-       'user_decides' => t('User is presented with radio buttons where they choose between the two options above.'),
-    ),
-    '#weight' => 21,
-  );
-
-  $form['redirect'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Redirect'),
-  );
-  $form['redirect']['boincuser_delete_redirect'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Redirection page'),
-    '#default_value' => $default['boincuser_delete_redirect'],
-    '#description' => t('Choose where to redirect your users after account deletion. Any valid Drupal path will do, e.g. %front or %node', array('%front' => '<front>', '%node' => 'node/1')),
-  );
-
-  return system_settings_form($form);
+$form = array();
+
+$default = array(
+'boincuser_delete_type' => variable_get('boincuser_delete_type', ''),
+'boincuser_delete_redirect' => variable_get('boincuser_delete_redirect', '<front>'),
+);
+
+$form['options'] = array(
+'#type' => 'fieldset',
+'#title' => t('Options'),
+);
+$form['options']['help'] = array(
+'#value' => t('When a user deletes their account, which option is shown to the user? A soft/obfusate delete, a hard/wipe delete, or let the user chose between the two.'),
+'#weight' => 11,
+);
+$form['options']['boincuser_delete_type'] = array(
+'#type' => 'radios',
+'#title' => t('Type of delete'),
+'#default_value' => $default['boincuser_delete_type'],
+'#options' => array(
+   'soft_obfuscate' => t('A soft/obfuscate delete. User\'s account is disabled, but some data is deleted.'),
+   'hard_wipe' => t('A hard/wipe delete. User\'s account is deleted along with many data.'),
+   'user_decides' => t('User is presented with radio buttons where they choose between the two options above.'),
+),
+'#weight' => 21,
+);
+
+$form['redirect'] = array(
+'#type' => 'fieldset',
+'#title' => t('Redirect'),
+);
+$form['redirect']['boincuser_delete_redirect'] = array(
+'#type' => 'textfield',
+'#title' => t('Redirection page'),
+'#default_value' => $default['boincuser_delete_redirect'],
+'#description' => t('Choose where to redirect your users after account deletion. Any valid Drupal path will do, e.g. %front or %node', array('%front' => '<front>', '%node' => 'node/1')),
+);
+
+return system_settings_form($form);
 }
 
 
@@ -60,124 +60,124 @@ 
  * password checks.
  */
 function boincuser_delete_admindelete(&$form_state, $uid) {
-  $form = array();
-
-  $form['#uid'] = $uid;
-
-  $form['account']['help'] = array(
-    '#value' => "<p>" . t("This form will delete this user <strong>without any email notification</strong> sent to the user. Be very careful in deleting users using this form. Once you select the delete type, check the checkbox, enter your password, and click submit, the user's account will be deleted. This will occur <strong>immediately</strong>. There is no 'undo'!") . "</p><p>" . t("You are deleting the following user, link opens in new window:") . "</p>",
-    '#weight' => -1,
-    '#prefix' => "<div id='delete-instructions'>",
-    '#suffix' => "</div>",
+$form = array();
+
+$form['#uid'] = $uid;
+
+$form['account']['help'] = array(
+'#value' => "<p>" . t("This form will delete this user <strong>without any email notification</strong> sent to the user. Be very careful in deleting users using this form. Once you select the delete type, check the checkbox, enter your password, and click submit, the user's account will be deleted. This will occur <strong>immediately</strong>. There is no 'undo'!") . "</p><p>" . t("You are deleting the following user, link opens in new window:") . "</p>",
+'#weight' => -1,
+'#prefix' => "<div id='delete-instructions'>",
+'#suffix' => "</div>",
+);
+
+$account = user_load($uid);
+if ($account) {
+drupal_set_title($account->boincuser_name);
+
+$form['account']['boincuser_name'] = array(
+  '#value' => t('<li>BOINC username (public displayname): ') . l("{$account->boincuser_name}", "account/{$account->uid}", array('attributes' => array('target' => '_blank'))),
+);
+$form['account']['boincuser_id'] = array(
+  '#value' => t('<li>BOINC user ID: ') . $account->boincuser_id,
+);
+$form['account']['drupal_name'] = array(
+  '#value' => t('<li>Drupal username (internal): ') . $account->name,
+);
+$form['account']['user_id'] = array(
+  '#value' => t('<li>Drupal user ID: ') . $account->uid,
+);
+
+$form['account']['user_delete_action'] = array(
+    '#type' => 'radios',
+    '#options' => array(
+      'soft_obfuscate' => bts('<b>Soft delete</b> the account. The account will be disabled, and all posts/comments will be attributed to the Anonymous User. The user profile will be deleted, the host information deleted, and the user will be removed from any team.', array(), NULL, 'boinc:delete-user-account'),
+      'hard_wipe' => bts('<b>Delete</b> the account. The account will be deleted, and all posts/comments will be attributed to the Anonymous User. The user profile will be deleted.', array(), NULL, 'boinc:delete-user-account'),),
   );
 
-  $account = user_load($uid);
-  if ($account) {
-    drupal_set_title($account->boincuser_name);
-
-    $form['account']['boincuser_name'] = array(
-      '#value' => t('<li>BOINC username (public displayname): ') . l("{$account->boincuser_name}", "account/{$account->uid}", array('attributes' => array('target' => '_blank'))),
-    );
-    $form['account']['boincuser_id'] = array(
-      '#value' => t('<li>BOINC user ID: ') . $account->boincuser_id,
-    );
-    $form['account']['drupal_name'] = array(
-      '#value' => t('<li>Drupal username (internal): ') . $account->name,
-    );
-    $form['account']['user_id'] = array(
-      '#value' => t('<li>Drupal user ID: ') . $account->uid,
-    );
-
-    $form['account']['user_delete_action'] = array(
-        '#type' => 'radios',
-        '#options' => array(
-          'soft_obfuscate' => bts('<b>Soft delete</b> the account. The account will be disabled, and all posts/comments will be attributed to the Anonymous User. The user profile will be deleted, the host information deleted, and the user will be removed from any team.', array(), NULL, 'boinc:delete-user-account'),
-          'hard_wipe' => bts('<b>Delete</b> the account. The account will be deleted, and all posts/comments will be attributed to the Anonymous User. The user profile will be deleted.', array(), NULL, 'boinc:delete-user-account'),),
-      );
-
-    $form['account']['surecheckbox'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('I am <strong>sure</strong> I know what I am doing. I am <u><strong>deleting user</strong></u> %name.',
-        array('%name' => $account->boincuser_name)
-      ),
-      '#default_value' => FALSE,
-    );
-
-    $form['account']['current_pass'] = array(
-      '#type' => 'password',
-      '#title' => bts('Enter your password before clicking Submit, or click Cancel to return to the user\'s edit page', array(), NULL, 'boinc:delete-user-account'),
-      '#size' => 17,
-      '#attributes' => array(
-        'autocomplete' => 'off',
-      ),
-      '#weight' => 25,
-    );
-
-    // Action buttons
-    $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => t('Submit'),
-    );
-    $form['actions']['cancel'] = array(
-      '#type' => 'button',
-      '#value' => t('Cancel'),
-      '#executes_submit_callback' => TRUE,
-      '#validate' => array(),
-      '#submit' => array('_boincuser_delete_cancel'),
-    );
-
-    $form['#redirect'] = 'account';
-  }
-  else {
-    $form['noaccount'] = array(
-      '#value' => t('No such user with UID: %uid', array('%uid' => $uid)),
-    );
-  }
-
-  return $form;
+$form['account']['surecheckbox'] = array(
+  '#type' => 'checkbox',
+  '#title' => t('I am <strong>sure</strong> I know what I am doing. I am <u><strong>deleting user</strong></u> %name.',
+    array('%name' => $account->boincuser_name)
+  ),
+  '#default_value' => FALSE,
+);
+
+$form['account']['current_pass'] = array(
+  '#type' => 'password',
+  '#title' => bts('Enter your password before clicking Submit, or click Cancel to return to the user\'s edit page', array(), NULL, 'boinc:delete-user-account'),
+  '#size' => 17,
+  '#attributes' => array(
+    'autocomplete' => 'off',
+  ),
+  '#weight' => 25,
+);
+
+// Action buttons
+$form['actions']['submit'] = array(
+  '#type' => 'submit',
+  '#value' => t('Submit'),
+);
+$form['actions']['cancel'] = array(
+  '#type' => 'button',
+  '#value' => t('Cancel'),
+  '#executes_submit_callback' => TRUE,
+  '#validate' => array(),
+  '#submit' => array('_boincuser_delete_cancel'),
+);
+
+$form['#redirect'] = 'account';
+}
+else {
+$form['noaccount'] = array(
+  '#value' => t('No such user with UID: %uid', array('%uid' => $uid)),
+);
+}
+
+return $form;
 }
 
 /**
  * Validation function for admin delete user.
  */
 function boincuser_delete_admindelete_validate($form, &$form_state) {
-  global $user;
-  $boinc_user = boincuser_load($user->uid, TRUE);
+global $user;
+$boinc_user = boincuser_load($user->uid, TRUE);
 
-  if ($form_state['values']['user_delete_action'] == '') {
-    form_set_error('user_delete_action', t('Please select an action to perform using the radio buttons.'));
-  }
+if ($form_state['values']['user_delete_action'] == '') {
+form_set_error('user_delete_action', t('Please select an action to perform using the radio buttons.'));
+}
 
-  if ( ($form_state['values']['user_delete_action'] != 'soft_obfuscate') and ($form_state['values']['user_delete_action'] != 'hard_wipe') ) {
-    form_set_error('user_delete_action', t('User Delete action not a predefined value, unknown error in radio buttons.'));
-  }
+if ( ($form_state['values']['user_delete_action'] != 'soft_obfuscate') and ($form_state['values']['user_delete_action'] != 'hard_wipe') ) {
+form_set_error('user_delete_action', t('User Delete action not a predefined value, unknown error in radio buttons.'));
+}
 
-  if (!($form_state['values']['surecheckbox'])) {
-    return form_set_error('surecheckbox', t('Please confirm you are sure you want to delete this account.'));
-  }
+if (!($form_state['values']['surecheckbox'])) {
+return form_set_error('surecheckbox', t('Please confirm you are sure you want to delete this account.'));
+}
 
-  if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
-    return true;
-  }
+if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
+return true;
+}
 }
 
 /**
  * Submit function for admin delete user.
  */
 function boincuser_delete_admindelete_submit($form, &$form_state) {
-  // This is the account to be deleted, and not the administrator's
-  // account.
-  $account = user_load(array('uid' => $form['#uid']));
-  $action = $form_state['values']['user_delete_action'];
+// This is the account to be deleted, and not the administrator's
+// account.
+$account = user_load(array('uid' => $form['#uid']));
+$action = $form_state['values']['user_delete_action'];
 
-  drupal_set_message(t('WARNING: Account @displayname, Drupal UID=@uid has been deleted.',
-    array(
-      '@uid' => $form['#uid'],
-      '@displayname' => $account->boincuser_name,
-    )), 'warning');
+drupal_set_message(t('WARNING: Account @displayname, Drupal UID=@uid has been deleted.',
+array(
+  '@uid' => $form['#uid'],
+  '@displayname' => $account->boincuser_name,
+)), 'warning');
 
-  // Delete the user
-  _boincuser_delete_deleteuser($account, $action);
+// Delete the user
+_boincuser_delete_deleteuser($account, $action);
 
-  drupal_goto('/admin/boinc/user_delete');
+drupal_goto('/admin/boinc/user_delete');
 }

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

Switch Indentation +31 added lines, -31 removed lines

@@ -59,37 +59,37 @@
   // hook_user() functions.
 
   switch ($action) {
-    case 'soft_obfuscate':
-      obfuscate_account($boinc_user);
-      _boincuser_delete_comment_reassign($account);
-      _boincuser_delete_node_reassign($account);
-      _boincuser_delete_privatemsg_delete($account);
-      _boincuser_delete_friends($account);
-      // delete the user's profile
-      $profile = content_profile_load('profile', $account->uid);
-      node_delete($profile->nid);
-      // Drupal account -
-      //  * 'block'/disable the account
-      //  * set name, mail, pass, and init to deleted
-      //  * erase signature
-      $myarray = array(
-        'status'    => 0,
-        'name'      => 'deleted_' . time() . '_' . random_string(),
-        'mail'      => 'deleted_' . time() . '_' . random_string(),
-        'pass'      => 'deleted_' . time() . '_' . random_string(),
-        'signature' => '',
-        'init'      => 'deleted_' . time() . '_' . random_string(),
-      );
-      user_save($account, $myarray);
-      break;
-    case 'hard_wipe':
-      wipe_account($boinc_user);
-      user_delete(array(), $account->uid);
-      break;
-    default:
-      watchdog('boincuser_delete', 'Delete action is %action, which is not \'soft_obfuscate\' or \'hard_wipe\'.', array(
-        '%action' => $action,
-      ), WATCHDOG_ERROR);
+  case 'soft_obfuscate':
+    obfuscate_account($boinc_user);
+    _boincuser_delete_comment_reassign($account);
+    _boincuser_delete_node_reassign($account);
+    _boincuser_delete_privatemsg_delete($account);
+    _boincuser_delete_friends($account);
+    // delete the user's profile
+    $profile = content_profile_load('profile', $account->uid);
+    node_delete($profile->nid);
+    // Drupal account -
+    //  * 'block'/disable the account
+    //  * set name, mail, pass, and init to deleted
+    //  * erase signature
+    $myarray = array(
+      'status'    => 0,
+      'name'      => 'deleted_' . time() . '_' . random_string(),
+      'mail'      => 'deleted_' . time() . '_' . random_string(),
+      'pass'      => 'deleted_' . time() . '_' . random_string(),
+      'signature' => '',
+      'init'      => 'deleted_' . time() . '_' . random_string(),
+    );
+    user_save($account, $myarray);
+    break;
+  case 'hard_wipe':
+    wipe_account($boinc_user);
+    user_delete(array(), $account->uid);
+    break;
+  default:
+    watchdog('boincuser_delete', 'Delete action is %action, which is not \'soft_obfuscate\' or \'hard_wipe\'.', array(
+      '%action' => $action,
+    ), WATCHDOG_ERROR);
   }
 }
 

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

Switch Indentation +304 added lines, -304 removed lines

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

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

Switch Indentation +36 added lines, -36 removed lines

@@ -32,42 +32,42 @@
   * existing BOINC web interface.
   */
 function boincuser_admin_environment(&$form_state) {
-  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', ''),
-    'boinc_project_config_dir' => variable_get('boinc_project_config_dir', ''),
-    'boinc_user_image_dir' => variable_get('boinc_user_image_dir', ''),
-    'boinc_host_sched_logs_dir' => variable_get('boinc_host_sched_logs_dir', ''),
-    'boinc_server_status_url' => variable_get('boinc_server_status_url', ''),
-    'boinc_app_list_url' => variable_get('boinc_app_list_url', ''),
-    'boinc_admin_mailing_list' => variable_get('boinc_admin_mailing_list', ''),
-    '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']) {
-    foreach ($default as $key => $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;
-        }
-        break;
-      default:
-      }
+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', ''),
+'boinc_project_config_dir' => variable_get('boinc_project_config_dir', ''),
+'boinc_user_image_dir' => variable_get('boinc_user_image_dir', ''),
+'boinc_host_sched_logs_dir' => variable_get('boinc_host_sched_logs_dir', ''),
+'boinc_server_status_url' => variable_get('boinc_server_status_url', ''),
+'boinc_app_list_url' => variable_get('boinc_app_list_url', ''),
+'boinc_admin_mailing_list' => variable_get('boinc_admin_mailing_list', ''),
+'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']) {
+foreach ($default as $key => $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;
+  }
+  break;
+  default:
+  }
       if ($show_overrides) {
         break;
       }

html/ops/db_form.php

Switch Indentation +50 added lines, -50 removed lines

@@ -35,63 +35,63 @@
 start_table();
 
 switch($table){
-	case "platform":
-		break;
-	case "app":
-		break;
-    case "app_version":
-        print_detail_field();
-        print_query_field();
-        break;
-    case "host":
-        echo "
+case "platform":
+	break;
+case "app":
+	break;
+case "app_version":
+    print_detail_field();
+    print_query_field();
+    break;
+case "host":
+    echo "
             <tr>
             <td align=\"right\">Show Aggregate Information</td>
             <td>
         ";
-        print_checkbox("", "show_aggregate", $show_aggregate);
-        echo "
+    print_checkbox("", "show_aggregate", $show_aggregate);
+    echo "
             </td>
             </tr>
         ";
-        print_detail_field();
-        print_query_field();
-        break;
-    case "workunit":
-        print_detail_field();
-        print_query_field();
-        echo "<input type=\"hidden\" name=\"sort_by\" value=\"id\">\n";
-        break;
-    case "result":
-        echo "<tr><td align=\"right\">Server state</td><td> ";
-        server_state_select();
-        echo "</td></tr>\n";
-        //print_text_field( "Batch number:", "batch", $batch );
-        echo "<tr><td align=\"right\">Outcome</td><td>";
-        outcome_select();
-        echo "</td></tr>\n";
-        echo "<tr><td align=\"right\">Client state</td><td>";
-        client_state_select();
-        echo "</td></tr>\n";
-        echo "<tr><td align=\"right\">Validate state</td><td>";
-        validate_state_select();
-        echo "</td></tr>\n";
-        echo "<tr><td align=\"right\">Sort by</td><td>";
-        result_sort_select();
-        sort_order_select();
-        echo "</td></tr>\n";
-        print_detail_field();
-        print_query_field();
-        break;
-    case "team":
-        print_query_field();
-        break;
-    case "user":
-        print_query_field();
-        break;
-	default:
-		echo "Unknown table name\n";
-        exit();
+    print_detail_field();
+    print_query_field();
+    break;
+case "workunit":
+    print_detail_field();
+    print_query_field();
+    echo "<input type=\"hidden\" name=\"sort_by\" value=\"id\">\n";
+    break;
+case "result":
+    echo "<tr><td align=\"right\">Server state</td><td> ";
+    server_state_select();
+    echo "</td></tr>\n";
+    //print_text_field( "Batch number:", "batch", $batch );
+    echo "<tr><td align=\"right\">Outcome</td><td>";
+    outcome_select();
+    echo "</td></tr>\n";
+    echo "<tr><td align=\"right\">Client state</td><td>";
+    client_state_select();
+    echo "</td></tr>\n";
+    echo "<tr><td align=\"right\">Validate state</td><td>";
+    validate_state_select();
+    echo "</td></tr>\n";
+    echo "<tr><td align=\"right\">Sort by</td><td>";
+    result_sort_select();
+    sort_order_select();
+    echo "</td></tr>\n";
+    print_detail_field();
+    print_query_field();
+    break;
+case "team":
+    print_query_field();
+    break;
+case "user":
+    print_query_field();
+    break;
+default:
+	echo "Unknown table name\n";
+       exit();
 }
 
 row2("Number of entries to show", "<input name=\"nresults\" value=\"20\">");