BOINC / boinc

html/user/edit_email_action.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
             echo tra("Invalid password.");
         } else {
             $passwd_hash = md5($passwd.$email_addr);
-            $database_passwd_hash = password_hash($passwd_hash , PASSWORD_DEFAULT);
+            $database_passwd_hash = password_hash($passwd_hash, PASSWORD_DEFAULT);
             $email_addr = BoincDb::escape_string($email_addr);
             $user->email_addr_change_time = time();
             $result = $user->update(

html/user/recover_email.php

Indentation +2 added lines, -2 removed lines

@@ -56,9 +56,9 @@
                 "email_addr=previous_email_addr, previous_email_addr='', email_addr_change_time=0, passwd_hash='$database_passwd_hash', email_validated=0"
             );
             $result = delete_token($userid, $token, TOKEN_TYPE_CHANGE_EMAIL);
-	}
+    }
     } else {
-	echo tra("Invalid token.");
+    echo tra("Invalid token.");
     }
 } else {
     echo tra("Invalid token.");

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         } else {
             echo tra("Email address has been reverted.")."<br /><br />".tra("You need to reset your password:  ")."<a href=\"".secure_url_base()."get_passwd.php\">".secure_url_base()."get_passwd.php</a>";
 
-            $database_passwd_hash = password_hash(random_string() , PASSWORD_DEFAULT);
+            $database_passwd_hash = password_hash(random_string(), PASSWORD_DEFAULT);
             //Change previous_email
             $result = $tmpuser->update(
                 "email_addr=previous_email_addr, previous_email_addr='', email_addr_change_time=0, passwd_hash='$database_passwd_hash', email_validated=0"

html/ops/test_token.php

Spacing +15 added lines, -15 removed lines

@@ -11,39 +11,39 @@
 BoincToken::insert("(token,userid,type,create_time, expire_time) values ('$token', 0, 'T', $now, $now+3600)");
 
 $boincTokens = BoincToken::enum("userid=0");
-foreach($boincTokens as $boincToken) {
-    echo $boincToken->token . "\n";
-    echo $boincToken->userid . "\n";
-    echo $boincToken->type . "\n";
-    echo $boincToken->create_time . "\n";
-    echo $boincToken->expire_time . "\n";
+foreach ($boincTokens as $boincToken) {
+    echo $boincToken->token."\n";
+    echo $boincToken->userid."\n";
+    echo $boincToken->type."\n";
+    echo $boincToken->create_time."\n";
+    echo $boincToken->expire_time."\n";
 }
 
 echo "---------------\n";
 $boincToken = BoincToken::lookup("userid=0");
-echo $boincToken->token . "\n";
-echo $boincToken->userid . "\n";
-echo $boincToken->type . "\n";
-echo $boincToken->create_time . "\n";
-echo $boincToken->expire_time . "\n";
+echo $boincToken->token."\n";
+echo $boincToken->userid."\n";
+echo $boincToken->type."\n";
+echo $boincToken->create_time."\n";
+echo $boincToken->expire_time."\n";
 
 echo "---------------\n";
 $boincToken = BoincToken::lookup_valid_token(0, $token, 'T');
-if ( $boincToken != null ) {
+if ($boincToken != null) {
     echo "Found valid token\n";
 }
 
 echo "---------------\n";
 $boincToken = BoincToken::lookup_valid_token(0, 'notrealtoken', 'T');
-if ( $boincToken == null ) {
+if ($boincToken == null) {
     echo "Successfully didn't find invalid token\n";
 }
 
 echo "---------------\n";
 $user = new BoincUser();
-$user->id=0;
+$user->id = 0;
 $token = create_token($user->id, TOKEN_TYPE_DELETE_ACCOUNT, TOKEN_DURATION_ONE_DAY);
-if ( is_valid_token($user->id, $token, TOKEN_TYPE_DELETE_ACCOUNT) ) {
+if (is_valid_token($user->id, $token, TOKEN_TYPE_DELETE_ACCOUNT)) {
     echo "Successfully created and validated delete account token";
 }
 

html/user/delete_account_confirm.php

Indentation +3 added lines, -3 removed lines

@@ -44,9 +44,9 @@
     page_head(tra("Delete Account"));
     
     echo "<p>".tra("Thank you for verifying ownership of your account.")."</p>"
-         ."<p>".tra("You can now delete your account by entering in your password below and clicking the \"Delete Account\" button.")."</p>"
-         ."<p>".tra("As a reminder, your account <b>cannot be recovered</b> once you delete it.")."</p>"
-         ."<br/>";
+            ."<p>".tra("You can now delete your account by entering in your password below and clicking the \"Delete Account\" button.")."</p>"
+            ."<p>".tra("As a reminder, your account <b>cannot be recovered</b> once you delete it.")."</p>"
+            ."<br/>";
     
     form_start(secure_url_base()."delete_account_confirm.php", "post");
     form_input_hidden("token", $token);

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
     
     page_head(tra("Account Deleted"));
     
-    echo "<p>".tra("Your account has been deleted.  If you want to contribute to %1 in the future you will need to create a new account.",PROJECT)."</p>";
+    echo "<p>".tra("Your account has been deleted.  If you want to contribute to %1 in the future you will need to create a new account.", PROJECT)."</p>";
     
     page_tail();
 }

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

Braces +1 added lines, -2 removed lines

@@ -99,8 +99,7 @@
     );
 
     $form['#redirect'] = 'account';
-  }
-  else {
+  } else {
     $form['noaccount'] = array(
       '#value' => t('No such user with UID: %uid', array('%uid' => $uid)),
     );

Indentation +72 added lines, -72 removed lines

@@ -13,45 +13,45 @@ 
  *   a form array
  */
 function boincuser_delete_settings() {
-  $form = array();
+    $form = array();
 
-  $default = array(
+    $default = array(
     'boincuser_delete_type' => variable_get('boincuser_delete_type', ''),
     'boincuser_delete_redirect' => variable_get('boincuser_delete_redirect', '<front>'),
-  );
+    );
 
-  $form['options'] = array(
+    $form['options'] = array(
     '#type' => 'fieldset',
     '#title' => t('Options'),
-  );
-  $form['options']['help'] = array(
+    );
+    $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(
+    );
+    $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.'),
+        '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(
+    $form['redirect'] = array(
     '#type' => 'fieldset',
     '#title' => t('Redirect'),
-  );
-  $form['redirect']['boincuser_delete_redirect'] = array(
+    );
+    $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);
+    return system_settings_form($form);
 }
 
 
@@ -60,124 +60,124 @@ 
  * password checks.
  */
 function boincuser_delete_admindelete(&$form_state, $uid) {
-  $form = array();
+    $form = array();
 
-  $form['#uid'] = $uid;
+    $form['#uid'] = $uid;
 
-  $form['account']['help'] = array(
+    $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) {
+    $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'))),
+        '#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,
+        '#value' => t('<li>BOINC user ID: ') . $account->boincuser_id,
     );
     $form['account']['drupal_name'] = array(
-      '#value' => t('<li>Drupal username (internal): ') . $account->name,
+        '#value' => t('<li>Drupal username (internal): ') . $account->name,
     );
     $form['account']['user_id'] = array(
-      '#value' => t('<li>Drupal user ID: ') . $account->uid,
+        '#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'),),
-      );
+            '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.',
+        '#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,
+        ),
+        '#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(
+        '#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,
+        ),
+        '#weight' => 25,
     );
 
     // Action buttons
     $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => t('Submit'),
