BOINC / boinc

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

Switch Indentation +28 added lines, -28 removed lines

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

html/inc/password_compat/password.inc

Switch Indentation +40 added lines, -40 removed lines

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

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

Switch Indentation +31 added lines, -31 removed lines

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

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

Switch Indentation +304 added lines, -304 removed lines

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

html/ops/db_form.php

Switch Indentation +50 added lines, -50 removed lines

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

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

Switch Indentation +109 added lines, -109 removed lines

@@ -301,125 +301,125 @@
   }
 
   switch ($form_state['values']['import']) {
-    case 'users':
-      boincimport_users();
-      break;
-
-    case 'teams':
-      boincimport_teams();
-      if (!variable_get('boincimport_import_team_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'teams';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      break;
+  case 'users':
+    boincimport_users();
+    break;
 
-    case 'friends':
-      boincimport_friends();
-      if (!variable_get('boincimport_import_friend_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      break;
+  case 'teams':
+    boincimport_teams();
+    if (!variable_get('boincimport_import_team_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'teams';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'friends';
+    }
+    break;
 
-    case 'preferences':
-      boincimport_preferences();
-      if (!variable_get('boincimport_import_preferences_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      break;
+  case 'friends':
+    boincimport_friends();
+    if (!variable_get('boincimport_import_friend_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'friends';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'preferences';
+    }
+    break;
 
-    case 'private messages':
-      boincimport_private_msgs();
-      if (!variable_get('boincimport_import_private_msg_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      break;
+  case 'preferences':
+    boincimport_preferences();
+    if (!variable_get('boincimport_import_preferences_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'preferences';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'private messages';
+    }
+    break;
 
-    case 'categories':
-      boincimport_forum_categories();
-      if (!variable_get('boincimport_import_category_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      break;
+  case 'private messages':
+    boincimport_private_msgs();
+    if (!variable_get('boincimport_import_private_msg_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'private messages';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'categories';
+    }
+    break;
 
-    case 'topics':
-      boincimport_forum_topics();
-      if (!variable_get('boincimport_import_topic_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      break;
+  case 'categories':
+    boincimport_forum_categories();
+    if (!variable_get('boincimport_import_category_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'categories';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'topics';
+    }
+    break;
 
-    case 'posts':
-      boincimport_forum_posts();
-      if (!variable_get('boincimport_import_post_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      break;
+  case 'topics':
+    boincimport_forum_topics();
+    if (!variable_get('boincimport_import_topic_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'topics';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'posts';
+    }
+    break;
 
-    case 'team forums':
-      boincimport_team_forums();
-      if (!variable_get('boincimport_team_forum_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'team forums';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      break;
+  case 'posts':
+    boincimport_forum_posts();
+    if (!variable_get('boincimport_import_post_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'posts';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'url';
+    }
+    break;
 
-    case 'team topics':
-      boincimport_team_forum_topics();
-      if (!variable_get('boincimport_team_topic_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      break;
+  case 'team forums':
+    boincimport_team_forums();
+    if (!variable_get('boincimport_team_forum_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'team forums';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'team topics';
+    }
+    break;
 
-    case 'team posts':
-      boincimport_team_forum_posts();
-      if (!variable_get('boincimport_team_post_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      break;
+  case 'team topics':
+    boincimport_team_forum_topics();
+    if (!variable_get('boincimport_team_topic_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'team topics';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'team posts';
+    }
+    break;
 
-    case 'url':
-      boincimport_replace_urls();
-      if (!variable_get('boincimport_replace_url_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      else {
-        drupal_set_message('Congratulations.  Import Finished');
-        drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
-        watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO);
-        unset($_SESSION['boincimport_stage_selected']);
-      }
-      break;
-    default:
-      $_SESSION['boincimport_stage_selected'] = 'users';
-      break;
+  case 'team posts':
+    boincimport_team_forum_posts();
+    if (!variable_get('boincimport_team_post_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'team posts';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'url';
+    }
+    break;
+
+  case 'url':
+    boincimport_replace_urls();
+    if (!variable_get('boincimport_replace_url_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'url';
+    }
+    else {
+      drupal_set_message('Congratulations.  Import Finished');
+      drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
+      watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO);
+      unset($_SESSION['boincimport_stage_selected']);
+    }
+    break;
+  default:
+    $_SESSION['boincimport_stage_selected'] = 'users';
+    break;
   }
 }
 

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

Switch Indentation +29 added lines, -29 removed lines

@@ -643,9 +643,9 @@ 
     }
     break;
 
-    default:
-      // Don't generate form elements for things that aren't explicitly form
-      // elements (i.e. 'title', '@attributes' keys, and the like)
+  default:
+    // Don't generate form elements for things that aren't explicitly form
+    // elements (i.e. 'title', '@attributes' keys, and the like)
   }
 }
 
@@ -1990,31 +1990,31 @@ 
  */
 function pretty_application_version($appverid, $vernum, $plan_class, $plfm) {
   switch ($appverid) {
-    case ANON_PLATFORM_UNKNOWN:
-      return "Anonymous platform";
-    case ANON_PLATFORM_CPU:
-      return "Anonymous platform CPU";
-    case ANON_PLATFORM_NVIDIA:
-      return "Anonymous platform NVIDIA GPU";
-    case ANON_PLATFORM_ATI:
-      return "Anonymous platform AMD GPU";
-    case ANON_PLATFORM_INTEL_GPU:
-      return "Anonymous platform Intel GPU";
-    case ANON_PLATFORM_APPLE_GPU:
-      return "Anonymous platform Apple GPU";
-    case 0:
-      return "---";
-    default:
-      // Handle the case where the appversid is still negative. This
-      // may be cause BOINC has introduced a new anonymous platform
-      // that is not handled by the above case statements.
-      if ($appverid < 0) {
-        return "Unknown Anonymous platform";
-      }
-      else {
-        $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
-        $prettyc = ($plan_class) ? "($av->plan_class)" : '';
-        return "v$prettyv $prettyc $plfm";
-      }
+  case ANON_PLATFORM_UNKNOWN:
+    return "Anonymous platform";
+  case ANON_PLATFORM_CPU:
+    return "Anonymous platform CPU";
+  case ANON_PLATFORM_NVIDIA:
+    return "Anonymous platform NVIDIA GPU";
+  case ANON_PLATFORM_ATI:
+    return "Anonymous platform AMD GPU";
+  case ANON_PLATFORM_INTEL_GPU:
+    return "Anonymous platform Intel GPU";
+  case ANON_PLATFORM_APPLE_GPU:
+    return "Anonymous platform Apple GPU";
+  case 0:
+    return "---";
+  default:
+    // Handle the case where the appversid is still negative. This
+    // may be cause BOINC has introduced a new anonymous platform
+    // that is not handled by the above case statements.
+    if ($appverid < 0) {
+      return "Unknown Anonymous platform";
+    }
+    else {
+      $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
+      $prettyc = ($plan_class) ? "($av->plan_class)" : '';
+      return "v$prettyv $prettyc $plfm";
+    }
   }
 }

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

Switch Indentation +22 added lines, -22 removed lines

@@ -9,28 +9,28 @@
  * Implements hook_block() for Drupal 6 compatibility
  */
 function comment_form_block_block($op = 'list', $delta = 0, $edit = array()) {
-  switch ($op) {
-  case 'view':
-    //$block = node_comment_block_block_view($delta);
-    $block = array();
-    if ($delta == 'comment_form') {
-      if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
-        global $user;
-        $node = node_load($nid);
-        if ($node->comment !== 0 AND user_access('post comments', $user)) {
-          $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
-          $block['content'] = '<h2>' . bts('Post new comment', array(), NULL, 'boinc:forum-post-new-comment') . '</h2>';
-          $block['content'] .= drupal_get_form('comment_form', array('nid' => $nid));
-        }
-      }
-    }
-    break;
-  case 'list':
-    $blocks = comment_form_block_block_info();
-    return $blocks;
-    break;
-  default:
-  }
+switch ($op) {
+case 'view':
+//$block = node_comment_block_block_view($delta);
+$block = array();
+if ($delta == 'comment_form') {
+if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
+global $user;
+$node = node_load($nid);
+if ($node->comment !== 0 AND user_access('post comments', $user)) {
+$block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
+$block['content'] = '<h2>' . bts('Post new comment', array(), NULL, 'boinc:forum-post-new-comment') . '</h2>';
+$block['content'] .= drupal_get_form('comment_form', array('nid' => $nid));
+}
+}
+}
+break;
+case 'list':
+$blocks = comment_form_block_block_info();
+return $blocks;
+break;
+default:
+}
   return $block;
 }
 

html/user/job_file.php

Switch Indentation +14 added lines, -14 removed lines

@@ -80,20 +80,20 @@
 
 function upload_error_description($errno) {
     switch ($errno) {
-        case UPLOAD_ERR_INI_SIZE:
-            return "The uploaded file exceeds upload_max_filesize of php.ini."; break;
-        case UPLOAD_ERR_FORM_SIZE:
-            return "The uploaded file exceeds the MAX_FILE_SIZE specified in the HTML form."; break;
-        case UPLOAD_ERR_PARTIAL:
-            return "The uploaded file was only partially uploaded."; break;
-        case UPLOAD_ERR_NO_FILE:
-            return "No file was uploaded."; break;
-        case UPLOAD_ERR_NO_TMP_DIR:
-            return "Missing a temporary folder."; break;
-        case UPLOAD_ERR_CANT_WRITE:
-            return "Failed to write file to disk."; break;
-        case UPLOAD_ERR_EXTENSION:
-            return "A PHP extension stopped the file upload."; break;
+    case UPLOAD_ERR_INI_SIZE:
+        return "The uploaded file exceeds upload_max_filesize of php.ini."; break;
+    case UPLOAD_ERR_FORM_SIZE:
+        return "The uploaded file exceeds the MAX_FILE_SIZE specified in the HTML form."; break;
+    case UPLOAD_ERR_PARTIAL:
+        return "The uploaded file was only partially uploaded."; break;
+    case UPLOAD_ERR_NO_FILE:
+        return "No file was uploaded."; break;
+    case UPLOAD_ERR_NO_TMP_DIR:
+        return "Missing a temporary folder."; break;
+    case UPLOAD_ERR_CANT_WRITE:
+        return "Failed to write file to disk."; break;
+    case UPLOAD_ERR_EXTENSION:
+        return "A PHP extension stopped the file upload."; break;
     }
 }