BOINC / boinc

html/inc/random_compat/random_bytes_mcrypt.inc

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
      *
      * @return string
      */
-    function random_bytes($bytes)
-    {
+    function random_bytes($bytes) {
         try {
             $bytes = RandomCompat_intval($bytes);
         } catch (TypeError $ex) {

html/inc/token.inc

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     $expiration = $now + $duration;
     $type = BoincDb::escape_string($type);
     $ret = BoincToken::insert("(token,userid,type,create_time,expire_time) values ('$token', $userid, '$type', $now, $expiration)");
-    if ( !$ret ) {
+    if (!$ret) {
         return null;
     }
     return $token;
@@ -39,7 +39,7 @@ 
 
 function is_valid_token($userid, $token, $type) {
     $boincToken = BoincToken::lookup_valid_token($userid, $token, $type);
-    if ( $boincToken == null ) {
+    if ($boincToken == null) {
         return false;
     }
     return true;

html/ops/result_summary.php

Spacing +1 added lines, -1 removed lines

@@ -26,5 +26,5 @@
 admin_show_result_summary();
 
 admin_page_tail();
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

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

html/user/prefs_edit.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 $subset = sanitize_tags(get_str("subset"));
 $venue = sanitize_tags(get_str("venue", true));
 $columns = get_str("cols", true);
-$c = $columns?"&cols=$columns":"";
+$c = $columns ? "&cols=$columns" : "";
 check_subset($subset);
 if ($action) {
     check_tokens($user->authenticator);
@@ -116,5 +116,5 @@ 
 echo "<a href=prefs.php?subset=$subset$c>".tra("Back to preferences")."</a>\n";
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

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

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