+        '#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'),
+        '#type' => 'button',
+        '#value' => t('Cancel'),
+        '#executes_submit_callback' => TRUE,
+        '#validate' => array(),
+        '#submit' => array('_boincuser_delete_cancel'),
     );
 
     $form['#redirect'] = 'account';
-  }
-  else {
+    }
+    else {
     $form['noaccount'] = array(
-      '#value' => t('No such user with UID: %uid', array('%uid' => $uid)),
+        '#value' => t('No such user with UID: %uid', array('%uid' => $uid)),
     );
-  }
+    }
 
-  return $form;
+    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'] == '') {
+    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') ) {
+    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'])) {
+    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'])) {
+    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.',
+    drupal_set_message(t('WARNING: Account @displayname, Drupal UID=@uid has been deleted.',
     array(
-      '@uid' => $form['#uid'],
-      '@displayname' => $account->boincuser_name,
+        '@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');
 }

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

Spacing +6 added lines, -6 removed lines

@@ -65,7 +65,7 @@ 
   $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>",
+    '#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>",
@@ -76,16 +76,16 @@ 
     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'))),
+      '#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,
+      '#value' => t('<li>BOINC user ID: ').$account->boincuser_id,
     );
     $form['account']['drupal_name'] = array(
-      '#value' => t('<li>Drupal username (internal): ') . $account->name,
+      '#value' => t('<li>Drupal username (internal): ').$account->name,
     );
     $form['account']['user_id'] = array(
-      '#value' => t('<li>Drupal user ID: ') . $account->uid,
+      '#value' => t('<li>Drupal user ID: ').$account->uid,
     );
 
     $form['account']['user_delete_action'] = array(
@@ -148,7 +148,7 @@ 
     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') ) {
+  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.'));
   }
 

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

