BOINC / boinc

drupal/sites/default/boinc/themes/boinc/template.php

Switch Indentation +24 added lines, -24 removed lines

@@ -626,13 +626,13 @@ 
   $sender = user_load($sender->uid);
   
   switch ($status) {
-    case FLAG_FRIEND_FLAGGED:
-      // Sender accepted recipient's friend request
-      $email['subject'] = bts('!name accepted your friend request [!site]', array(
-        '!name' => $sender->boincuser_name,
-        '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        ), NULL, 'boinc:friend-request-email');
-      $email['body'] = bts('!name confirmed you as a friend on !site.
+  case FLAG_FRIEND_FLAGGED:
+    // Sender accepted recipient's friend request
+    $email['subject'] = bts('!name accepted your friend request [!site]', array(
+      '!name' => $sender->boincuser_name,
+      '!site' => variable_get('site_name', 'Drupal-BOINC'),
+      ), NULL, 'boinc:friend-request-email');
+    $email['body'] = bts('!name confirmed you as a friend on !site.
 
 Follow this link to view his or her profile:
 !link
@@ -641,17 +641,17 @@ 
 
 Thanks,
 The !site team', array(
-        '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
-        '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
-        '!link' => url('account/'. $sender->uid, array('absolute' => TRUE)),
-        ), array(), NULL, 'boinc:friend-request-email');
-      break;
+      '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
+      '!site' => variable_get('site_name', 'Drupal-BOINC'),
+      '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
+      '!link' => url('account/'. $sender->uid, array('absolute' => TRUE)),
+      ), array(), NULL, 'boinc:friend-request-email');
+    break;
 
-    case FLAG_FRIEND_PENDING:
-      // Sender is requesting to be recipient's friend
-      $email['subject'] = bts('Friend request from !name [!site]', array('!name' => $sender->boincuser_name, '!site' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:friend-request-email');
-      $email['body'] = bts('!name added you as a friend on !site. You can approve or deny this request. Denying a request will not send a notification, but will remove the request from both of your accounts.
+  case FLAG_FRIEND_PENDING:
+    // Sender is requesting to be recipient's friend
+    $email['subject'] = bts('Friend request from !name [!site]', array('!name' => $sender->boincuser_name, '!site' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:friend-request-email');
+    $email['body'] = bts('!name added you as a friend on !site. You can approve or deny this request. Denying a request will not send a notification, but will remove the request from both of your accounts.
 
 Follow the link below to view this request:
 !link
@@ -660,13 +660,13 @@ 
 
 Thanks,
 The !site team', array(
-        '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
-        '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
-        '!link' => url('goto/friend-requests', array('absolute' => TRUE)),
-        ),
-      array(), NULL, 'boinc:friend-request-email');
-      break;
+      '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
+      '!site' => variable_get('site_name', 'Drupal-BOINC'),
+      '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
+      '!link' => url('goto/friend-requests', array('absolute' => TRUE)),
+      ),
+    array(), NULL, 'boinc:friend-request-email');
+    break;
   }
   return $email;
 }

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

Switch Indentation +58 added lines, -58 removed lines

@@ -1398,72 +1398,72 @@
 
   switch ($op) {
     // Return stored strings
-    case 'mem-report':
-      return $strings;
-
-      // Store string in memory (only supports single strings)
-    case 'mem-store':
-      $strings[$value['msgid']] = $value['msgstr'];
-      return;
-
-      // Called at end of import to inform the user
-    case 'db-report':
-      return array(
-        $headerdone,
-        $report['additions'],
-        $report['updates'],
-        $report['deletes'],
-        $report['skips'],
-      );
+  case 'mem-report':
+    return $strings;
+
+    // Store string in memory (only supports single strings)
+  case 'mem-store':
+    $strings[$value['msgid']] = $value['msgstr'];
+    return;
+
+    // Called at end of import to inform the user
+  case 'db-report':
+    return array(
+      $headerdone,
+      $report['additions'],
+      $report['updates'],
+      $report['deletes'],
+      $report['skips'],
+    );
 
-      // Store the string we got in the database.
-    case 'db-store':
-      // We got header information.
-      if ($value['msgid'] == '') {
-        $languages = language_list();
-        if (($mode != LOCALE_IMPORT_KEEP) || empty($languages[$lang]->plurals)) {
-          // Since we only need to parse the header if we ought to update the
-          // plural formula, only run this if we don't need to keep existing
-          // data untouched or if we don't have an existing plural formula.
-          $header = _locale_import_parse_header($value['msgstr']);
-
-          // Get and store the plural formula if available.
-          if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filename)) {
-            list($nplurals, $plural) = $p;
-            db_query("UPDATE {languages} SET plurals = %d, formula = '%s' WHERE language = '%s'", $nplurals, $plural, $lang);
-          }
+    // Store the string we got in the database.
+  case 'db-store':
+    // We got header information.
+    if ($value['msgid'] == '') {
+      $languages = language_list();
+      if (($mode != LOCALE_IMPORT_KEEP) || empty($languages[$lang]->plurals)) {
+        // Since we only need to parse the header if we ought to update the
+        // plural formula, only run this if we don't need to keep existing
+        // data untouched or if we don't have an existing plural formula.
+        $header = _locale_import_parse_header($value['msgstr']);
+
+        // Get and store the plural formula if available.
+        if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filename)) {
+          list($nplurals, $plural) = $p;
+          db_query("UPDATE {languages} SET plurals = %d, formula = '%s' WHERE language = '%s'", $nplurals, $plural, $lang);
         }
-        $headerdone = TRUE;
       }
+      $headerdone = TRUE;
+    }
 