@@ -91,8 +91,8 @@ 
     $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'),),
+          '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(
@@ -100,12 +100,12 @@ 
       '#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,
+      '#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'),
+      '#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',
@@ -121,7 +121,7 @@ 
     $form['actions']['cancel'] = array(
       '#type' => 'button',
       '#value' => t('Cancel'),
-      '#executes_submit_callback' => TRUE,
+      '#executes_submit_callback' => true,
       '#validate' => array(),
       '#submit' => array('_boincuser_delete_cancel'),
     );
@@ -142,7 +142,7 @@ 
  */
 function boincuser_delete_admindelete_validate($form, &$form_state) {
   global $user;
-  $boinc_user = boincuser_load($user->uid, TRUE);
+  $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.'));

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

Braces +4 added lines, -8 removed lines

@@ -94,8 +94,7 @@ 
           '#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'),
@@ -104,8 +103,7 @@ 
           '#prefix' => '<li class="tab">',
           '#suffix' => '</li>',
         );
-      }
-      else {
+      } else {
         unset($form['delete']);
       }
       break;
@@ -295,8 +293,7 @@ 
   // Redirect
   if (!empty($redirect)) {
     drupal_goto($redirect);
-  }
-  else {
+  } else {
     drupal_goto();
   }
 }
@@ -429,8 +426,7 @@ 
   // Redirect
   if (!empty($redirect)) {
     drupal_goto($redirect);
-  }
-  else {
+  } else {
     drupal_goto();
   }
 

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();
+}
 
 }

Spacing +11 added lines, -11 removed lines

@@ -93,9 +93,9 @@ 
 function boincuser_delete_form_alter(&$form, $form_state, $form_id) {
   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)=='') ) {
+      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'),
@@ -105,7 +105,7 @@ 
           '#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'),
@@ -158,7 +158,7 @@ 
           break;
       }
 
-      $question = 'Are you sure you want to delete the account <em>' . htmlspecialchars($form['_account']['#value']->boincuser_name) . '</em>?';
+      $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']);
@@ -177,7 +177,7 @@ 
       );
       $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>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'),
@@ -189,7 +189,7 @@ 
 
       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'),
+          '#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,
@@ -257,7 +257,7 @@ 
         '#weight' => 1010,
       );
 
-      $form['#redirect'] = 'account/' . $uid;
+      $form['#redirect'] = 'account/'.$uid;
       $form['#validate'] = array('boincuser_delete_validate');
       $form['#submit'] = array('boincuser_delete_submit');
       break;
@@ -317,7 +317,7 @@ 
   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";
+  $site_url = $base_url.$base_path."user/login";
 
   // Perform the requested operation
   $op = $form_state['values']['user_delete_action'];
@@ -364,7 +364,7 @@ 
   );
   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
@@ -458,7 +458,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -548,7 +548,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(

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();
-  }
+    }
 
 }

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

@@ -96,7 +96,7 @@ 
 
   switch($form_id) {
     case 'user_profile_form':
-      if ( user_access('delete own account') AND ($form['#uid'] == $user->uid) AND (arg(3)=='') ) {
+      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'),
@@ -122,7 +122,7 @@ 
       break;
     case 'user_confirm_delete':
 
-      $disable_delete = FALSE;
+      $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;
@@ -131,17 +131,17 @@ 
           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')
+            ), null, 'boinc:account-credentials-change')
         , 'info');