-      else {
-        // Some real string to import.
-        $comments = _locale_import_shorten_comments(empty($value['#']) ? array() : $value['#']);
-
-        if (strpos($value['msgid'], "\0")) {
-          // This string has plural versions.
-          $english = explode("\0", $value['msgid'], 2);
-          $entries = array_keys($value['msgstr']);
-          for ($i = 3; $i <= count($entries); $i++) {
-            $english[] = $english[1];
-          }
-          $translation = array_map('_locale_import_append_plural', $value['msgstr'], $entries);
-          $english = array_map('_locale_import_append_plural', $english, $entries);
-          foreach ($translation as $key => $trans) {
-            if ($key == 0) {
-              $plid = 0;
-            }
-            $plid = _boinctranslate_locale_import_one_string_db($report, $lang, $english[$key], $trans, $group, $comments, $mode, $plid, $key);
+    else {
+      // Some real string to import.
+      $comments = _locale_import_shorten_comments(empty($value['#']) ? array() : $value['#']);
+
+      if (strpos($value['msgid'], "\0")) {
+        // This string has plural versions.
+        $english = explode("\0", $value['msgid'], 2);
+        $entries = array_keys($value['msgstr']);
+        for ($i = 3; $i <= count($entries); $i++) {
+          $english[] = $english[1];
+        }
+        $translation = array_map('_locale_import_append_plural', $value['msgstr'], $entries);
+        $english = array_map('_locale_import_append_plural', $english, $entries);
+        foreach ($translation as $key => $trans) {
+          if ($key == 0) {
+            $plid = 0;
           }
+          $plid = _boinctranslate_locale_import_one_string_db($report, $lang, $english[$key], $trans, $group, $comments, $mode, $plid, $key);
         }
+      }
 
-        else {
-          // A simple string to import.
-          $english = $value['msgid'];
-          $translation = $value['msgstr'];
-          _boinctranslate_locale_import_one_string_db($report, $lang, $english, $translation, $group, $comments, $mode);
-        }
+      else {
+        // A simple string to import.
+        $english = $value['msgid'];
+        $translation = $value['msgstr'];
+        _boinctranslate_locale_import_one_string_db($report, $lang, $english, $translation, $group, $comments, $mode);
       }
+    }
   } // end of db-store operation
 }
 

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

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

Switch Indentation +27 added lines, -27 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,29 +1990,29 @@ 
  */
 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:
-      return "Anonymous platform Intel 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:
+    return "Anonymous platform Intel 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";
+    }
   }
 }