-        $disable_delete = TRUE;
+        $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');
+      $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'),
+        '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');
@@ -171,18 +171,18 @@ 
 
       $form['main']['fs1'] = array(
         '#type' => 'fieldset',
-        '#title' => bts('Instructions', array(), NULL, 'boinc:delete-user-account'),
+        '#title' => bts('Instructions', array(), null, 'boinc:delete-user-account'),
         '#weight' => 10,
-        '#collapsible' => TRUE,
-        '#collapsed' => TRUE,
+        '#collapsible' => true,
+        '#collapsed' => true,
       );
       $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(
-            '!link' => l(bts('change your email address', array(), NULL, 'boinc:delete-user-account'), '/account/info/edit'),
-          ), NULL, 'boinc:delete-user-account'),
+            '!link' => l(bts('change your email address', array(), null, 'boinc:delete-user-account'), '/account/info/edit'),
+          ), null, 'boinc:delete-user-account'),
         '#weight' => 11,
         '#prefix' => "<div id='delete-instructions'>",
         '#suffix' => "</div>",
@@ -190,7 +190,7 @@ 
 
       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'),
+          '#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,
@@ -203,14 +203,14 @@ 
         '#weight' => 21,
       );
       if ($disable_delete) {
-        $form['main']['user_delete_action']['#disabled'] = TRUE;
+        $form['main']['user_delete_action']['#disabled'] = true;
       }
 
       // 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'),
+          '#title' => bts('Enter your password to delete your account', array(), null, 'boinc:delete-user-account'),
           '#size' => 17,
           '#attributes' => array(
             'autocomplete' => 'off',
@@ -238,17 +238,17 @@ 
       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']['#value'] = bts('Submit', array(), null, 'boinc:form-submit');
       $form['actions']['submit']['#weight'] = 1002;
       if ($disable_delete) {
-        $form['actions']['submit']['#disabled'] = TRUE;
+        $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');
+      $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">';
       }
@@ -277,12 +277,12 @@ 
   require_boinc('boinc_db');
 
   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'));
+    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);
+  $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',
@@ -290,7 +290,7 @@ 
       array(
         '@project' => variable_get('site_name', 'Drupal-BOINC'),
       )
-      , NULL, 'boinc:delete-user-account')
+      , null, 'boinc:delete-user-account')
     );
   }
 
@@ -320,7 +320,7 @@ 
         array(
           '@uid' => $uid,
           '@project' => variable_get('site_name', 'Drupal-BOINC'),
-        ), NULL, 'delete-user-account'),
+        ), null, 'delete-user-account'),
       'error');
     watchdog('user', 'Attempted to cancel non-existing user account UID: %uid.', array('%uid' => $uid), WATCHDOG_ERROR);
     return;
@@ -377,7 +377,7 @@ 
   );
   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
@@ -411,9 +411,9 @@ 
   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');
+    null, 'boinc:delete-user-account'), 'error');
     drupal_goto();
   }
 
@@ -426,14 +426,14 @@ 
   // Instructions
   $form['main']['fs1'] = array(
     '#type' => 'fieldset',
-    '#title' => bts('Instructions', array(), NULL, 'boinc:delete-user-account'),
+    '#title' => bts('Instructions', array(), null, 'boinc:delete-user-account'),
     '#weight' => 10,
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#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').
+    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>",
@@ -441,7 +441,7 @@ 
 
   $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').
+    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>",
@@ -450,7 +450,7 @@ 
   // Password field
   $form['main']['current_pass'] = array(
     '#type' => 'password',
-    '#title' => bts('Enter your password to delete your account', array(), NULL, 'boinc:delete-user-account'),
+    '#title' => bts('Enter your password to delete your account', array(), null, 'boinc:delete-user-account'),
     '#size' => 17,
     '#attributes' => array(
       'autocomplete' => 'off',
@@ -466,12 +466,12 @@ 
   $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
+    '#value' => bts('Submit', array(), null, 'boinc:form-submit'),
     '#suffix' => '</li>',
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), "account/") . '</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -501,9 +501,9 @@ 
   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');
+    null, 'boinc:delete-user-account'), 'error');
     drupal_goto();
   }
 
@@ -516,14 +516,14 @@ 
   // Instructions
   $form['main']['fs1'] = array(
     '#type' => 'fieldset',
-    '#title' => bts('Instructions', array(), NULL, 'boinc:delete-user-account'),
+    '#title' => bts('Instructions', array(), null, 'boinc:delete-user-account'),
     '#weight' => 10,
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#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').
+    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>",
@@ -531,7 +531,7 @@ 
 
   $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').
+    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>",
@@ -540,7 +540,7 @@ 
   // Password field
   $form['main']['current_pass'] = array(
     '#type' => 'password',
-    '#title' => bts('Enter your password to delete your account', array(), NULL, 'boinc:delete-user-account'),
+    '#title' => bts('Enter your password to delete your account', array(), null, 'boinc:delete-user-account'),
     '#size' => 17,
     '#attributes' => array(
       'autocomplete' => 'off',
@@ -556,12 +556,12 @@ 
   $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
+    '#value' => bts('Submit', array(), null, 'boinc:form-submit'),
     '#suffix' => '</li>',
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), "account/") . '</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -601,7 +601,7 @@ 
   // Destroy the current session:
   session_destroy();
   // Only variables can be passed by reference workaround.
-  $null = NULL;
+  $null = null;
   user_module_invoke('logout', $null, $user);
 
   // Load the anonymous user

html/inc/account.inc

Braces +1 added lines, -2 removed lines

@@ -174,8 +174,7 @@
             array("agree_to_terms_of_use", "", false),
         );
         form_checkboxes(tra("Do you agree to the terms of use above?"), $myitems, 'tabindex="0"');
-    }
-    else {
+    } else {
         // error - no terms of use for user to agree to!
     }
 

Spacing +3 added lines, -3 removed lines

@@ -100,7 +100,7 @@ 
             tra("Must be at least %1 characters", $min_passwd_length),
             tra("Password")
         ),
-        "passwd", "", "password",'id="passwd"',passwd_visible_checkbox("passwd")
+        "passwd", "", "password", 'id="passwd"', passwd_visible_checkbox("passwd")
     );
     if (USER_COUNTRY) {
         form_select(
@@ -145,9 +145,9 @@ 
     } else {
         $x = tra("Email address:");
     }
-    form_input_text($x, "email_addr", '', 'text', $attrs='autofocus tabindex="1"');
+    form_input_text($x, "email_addr", '', 'text', $attrs = 'autofocus tabindex="1"');
     form_input_text(
-        tra("Password:").'<br><small><a href="get_passwd.php">' . tra("forgot password?") . "</a></small>",
+        tra("Password:").'<br><small><a href="get_passwd.php">'.tra("forgot password?")."</a></small>",
         "passwd",
         "",
         "password",

html/user/sample_index.php

Spacing +2 added lines, -2 removed lines

@@ -58,10 +58,10 @@
     //panel(null, 'panel_contents');
 }
 
-function left(){
+function left() {
     global $user, $no_web_account_creation, $master_url, $project_id;
     panel(
-        $user?tra("Welcome, %1", $user->name):tra("What is %1?", PROJECT),
+        $user ?tra("Welcome, %1", $user->name) : tra("What is %1?", PROJECT),
         function() use($user) {
             global $no_web_account_creation, $master_url, $project_id;
             if ($user) {

Braces +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     //panel(null, 'panel_contents');
 }
 
-function left(){
+function left() {
     global $user, $no_web_account_creation, $master_url, $project_id;
     panel(
         $user?tra("Welcome, %1", $user->name):tra("What is %1?", PROJECT),

html/user/am_set_info.php

Spacing +5 added lines, -5 removed lines

@@ -187,7 +187,7 @@ 
 }
 
 if (!is_null($teamid)) {
-    if ($teamid==0) {
+    if ($teamid == 0) {
         user_quit_team($user);
     } else {
         $team = BoincTeam::lookup_id_nocache($teamid);
@@ -240,15 +240,15 @@ 
 // table. If one or more of these consent_xyz parameters are NOT
 // present, the RPC will still return 'success', even though the
 // consent table is not updated.
-if ( (isset($consent_name) and isset($consent_flag) and isset($consent_not_required) and isset($consent_source)) ) {
+if ((isset($consent_name) and isset($consent_flag) and isset($consent_not_required) and isset($consent_source))) {
     list($checkct, $ctid) = check_consent_type($consent_name);
     if ($checkct) {
 
         // Check to see if latest consent of this name is already
         // given.
-        $cr= BoincConsent::lookup("userid={$user->id} AND consent_type_id='${ctid}' ORDER BY consent_time DESC LIMIT 1");
-        if ( (($cr) and ($cr->consent_flag!=$consent_flag)) or
-             (!$cr) ) {
+        $cr = BoincConsent::lookup("userid={$user->id} AND consent_type_id='${ctid}' ORDER BY consent_time DESC LIMIT 1");
+        if ((($cr) and ($cr->consent_flag != $consent_flag)) or
+             (!$cr)) {
 
             $rc = consent_to_a_policy($user, $ctid, $consent_flag, $consent_not_required, $consent_source, time());
             if (!$rc) {