html/user/submit_rpc_handler.php

Switch Indentation +18 added lines, -18 removed lines

@@ -1049,24 +1049,24 @@
 log_write("----- Handling RPC; command ".$r->getName());
 
 switch ($r->getName()) {
-    case 'abort_batch': handle_abort_batch($r); break;
-    case 'abort_jobs': handle_abort_jobs($r); break;
-    case 'create_batch': create_batch($r); break;
-    case 'estimate_batch': estimate_batch($r); break;
-    case 'get_templates': get_templates($r); break;
-    case 'ping': ping($r); break;
-    case 'query_batch': query_batch($r); break;
-    case 'query_batch2': query_batch2($r); break;
-    case 'query_batches': query_batches($r); break;
-    case 'query_job': query_job($r); break;
-    case 'query_completed_job': query_completed_job($r); break;
-    case 'retire_batch': handle_retire_batch($r); break;
-    case 'set_expire_time': handle_set_expire_time($r); break;
-    case 'submit_batch': submit_batch($r); break;
-    default:
-        log_write("bad command");
-        xml_error(-1, "bad command: ".$r->getName());
-        break;
+case 'abort_batch': handle_abort_batch($r); break;
+case 'abort_jobs': handle_abort_jobs($r); break;
+case 'create_batch': create_batch($r); break;
+case 'estimate_batch': estimate_batch($r); break;
+case 'get_templates': get_templates($r); break;
+case 'ping': ping($r); break;
+case 'query_batch': query_batch($r); break;
+case 'query_batch2': query_batch2($r); break;
+case 'query_batches': query_batches($r); break;
+case 'query_job': query_job($r); break;
+case 'query_completed_job': query_completed_job($r); break;
+case 'retire_batch': handle_retire_batch($r); break;
+case 'set_expire_time': handle_set_expire_time($r); break;
+case 'submit_batch': submit_batch($r); break;
+default:
+    log_write("bad command");
+    xml_error(-1, "bad command: ".$r->getName());
+    break;
 }
 
 log_write("RPC done");

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

Switch Indentation +310 added lines, -310 removed lines

@@ -19,113 +19,113 @@ 
  * Implementation of hook_menu()
  */
 function boincimport_menu() {
-  $items = array();
-  
-  $items['admin/boinc/import'] = array(
-    'title' => 'Environment: Data import',
-    'description' => 'Overview of the BOINC data import process.',
-    'access callback' => 'user_access',
-    'access arguments' => array('import boinc data'),
-    'page callback' => 'boincimport_main',
-    'file' => 'boincimport.pages.inc',
-    'type' => MENU_NORMAL_ITEM,
-  );
-  $items['admin/boinc/import/post_configuration'] = array(
-    'title' => 'Post-migration configuration',
-    'description' => 'Tie up a few odds and ends in the system configuration
+$items = array();
+  
+$items['admin/boinc/import'] = array(
+'title' => 'Environment: Data import',
+'description' => 'Overview of the BOINC data import process.',
+'access callback' => 'user_access',
+'access arguments' => array('import boinc data'),
+'page callback' => 'boincimport_main',
+'file' => 'boincimport.pages.inc',
+'type' => MENU_NORMAL_ITEM,
+);
+$items['admin/boinc/import/post_configuration'] = array(
+'title' => 'Post-migration configuration',
+'description' => 'Tie up a few odds and ends in the system configuration
       after data importation is complete.',
-    'access callback' => 'user_access',
-    'access arguments' => array('import boinc data'),
-    'page callback' => 'boincimport_post_configuration', 
-    'file' => 'boincimport.pages.inc',
-    'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/cleanup'] = array(
-    'title' => 'Cleanup',
-    'access callback' => 'user_access',
-    'access arguments' => array('import boinc data'),
-    'page callback' => 'boincimport_cleanup', 
-    'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/complete/%'] = array(
-    'title' => 'Complete',
-    'access callback' => 'user_access',
-    'access arguments' => array('import boinc data'),
-    'page callback' => 'boincimport_complete',
-    'page arguments' => array(4),
-    'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/process'] = array(
-    'title' => 'Execute migration',
-    'access callback' => 'user_access',
-    'access arguments' => array('import boinc data'),
-    'page callback' => 'boincimport_process', 
-    'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/reset'] = array(
-    'title' => 'Reset BOINC database URL',
-    'access callback' => 'user_access',
-    'access arguments' => array('import boinc data'),
-    'page callback' => 'boincimport_reset',
-    'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/unlock'] = array(
-    'title' => 'Unlock BOINC import process',
-    'access callback' => 'user_access',
-    'access arguments' => array('import boinc data'),
-    'page callback' => 'boincimport_unlock',
-    'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/settings'] = array(
-    'title' => 'BOINC data import settings',
-    'description' => 'Configure the BOINC data import process in preparation
+'access callback' => 'user_access',
+'access arguments' => array('import boinc data'),
+'page callback' => 'boincimport_post_configuration', 
+'file' => 'boincimport.pages.inc',
+'type' => MENU_CALLBACK,
+);
+$items['admin/boinc/import/cleanup'] = array(
+'title' => 'Cleanup',
+'access callback' => 'user_access',
+'access arguments' => array('import boinc data'),
+'page callback' => 'boincimport_cleanup', 
+'type' => MENU_CALLBACK,
+);
+$items['admin/boinc/import/complete/%'] = array(
+'title' => 'Complete',
+'access callback' => 'user_access',
+'access arguments' => array('import boinc data'),
+'page callback' => 'boincimport_complete',
+'page arguments' => array(4),
+'type' => MENU_CALLBACK,
+);
+$items['admin/boinc/import/process'] = array(
+'title' => 'Execute migration',
+'access callback' => 'user_access',
+'access arguments' => array('import boinc data'),
+'page callback' => 'boincimport_process', 
+'type' => MENU_CALLBACK,
+);
+$items['admin/boinc/import/reset'] = array(
+'title' => 'Reset BOINC database URL',
+'access callback' => 'user_access',
+'access arguments' => array('import boinc data'),
+'page callback' => 'boincimport_reset',
+'type' => MENU_CALLBACK,
+);
+$items['admin/boinc/import/unlock'] = array(
+'title' => 'Unlock BOINC import process',
+'access callback' => 'user_access',
+'access arguments' => array('import boinc data'),
+'page callback' => 'boincimport_unlock',
+'type' => MENU_CALLBACK,
+);
+$items['admin/boinc/import/settings'] = array(
+'title' => 'BOINC data import settings',
+'description' => 'Configure the BOINC data import process in preparation
       for pulling user accounts, teams, and forums into Drupal.',
-    'access callback' => 'user_access',
-    'access arguments' => array('import boinc data'),
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('boincimport_admin_settings'),
-    'file' => 'boincimport.pages.inc',
-    'type' => MENU_CALLBACK,
-  );
-  return $items;
+'access callback' => 'user_access',
+'access arguments' => array('import boinc data'),
+'page callback' => 'drupal_get_form',
+'page arguments' => array('boincimport_admin_settings'),
+'file' => 'boincimport.pages.inc',
+'type' => MENU_CALLBACK,
+);
+return $items;
 }
 
 /**
  * Implementation of hook_perm()
  */
 function boincimport_perm() {
-  return array('import boinc data');
+return array('import boinc data');
 }
 
 /**
  * Callback admin/boinc/import/reset
  */
 function boincimport_reset() {
-  global $db_url;
-  $boinc_db_url = (is_array($db_url)) ? (isset($db_url['boinc_rw']) ? $db_url['boinc_rw'] : $db_url['default']) : $db_url;
-  variable_set('boincimport_db_url', $boinc_db_url);
-  variable_set('boincimport_ready', 0);
-  return '<p>'. t('The BOINC database URL has been reset. You may now <a href="@configlink">go back to the configuration page</a>.',
-      array('@configlink' => url('admin/boinc/import/settings'))) .'</p>';
+global $db_url;
+$boinc_db_url = (is_array($db_url)) ? (isset($db_url['boinc_rw']) ? $db_url['boinc_rw'] : $db_url['default']) : $db_url;
+variable_set('boincimport_db_url', $boinc_db_url);
+variable_set('boincimport_ready', 0);
+return '<p>'. t('The BOINC database URL has been reset. You may now <a href="@configlink">go back to the configuration page</a>.',
+  array('@configlink' => url('admin/boinc/import/settings'))) .'</p>';
 }
 
 /**
  * Callback admin/boinc/import/unlock
  */
 function boincimport_unlock() {
-  variable_del('boincimport_process_locked');
-  return '<p>'. t('The BOINC data import process has been unlocked. You may
+variable_del('boincimport_process_locked');
+return '<p>'. t('The BOINC data import process has been unlocked. You may
     now !proceed_with_import.', array(
-      '!proceed_with_import' => l(t('proceed with the import'),
-        'admin/boinc/import/process')
-    )) .'</p>';
+  '!proceed_with_import' => l(t('proceed with the import'),
+    'admin/boinc/import/process')
+)) .'</p>';
 }
 
 /**
  * Callback admin/boinc/import/cleanup
  */
 function boincimport_cleanup() {
-  return boincimport_process_cleanup() .'<p>'. t('Drupal database cleaned.') .'</p>';
+return boincimport_process_cleanup() .'<p>'. t('Drupal database cleaned.') .'</p>';
 }
 
 /**
@@ -139,23 +139,23 @@ 
  * want to test. Therefore, the test part of the code is not used, now.
  */
 function _boincimport_db_connect($test= 0) {
-  global $db_url;
-  $db_ready = variable_get('boincimport_db_configured', 1);
-  if (!$db_ready) {
-    if (is_array($db_url)) {
-      $db_url2 = $db_url;
-    } else {
-      $db_url2['default'] = $db_url;
-    }
-    $db_url2['boinc_rw'] = variable_get('boincimport_db_url', $db_url);
-    $GLOBALS['db_url'] =& $db_url2;
-    if ($test) {
-      if (!db_connect($db_url2['boinc_rw'])) {
-        return 0;
-      }
-    }
+global $db_url;
+$db_ready = variable_get('boincimport_db_configured', 1);
+if (!$db_ready) {
+if (is_array($db_url)) {
+  $db_url2 = $db_url;
+} else {
+  $db_url2['default'] = $db_url;
+}
+$db_url2['boinc_rw'] = variable_get('boincimport_db_url', $db_url);
+$GLOBALS['db_url'] =& $db_url2;
+if ($test) {
+  if (!db_connect($db_url2['boinc_rw'])) {
+    return 0;
   }
-  return 1;
+}
+}
+return 1;
   
 }
 
@@ -167,17 +167,17 @@ 
  *    $out['result'] = boolean.
  */
 function _boincimport_check_module($module) {
-  $out['html'] = '<ul>';
-  $result = module_exists($module);
-  $out['result'] = $result;
-  if ($result == 1) {
-    $out['html'] .= '<li>'. t('Module %module is enabled. OK!', array('%module' => $module)) .'</li>';
-  }
-  else {
-    $out['html'] .= '<li><span class="marker">'. t('Module %module is disabled.', array('%module' => $module)) .'</span></li>';
-  }
-  $out['html'] .= '</ul>';
-  return $out;
+$out['html'] = '<ul>';
+$result = module_exists($module);
+$out['result'] = $result;
+if ($result == 1) {
+$out['html'] .= '<li>'. t('Module %module is enabled. OK!', array('%module' => $module)) .'</li>';
+}
+else {
+$out['html'] .= '<li><span class="marker">'. t('Module %module is disabled.', array('%module' => $module)) .'</span></li>';
+}
+$out['html'] .= '</ul>';
+return $out;
 }
 
 /**
@@ -188,239 +188,239 @@ 
  *   $out['result'] = boolean.
  */
 function _boincimport_check_tables($tables = array(), $db = 'default' , $prefix = 1) {
-  _boincimport_db_connect();
-
-  $out['html'] = '<ul>';
-  $out['result']= 1;
-  foreach ($tables as $table) {
-    if ($prefix) {
-      $table = db_prefix_tables('{'. $table .'}');
-    }  
-
-    db_set_active($db);
-    if ($GLOBALS['db_type'] == 'pgsql') {
-      // adapt from db_table_exists in database.pgsql.inc
-      $result = (bool) db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
-    }
-    else {
-      // adapt from db_table_exists in database.mysql.inc
-      $result = (bool) db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
-    }
-    db_set_active('default');
-    if ($result) {
-      $out['html'] .= '<li>'. t('Table %table: OK!', array('%table' => $table)) .'</li>';
-    }
-    else {
-      $out['html'] .= '<li><span class="marker">'. t('Table <strong>%table</strong> does not exist!', array('%table' => $table)) .'</span></li>';
-      $out['result']= 0;
-    }
-  }
-  $out['html'] .= '</ul>';
-  return $out;
+_boincimport_db_connect();
+
+$out['html'] = '<ul>';
+$out['result']= 1;
+foreach ($tables as $table) {
+if ($prefix) {
+  $table = db_prefix_tables('{'. $table .'}');
+}  
+
+db_set_active($db);
+if ($GLOBALS['db_type'] == 'pgsql') {
+  // adapt from db_table_exists in database.pgsql.inc
+  $result = (bool) db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
+}
+else {
+  // adapt from db_table_exists in database.mysql.inc
+  $result = (bool) db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
+}
+db_set_active('default');
+if ($result) {
+  $out['html'] .= '<li>'. t('Table %table: OK!', array('%table' => $table)) .'</li>';
+}
+else {
+  $out['html'] .= '<li><span class="marker">'. t('Table <strong>%table</strong> does not exist!', array('%table' => $table)) .'</span></li>';
+  $out['result']= 0;
+}
+}
+$out['html'] .= '</ul>';
+return $out;
 }
 
 
 
 function boincimport_process() {
-  // Start with a quick sanity check on the BOINC environment
-  boinc_get_path();
+// Start with a quick sanity check on the BOINC environment
+boinc_get_path();
   
-  if (!variable_get('boincimport_ready', 0)) {
-    return '<p>'. t('You cannot import the data now. Please <a href="@settings">complete the setup first</a>', array('@settings' => url('admin/boinc/import/settings'))) .'</p>';
-  }
+if (!variable_get('boincimport_ready', 0)) {
+return '<p>'. t('You cannot import the data now. Please <a href="@settings">complete the setup first</a>', array('@settings' => url('admin/boinc/import/settings'))) .'</p>';
+}
 
-  $output = 'BOINC import process form';
-  $output .= drupal_get_form('boincimport_process_form');
-  return $output;
+$output = 'BOINC import process form';
+$output .= drupal_get_form('boincimport_process_form');
+return $output;
 }
 
 function boincimport_process_form() {
-  $form = array();
-  _boincimport_db_connect() ;
-  // Causes problems with form api redirect
-  //ini_set('display_errors', TRUE);
-
-  // Adjust how long you want the script to run...
-  if (!ini_get('safe_mode')) {
-    // This will always be set on PHP7, but not on PHP5 with safe mode
-    set_time_limit(variable_get('boincimport_time_limit', 0));
-  }
+$form = array();
+_boincimport_db_connect() ;
+// Causes problems with form api redirect
+//ini_set('display_errors', TRUE);
+
+// Adjust how long you want the script to run...
+if (!ini_get('safe_mode')) {
+// This will always be set on PHP7, but not on PHP5 with safe mode
+set_time_limit(variable_get('boincimport_time_limit', 0));
+}
 
-  // Check for a lock on the import process
-  if (variable_get('boincimport_process_locked', 0)) {
-    drupal_set_message(t('The import process is locked. If you are sure that
+// Check for a lock on the import process
+if (variable_get('boincimport_process_locked', 0)) {
+drupal_set_message(t('The import process is locked. If you are sure that
       it is no longer running, you may !unlock_it', 
-      array('!unlock_it' => l(t('release the lock'),
-        'admin/boinc/import/unlock')
-      )), 'warning');
-    watchdog('boincimport', 'The import process is locked. If you are sure that
+  array('!unlock_it' => l(t('release the lock'),
+    'admin/boinc/import/unlock')
+  )), 'warning');
+watchdog('boincimport', 'The import process is locked. If you are sure that
       it is no longer running, you may !unlock_it', 
-      array('!unlock_it' => l(t('release the lock'),
-        'admin/boinc/import/unlock')
-      ), WATCHDOG_WARNING); 
-  }
-  else {
-    $boincimport_functions = array(
-      'users' => t('Import users'),
-      'teams' => t('Import teams'),
-      'friends' => t('Import friendships'), 
-      'preferences' => t('Import user preferences'),
-      'private messages' => t('Import private messages'),
-      'categories' => t('Import forum containers'),
-      'topics' => t('Import topics'),
-      'posts' => t('Import posts'),
-      'team forums' => t('Import team forums'),
-      'team topics' => t('Import team topics'),
-      'team posts' => t('Import team posts'),
-      'url' => t('Transform URLs'),
-    );
-
-    $form['import'] = array(
-      '#type' => 'select',
-      '#title' => t('Next import to perform'),
-      '#default_value' => $_SESSION['boincimport_stage_selected'],
-      '#options' => $boincimport_functions,
-    );
-    $form[] = array(
-      '#type' => 'submit',
-      '#value' => t('Import'),
-    );
-  }
-  return $form;
+  array('!unlock_it' => l(t('release the lock'),
+    'admin/boinc/import/unlock')
+  ), WATCHDOG_WARNING); 
+}
+else {
+$boincimport_functions = array(
+  'users' => t('Import users'),
+  'teams' => t('Import teams'),
+  'friends' => t('Import friendships'), 
+  'preferences' => t('Import user preferences'),
+  'private messages' => t('Import private messages'),
+  'categories' => t('Import forum containers'),
+  'topics' => t('Import topics'),
+  'posts' => t('Import posts'),
+  'team forums' => t('Import team forums'),
+  'team topics' => t('Import team topics'),
+  'team posts' => t('Import team posts'),
+  'url' => t('Transform URLs'),
+);
+
+$form['import'] = array(
+  '#type' => 'select',
+  '#title' => t('Next import to perform'),
+  '#default_value' => $_SESSION['boincimport_stage_selected'],
+  '#options' => $boincimport_functions,
+);
+$form[] = array(
+  '#type' => 'submit',
+  '#value' => t('Import'),
+);
+}
+return $form;
 }
 
 function boincimport_process_form_submit($form, $form_state) {
   
-  // Lock the import process
-  if (!variable_get('boincimport_process_locked', 0)) {
-    variable_set('boincimport_process_locked', 1);
-  }
-  else {
-    watchdog('boincimport', 'The import process is locked, but another process
+// Lock the import process
+if (!variable_get('boincimport_process_locked', 0)) {
+variable_set('boincimport_process_locked', 1);
+}
+else {
+watchdog('boincimport', 'The import process is locked, but another process
       is trying to access it...', array(), WATCHDOG_WARNING); 
-  }
+}
   
-  switch ($form_state['values']['import']) {
-    case 'users':
-      boincimport_users();
-      break;
+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 'teams':
+boincimport_teams();
+if (!variable_get('boincimport_import_team_successful', 0)) {
+$_SESSION['boincimport_stage_selected'] = 'teams';
+}
+else {
+$_SESSION['boincimport_stage_selected'] = 'friends';
+}
+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 'friends':
+boincimport_friends();
+if (!variable_get('boincimport_import_friend_successful', 0)) {
+$_SESSION['boincimport_stage_selected'] = 'friends';
+}
+else {
+$_SESSION['boincimport_stage_selected'] = 'preferences';
+}
+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 '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 '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 '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 '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 '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 '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 '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 '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 '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 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 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 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 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 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 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;
-  }
+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;
+}
 }
 
 function boincimport_complete($section) {