BOINC / boinc

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

Braces +1 added lines, -2 removed lines

@@ -53,8 +53,7 @@
             $boincusername = (!empty($account)) ? $account->boincuser_name : variable_get('anonymous', 'Anonymous');
             $replace = TRUE;
           }
-        }
-        elseif ($nid && _quote_variable_get('node_link_display')) {
+        } elseif ($nid && _quote_variable_get('node_link_display')) {
           $node = node_load(array('nid' => $nid));
           if (in_array($node->type, _quote_variable_get('node_types'))) {
             $account = user_load($node->uid);

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

@@ -45,13 +45,13 @@ 
         $nid = arg(2);
         $cid = arg(3);
 
-        $replace = FALSE;
+        $replace = false;
         if ($cid) {
           $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0', $cid));
           if ($comment->uid) {
             $account = user_load($comment->uid);
             $boincusername = (!empty($account)) ? $account->boincuser_name : variable_get('anonymous', 'Anonymous');
-            $replace = TRUE;
+            $replace = true;
           }
         }
         elseif ($nid && _quote_variable_get('node_link_display')) {
@@ -59,7 +59,7 @@ 
           if (in_array($node->type, _quote_variable_get('node_types'))) {
             $account = user_load($node->uid);
             $boincusername = (!empty($account)) ? $account->boincuser_name : variable_get('anonymous', 'Anonymous');
-            $replace = TRUE;
+            $replace = true;
           }
         }
 

Indentation +14 added lines, -14 removed lines

@@ -31,43 +31,43 @@
  */
 
 function boincuser_quote_form_alter(&$form, $form_state, $form_id) {
-  switch ($form_id) {
-  // Comment form
-  case 'comment_form':
+    switch ($form_id) {
+    // Comment form
+    case 'comment_form':
     // If there is a quote as part of the comment body, replace the
     // first instance of quote=author with quote=boincusername. This
     // is done with regexp.
     // Modify for quotes only
     if ((isset($_POST['quote']) || isset($_GET['quote']) && $_GET['quote'])) {
-      // If default_value is already set, then modify it
-      if (isset($form['comment_filter']['comment']['#default_value'])) {
+        // If default_value is already set, then modify it
+        if (isset($form['comment_filter']['comment']['#default_value'])) {
         $nid = arg(2);
         $cid = arg(3);
 
         $replace = FALSE;
         if ($cid) {
-          $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0', $cid));
-          if ($comment->uid) {
+            $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0', $cid));
+            if ($comment->uid) {
             $account = user_load($comment->uid);
             $boincusername = (!empty($account)) ? $account->boincuser_name : variable_get('anonymous', 'Anonymous');
             $replace = TRUE;
-          }
+            }
         }
         elseif ($nid && _quote_variable_get('node_link_display')) {
-          $node = node_load(array('nid' => $nid));
-          if (in_array($node->type, _quote_variable_get('node_types'))) {
+            $node = node_load(array('nid' => $nid));
+            if (in_array($node->type, _quote_variable_get('node_types'))) {
             $account = user_load($node->uid);
             $boincusername = (!empty($account)) ? $account->boincuser_name : variable_get('anonymous', 'Anonymous');
             $replace = TRUE;
-          }
+            }
         }
 
         // Replace the quoted author name (drupal name) with BOINC username.
         if ($replace) {
-          $form['comment_filter']['comment']['#default_value'] = preg_replace("/\[quote=(.*?)\]/", "[quote=${boincusername}]", $form['comment_filter']['comment']['#default_value'], 1);
+            $form['comment_filter']['comment']['#default_value'] = preg_replace("/\[quote=(.*?)\]/", "[quote=${boincusername}]", $form['comment_filter']['comment']['#default_value'], 1);
+        }
         }
-      }
     }
     break;
-  }
+    }
 }

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

Braces +15 added lines, -25 removed lines

@@ -418,11 +418,9 @@ 
 
         if ($edit['boincuser_name']) {
           $myname = $edit['boincuser_name'];
-        }
-        else if ($edit['name']) {
+        } else if ($edit['name']) {
           $myname = $edit['name'];
-        }
-        else {
+        } else {
           $myname = 'noname';
         }
 
@@ -434,8 +432,7 @@ 
         // If the 'pass' variable is already a hash, then don't hash it again.
         if ($edit['boinchash_flag']) {
           $user_params['passwd_hash'] = $edit['pass'];
-        }
-        else {
+        } else {
           // The passwd_hash here is only the md5() hash. This is
           // because BOINC make_user(), called later, will run
           // password_hash() on this md5 hash.
@@ -506,8 +503,7 @@ 
               $prev_email = $account->mail;
               $mytime = (user_access('administer users')) ? $boinc_user->email_addr_change_time : time();
               $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}', previous_email_addr = '{$prev_email}', email_addr_change_time = $mytime";
-            }
-            else {
+            } else {
               $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}'";
             }
 
@@ -750,8 +746,7 @@ 
       case FLAG_FRIEND_APPROVAL:
         if ($action == 'flag') {
           $form['flag_friend_submit']['#value'] = bts('Approve request', array(), NULL, 'boinc:friends-page');
-        }
-        elseif ($action == 'unflag') {
+        } elseif ($action == 'unflag') {
           unset($form['actions']);
           $form['flag_friend_submit']['#value'] = bts('Deny request', array(), NULL, 'boinc:friends-page');
         }
@@ -1527,8 +1522,7 @@ 
         array(
           '!boinccmd' => l('boinccmd --project_attach', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
         ), NULL, 'boinc:join-page') . '</li>';
-    }
-    else {
+    } else {
       $output .= '<li>' . bts("If you're running a command-line version of BOINC,
         please follow the <b>!instructionslink</b> to first <i>create an account</i>, and then <i>attach</i> to this project. Use the same project URL as above.",
         array(
@@ -1563,8 +1557,7 @@ 
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
       ), NULL, 'boinc:join-page') . '</li>';
-    }
-    else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
+    } else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
       $output .= '  <li>' . bts("Read our !rules_and_policies.", array(
         '!rules_and_policies' => l(bts('Rules and Policies', array(), NULL, 'boinc:join-page'), $ruleslink),
       ), NULL, 'boinc:join-page') . '</li>';
@@ -1606,8 +1599,7 @@ 
   ));
   if ($current_uotd->uotd_time < strtotime('today midnight')) {
     $uotd = boincuser_select_user_of_the_day();
-  }
-  else {
+  } else {
     $uotd = user_load($current_uotd->uid);
   }
   $uotd_image = boincuser_get_user_profile_image($uotd->uid, FALSE);
@@ -1618,8 +1610,7 @@ 
   $output .= '  <div>' . bts($site_message, array(), NULL, "project:front page") . ' ' . l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about') . '</div>';
   if ($user->uid) {
     $output .= '  <div>' . l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))) . '</div>';
-  }
-  else {
+  } else {
     $output .= '  <div>' . l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))) . '</div>';
   }
   $output .= '</div>';
@@ -1704,12 +1695,10 @@ 
     if ( ($params['passwd_hash'] == $boinc_user->passwd_hash) or
     password_verify($params['passwd_hash'], $boinc_user->passwd_hash) ) {
       $output = array('authenticator' => $boinc_user->authenticator);
-    }
-    else {
+    } else {
       xml_error(-137);
     }
-  }
-  else {
+  } else {
     // Verify that there isn't somehow a Drupal user already (not possible with proper function)
     if ($existing_user = user_load(array('mail' => $params['email_addr']))) {
       xml_error(-137, 'account error');
@@ -2193,7 +2182,9 @@ 
     'cpid' => $cpid
   );
   $args = array();
-  foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
+  foreach ($get as $arg => $value) {
+      $args[] = "{$arg}=" . rawurlencode($value);
+  }
   $query = '?' . implode('&', $args);
   
   // Load XML from RPC
@@ -2324,8 +2315,7 @@ 
       if ($node->uid == 0 || strlen($node->name) == 0) {
         // @see user_validate_name(). !'0' === TRUE.
         $document->ss_name = '0';
-      }
-      else {
+      } else {
         $document->ss_name = $account->boincuser_name;
         // We want the name to be searchable for keywords.
         $document->tos_name = $account->boincuser_name;

Indentation +847 added lines, -847 removed lines

@@ -27,44 +27,44 @@ 
  * with defined URL paths
  */
 function boincuser_menu() {
-  $items['account/posts'] = array(
+    $items['account/posts'] = array(
     'title' => 'Recent posts',
     'description' => '',
     'page callback' => 'boincuser_goto_recent_posts',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['account/profile'] = array(
+    );
+    $items['account/profile'] = array(
     'title' => '',
     'description' => '',
     'page callback' => 'boincuser_view_profile',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_NORMAL_ITEM
-  );
-  $items['account/profile/view'] = array(
+    );
+    $items['account/profile/view'] = array(
     'title' => 'View',
     'description' => 'Show a user profile',
     'page callback' => 'boincuser_view_profile',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => 0
-  );
-  $items['account/profile/edit'] = array(
+    );
+    $items['account/profile/edit'] = array(
     'title' => 'Edit',
     'description' => 'Edit a user profile',
     'page callback' => 'boincuser_edit_profile',
     'access arguments' => array('edit own profile content'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 5
-  );
-  $items['account/team'] = array(
+    );
+    $items['account/team'] = array(
     'title' => 'User team',
     'description' => '',
     'page callback' => 'boincuser_goto_team',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['moderate/profile/%user/approve'] = array(
+    );
+    $items['moderate/profile/%user/approve'] = array(
     'title' => 'Profile approval',
     'description' => 'Approve profile content',
     'page callback' => 'boincuser_moderate_profile_approve',
@@ -72,8 +72,8 @@ 
     'access arguments' => array('edit any profile content'),
     'type' => MENU_CALLBACK,
     'weight' => 5
-  );
-  $items['moderate/profile/%user/edit'] = array(
+    );
+    $items['moderate/profile/%user/edit'] = array(
     'title' => 'Profile editor',
     'description' => 'Edit a user profile',
     'page callback' => 'boincuser_edit_profile',
@@ -81,8 +81,8 @@ 
     'access arguments' => array('edit any profile content'),
     'type' => MENU_CALLBACK,
     'weight' => 5
-  );
-  $items['moderate/profile/%/reject'] = array(
+    );
+    $items['moderate/profile/%/reject'] = array(
     'title' => bts('Reject profile', array(), NULL, 'boinc:moderate-user'),
     'description' => 'Reject profile content',
     'page callback' => 'drupal_get_form',
@@ -90,60 +90,60 @@ 
     'access arguments' => array('edit any profile content'),
     'type' => MENU_CALLBACK,
     'weight' => 5
-  );
-  $items['moderate/user/%/ban'] = array(
+    );
+    $items['moderate/user/%/ban'] = array(
     'title' => bts('Ban user', array(), NULL, 'boinc:moderate-ban-user'),
     'description' => 'Ban a user from using community features',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_moderate_user_ban_form', 2),
     'access callback' => 'boincuser_moderate_community_access',
     'type' => MENU_CALLBACK,
-  );
-  $items['join'] = array(
+    );
+    $items['join'] = array(
     'title' => '',
     'description' => '',
     'page callback' => 'join_page',
     'access arguments' => array('access content'),
     'type' => MENU_NORMAL_ITEM
-  );
-  $items['join/new'] = array(
+    );
+    $items['join/new'] = array(
     'title' => bts("I'm new"),
     'page callback' => 'join_page',
     'page arguments' => array(1),
     'access arguments' => array('access content'),
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => 0
-  );
-  $items['join/boinc'] = array(
+    );
+    $items['join/boinc'] = array(
     'title' => bts("I'm a BOINC user"),
     'page callback' => 'join_page',
     'page arguments' => array(1),
     'access arguments' => array('access content'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 5
-  );
-  $items['user/login/auth'] = array(
+    );
+    $items['user/login/auth'] = array(
     'title' => bts('Authenticator login', array(), NULL, 'boinc:authenticator-login-page'),
     'description' => 'Log in using a user authenticator',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_authloginform'),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
-  );
-  $items['user/termsofuse'] = array(
+    );
+    $items['user/termsofuse'] = array(
     'title' => bts('Terms of Use', array(), NULL, 'boinc:termsofuse-form'),
     'description' => 'A site\'s term of use.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_termsofuse_form'),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['user_control'] = array(
+    );
+    $items['user_control'] = array(
     'page callback' => 'boincuser_control',
     'access arguments' => array('access user profiles'),
     'type' => MENU_CALLBACK
-  );
-  $items['admin/boinc'] = array(
+    );
+    $items['admin/boinc'] = array(
     'title' => 'BOINC configuration',
     'position' => 'right',
     'weight' => -8,
@@ -151,8 +151,8 @@ 
     'access arguments' => array('administer site configuration'),
     'file' => 'system.admin.inc',
     'file path' => drupal_get_path('module', 'system'),
-  );
-  $items['admin/boinc/environment'] = array(
+    );
+    $items['admin/boinc/environment'] = array(
     'title' => 'Environment: General',
     'description' => 'Set paths to BOINC functions and any other necessary
       variables that establish a BOINC environment.',
@@ -161,8 +161,8 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincuser.admin.inc'
-  );
-  $items['admin/boinc/scheduler'] = array(
+    );
+    $items['admin/boinc/scheduler'] = array(
     'title' => 'Environment: Scheduling server URLs',
     'description' => 'Set BOINC scheduler options.',
     'page callback' => 'drupal_get_form',
@@ -170,8 +170,8 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincuser.admin.inc'
-  );
-  $items['admin/boinc/weboptions'] = array(
+    );
+    $items['admin/boinc/weboptions'] = array(
     'title' => 'Environment: Website Options',
     'description' => 'Set options configuring this Drupal-BOINC Web site.',
     'page callback' => 'drupal_get_form',
@@ -179,117 +179,117 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincuser.admin.inc'
-  );
+    );
 
-  $items['create_account.php'] = array(
+    $items['create_account.php'] = array(
     'title' => 'Create Account RPC',
     'description' => 'RPC for creating user accounts.',
     'page callback' => 'boincuser_create_account',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK
-  );
-  $items['account_finish.php'] = array(
+    );
+    $items['account_finish.php'] = array(
     'title' => 'Welcome to ' . variable_get('site_name', 'Drupal-BOINC'),
     'description' => 'RPC for after a user has created an account.',
     'page callback' => 'boincuser_account_finish',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK,
-  );
-  $items['boincuser/autocomplete'] = array(
+    );
+    $items['boincuser/autocomplete'] = array(
     'page callback' => '_boincuser_user_name_autocomplete',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK,
-  );
-  $items['user/%user/recoveremail/%'] = array(
+    );
+    $items['user/%user/recoveremail/%'] = array(
     'title' => t('Recover previous email'),
     'description' => t('Form to revert email to previous address.'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_revertemail', 3),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['recover_email.php'] = array(
+    );
+    $items['recover_email.php'] = array(
     'title' => t('Recover previous email'),
     'description' => t('redirect'),
     'page callback' => '_boincuser_redirect_recover_email',
     'access callback' => TRUE,
     'type' => MENU_CALLBACK,
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implementation of hook_init()
  */
 function boincuser_init() {
-  global $user;
-  // Skip this check for charts, which are loaded separately
-  // (may get duplicate or unexpected messages otherwise)
-  if (substr($_GET['q'], 0, 7) == 'charts/') {
+    global $user;
+    // Skip this check for charts, which are loaded separately
+    // (may get duplicate or unexpected messages otherwise)
+    if (substr($_GET['q'], 0, 7) == 'charts/') {
     return;
-  }
+    }
 
-  // If admin user, do some basic site functionality checks
-  if (user_access('administer site configuration')) {
+    // If admin user, do some basic site functionality checks
+    if (user_access('administer site configuration')) {
     // Ensure we have a configured BOINC environment
     boinc_get_path();
     boinc_get_scheduler_tags();
-  }
+    }
 
-  // Check credits for the verified contributor role
-  boincuser_check_credit_requirements();
+    // Check credits for the verified contributor role
+    boincuser_check_credit_requirements();
 
-  if (module_exists('boincteam')) {
+    if (module_exists('boincteam')) {
     // Display any persistent team messages
     boincteam_show_messages();
-  }
+    }
 
-  // Check if user has agreed to the terms of use. If not, send the
-  // user to the terms-of-use form. This is only makes sense if the
-  // termsofuse is enabled, by having text in the termsofuse variable.
-  $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
-  $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-  if ( (!empty($termsofuse)) and ($user->uid) ) {
+    // Check if user has agreed to the terms of use. If not, send the
+    // user to the terms-of-use form. This is only makes sense if the
+    // termsofuse is enabled, by having text in the termsofuse variable.
+    $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
+    $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
+    if ( (!empty($termsofuse)) and ($user->uid) ) {
     if ( !boincuser_check_termsofuse($user) and ($existinguser_tou) ) {
 
-      // Admins are exempt, otherwise the admin may not be able to
-      // access the site!
-      $administrator_role = array_search('administrator', user_roles(true));
-      if (!isset($user->roles[$administrator_role])) {
+        // Admins are exempt, otherwise the admin may not be able to
+        // access the site!
+        $administrator_role = array_search('administrator', user_roles(true));
+        if (!isset($user->roles[$administrator_role])) {
         $path = drupal_get_path_alias($_GET['q']);
 
         // Any paths that should NOT be redirected go here.
         // The site will not function correctly if these are not exempt!
         $paths0 = array(
-          'user/termsofuse',
-          'logout',
-          'account/info/edit',
-          'user/' . $user->uid . '/edit',
-          'user/' . $user->uid . '/recoveremail/*',
-          'recover_email.php',
+            'user/termsofuse',
+            'logout',
+            'account/info/edit',
+            'user/' . $user->uid . '/edit',
+            'user/' . $user->uid . '/recoveremail/*',
+            'recover_email.php',
         );
         if (module_exists('boincuser_delete')) {
-          $paths0[] = 'user/' . $user->uid . '/delete';
-          $paths0[] = 'user/' . $user->uid . '/deleteconfirm/*';
-          $paths0[] = 'user/' . $user->uid . '/odeleteconfirm/*';
+            $paths0[] = 'user/' . $user->uid . '/delete';
+            $paths0[] = 'user/' . $user->uid . '/deleteconfirm/*';
+            $paths0[] = 'user/' . $user->uid . '/odeleteconfirm/*';
         }
 
         // Paths added by the admin
         $paths1 = preg_split('/\r\n|\r|\n/', variable_get('boinc_weboptions_pathstoignore', "moderation\ncontent/moderation\nprivacy"));
         $paths2 = array();
         if (is_array($paths1)) {
-          $paths2 = array_map('strtolower', $paths1);
+            $paths2 = array_map('strtolower', $paths1);
         }
 
         // paths to ignore
         $paths_to_ignore = array_unique( array_merge($paths0, $paths2) );
 
         if (!_boincuser_ignore_paths($path, $paths_to_ignore)) {
-          drupal_goto('user/termsofuse');
+            drupal_goto('user/termsofuse');
+        }
         }
-      }
     }
-  }
+    }
 }
 
 /**
@@ -297,13 +297,13 @@ 
  * Drupal user operations
  */
 function boincuser_user($op, &$edit, &$account, $category = NULL) {
-  require_boinc('boinc_db');
-  require_boinc('user');
-  require_boinc('xml');
+    require_boinc('boinc_db');
+    require_boinc('user');
+    require_boinc('xml');
 
-  require_boinc('password_compat/password');
-  // Handle BOINC integration for users with UID > 1 (skip anonymous and admin)
-  if (isset($account->uid) && ($account->uid > 1)) {
+    require_boinc('password_compat/password');
+    // Handle BOINC integration for users with UID > 1 (skip anonymous and admin)
+    if (isset($account->uid) && ($account->uid > 1)) {
     switch($op) {
     case 'load':
       // User loading; insert BOINC data into the user object
@@ -311,11 +311,11 @@ 
         SELECT boinc_id, penalty_expiration
         FROM {boincuser} WHERE uid = %d",
         $account->uid
-      ));
-      $account->boincuser_id = $drupal_user->boinc_id;
-      $account->boincuser_penalty_expiration = $drupal_user->penalty_expiration;
-      db_set_active('boinc_rw');
-      $boinc_user = db_fetch_object(db_query("
+        ));
+        $account->boincuser_id = $drupal_user->boinc_id;
+        $account->boincuser_penalty_expiration = $drupal_user->penalty_expiration;
+        db_set_active('boinc_rw');
+        $boinc_user = db_fetch_object(db_query("
         SELECT
           name,
           authenticator,
@@ -331,29 +331,29 @@ 
         FROM {user}
         WHERE id = %d",
         $account->boincuser_id
-      ));
-      $account->boincuser_name = $boinc_user->name;
-      $account->boincuser_account_key = $boinc_user->authenticator;
-      $account->boincuser_weak_auth = md5($boinc_user->authenticator . $boinc_user->passwd_hash);
-      $account->boincuser_total_credit = round($boinc_user->total_credit);
-      $account->boincuser_expavg_credit = round($boinc_user->expavg_credit);
-      $account->boincuser_expavg_time = round($boinc_user->expavg_time);
-      $account->boincuser_cpid = md5($boinc_user->cross_project_id . $account->mail);
-      $account->boincuser_default_pref_set = $boinc_user->venue;
-      $account->boincteam_id = $boinc_user->teamid;
-      $account->boincuser_previous_email_addr = $boinc_user->previous_email_addr;
-      $account->boincuser_email_addr_change_time = $boinc_user->email_addr_change_time;
-      db_set_active('default');
-      // Set Drupal team ID
-      $account->team = NULL;
-      if ($account->boincteam_id) {
+        ));
+        $account->boincuser_name = $boinc_user->name;
+        $account->boincuser_account_key = $boinc_user->authenticator;
+        $account->boincuser_weak_auth = md5($boinc_user->authenticator . $boinc_user->passwd_hash);
+        $account->boincuser_total_credit = round($boinc_user->total_credit);
+        $account->boincuser_expavg_credit = round($boinc_user->expavg_credit);
+        $account->boincuser_expavg_time = round($boinc_user->expavg_time);
+        $account->boincuser_cpid = md5($boinc_user->cross_project_id . $account->mail);
+        $account->boincuser_default_pref_set = $boinc_user->venue;
+        $account->boincteam_id = $boinc_user->teamid;
+        $account->boincuser_previous_email_addr = $boinc_user->previous_email_addr;
+        $account->boincuser_email_addr_change_time = $boinc_user->email_addr_change_time;
+        db_set_active('default');
+        // Set Drupal team ID
+        $account->team = NULL;
+        if ($account->boincteam_id) {
         $account->team = db_result(db_query("
           SELECT nid FROM {boincteam} WHERE team_id = %d",
-          $account->boincteam_id
+            $account->boincteam_id
         ));
-      }
-      // Set post count
-      $account->post_count = db_result(db_query("
+        }
+        // Set post count
+        $account->post_count = db_result(db_query("
         SELECT COUNT(*) +
         (
           SELECT COUNT(*) FROM {node}
@@ -366,8 +366,8 @@ 
         WHERE comments.uid = '%d'
         AND node.status = 1",
         $account->uid, $account->uid
-      ));
-      break;
+        ));
+        break;
 
     case 'view':
       // SAMPLE: Add BOINC data to the user profile
@@ -393,74 +393,74 @@ 
         case 'user_account':
           // Validate data before updating user account info
           boincuser_account_validate($edit, $account);
-          break;
+            break;
 
         default:
 
         }
         // We don't want to save validation source, so remove it
         $edit['validation_source'] = null;
-      }
-      break;
+        }
+        break;
 
     case 'insert':
       // New user being added to the system
       $imported = $_SESSION['importedUser'];
-      unset($_SESSION['importedUser']);
+        unset($_SESSION['importedUser']);
 
-      watchdog(
+        watchdog(
         'boincuser',
         'Creating user account for %email_addr',
         array('%email_addr' => $edit['mail']),
         WATCHDOG_NOTICE
-      );
+        );
 
-      // The create_acount RPC will call this block of code when
-      // user_save() is used. If user is registering using the Web
-      // registration form, create a BOINC user and relationships.
-      // Create a BOINC account unless importing from BOINC.
-      if (!$imported) {
+        // The create_acount RPC will call this block of code when
+        // user_save() is used. If user is registering using the Web
+        // registration form, create a BOINC user and relationships.
+        // Create a BOINC account unless importing from BOINC.
+        if (!$imported) {
 
         // set email address lower-case
         $lower_email_addr = strtolower($edit['mail']);
 
         if ($edit['boincuser_name']) {
-          $myname = $edit['boincuser_name'];
+            $myname = $edit['boincuser_name'];
         }
         else if ($edit['name']) {
-          $myname = $edit['name'];
+            $myname = $edit['name'];
         }
         else {
-          $myname = 'noname';
+            $myname = 'noname';
         }
 
         $user_params = array(
-          'email_addr' => $lower_email_addr,
-          'name' => $myname,
+            'email_addr' => $lower_email_addr,
+            'name' => $myname,
         );
 
         // If the 'pass' variable is already a hash, then don't hash it again.
         if ($edit['boinchash_flag']) {
-          $user_params['passwd_hash'] = $edit['pass'];
+            $user_params['passwd_hash'] = $edit['pass'];
         }
         else {
-          // The passwd_hash here is only the md5() hash. This is
-          // because BOINC make_user(), called later, will run
-          // password_hash() on this md5 hash.
-          $user_params['passwd_hash'] = md5($edit['pass'].$lower_email_addr);
+            // The passwd_hash here is only the md5() hash. This is
+            // because BOINC make_user(), called later, will run
+            // password_hash() on this md5 hash.
+            $user_params['passwd_hash'] = md5($edit['pass'].$lower_email_addr);
         }
 
         $boinc_user = boincuser_register_make_user($user_params);
         if (!$boinc_user) {
-          // Account exists with this email addr
-          form_set_error('email', bts('Error creating BOINC account.', array(), NULL, 'boinc:add-new-user'));
-          return;
+            // Account exists with this email addr
+            form_set_error('email', bts('Error creating BOINC account.', array(), NULL, 'boinc:add-new-user'));
+            return;
         }
 
         // Add user to community role by default (not banned)
         $unrestricted_role = array_search('community member', user_roles(true));
         $edit['roles'] = array(
-          $unrestricted_role => ''
+            $unrestricted_role => ''
         );
 
         // Disable show_hosts flag, set to TRUE by default
@@ -471,14 +471,14 @@ 
         // Cross reference Drupal account with BOINC
         $reference = db_query("INSERT INTO {boincuser} SET uid='%d', boinc_id='%d'", $account->uid, $boinc_user->id);
         if (!$reference) {
-          drupal_set_message(t('Error connecting BOINC account.'), 'error');
-          return;
+            drupal_set_message(t('Error connecting BOINC account.'), 'error');
+            return;
         }
 
         // if terms of use exist, the user must agree.
         $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
         if (!empty($termsofuse)) {
-          $reference2 = boincuser_consentto_termsofuse($account);
+            $reference2 = boincuser_consentto_termsofuse($account);
         }
 
         // Don't save custom fields to the Drupal user object
@@ -486,10 +486,10 @@ 
         $edit['boinchash_flag'] = null;
         // Set email address to lower case in Drupal users table
         if ($account) {
-          user_save($account, array('mail' => $lower_email_addr));
+            user_save($account, array('mail' => $lower_email_addr));
         }
-      }
-      break;
+        }
+        break;
 
     case 'update':
       if (isset($edit['update_source'])) {
@@ -500,8 +500,8 @@ 
           // Ensure that BOINC data is altered
 
           $changing_email = ($edit['mail'] AND $edit['mail'] != $boinc_user->email_addr) ? true : false;
-          $changing_pass = ($edit['pass']) ? true : false;
-          if ($changing_email OR $changing_pass) {
+            $changing_pass = ($edit['pass']) ? true : false;
+            if ($changing_email OR $changing_pass) {
             // set email address to lower-case
             $lower_email_addr = strtolower($edit['mail']);
 
@@ -510,47 +510,47 @@ 
             $passwd_hash = password_hash( md5($passwd.$lower_email_addr), PASSWORD_DEFAULT );
             // Algorithm for changing email and/or password
             if ($changing_email) {
-              // locally store current email to set as previous email
-              $prev_email = $account->mail;
-              $mytime = (user_access('administer users')) ? $boinc_user->email_addr_change_time : time();
-              $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}', previous_email_addr = '{$prev_email}', email_addr_change_time = $mytime";
+                // locally store current email to set as previous email
+                $prev_email = $account->mail;
+                $mytime = (user_access('administer users')) ? $boinc_user->email_addr_change_time : time();
+                $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}', previous_email_addr = '{$prev_email}', email_addr_change_time = $mytime";
             }
             else {
-              $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}'";
+                $querypart = "email_addr='{$lower_email_addr}', passwd_hash='{$passwd_hash}'";
             }
 
             // Update user account information
             $result = $boinc_user->update($querypart);
 
             if ($changing_email) {
-              // reload account
-              $account = user_load($account->uid);
-              _boincuser_send_emailchange($account, $lower_email_addr, $prev_email, user_access('administer users'));
+                // reload account
+                $account = user_load($account->uid);
+                _boincuser_send_emailchange($account, $lower_email_addr, $prev_email, user_access('administer users'));
             }
 
             // Change email to edit to lower-case version, this sets
             // email in Drupal database to the lower-case email
             // address.
             $edit['mail'] = strtolower($lower_email_addr);
-          }
+            }
 
-          // Change boinc username
-          if ($edit['boincuser_name'] and ($edit['boincuser_name'] != $boinc_user->name)) {
+            // Change boinc username
+            if ($edit['boincuser_name'] and ($edit['boincuser_name'] != $boinc_user->name)) {
             $boincuser_name = $edit['boincuser_name'];
             $result = $boinc_user->update(
                 "name='{$boincuser_name}'"
             );
-          }
+            }
 
-          break;
+            break;
         case 'user_profile':
           if ($edit['boincuser_name'] != $boinc_user->name) {
             $boincuser_name = $edit['boincuser_name'];
             $result = $boinc_user->update(
                 "name='{$boincuser_name}'"
             );
-          }
-          break;
+            }
+            break;
         default:
         }
         // We don't want to save update source or duplicate custom fields, so
@@ -558,23 +558,23 @@ 
         $edit['update_source'] = null;
         $edit['boincuser_name'] = null;
         $edit['current_pass'] = null;
-      }
-      break;
+        }
+        break;
 
     case 'login':
       // Function is forward compatible to Drupal 7
       boincuser_user_login($edit, $account);
-      break;
+        break;
 
     case 'delete':
       // Function is forward compatible to Drupal 7
       boincuser_user_delete($account);
-      break;
+        break;
 
     default:
 
     }
-  }
+    }
 }
 
 /**
@@ -583,39 +583,39 @@ 
  *(forward compatible to Drupal 7).
  */
 function boincuser_user_login(&$edit, $account) {
-  $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
-  $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-
-  // Use the same code as boincuser_form_alter(), for case
-  // 'user_profile_form', if the refering page is the user password
-  // reset form, then do not check for terms of use.
-  $reset_pass = (strpos($_SERVER['HTTP_REFERER'], "/user/reset/$account->uid") === FALSE) ? 0 : 1;
-  if ($reset_pass) {
+    $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
+    $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
+
+    // Use the same code as boincuser_form_alter(), for case
+    // 'user_profile_form', if the refering page is the user password
+    // reset form, then do not check for terms of use.
+    $reset_pass = (strpos($_SERVER['HTTP_REFERER'], "/user/reset/$account->uid") === FALSE) ? 0 : 1;
+    if ($reset_pass) {
     return;
-  }
+    }
 
-  // Check if user has agreed to terms of use.
-  if ( (!empty($termsofuse)) and ($account->uid) and
+    // Check if user has agreed to terms of use.
+    if ( (!empty($termsofuse)) and ($account->uid) and
        (!boincuser_check_termsofuse($account)) and ($existinguser_tou) ) {
 
     // Admins are exempted.
     $administrator_role = array_search('administrator', user_roles(true));
     if (!isset($account->roles[$administrator_role])) {
 
-      // Find and save the current destination and use as an parameter
-      // to send the user back to here he/she came from.
-      $np = ltrim('user/termsofuse', '/');
-      $path_for_destination = rawurlencode($np);
+        // Find and save the current destination and use as an parameter
+        // to send the user back to here he/she came from.
+        $np = ltrim('user/termsofuse', '/');
+        $path_for_destination = rawurlencode($np);
 
-      $query_for_destination = '';
-      $prevdest = $_REQUEST['destination'];
-      if ($prevdest) {
+        $query_for_destination = '';
+        $prevdest = $_REQUEST['destination'];
+        if ($prevdest) {
         $query_for_destination = '?destination=' . $prevdest;
-      }
-      $_REQUEST['destination'] = $path_for_destination . $query_for_destination;
+        }
+        $_REQUEST['destination'] = $path_for_destination . $query_for_destination;
 
     }
-  }
+    }
 }
 
 /**
@@ -624,16 +624,16 @@ 
  */
 function boincuser_user_delete($account) {
 
-  $boincid = $account->boincuser_id;
-  // bug in comment module, remove user name from comments. Find all
-  // comments with uid=0 and clear the field 'name'.
-  $qrc1 = db_query("UPDATE {comments} SET comments.name='' WHERE comments.uid=0");
+    $boincid = $account->boincuser_id;
+    // bug in comment module, remove user name from comments. Find all
+    // comments with uid=0 and clear the field 'name'.
+    $qrc1 = db_query("UPDATE {comments} SET comments.name='' WHERE comments.uid=0");
 
-  // Delete entry in drupal boincuser table.
-  $qrc2 = db_query("DELETE FROM {boincuser} WHERE uid=%d", $account->uid);
-  if (!$qrc2) {
+    // Delete entry in drupal boincuser table.
+    $qrc2 = db_query("DELETE FROM {boincuser} WHERE uid=%d", $account->uid);
+    if (!$qrc2) {
     watchdog('user', 'Error deleting user account, boincuser table UID: %uid.', array('%uid' => $account->uid), WATCHDOG_ERROR);
-  }
+    }
 }
 
 
@@ -642,13 +642,13 @@ 
  * Obsolete in Drupal 7...
  */
 function boincuser_nodeapi(&$node, $op, $a3 = null, $a4 = null) {
-  // In Drupal 7, these operation cases will all exist as their own hooks,
-  // so let's approximate that here so that this function can simply be removed
-  // upon migration to 7
-  switch($op) {
-  case 'update':
+    // In Drupal 7, these operation cases will all exist as their own hooks,
+    // so let's approximate that here so that this function can simply be removed
+    // upon migration to 7
+    switch($op) {
+    case 'update':
     boincuser_node_update($node);
-  }
+    }
 }
 
 /**
@@ -656,8 +656,8 @@ 
  * is updated (forward compatible to Drupal 7)
  */
 function boincuser_node_update($node) {
-  switch($node->type) {
-  case 'profile':
+    switch($node->type) {
+    case 'profile':
     // Update the BOINC database directly
     $account = user_load($node->uid);
     // Save user account data
@@ -669,11 +669,11 @@ 
       UPDATE user
       SET country = '%s', postal_code = '%s', url = '%s', has_profile = 1
       WHERE id = %d",
-      $country, $postal_code, $url, $account->boincuser_id
+        $country, $postal_code, $url, $account->boincuser_id
     );
     db_set_active('default');
     if (!$account_updated) {
-      drupal_set_message(t('Error saving BOINC account info.'), 'error');
+        drupal_set_message(t('Error saving BOINC account info.'), 'error');
     }
     // Save profile data
     $response1 = $node->field_background[0]['value'];
@@ -684,16 +684,16 @@ 
       SET userid = %d, response1 = '%s', response2 = '%s'
       ON DUPLICATE KEY UPDATE
         response1 = '%s', response2 = '%s'",
-      $account->boincuser_id, $response1, $response2,
-      $response1, $response2
+        $account->boincuser_id, $response1, $response2,
+        $response1, $response2
     );
     db_set_active('default');
     if (!$profile_updated) {
-      drupal_set_message(t('Error saving BOINC profile.'), 'error');
+        drupal_set_message(t('Error saving BOINC profile.'), 'error');
     }
     break;
 
-  default:
+    default:
 
   }
 }
@@ -702,21 +702,21 @@ 
 * Implementation of hook_views_api()
 */
 function boincuser_views_api() {
-  return array(
+    return array(
     'api' => 2.0,
     'path' => drupal_get_path('module', 'boincuser')
-  );
+    );
 }
 
 /**
 * Implementation of hook_form_alter()
 */
 function boincuser_form_alter(&$form, $form_state, $form_id) {
-  require_boinc('token');
+    require_boinc('token');
 
-  global $user;
-  switch ($form_id) {
-  case 'flag_confirm':
+    global $user;
+    switch ($form_id) {
+    case 'flag_confirm':
     // The URL seems to be the only way to put any kind of context to this
     // request!
     $action = arg(2);
@@ -725,25 +725,25 @@ 
 
     // Wrap action buttons for styling consistency
     $form['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
 
     switch ($flag_type) {
     case 'friend':
       $friend_id = $form['content_id']['#value'];
-      $flag = flag_get_flag('friend');
-      $friend_status = flag_friend_determine_friend_status($flag, $friend_id, $user->uid);
-
-      // General friend form overrides
-      $form['flag_friend_submit']['#prefix'] = '<li class="first tab">';
-      $form['flag_friend_submit']['#value'] = bts('Send request', array(), NULL, 'boinc:friends-page');
-      $form['flag_friend_submit']['#type'] = 'submit';
-      $form['flag_friend_submit']['#suffix'] = '</li>';
-      $form['flag_friend_submit']['#weight'] = 1002;
-
-      switch ($friend_status) {
-      case FLAG_FRIEND_BOTH:
+        $flag = flag_get_flag('friend');
+        $friend_status = flag_friend_determine_friend_status($flag, $friend_id, $user->uid);
+
+        // General friend form overrides
+        $form['flag_friend_submit']['#prefix'] = '<li class="first tab">';
+        $form['flag_friend_submit']['#value'] = bts('Send request', array(), NULL, 'boinc:friends-page');
+        $form['flag_friend_submit']['#type'] = 'submit';
+        $form['flag_friend_submit']['#suffix'] = '</li>';
+        $form['flag_friend_submit']['#weight'] = 1002;
+
+        switch ($friend_status) {
+        case FLAG_FRIEND_BOTH:
       case FLAG_FRIEND_FLAGGED:
         unset($form['actions']);
         $form['flag_friend_submit']['#value'] = bts('Remove friend', array(), NULL, 'boinc:friends-remove');
@@ -752,53 +752,53 @@ 
         $form['#submit'][] = 'boincuser_fix_unfriend_form_submit';
         $form['#submit'][] = $final_handler;
         break;
-      case FLAG_FRIEND_PENDING:
+        case FLAG_FRIEND_PENDING:
         unset($form['actions']);
         $form['flag_friend_submit']['#value'] = bts('Remove request', array(), NULL, 'boinc:friends-page');
         break;
-      case FLAG_FRIEND_APPROVAL:
+        case FLAG_FRIEND_APPROVAL:
         if ($action == 'flag') {
-          $form['flag_friend_submit']['#value'] = bts('Approve request', array(), NULL, 'boinc:friends-page');
+            $form['flag_friend_submit']['#value'] = bts('Approve request', array(), NULL, 'boinc:friends-page');
         }
         elseif ($action == 'unflag') {
-          unset($form['actions']);
-          $form['flag_friend_submit']['#value'] = bts('Deny request', array(), NULL, 'boinc:friends-page');
+            unset($form['actions']);
+            $form['flag_friend_submit']['#value'] = bts('Deny request', array(), NULL, 'boinc:friends-page');
         }
         break;
-      case FLAG_FRIEND_UNFLAGGED:
+        case FLAG_FRIEND_UNFLAGGED:
       default:
         $user_links[] = array(
-          'title' => bts('Add as friend', array(), NULL, 'boinc:friends-add'),
-          'href' => "flag/confirm/flag/friend/{$account->uid}"
+            'title' => bts('Add as friend', array(), NULL, 'boinc:friends-add'),
+            'href' => "flag/confirm/flag/friend/{$account->uid}"
         );
-      }
-      break;
+        }
+        break;
 
     default:
     }
 
     $form['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_dest) . '</li>',
-      '#weight' => 1004,
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_dest) . '</li>',
+        '#weight' => 1004,
     );
     $form['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
 
     break;
 
-  // General node edit form
-  case 'news_node_form':
+    // General node edit form
+    case 'news_node_form':
     $form['separator_bottom'] = array(
-      '#value' => '<div class="separator buttons"></div>',
-      '#weight' => 999,
+        '#value' => '<div class="separator buttons"></div>',
+        '#weight' => 999,
     );
 
     // Wrap action buttons for styling consistency
     $form['buttons']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
     $form['buttons']['submit']['#value'] = bts('Save changes', array(), NULL, 'boinc:form-save');
@@ -811,15 +811,15 @@ 
     $form['buttons']['preview_changes']['#suffix'] = '</li>';
     $form['buttons']['preview_changes']['#weight'] = 1004;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
-      '#weight' => 1005,
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
+        '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
     $form['buttons']['delete']['#suffix'] = '</li>';
     $form['buttons']['delete']['#weight'] = 1006;
     $form['buttons']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
 
     // Preview is ugly, unset until it works
@@ -827,16 +827,16 @@ 
 
     break;
 
-  case 'node_delete_confirm':
+    case 'node_delete_confirm':
     $form['separator_bottom'] = array(
-      '#value' => '<div class="separator buttons"></div>',
-      '#weight' => 999,
+        '#value' => '<div class="separator buttons"></div>',
+        '#weight' => 999,
     );
 
     // Wrap action buttons for styling consistency
     $form['actions']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['actions']['submit']['#prefix'] = '<li class="first tab">';
     $form['actions']['submit']['#value'] = bts('Delete', array(), NULL, 'boinc:form-delete');
@@ -844,23 +844,23 @@ 
     $form['actions']['submit']['#weight'] = 1002;
     $form['actions']['cancel'] = array(
         '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
-      '#weight' => 1005,
+        '#weight' => 1005,
     );
     $form['actions']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
     $form['#redirect'] = 'account/profile';
     break;
 
-  case 'privatemsg_new':
+    case 'privatemsg_new':
 
     $form['privatemsg']['body']['#title'] = '';
 
     // Wrap action buttons for styling consistency
     $form['privatemsg']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['privatemsg']['submit']['#prefix'] = '<li class="first tab">';
     $form['privatemsg']['submit']['#value'] = bts('Send message', array(), NULL, 'boinc:private-message');
@@ -870,26 +870,26 @@ 
     $form['privatemsg']['preview']['#suffix'] = '</li>';
     $form['privatemsg']['preview']['#weight'] = 1003;
     $form['privatemsg']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
-      '#weight' => 1004,
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+        '#weight' => 1004,
     );
     $form['privatemsg']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
 
     unset($form['privatemsg']['recipient_display']);
 
     break;
 
-  // Login form
-  case 'user_login':
+    // Login form
+    case 'user_login':
   case 'user_login_block':
       drupal_set_title(bts('Login', array(), NULL, 'boinc:menu-link'));
     // Replace name with email in login form
     unset($form['name']);
     array_unshift($form, array(
-      'email' => array(
+        'email' => array(
         '#type' => 'textfield',
         '#title' => bts('Email address', array(), NULL, 'boinc:email-address-to-login'),
         '#size' => ($form_id == 'user_login_block') ? 15 : 60,
@@ -897,18 +897,18 @@ 
         '#required' => TRUE,
         '#attributes' => array('tabindex' => '1'),
         '#description' => bts('Enter your @s email address.', array('@s' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:standard-login-page')
-      ),
-      'validation_source' => array(
+        ),
+        'validation_source' => array(
         '#type' => 'hidden',
         '#value' => 'user_login'
-      )
+        )
     ));
     $form['#redirect'] = 'home';
 
     // Wrap action buttons for styling consistency
     $form['buttons']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['buttons']['submit'] = $form['submit'];
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
@@ -916,8 +916,8 @@ 
     $form['buttons']['submit']['#suffix'] = '</li>';
     $form['buttons']['submit']['#weight'] = 1002;
     $form['buttons']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
     unset($form['submit']);
 
@@ -926,23 +926,23 @@ 
     isset($form['buttons']['submit']['#attributes']) ? array_push($form['buttons']['submit']['#attributes'], array('tabindex' => '3')) : $form['buttons']['submit']['#attributes'] = array('tabindex' => '3');
     // If the user login form is being submitted, use BOINC validation handler.
     if (isset($form_state['post']['email']) and isset($form_state['post']['pass'])) {
-      // Find the local validation function's entry so we can replace it.
-      $array_key = array_search('user_login_authenticate_validate', $form['#validate']);
-      if ($array_key === FALSE) {
+        // Find the local validation function's entry so we can replace it.
+        $array_key = array_search('user_login_authenticate_validate', $form['#validate']);
+        if ($array_key === FALSE) {
         // Could not find it. Some other module must have run form_alter().
         // We will simply add our validation just before the final validator.
         $final_validator = array_pop($form['#validate']);
         $form['#validate'][] = 'boincuser_login_validate';
         $form['#validate'][] = $final_validator;
-      } else {
+        } else {
         // Replace the local validation function with BOINC validation
         $form['#validate'][$array_key] = 'boincuser_login_validate';
-      }
+        }
     }
     break;
 
-  // User credentials form
-  case 'user_profile_form':
+    // User credentials form
+    case 'user_profile_form':
 
     // Use the displaly name as the title, not the username
     $account = user_load($form['#uid']);
@@ -950,28 +950,28 @@ 
 
     // Message for admins
     if (user_access('administer users')) {
-      drupal_set_message(
+        drupal_set_message(
         bts('WARNING: You are editing the information for user. Please note: you may change a user\'s password by itself. But to change the user\'s email address you must change both the email address and the password simultaneously.')
-      , 'warning');
+        , 'warning');
     }
 
     // Set special message if user has not agreed to TOU
     $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
     $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
     if ( (!boincuser_check_termsofuse($account)) and ($existinguser_tou) and (!empty($termsofuse)) and (!user_access('administer users')) ) {
-      drupal_set_message(
+        drupal_set_message(
         bts('INFO: You have not agreed to the terms of use for @project. You may use this form to change your email address and/or password. Please note: you may not delete your account within seven (7) days of changing your email address.',
         array(
-          '@project' => variable_get('site_name','Drupal-BOINC'),
+            '@project' => variable_get('site_name','Drupal-BOINC'),
         ), NULL, 'boinc:account-credentials-change')
-      , 'info');
+        , 'info');
     }
 
     // A bit hackish... but don't require the user to enter his password if
     // coming from the password reset function
     $reset_pass = (strpos($_SERVER['HTTP_REFERER'], "/user/reset/{$form['#uid']}") === FALSE) ? 0 : 1;
     if ($reset_pass) {
-      $_SESSION['reset_pass'] = 1;
+        $_SESSION['reset_pass'] = 1;
     }
 
     // Adjust form elements already present
@@ -983,8 +983,8 @@ 
     $form['account']['pass']['#size'] = 17;
 
     if (user_access('administer users')) {
-      // Add BOINC username (aka displayname)
-      $form['account']['boincuser_name'] = array(
+        // Add BOINC username (aka displayname)
+        $form['account']['boincuser_name'] = array(
         '#type' => 'textfield',
         '#title' => bts('BOINC Username', array(), NULL, 'boinc:user-or-team-name'),
         '#default_value' => $account->boincuser_name,
@@ -992,68 +992,68 @@ 
         '#required' => TRUE,
         '#description' => bts('This is the BOINC (external) username. This is the same setting as found in Account -> Preferences -> Community.', array(), NULL, 'boinc:username-change'),
         '#size' => 40,
-      );
+        );
     }
 
     // If email address was changed less than 7 days (7 * 86400 s)
     // ago, it cannot be changed again.
     $duration = TOKEN_DURATION_ONE_WEEK;
     if (($account->boincuser_email_addr_change_time + $duration) > time() and (!user_access('administer users'))) {
-      $form['account']['mail']['#required'] = FALSE;
-      $form['account']['mailhelp'] = array(
+        $form['account']['mail']['#required'] = FALSE;
+        $form['account']['mailhelp'] = array(
         '#value' => bts("You email address was changed within the past seven (7) days. Please look for an email to !prev_email if you need to revert this change. You may change your email address on !time.",
-          array(
+            array(
             '!prev_email' => $account->boincuser_previous_email_addr,
             '!time' => date('F j, Y \a\t G:i T', $account->boincuser_email_addr_change_time + $duration),
-          ), NULL, 'boinc:account-credentials-change'),
-      );
+            ), NULL, 'boinc:account-credentials-change'),
+        );
     }
 
     if (!$reset_pass AND ($user->uid == $account->uid OR !user_access('administer users'))) {
-      // Add a password authenticator, required to change email or pw
-      $form['account']['current_pass'] = array(
+        // Add a password authenticator, required to change email or pw
+        $form['account']['current_pass'] = array(
         '#type' => 'password',
         '#title' => bts('Enter your password to save changes', array(), NULL, 'boinc:account-credentials-change'),
         '#description' => bts('Enter your current password if changing your email
           address or password.', array(), NULL, 'boinc:account-credentials-change'),
         '#size' => 17,
         '#attributes' => array(
-          'autocomplete' => 'off',
+            'autocomplete' => 'off',
         ),
-      );
+        );
     }
 
     // Add account keys, CPID, etc
     $form['account']['boincuser_id'] = array(
-      '#value' => '
+        '#value' => '
         <div class="form-item">
           <label>' . bts('BOINC user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->boincuser_id . '</span>
         </div>',
     );
     $form['account']['user_id'] = array(
-      '#value' => '
+        '#value' => '
         <div class="form-item">
           <label>' . bts('Drupal user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->uid . '</span>
         </div>',
     );
     $form['account']['account_key'] = array(
-      '#value' => '
+        '#value' => '
         <div class="form-item">
           <label>' . bts('Account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->boincuser_account_key . '</span>
         </div>',
     );
     $form['account']['weak_account_key'] = array(
-      '#value' => '
+        '#value' => '
         <div class="form-item">
           <label>' . bts('Weak account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
           <span>' . "{$account->boincuser_id}_{$account->boincuser_weak_auth}" . '</span>
         </div>',
     );
     $form['account']['cpid'] = array(
-      '#value' => '
+        '#value' => '
         <div class="form-item">
           <label>' . bts('Cross-project ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->boincuser_cpid . '</span>
@@ -1061,30 +1061,30 @@ 
     );
 
     $form['account']['separator_bottom'] = array(
-      '#value' => '<div class="separator buttons"></div>'
+        '#value' => '<div class="separator buttons"></div>'
     );
 
     // Wrap action buttons for styling consistency
     $form['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['submit']['#prefix'] = '<li class="first tab">';
     $form['submit']['#value'] = bts('Save changes', array(), NULL, 'boinc:form-save');
     $form['submit']['#suffix'] = '</li>';
     $form['submit']['#weight'] = 1002;
     $form['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
-      '#weight' => 1003,
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+        '#weight' => 1003,
     );
     if (isset($form['delete']) AND is_array($form['delete'])) {
-      $form['delete']['#prefix'] = '<li class="first alt tab">';
-      $form['delete']['#suffix'] = '</li>';
-      $form['delete']['#weight'] = 1004;
+        $form['delete']['#prefix'] = '<li class="first alt tab">';
+        $form['delete']['#suffix'] = '</li>';
+        $form['delete']['#weight'] = 1004;
     }
     $form['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
 
     // Rearrange form elements
@@ -1104,7 +1104,7 @@ 
     // Remove redundant / unnecessary form elements
     unset($form['theme_select']);
     if (!module_exists('boincuser_delete')) {
-      unset($form['delete']);
+        unset($form['delete']);
     }
 
     // These are on the Community preferences form (boincwork module)
@@ -1120,18 +1120,18 @@ 
 
     // Internal fields to indicate where these user changes are taking place
     array_unshift($form, array(
-      'validation_source' => array(
+        'validation_source' => array(
         '#type' => 'hidden',
         '#value' => 'user_account'
-      ),
-      'update_source' => array(
+        ),
+        'update_source' => array(
         '#type' => 'hidden',
         '#value' => 'user_account'
-      )
+        )
     ));
     break;
 
-  case 'profile_node_form':
+    case 'profile_node_form':
 
     // Use the display name as the title, not the username
     $account = user_load($form['uid']['#value']);
@@ -1142,22 +1142,22 @@ 
     $form['title']['#access'] = FALSE;
 
     $form['separator_bottom'] = array(
-      '#value' => '<div class="separator buttons"></div>',
-      '#weight' => 999,
+        '#value' => '<div class="separator buttons"></div>',
+        '#weight' => 999,
     );
 
     if (module_exists('captcha')) {
-      // Add an optional captcha
-      $form['profile_captcha'] = array(
+        // Add an optional captcha
+        $form['profile_captcha'] = array(
         '#type' => 'captcha',
         '#weight' => 1000,
-      );
+        );
     }
 
     // Wrap action buttons for styling consistency
     $form['buttons']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
     $form['buttons']['submit']['#value'] = bts('Save changes', array(), NULL, 'boinc:form-save');
@@ -1170,8 +1170,8 @@ 
     $form['buttons']['preview_changes']['#suffix'] = '</li>';
     $form['buttons']['preview_changes']['#weight'] = 1004;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
-      '#weight' => 1005,
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+        '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
     $form['buttons']['delete']['#suffix'] = '</li>';
@@ -1179,8 +1179,8 @@ 
     $form['buttons']['delete']['#weight'] = 1006;
     $form['buttons']['delete']['#submit'] = array('_boincuser_node_profile_delete_submit');
     $form['buttons']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
 
     $form['#after_build'][] = 'boincuser_profile_node_form_after_build';
@@ -1193,33 +1193,33 @@ 
 
     // Internal fields to indicate where these user changes are taking place
     array_unshift($form, array(
-      'validation_source' => array(
+        'validation_source' => array(
         '#type' => 'hidden',
         '#value' => 'user_profile'
-      ),
-      'update_source' => array(
+        ),
+        'update_source' => array(
         '#type' => 'hidden',
         '#value' => 'user_profile'
-      )
+        )
     ));
     break;
 
-  // Registration form
-  case 'user_register':
+    // Registration form
+    case 'user_register':
     array_unshift($form, array(
-      'boincuser_name' => array(
+        'boincuser_name' => array(
         '#type' => 'textfield',
         '#title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
         '#default_value' => $edit['boincuser_name'],
         '#maxlength' => USERNAME_MAX_LENGTH,
         '#description' => bts('Spaces are allowed; punctuation is not allowed except for periods, hyphens, and underscores.', array(), NULL, 'boinc:user-register'),
         '#required' => TRUE
-      ),
+        ),
     ));
     // Set name temporarily to dummy value to beat validation
     $form['name'] = array(
-      '#type' => 'hidden',
-      '#value' => rand() . '.' . time()
+        '#type' => 'hidden',
+        '#value' => rand() . '.' . time()
     );
 
     // Add JS for submit button disabling
@@ -1229,50 +1229,50 @@ 
     $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
     if (!empty($termsofuse)) {
 
-      $form['termsofuse'] = array(
+        $form['termsofuse'] = array(
         '#type'   => 'fieldset',
         '#prefix' => '<div id="termsofuse-wrapper">', // This is our wrapper div.
         '#suffix' => '</div>',
         '#tree'   => TRUE,
         '#weight' => -15,
-      );
+        );
 
-      $form['termsofuse']['title1'] = array(
+        $form['termsofuse']['title1'] = array(
         '#weight' => -12,
         '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:user-register' ) . '</h2>',
         '#prefix' => '<div id="register-title1">',
         '#suffix' => '</div>',
-      );
+        );
 
-      $form['termsofuse']['body'] = array(
+        $form['termsofuse']['body'] = array(
         '#weight' => -10,
         '#value' => bts($termsofuse, array(), NULL, 'project:user-register'),
         '#prefix' => '<div id="register-termsofuse">',
         '#suffix' => '</div>',
-      );
+        );
 
-      $form['termsofuse']['agreeTOU'] = array(
+        $form['termsofuse']['agreeTOU'] = array(
         '#type' => 'checkbox',
         '#title' => bts(variable_get('boinc_weboptions_agreequestion', 'Do you agree with the above terms of use?'), array(), NULL, 'project:user-register'),
         '#weight' => -8,
         '#prefix' => '<div id="register-checkbox">',
         '#suffix' => '</div>',
-      );
+        );
     }
 
     $form['title2'] = array(
-      '#weight' => -6,
-      '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), NULL, 'project:user-register') . '</h2>',
-      '#prefix' => '<div id="register-title2">',
-      '#suffix' => '</div>',
+        '#weight' => -6,
+        '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), NULL, 'project:user-register') . '</h2>',
+        '#prefix' => '<div id="register-title2">',
+        '#suffix' => '</div>',
     );
 
     if (module_exists('captcha')) {
-      // Add an optional captcha
-      $form['register_captcha'] = array(
+        // Add an optional captcha
+        $form['register_captcha'] = array(
         '#type' => 'captcha',
         '#weight' => 1000,
-      );
+        );
     }
 
     $form['#validate'][] = 'boincuser_register_validate';
@@ -1280,45 +1280,45 @@ 
     $form['submit']['#weight'] = 1001;
     break;
 
-  // Request new password form
-  case 'user_pass':
+    // Request new password form
+    case 'user_pass':
     drupal_set_title(bts('Forgot password', array(), NULL, 'boinc:forgot-password'));
     // Replace name/email text box with email only; retain "name" label
     // for compatibility with standard Drupal submit function
     unset($form['name']);
     array_unshift($form, array(
-      'name' => array(
+        'name' => array(
         '#type' => 'textfield',
         '#title' => bts('Email address', array(), NULL, 'boinc:email-address-to-login'),
         '#size' => 60,
         '#maxlength' => EMAIL_MAX_LENGTH,
         '#required' => TRUE,
         '#description' => bts(
-          'Enter your email address to receive instructions for resetting your password (or use the !authenticator_login).',
-          array(
+            'Enter your email address to receive instructions for resetting your password (or use the !authenticator_login).',
+            array(
             '!authenticator_login' => l(
-              bts('authenticator-based login', array(), NULL, 'boinc:forgot-password'),
-              'user/login/auth'
+                bts('authenticator-based login', array(), NULL, 'boinc:forgot-password'),
+                'user/login/auth'
+            )
             )
-          )
         , NULL, 'boinc:forgot-password'),
-      ),
+        ),
     ));
 
     if (module_exists('captcha')) {
-      // Add an optional captcha
-      $form['register_captcha'] = array(
+        // Add an optional captcha
+        $form['register_captcha'] = array(
         '#type' => 'captcha',
         '#weight' => 0,
         '#prefix' => '<div id="captcha-password-reset">',
         '#suffix' => '</div>'
-      );
+        );
     }
 
     // Wrap action buttons for styling consistency
     $form['buttons']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
     );
     $form['buttons']['submit'] = $form['submit'];
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
@@ -1326,26 +1326,26 @@ 
     $form['buttons']['submit']['#suffix'] = '</li>';
     $form['buttons']['submit']['#weight'] = 1002;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/login') . '</li>',
-      '#weight' => 1005,
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/login') . '</li>',
+        '#weight' => 1005,
     );
     $form['buttons']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
+        '#value' => '</ul>',
+        '#weight' => 1010,
     );
     unset($form['submit']);
 
     // If the form is being submitted, use BOINC validation handler.
     if (isset($form_state['post']['name'])) {
-      // Prepend the BOINC validation function to local validation
-      array_unshift($form['#validate'], 'boincuser_request_pass_validate');
+        // Prepend the BOINC validation function to local validation
+        array_unshift($form['#validate'], 'boincuser_request_pass_validate');
     }
     break;
 
-  case 'views_exposed_form':
+    case 'views_exposed_form':
       $form['submit']['#value'] = bts('Search', array(), NULL, 'boinc:search-user');
     break;
-  }
+    }
 }
 
 /**
@@ -1353,10 +1353,10 @@ 
  * built; this is called from boincuser_form_alter()
  */
 function boincuser_profile_node_form_after_build($form, &$form_state) {
-  // Move to community prefs form
-  $form_state['storage']['avatar'] = $form['field_image'];
-  unset($form['field_image']);
-  return $form;
+    // Move to community prefs form
+    $form_state['storage']['avatar'] = $form['field_image'];
+    unset($form['field_image']);
+    return $form;
 }
 
 /**
@@ -1364,8 +1364,8 @@ 
  * @see http://api.drupal.org/api/drupal/developer--hooks--core.php/function/hook_elements/6
  */
 function boincuser_elements() {
-  $type['password_confirm']['#process'][] = 'boincuser_process_password_confirm';
-  return $type;
+    $type['password_confirm']['#process'][] = 'boincuser_process_password_confirm';
+    return $type;
 }
 
 /**
@@ -1373,11 +1373,11 @@ 
  * profile form
  */
 function boincuser_process_password_confirm($element) {
-  // Check if parent element is "account".
-  if ($element['#array_parents'][0] == 'account') {
+    // Check if parent element is "account".
+    if ($element['#array_parents'][0] == 'account') {
     $element['pass1']['#title'] = bts('Change password', array(), NULL, 'boinc:forgot-password');
-  }
-  return $element;
+    }
+    return $element;
 }
 
 /**
@@ -1385,42 +1385,42 @@ 
  * Register theme functions for use in this module.
  */
 function boincuser_theme($existing, $type, $theme, $path) {
-  return array(
+    return array(
     'boincuser_user_pass' => array(
-      'arguments' => array()
+        'arguments' => array()
     )
-  );
+    );
 }
 
 /**
  * Implementation of hook_token_values
  */
 function boincuser_token_values($type, $object = NULL, $options = array()) {
-  if ($type == 'user') {
+    if ($type == 'user') {
     $account = user_load($object->uid);
     $tokens['display-name'] = $account->boincuser_name;
     return $tokens;
-  }
+    }
 }
 
 /**
  * Implementation of hook_token_list
  */
 function boincuser_token_list($type = 'all') {
-  if ($type == 'user' || $type == 'all') {
+    if ($type == 'user' || $type == 'all') {
     $tokens['user']['display-name']      = t("The user's name that should be displayed");
     return $tokens;
-  }
+    }
 }
 
 /**
  * Implementation of hook_views_pre_execute()
  */
 function boincuser_views_pre_execute(&$view) {
-  if ($view->args) {
+    if ($view->args) {
     $account_id = $view->args[0];
-  }
-  if ($view->name=="user_activity") {
+    }
+    if ($view->name=="user_activity") {
     // Run the following custom query for the user_activity view
     $view->build_info['query']= "
       SELECT node_revisions.vid AS vid,
@@ -1452,25 +1452,25 @@ 
 
     // count_query determines the pager.  Do this so the right item count is returned.
     $view->build_info['count_query'] = $view->build_info['query'];
-  }
+    }
 }
 
 /**
  * Implementation of hook_cron()
  */
 function boincuser_cron() {
-  // Delete expired users in the BOINC database, user_delete table.
-  require_boinc('boinc_db');
-  $num_deleted = BoincUserDeleted::delete_expired();
-  if ($num_deleted>0) {
+    // Delete expired users in the BOINC database, user_delete table.
+    require_boinc('boinc_db');
+    $num_deleted = BoincUserDeleted::delete_expired();
+    if ($num_deleted>0) {
     watchdog('boincuser', "Deleted ${num_deleted} users from user_deleted table", WATCHDOG_NOTICE);
-  }
+    }
 
-  // Delete expired tokens from token table
-  $tokens_deleted = BoincToken::delete_expired();
-  if ($tokens_deleted>0) {
+    // Delete expired tokens from token table
+    $tokens_deleted = BoincToken::delete_expired();
+    if ($tokens_deleted>0) {
     watchdog('boincuser', "Deleted ${tokens_deleted} tokens from token table", WATCHDOG_NOTICE);
-  }
+    }
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1481,17 +1481,17 @@ 
  * Page callback shortcut to recent posts for the logged in user
  */
 function boincuser_goto_recent_posts() {
-  global $user;
-  drupal_goto("account/{$user->uid}/posts");
+    global $user;
+    drupal_goto("account/{$user->uid}/posts");
 }
 
 /**
  * Page callback shortcut to the team of the logged in user
  */
 function boincuser_goto_team() {
-  global $user;
-  $account = user_load($user->uid);
-  drupal_goto("community/teams/{$account->team}");
+    global $user;
+    $account = user_load($user->uid);
+    drupal_goto("community/teams/{$account->team}");
 }
 
 /**
@@ -1500,93 +1500,93 @@ 
  * user profile pages, so use a wrapper for display
  */
 function boincuser_view_profile($account = null) {
-  // Create the user profile page
-  if (!$account) {
+    // Create the user profile page
+    if (!$account) {
     global $user;
     $account = $user;
-  }
+    }
 
-  $min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
-  $verified_contributor = array_search('verified contributor', user_roles(true));
-  if (!isset($account->roles[$verified_contributor])) {
+    $min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
+    $verified_contributor = array_search('verified contributor', user_roles(true));
+    if (!isset($account->roles[$verified_contributor])) {
     drupal_set_message(bts(
         'You may only create or modify your user profile after earning @count credits.',
         array('@count' => $min_credit_to_post), NULL, 'boinc:view-profile'
     ), 'warning', FALSE);
-  }
+    }
 
-  // For now, just call the user module profile view function
-  user_build_content($account);
-  return theme('user_profile', $account);
+    // For now, just call the user module profile view function
+    user_build_content($account);
+    return theme('user_profile', $account);
 }
 
 /**
  * Page callback for editing a user profile
  */
 function boincuser_edit_profile($account = null) {
-  // Create the user profile form
-  if (!$account) {
+    // Create the user profile form
+    if (!$account) {
     global $user;
     $account = $user;
-  }
-  // Render the form
-  module_load_include('pages.inc', 'node', 'node');
-  return content_profile_page_edit('profile', $account);
+    }
+    // Render the form
+    module_load_include('pages.inc', 'node', 'node');
+    return content_profile_page_edit('profile', $account);
 }
 
 /**
-  * Join page menu callback.
-  * Display instructions on joining for new or existing BOINC users
-  */
+ * Join page menu callback.
+ * Display instructions on joining for new or existing BOINC users
+ */
 function join_page($type = null) {
-  global $base_url;
-  /* The paths/links to the rules-and-policies page is hardcoded
+    global $base_url;
+    /* The paths/links to the rules-and-policies page is hardcoded
    * here. An improvement would be admin settings for the Join Page
    * where this path could be set.
    */
-  $ruleslinkA = 'rules-and-policies';
-  $ruleslinkB = 'content/rules-and-policies';
-  $site_name = variable_get('site_name', 'Drupal-BOINC');
-  $registration_enabled = variable_get('user_register', 0);
-  $output = '<div class="join">';
-  switch ($type) {
-  case 'boinc':
+    $ruleslinkA = 'rules-and-policies';
+    $ruleslinkB = 'content/rules-and-policies';
+    $site_name = variable_get('site_name', 'Drupal-BOINC');
+    $registration_enabled = variable_get('user_register', 0);
+    $output = '<div class="join">';
+    switch ($type) {
+    case 'boinc':
     $output .= '<ol>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts('First !create_an_account here at @sitename.',
-      array(
+        $output .= '<li>' . bts('First !create_an_account here at @sitename.',
+        array(
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page') . '</li>';
     }
     $output .= '  <li>' . bts("Install BOINC on this device if not already present.", array(), NULL, 'boinc:join-page') . '</li>';
     $output .= '  <li>' . bts("Select <i>Tools / Add Project</i>. Choose @sitename from the list, or enter @siteurl.",
     array(
-      '@sitename' => $site_name,
-      '@siteurl' => $base_url,
+        '@sitename' => $site_name,
+        '@siteurl' => $base_url,
     ), NULL, 'boinc:join-page') . '</li>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts("If you're running a command-line or pre-5.0 version of BOINC, use <b>!boinccmd</b> to add the project.",
+        $output .= '<li>' . bts("If you're running a command-line or pre-5.0 version of BOINC, use <b>!boinccmd</b> to add the project.",
         array(
-          '!boinccmd' => l('boinccmd --project_attach', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
+            '!boinccmd' => l('boinccmd --project_attach', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
         ), NULL, 'boinc:join-page') . '</li>';
     }
     else {
-      $output .= '<li>' . bts("If you're running a command-line version of BOINC,
+        $output .= '<li>' . bts("If you're running a command-line version of BOINC,
         please follow the <b>!instructionslink</b> to first <i>create an account</i>, and then <i>attach</i> to this project. Use the same project URL as above.",
         array(
-          '!instructionslink' => l('instructions', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
+            '!instructionslink' => l('instructions', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
         ), NULL, 'boinc:join-page') . '</li>';
     }
     $output .= '<li>' . bts("If you're running a pre-5.0 version of BOINC, please
       upgrade to a more recent version of BOINC to create an account
       at @this_project.",
-      array(
+        array(
         '@this_project' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page') . '</li>';
     $output .=  '</ol>';
     break;
-  case 'new':
+    case 'new':
   default:
     // Determine if there is a link to rules-and-policies
     //$ruleslink='';
@@ -1601,95 +1601,95 @@ 
     // Join page output
     $output .= '<ol>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts('First !create_an_account here at @sitename.',
-      array(
+        $output .= '<li>' . bts('First !create_an_account here at @sitename.',
+        array(
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page') . '</li>';
     }
     else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
-      $output .= '  <li>' . bts("Read our !rules_and_policies.", array(
+        $output .= '  <li>' . bts("Read our !rules_and_policies.", array(
         '!rules_and_policies' => l(bts('Rules and Policies', array(), NULL, 'boinc:join-page'), $ruleslink),
-      ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page') . '</li>';
     }
     $output .= '  <li>' . bts('Download the BOINC desktop software.', array(), NULL, 'boinc:join-page');
     $output .= '    <p>';
     $output .= '      <a class="button" href="http://boinc.berkeley.edu/download.php">Download</a>';
     $output .= '    </p>';
     $output .= '    ' . bts("For Android devices, visit !fdroid_link or download !apk_link directly.", array(
-      '!fdroid_link' => '<a href="https://f-droid.org/en/packages/edu.berkeley.boinc">F-Droid</a>',
-      '!apk_link' => '<a href="https://boinc.berkeley.edu/download_all.php">BOINC for Android</a>',
+        '!fdroid_link' => '<a href="https://f-droid.org/en/packages/edu.berkeley.boinc">F-Droid</a>',
+        '!apk_link' => '<a href="https://boinc.berkeley.edu/download_all.php">BOINC for Android</a>',
     ), NULL, 'boinc:join-page');
     $output .= '  </li>';
     $output .= '  <li>' . bts('Run the installer.', array(), NULL, 'boinc:join-page') . '</li>';
     $output .= '  <li>' . bts('Choose @sitename from the list, or enter @siteurl.', array(
-      '@sitename' => $site_name,
-      '@siteurl' => $base_url,
+        '@sitename' => $site_name,
+        '@siteurl' => $base_url,
     ), NULL, 'boinc:join-page') . '</li>';
     $output .=  '</ol>';
-  }
-  $output .= '</div>';
-  return $output;
+    }
+    $output .= '</div>';
+    return $output;
 }
 
 /**
-  * Home page content for embedding in Panels page
-  */
+ * Home page content for embedding in Panels page
+ */
 function boincuser_home_page() {
-  global $user;
-  $site_name = variable_get('site_name', 'Drupal-BOINC');
-  // get the front page message from database; this is set in the admin interface under BOINC Other
-  $site_message = variable_get('boinc_other_frontpage','');
+    global $user;
+    $site_name = variable_get('site_name', 'Drupal-BOINC');
+    // get the front page message from database; this is set in the admin interface under BOINC Other
+    $site_message = variable_get('boinc_other_frontpage','');
 
-  // Determine the user of the day
-  $current_uotd = db_fetch_object(db_query("
+    // Determine the user of the day
+    $current_uotd = db_fetch_object(db_query("
     SELECT
       uid,
       uotd_time
     FROM {boincuser}
     ORDER BY uotd_time DESC
     LIMIT 1"
-  ));
-  if ($current_uotd->uotd_time < strtotime('today midnight')) {
+    ));
+    if ($current_uotd->uotd_time < strtotime('today midnight')) {
     $uotd = boincuser_select_user_of_the_day();
-  }
-  else {
+    }
+    else {
     $uotd = user_load($current_uotd->uid);
-  }
-  $uotd_image = boincuser_get_user_profile_image($uotd->uid, FALSE);
-  $output = '<h2 class="pane-title">';
-  $output .= ($user->uid) ? bts('Welcome back!', array(), NULL, 'boinc:front-page') : ($site_name ? bts('What is @this_project?', array('@this_project' => $site_name)) : bts('Welcome!', array(), NULL, 'boinc:front-page'));
-  $output .= '</h2>';
-  $output .= '<div class="boinc-overview balance-height-front">';
-  $output .= '  <div>' . bts($site_message, array(), NULL, "project:front page") . ' ' . l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about') . '</div>';
-  if ($user->uid) {
+    }
+    $uotd_image = boincuser_get_user_profile_image($uotd->uid, FALSE);
+    $output = '<h2 class="pane-title">';
+    $output .= ($user->uid) ? bts('Welcome back!', array(), NULL, 'boinc:front-page') : ($site_name ? bts('What is @this_project?', array('@this_project' => $site_name)) : bts('Welcome!', array(), NULL, 'boinc:front-page'));
+    $output .= '</h2>';
+    $output .= '<div class="boinc-overview balance-height-front">';
+    $output .= '  <div>' . bts($site_message, array(), NULL, "project:front page") . ' ' . l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about') . '</div>';
+    if ($user->uid) {
     $output .= '  <div>' . l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))) . '</div>';
-  }
-  else {
+    }
+    else {
     $output .= '  <div>' . l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))) . '</div>';
-  }
-  $output .= '</div>';
-  $output .= '<div class="boinc-overview-details">';
-  $output .= '  <div class="detail-container">';
-  $output .= '    <a class="user-of-the-day" href="account/' . $uotd->uid . '">';
-  $output .= '      <div class="picture">';
-  $output .= theme('imagefield_image', $uotd_image['image'], $uotd_image['alt'],
+    }
+    $output .= '</div>';
+    $output .= '<div class="boinc-overview-details">';
+    $output .= '  <div class="detail-container">';
+    $output .= '    <a class="user-of-the-day" href="account/' . $uotd->uid . '">';
+    $output .= '      <div class="picture">';
+    $output .= theme('imagefield_image', $uotd_image['image'], $uotd_image['alt'],
     $uotd_image['alt'], array(), FALSE);
-  $output .= '      </div>';
-  $output .= '      <div class="text">' . bts('User of the day', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '      <div class="detail">' . $uotd->boincuser_name . '</div>';
-  $output .= '    </a>';
-  $output .= '    <div class="volunteers">';
-  $output .= '      <div class="text">' . bts('Over 500,000 volunteers and counting.', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '      <div class="platforms">';
-  $output .= '        <div class="detail platform windows">' . bts('Windows', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform mac">' .  bts('Mac', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform linux">' . bts('Linux', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '      </div>';
-  $output .= '    </div>';
-  $output .= '  </div>';
-  $output .= '</div>';
-  return $output;
+    $output .= '      </div>';
+    $output .= '      <div class="text">' . bts('User of the day', array(), NULL, 'boinc:front-page') . '</div>';
+    $output .= '      <div class="detail">' . $uotd->boincuser_name . '</div>';
+    $output .= '    </a>';
+    $output .= '    <div class="volunteers">';
+    $output .= '      <div class="text">' . bts('Over 500,000 volunteers and counting.', array(), NULL, 'boinc:front-page') . '</div>';
+    $output .= '      <div class="platforms">';
+    $output .= '        <div class="detail platform windows">' . bts('Windows', array(), NULL, 'boinc:front-page') . '</div>';
+    $output .= '        <div class="detail platform mac">' .  bts('Mac', array(), NULL, 'boinc:front-page') . '</div>';
+    $output .= '        <div class="detail platform linux">' . bts('Linux', array(), NULL, 'boinc:front-page') . '</div>';
+    $output .= '      </div>';
+    $output .= '    </div>';
+    $output .= '  </div>';
+    $output .= '</div>';
+    return $output;
 }
 
 /**
@@ -1697,81 +1697,81 @@ 
  * Create a new user account based on supplied parameters.
  */
 function boincuser_create_account() {
-  global $base_url;
+    global $base_url;
 
-  require_boinc('boinc_db');
-  require_boinc('user_util');
-  require_boinc('xml');
-  $params = array(
+    require_boinc('boinc_db');
+    require_boinc('user_util');
+    require_boinc('xml');
+    $params = array(
     'email_addr' => isset($_GET['email_addr']) ? $_GET['email_addr'] : '',
     'user_name' => isset($_GET['user_name']) ? $_GET['user_name'] : '',
     'passwd_hash' => isset($_GET['passwd_hash']) ? $_GET['passwd_hash'] : ''
-  );
+    );
 
-  // Begin output
-  xml_header();
+    // Begin output
+    xml_header();
 
-  // Account creation disabled
-  $enablethisRPC = variable_get('boinc_weboptions_enableaccountcreateRPC', TRUE);
-  if (!$enablethisRPC) {
+    // Account creation disabled
+    $enablethisRPC = variable_get('boinc_weboptions_enableaccountcreateRPC', TRUE);
+    if (!$enablethisRPC) {
     $mess = bts('Account creation is done through our Web site. Please register at @url', array(
-      '@url' => $base_url . '/user/registration',
+        '@url' => $base_url . '/user/registration',
     ),
     NULL, 'boinc:create_account');
     xml_error(-208, $mess);
-  }
-  // Invalid invite code
+    }
+    // Invalid invite code
 
-  // Validate input
-  if (user_validate_mail($params['email_addr']) or !is_valid_email_addr($params['email_addr'])) {
+    // Validate input
+    if (user_validate_mail($params['email_addr']) or !is_valid_email_addr($params['email_addr'])) {
     xml_error(-205);
-  }
+    }
 
-  // Make sure user_name is unique and cleaned
-  $unique_name = create_proper_drupalname($params['user_name']);
-  if ($error = user_validate_name($unique_name)) {
+    // Make sure user_name is unique and cleaned
+    $unique_name = create_proper_drupalname($params['user_name']);
+    if ($error = user_validate_name($unique_name)) {
     xml_error(-188, $error);
-  }
-  if (strlen($params['passwd_hash']) != 32) {
+    }
+    if (strlen($params['passwd_hash']) != 32) {
     xml_error(-1, 'password hash length not 32');
-  }
+    }
 
-  // Process input
-  // Check this email against previous email addresses.
-  $tmpuser = BoincUser::lookup_prev_email_addr($params['email_addr']);
-  if ($tmpuser) {
+    // Process input
+    // Check this email against previous email addresses.
+    $tmpuser = BoincUser::lookup_prev_email_addr($params['email_addr']);
+    if ($tmpuser) {
     xml_error(-137);
-  }
+    }
 
-  // Check this email on current email addresses.
-  $boinc_user = BoincUser::lookup_email_addr($params['email_addr']);
-  if ($boinc_user) {
+    // Check this email on current email addresses.
+    $boinc_user = BoincUser::lookup_email_addr($params['email_addr']);
+    if ($boinc_user) {
     // Return authenticator for existing users
     if ( ($params['passwd_hash'] == $boinc_user->passwd_hash) or
     password_verify($params['passwd_hash'], $boinc_user->passwd_hash) ) {
-      $output = array('authenticator' => $boinc_user->authenticator);
+        $output = array('authenticator' => $boinc_user->authenticator);
     }
     else {
-      xml_error(-137);
+        xml_error(-137);
     }
-  }
-  else {
+    }
+    else {
     // Verify that there isn't somehow a Drupal user already (not possible with proper function)
     if ($existing_user = user_load(array('mail' => $params['email_addr']))) {
-      xml_error(-137, 'account error');
+        xml_error(-137, 'account error');
     }
     // Create new account
     $unrestricted_role = array_search('community member', user_roles(true));
 
     $newUser = array(
-      'name' => $unique_name,
-      'pass' => $params['passwd_hash'], // note: passing a hash here requires ALL passwords to be hashed via hook prior to interacting with the hash stored in the db
-      'mail' => $params['email_addr'],
-      'status' => 1,
-      'init' => $params['email_addr'],
-      'roles' => array($unrestricted_role => ''),
-      'boincuser_name' => $params['user_name'],
-      'boinchash_flag' => TRUE,
+        'name' => $unique_name,
+        'pass' => $params['passwd_hash'], // note: passing a hash here requires ALL passwords to be hashed via hook prior to interacting with the hash stored in the db
+        'mail' => $params['email_addr'],
+        'status' => 1,
+        'init' => $params['email_addr'],
+        'roles' => array($unrestricted_role => ''),
+        'boincuser_name' => $params['user_name'],
+        'boinchash_flag' => TRUE,
     );
 
     // Create the drupal user. If the drupal user cannot be created,
@@ -1779,17 +1779,17 @@ 
     // The user is created in the 'insert' op in hook_user.
     $user = user_save(null, $newUser);
     if (!$user) {
-      watchdog('boincuser', 'create_account: Failed to create Drupal user account for @email', array('@email' => $params['email_addr']), WATCHDOG_WARNING);
-      xml_error(-137, 'error creating BOINC account');
+        watchdog('boincuser', 'create_account: Failed to create Drupal user account for @email', array('@email' => $params['email_addr']), WATCHDOG_WARNING);
+        xml_error(-137, 'error creating BOINC account');
     }// if drupal user created.
 
     $output = array('authenticator' => $user->boincuser_account_key);
-  }// if existing user found.
+    }// if existing user found.
 
-  // Output authenticator
-  echo " <account_out>\n";
-  echo "   <authenticator>{$output['authenticator']}</authenticator>\n";
-  echo "</account_out>\n";
+    // Output authenticator
+    echo " <account_out>\n";
+    echo "   <authenticator>{$output['authenticator']}</authenticator>\n";
+    echo "</account_out>\n";
 }
 
 /**
@@ -1797,166 +1797,166 @@ 
  * account is created using the BOINC clinet.
  */
 function boincuser_account_finish() {
-  global $user;
+    global $user;
 
-  $authtoken = isset($_GET['auth']) ? $_GET['auth'] : '';
+    $authtoken = isset($_GET['auth']) ? $_GET['auth'] : '';
 
-  // Ensure there is a authentication token before continuing
-  if (empty($authtoken)) {
+    // Ensure there is a authentication token before continuing
+    if (empty($authtoken)) {
     drupal_not_found();
     return ;
-  }
+    }
 
-  if (strlen($authtoken) != 32) {
+    if (strlen($authtoken) != 32) {
     drupal_set_message(bts('ERROR: There is no account with that authenticator.', array(), NULL, 'boinc:account-finish'), 'error');
     drupal_goto();
-  }
+    }
 
-  require_boinc('boinc_db');
-  $boinc_user = BoincUser::lookup("authenticator='".addslashes($authtoken)."'");
-  if (!$boinc_user) {
+    require_boinc('boinc_db');
+    $boinc_user = BoincUser::lookup("authenticator='".addslashes($authtoken)."'");
+    if (!$boinc_user) {
     drupal_set_message(bts('ERROR: There is no account with that authenticator.', array(), NULL, 'boinc:account-finish'), 'error');
     drupal_goto();
-  }
-  $user = user_load(get_drupal_id($boinc_user->id));
+    }
+    $user = user_load(get_drupal_id($boinc_user->id));
 
-  if (!$user) {
+    if (!$user) {
     drupal_set_message(bts('ERROR: There was a problem loading your account. Try logging in with your user name and password.', array(), NULL, 'boinc:account-finish'), 'error');
     drupal_goto();
-  }
+    }
 
-  // Lookup path to custom account finish page
-  $customaccountfinishpath = drupal_lookup_path('source', variable_get('boinc_weboptions_accountfinish', '') );
-  if ( menu_valid_path(array('link_path' => $customaccountfinishpath)) ) {
+    // Lookup path to custom account finish page
+    $customaccountfinishpath = drupal_lookup_path('source', variable_get('boinc_weboptions_accountfinish', '') );
+    if ( menu_valid_path(array('link_path' => $customaccountfinishpath)) ) {
     $node = menu_get_object('node', 1, $customaccountfinishpath);
     if ($node) {
-      return node_page_view($node);
+        return node_page_view($node);
+    }
     }
-  }
 
-  // open links in new window
-  $options = array(
+    // open links in new window
+    $options = array(
     'attributes' => array( 'target' => '_blank' ),
-  );
+    );
 
-  // Check moderation page exists
-  $moderationpath = drupal_lookup_path('source', variable_get('boinc_weboptions_moderationpage', '') );
-  if ( menu_valid_path(array('link_path' => $moderationpath)) ) {
+    // Check moderation page exists
+    $moderationpath = drupal_lookup_path('source', variable_get('boinc_weboptions_moderationpage', '') );
+    if ( menu_valid_path(array('link_path' => $moderationpath)) ) {
     $modsentence = bts('Please note: user profiles are subject to !moderation.', array('!moderation' => l(bts('moderation', array(), NULL, 'boinc:account-finish'), $moderationpath, $options)), NULL, 'boinc:account-finish');
-  } else {
+    } else {
     $modsentence = bts('Please note: user profiles are subject to moderation.', array(), NULL, 'boinc:account-finish');
-  }
+    }
 
-  $username = $user->boincuser_name;
-  $site_name = variable_get('site_name', 'Drupal-BOINC');
-  $output = "<p>" . bts('Thank you @user_name for joining @site_name. Your account has been created. Your BOINC client should start working on assigned tasks soon, without any additional action or configuration. Please visit the links below for more information and additional options. (Links will open in a new window.)',
-  array(
+    $username = $user->boincuser_name;
+    $site_name = variable_get('site_name', 'Drupal-BOINC');
+    $output = "<p>" . bts('Thank you @user_name for joining @site_name. Your account has been created. Your BOINC client should start working on assigned tasks soon, without any additional action or configuration. Please visit the links below for more information and additional options. (Links will open in a new window.)',
+    array(
     '@user_name' => $username,
     '@site_name' => $site_name,
-  ), NULL, 'boinc:account-finish') . "</p>";
+    ), NULL, 'boinc:account-finish') . "</p>";
 
-  $links = array(
+    $links = array(
     array(
-      'data' => bts('Change your username at !community_preferences.', array(
+        'data' => bts('Change your username at !community_preferences.', array(
         '!community_preferences' => l(bts('Community Preferences', array(), NULL, 'boinc:account-fininsh'), 'account/prefs/community', $options),
-      ), NULL, 'boinc:account-finish'),
-      'children' => array(
+        ), NULL, 'boinc:account-finish'),
+        'children' => array(
         bts('Your username is used to identify yourself to other volunteers on this Web site.', array(), NULL, 'boinc:account-finish'),
         bts('In addition, you may set your account\'s default language and adjust notification settings.', array(), NULL, 'boinc:account-finish'),
-      ),
+        ),
     ),
     array(
-      'data' => bts('Change your !computing_preferences.', array(
+        'data' => bts('Change your !computing_preferences.', array(
         '!computing_preferences' => l(bts('Computing Preferences', array(), NULL, 'boinc:account-finish'), 'account/prefs', $options),
-      ), NULL, 'boinc:account-finish'),
-      'children' => array(
+        ), NULL, 'boinc:account-finish'),
+        'children' => array(
         bts('You may adjust how much CPU, RAM, and Disk space the BOINC client is allowed to use for tasks on your computer.', array(), NULL, 'boinc:account-finish'),
         bts('By default, you will run @site_name tasks without any additional configuration.', array(
-          '@site_name' => $site_name,
+            '@site_name' => $site_name,
         ), NULL, 'boinc:account-finish'),
         bts('It is recommended new volunteers leave the default settings until they gain experience running some tasks. Ask questions in the !forums to get advice before making changes to a setting you don\'t understand.', array(
-          '!forums' => l(bts('forums', array(), NULL, 'boinc:account-finish'), 'community/forum', $options),
+            '!forums' => l(bts('forums', array(), NULL, 'boinc:account-finish'), 'community/forum', $options),
         ), NULL, 'boinc:account-finish'),
-      ),
+        ),
     ),
     array(
         'data' => bts('Create a !user_profile.', array(
-          '!user_profile' => l(bts('User Profile', array(), NULL, 'boinc:account-finish'), '/account/profile/edit', $options),
+            '!user_profile' => l(bts('User Profile', array(), NULL, 'boinc:account-finish'), '/account/profile/edit', $options),
         ), NULL, 'boinc:account-finish'),
-      'children' => array(
+        'children' => array(
         bts('A user profile will inform other volunteers who you are and why you joined @site_name.', array(
-          '@site_name' => $site_name,
+            '@site_name' => $site_name,
         ), NULL, 'boinc:account-finish'),
         $modsentence,
-      ),
+        ),
     ),
     array(
-      'data' => bts('Join a !team.', array(
+        'data' => bts('Join a !team.', array(
         '!team' => l(bts('Team', array(), NULL, 'boinc:account-finish'), '/community/teams', $options),
-      ), NULL, 'boinc:account-finish'),
-      'children' => array(
+        ), NULL, 'boinc:account-finish'),
+        'children' => array(
         bts('You may join a team, made up of other volunteers.', array(), NULL, 'boinc:account-finish'),
-      ),
+        ),
     ),
     array(
-      'data' => bts('Go to your !account_dashboard.', array(
+        'data' => bts('Go to your !account_dashboard.', array(
         '!account_dashboard'=> l(bts('Account Dashboard', array(), NULL, 'boinc:account-finish'), 'account/dashboard', $options),
-      ), NULL, 'boinc:account-finish'),
-      'children' => array(
+        ), NULL, 'boinc:account-finish'),
+        'children' => array(
         bts('Your account dashboard has information and links about your computer(s) and task(s) assigned.', array(), NULL, 'boinc:account-finish'),
-      ),
+        ),
     ),
     array(
-      'data' => bts('Visit our !help pages.', array(
+        'data' => bts('Visit our !help pages.', array(
         '!help' => l(bts('Help', array(), NULL, 'boinc:account-finish'), '/help', $options)
-      ), NULL, 'boinc:account-finish'),
-      'children' => array(
+        ), NULL, 'boinc:account-finish'),
+        'children' => array(
         bts('Ask for help in our community\'s !forums.', array(
-          '!forums' => l(bts('forums', array(), NULL, 'boinc:account-finish'), 'community/forum', $options)
+            '!forums' => l(bts('forums', array(), NULL, 'boinc:account-finish'), 'community/forum', $options)
         ), NULL, 'boinc:account-finish'),
-      ),
+        ),
     ),
-  );
+    );
 
-  //List of links
-  $output .= theme_item_list($links, $title = NULL, $type='ul');
+    //List of links
+    $output .= theme_item_list($links, $title = NULL, $type='ul');
 
-  return $output;
+    return $output;
 }
 
 /**
  * Determine if the user has permission to control community access
  */
 function boincuser_moderate_community_access() {
-  if (user_access('assign community member role')
+    if (user_access('assign community member role')
   OR user_access('assign all roles')) {
     return TRUE;
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
  * Get the count of items in the moderation queue
  */
 function boincuser_moderation_queue_count($caller = 'user') {
-  $allowed = FALSE;
-  switch ($caller) {
-  case 'cron':
+    $allowed = FALSE;
+    switch ($caller) {
+    case 'cron':
     $allowed = TRUE;
     break;
-  case 'user':
+    case 'user':
   default:
     $allowed = user_access('edit any profile content');
-  }
-  if ($allowed) {
+    }
+    if ($allowed) {
     return db_result(db_query("
       SELECT COUNT(*)
       FROM {node}
       WHERE type = 'profile'
       AND moderate = 1"
     ));
-  }
-  return NULL;
+    }
+    return NULL;
 }
 
 /**
@@ -1965,43 +1965,43 @@ 
  * than through the user account info form.
  */
 function boincuser_control($uid = NULL, $action = NULL) {
-  if (!$uid OR !$account = user_load($uid)) {
+    if (!$uid OR !$account = user_load($uid)) {
     // What are you even doing here...
     return FALSE;
-  }
-  switch ($action) {
-  case 'ban':
+    }
+    switch ($action) {
+    case 'ban':
     if (boincuser_moderate_community_access()) {
-      $penalty_period = variable_get('boinc_penalty_period', 7*24*60*60);
-      $boincuser_record = array(
+        $penalty_period = variable_get('boinc_penalty_period', 7*24*60*60);
+        $boincuser_record = array(
         'uid' => $uid,
         'penalty_expiration' => time() + $penalty_period,
-      );
-      drupal_write_record('boincuser', $boincuser_record, 'uid');
-      $community_role = array_search('community member', user_roles(true));
-      if (isset($account->roles[$community_role])) {
+        );
+        drupal_write_record('boincuser', $boincuser_record, 'uid');
+        $community_role = array_search('community member', user_roles(true));
+        if (isset($account->roles[$community_role])) {
         unset($account->roles[$community_role]);
         user_save($account, array('roles' => $account->roles));
-      }
+        }
     }
     break;
-  case 'lift-ban':
+    case 'lift-ban':
     if (boincuser_moderate_community_access()) {
-      $boincuser_record = array(
+        $boincuser_record = array(
         'uid' => $uid,
         'penalty_expiration' => 0,
-      );
-      drupal_write_record('boincuser', $boincuser_record, 'uid');
-      $community_role = array_search('community member', user_roles(true));
-      if (!isset($account->roles[$community_role])) {
+        );
+        drupal_write_record('boincuser', $boincuser_record, 'uid');
+        $community_role = array_search('community member', user_roles(true));
+        if (!isset($account->roles[$community_role])) {
         $account->roles[$community_role] = 'community member';
         user_save($account, array('roles' => $account->roles));
-      }
+        }
     }
     break;
-  default:
+    default:
   }
-  drupal_goto("account/{$account->uid}");
+    drupal_goto("account/{$account->uid}");
 }
 
 /**
@@ -2009,29 +2009,29 @@ 
  * moderation flag.
  */
 function boincuser_moderate_profile_approve($account) {
-  $node = new stdClass;
-  $node->type = 'profile';
-  $node->language = '';
-  $nid = content_profile_profile_exists($node, $account->uid);
-  $profile = node_load($nid);
-  $profile->moderate = 0;
-  $profile->status = 1;
-  node_save($profile);
-  drupal_set_message('This profile has been marked as approved.');
-  drupal_goto();
+    $node = new stdClass;
+    $node->type = 'profile';
+    $node->language = '';
+    $nid = content_profile_profile_exists($node, $account->uid);
+    $profile = node_load($nid);
+    $profile->moderate = 0;
+    $profile->status = 1;
+    node_save($profile);
+    drupal_set_message('This profile has been marked as approved.');
+    drupal_goto();
 }
 
 /**
  * Mark a user profile as rejected and notify the user of the reason.
  */
 function boincuser_moderate_profile_reject($uid, $reason = '') {
-  $account = user_load($uid);
-  $node = new stdClass;
-  $node->type = 'profile';
-  $node->language = '';
-  $nid = content_profile_profile_exists($node, $uid);
-  $profile = node_load($nid);
-  if ($profile->nid) {
+    $account = user_load($uid);
+    $node = new stdClass;
+    $node->type = 'profile';
+    $node->language = '';
+    $nid = content_profile_profile_exists($node, $uid);
+    $profile = node_load($nid);
+    if ($profile->nid) {
     global $user;
     global $base_url;
     global $base_path;
@@ -2042,64 +2042,64 @@ 
     $profile->status = 0;
     node_save($profile);
     $settings = array(
-      'from' => '',
-      'subject' => "Profile moderation at {$site_name}",
-      'message' => ''
-      . "{$account->boincuser_name},\n"
-      . "\n"
-      . "{$moderator->boincuser_name} has rejected your profile at"
-      . " {$site_name} for the following reason: \n"
-      . "\n"
-      . "{$reason}\n"
-      . "\n"
-      . "\n"
-      . "Since it has not been approved, your profile is not visible to other"
-      . " {$site_name} users. Please make the needed changes here:\n"
-      . "\n"
-      . "{$site_url}account/profile \n"
-      . "\n"
-      . "Thanks, \n"
-      . "\n"
-      . "{$site_name} support team",
+        'from' => '',
+        'subject' => "Profile moderation at {$site_name}",
+        'message' => ''
+        . "{$account->boincuser_name},\n"
+        . "\n"
+        . "{$moderator->boincuser_name} has rejected your profile at"
+        . " {$site_name} for the following reason: \n"
+        . "\n"
+        . "{$reason}\n"
+        . "\n"
+        . "\n"
+        . "Since it has not been approved, your profile is not visible to other"
+        . " {$site_name} users. Please make the needed changes here:\n"
+        . "\n"
+        . "{$site_url}account/profile \n"
+        . "\n"
+        . "Thanks, \n"
+        . "\n"
+        . "{$site_name} support team",
     );
     rules_action_mail_to_user($account, $settings);
     drupal_set_message('This profile has been marked as rejected.');
-  }
-  drupal_goto();
+    }
+    drupal_goto();
 }
 
 /**
  * Ban a user and send a notification of the reason.
  */
 function boincuser_moderate_user_ban($uid, $reason = '', $duration = '') {
-  if (user_access('assign community member role')
+    if (user_access('assign community member role')
   OR user_access('assign all roles')) {
     $account = user_load($uid);
     if ($account->uid) {
-      module_load_include('inc', 'rules', 'modules/system.rules');
-      if ($duration === '') {
+        module_load_include('inc', 'rules', 'modules/system.rules');
+        if ($duration === '') {
         $duration = variable_get('boinc_penalty_period', 7*24*60*60);
-      }
-      $penalty_expiration = ($duration > 0) ? time() + $duration : 4294967295;
-      $boincuser_record = array(
+        }
+        $penalty_expiration = ($duration > 0) ? time() + $duration : 4294967295;
+        $boincuser_record = array(
         'uid' => $uid,
         'penalty_expiration' => $penalty_expiration,
-      );
-      drupal_write_record('boincuser', $boincuser_record, 'uid');
+        );
+        drupal_write_record('boincuser', $boincuser_record, 'uid');
 
-      $community_role = array_search('community member', user_roles(true));
-      if (isset($account->roles[$community_role])) {
+        $community_role = array_search('community member', user_roles(true));
+        if (isset($account->roles[$community_role])) {
         unset($account->roles[$community_role]);
         user_save($account, array('roles' => $account->roles));
-      }
-
-      global $user;
-      global $base_url;
-      global $base_path;
-      $site_name = variable_get('site_name', 'Drupal-BOINC');
-      $site_url = $base_url . $base_path;
-      $moderator = user_load($user->uid);
-      $settings = array(
+        }
+
+        global $user;
+        global $base_url;
+        global $base_path;
+        $site_name = variable_get('site_name', 'Drupal-BOINC');
+        $site_url = $base_url . $base_path;
+        $moderator = user_load($user->uid);
+        $settings = array(
         'from' => '',
         'subject' => "User moderation at {$site_name}",
         'message' => ''
@@ -2120,12 +2120,12 @@ 
         . "Thanks, \n"
         . "\n"
         . "{$site_name} support team",
-      );
-      rules_action_mail_to_user($account, $settings);
-      drupal_set_message('This user has been banned.');
+        );
+        rules_action_mail_to_user($account, $settings);
+        drupal_set_message('This user has been banned.');
     }
-  }
-  drupal_goto();
+    }
+    drupal_goto();
 }
 
 
@@ -2137,15 +2137,15 @@ 
  *
  */
 function boincuser_get_weak_auth($boinc_id = null) {
-  if (!$boinc_id) {
+    if (!$boinc_id) {
     global $user;
     $account = user_load($user->uid);
     $boinc_id = $account->boincuser_id;
-  }
+    }
 
-  $boinc_user = boincuser_load($account->boincuser_id);
+    $boinc_user = boincuser_load($account->boincuser_id);
 
-  return weak_auth($boinc_user);
+    return weak_auth($boinc_user);
 }
 
 /**
@@ -2154,75 +2154,75 @@ 
  * Drupal User so must be inserted into comments, etc. (not so by default)
  */
 function boincuser_get_user_profile_image($uid, $avatar = TRUE) {
-  // Though the function name implies otherwise, get the avatar by default
-  $image_field = ($avatar) ? 'field_image_fid' : 'field_profile_image_fid';
-  $image_fid = db_result(db_query("
+    // Though the function name implies otherwise, get the avatar by default
+    $image_field = ($avatar) ? 'field_image_fid' : 'field_profile_image_fid';
+    $image_fid = db_result(db_query("
     SELECT ctp.%s
     FROM {content_type_profile} ctp
     INNER JOIN {node} n ON ctp.nid = n.nid
     WHERE n.uid = %d AND n.type = '%s'",
     $image_field, $uid, 'profile'));
-  $user_image['image'] = field_file_load($image_fid);
-  if (!$user_image['image']['filepath']) {
+    $user_image['image'] = field_file_load($image_fid);
+    if (!$user_image['image']['filepath']) {
     // Load the default image if one does not exist
     $account = user_load($uid);
     if ($avatar AND module_exists('gravatar') AND user_access('use gravatar', $account) AND $account->gravatar) {
-      // Use a Gravatar rather than the system default image
-      $options = array(
+        // Use a Gravatar rather than the system default image
+        $options = array(
         'size' => 100,
         'rating' => 'G',
-      );
-      // Get the Gravatar URL and see if the image exists
-      $url = gravatar_get_gravatar($account->mail, $options);
-      $headers = @get_headers($url);
-      if (preg_match("|200|", $headers[0])) {
+        );
+        // Get the Gravatar URL and see if the image exists
+        $url = gravatar_get_gravatar($account->mail, $options);
+        $headers = @get_headers($url);
+        if (preg_match("|200|", $headers[0])) {
         return $url;
-      }
+        }
     }
     // Get default image if nothing else works
     $content_node_widget_settings = db_result(db_query("SELECT widget_settings FROM {content_node_field_instance} WHERE field_name = '%s'", ($avatar ? 'field_image' : 'field_profile_image')));
     $content_node_widget_settings = unserialize($content_node_widget_settings);
     $user_image['image'] = $content_node_widget_settings['default_image'];
-  }
-  $user = user_load($uid);
-  // Use boinc username for image alt/title attributes
-  $user_image['alt'] = $user->boincuser_name;
-  return $user_image;
+    }
+    $user = user_load($uid);
+    // Use boinc username for image alt/title attributes
+    $user_image['alt'] = $user->boincuser_name;
+    return $user_image;
 }
 
 /**
  * Generate a table of a user's projects
  */
 function boincuser_get_projects_table($account = null) {
-  if ($account AND is_numeric($account)) {
+    if ($account AND is_numeric($account)) {
     $account = user_load($account);
-  }
-  $projects = boincuser_get_projects($account);
-  if (!$projects) return bts('no projects...', array(), NULL, 'boinc:account-dashboard');
-
-  $output = '';
-  $output .= '<table class="user-projects">' . "\n";
-  $output .= '<thead>' . "\n";
-  $output .= '  <tr>' . "\n";
-  $output .= '    <th>' . bts('Name', array(), NULL, 'boinc:project-name:-1:ignoreoverwrite') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Avg credit', array(), NULL, 'boinc:account-dashboard') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . '</th>' . "\n";
-  $output .= '  </tr>' . "\n";
-  $output .= '</thead>' . "\n";
-  $output .= '<tbody>' . "\n";
-  foreach ($projects AS $project) {
+    }
+    $projects = boincuser_get_projects($account);
+    if (!$projects) return bts('no projects...', array(), NULL, 'boinc:account-dashboard');
+
+    $output = '';
+    $output .= '<table class="user-projects">' . "\n";
+    $output .= '<thead>' . "\n";
+    $output .= '  <tr>' . "\n";
+    $output .= '    <th>' . bts('Name', array(), NULL, 'boinc:project-name:-1:ignoreoverwrite') . '</th>' . "\n";
+    $output .= '    <th class="numeric">' . bts('Avg credit', array(), NULL, 'boinc:account-dashboard') . '</th>' . "\n";
+    $output .= '    <th class="numeric">' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . '</th>' . "\n";
+    $output .= '  </tr>' . "\n";
+    $output .= '</thead>' . "\n";
+    $output .= '<tbody>' . "\n";
+    foreach ($projects AS $project) {
     $url = rtrim($project->url, '/') . '/show_user.php?userid=' . $project->id;
     $output .= '  <tr>' . "\n";
     $output .= '    <td>' . l($project->name, $url) . '</td>' . "\n";
     $output .= '    <td class="numeric">' . boincwork_format_stats((float) $project->expavg_credit) . '</td>' . "\n";
     $output .= '    <td class="numeric">' . boincwork_format_stats((float) $project->total_credit) . '</td>' . "\n";
     $output .= '  </tr>' . "\n";
-  }
-  $output .= '</tbody>' . "\n";
-  $output .= '</table>' . "\n";
-  $more_link = ($account) ? "user/{$account->uid}/stats" : 'account/stats';
-  //$output .= "<div class=\"more-link\"><a href=\"{$more_link}\">More stats</a></div>" . "\n";
-  return $output;
+    }
+    $output .= '</tbody>' . "\n";
+    $output .= '</table>' . "\n";
+    $more_link = ($account) ? "user/{$account->uid}/stats" : 'account/stats';
+    //$output .= "<div class=\"more-link\"><a href=\"{$more_link}\">More stats</a></div>" . "\n";
+    return $output;
 }
 
 /**
@@ -2230,25 +2230,25 @@ 
  */
 function boincuser_get_stats_user_data($cpid = null) {
 
-  // [TODO] Set this stuff in site config!
-  $stats_server = 'stats.gridrepublic.org';
-  $stats_rpc = 'rpc/get_user.php';
+    // [TODO] Set this stuff in site config!
+    $stats_server = 'stats.gridrepublic.org';
+    $stats_rpc = 'rpc/get_user.php';
 
-  // Construct query string
-  $get = array(
+    // Construct query string
+    $get = array(
     'cpid' => $cpid
-  );
-  $args = array();
-  foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
-  $query = '?' . implode('&', $args);
-
-  // Load XML from RPC
-  $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
-  $result = drupal_http_request($target_url);
-  if (in_array($result->code, array(200, 304)) || in_array($result->redirect_code, array(200, 304))) {
+    );
+    $args = array();
+    foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
+    $query = '?' . implode('&', $args);
+
+    // Load XML from RPC
+    $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
+    $result = drupal_http_request($target_url);
+    if (in_array($result->code, array(200, 304)) || in_array($result->redirect_code, array(200, 304))) {
     return simplexml_load_string($result->data);
-  }
-  return NULL;
+    }
+    return NULL;
 }
 
 /**
@@ -2256,15 +2256,15 @@ 
  */
 function boincuser_get_projects($account = null) {
 
-  // Use the current user by default
-  if (!$account) {
+    // Use the current user by default
+    if (!$account) {
     global $user;
     $account = user_load($user->uid);
-  }
+    }
 
-  $account_stats = boincuser_get_stats_user_data($account->boincuser_cpid);
+    $account_stats = boincuser_get_stats_user_data($account->boincuser_cpid);
 
-  return ($account_stats AND isset($account_stats->project)) ? $account_stats->project : null;
+    return ($account_stats AND isset($account_stats->project)) ? $account_stats->project : null;
 }
 
 
@@ -2272,11 +2272,11 @@ 
  * Get the links to display under the user profile
  */
 function boincuser_get_profile_links($uid) {
-  global $user;
-  $account = user_load($uid);
-  $profile = content_profile_load('profile', $account->uid);
-  $output = '';
-  if ($profile) {
+    global $user;
+    $account = user_load($uid);
+    $profile = content_profile_load('profile', $account->uid);
+    $output = '';
+    if ($profile) {
     $profile_is_approved = ($profile->status AND !$profile->moderate);
     $user_is_moderator = user_access('edit any profile content');
     $is_own_profile = ($user->uid == $account->uid);
@@ -2284,15 +2284,15 @@ 
     $links = array();
 
     if ($profile->moderate AND $user_is_moderator) {
-      $links['approve_profile'] = array(
+        $links['approve_profile'] = array(
         'title' => bts('Approve profile', array(), NULL, 'boinc:moderate-user'),
         'href' => "{$profile_moderation_path}/approve",
         'attributes' => array(
-          'title' => bts('Approve this profile content', array(), NULL, 'boinc:moderate-user'),
-          'class' => 'first primary tab',
+            'title' => bts('Approve this profile content', array(), NULL, 'boinc:moderate-user'),
+            'class' => 'first primary tab',
         )
-      );
-      /*$links['edit_profile'] = array(
+        );
+        /*$links['edit_profile'] = array(
         'title' => bts('Edit profile', array(), NULL, 'boinc:moderate-user'),
         'href' => "{$profile_moderation_path}/edit",
         'attributes' => array(
@@ -2300,27 +2300,27 @@ 
           'class' => 'tab',
         )
       );*/
-      $links['reject_profile'] = array(
+        $links['reject_profile'] = array(
         'title' => bts('Reject profile', array(), NULL, 'boinc:moderate-user'),
         'href' => "{$profile_moderation_path}/reject",
         'attributes' => array(
-          'title' => bts('Reject this profile content', array(), NULL, 'boinc:moderate-user'),
-          'class' => 'tab',
+            'title' => bts('Reject this profile content', array(), NULL, 'boinc:moderate-user'),
+            'class' => 'tab',
         )
-      );
+        );
     }
     $output .= '<ul class="tab-list">';
     $count = 0;
     foreach ($links as $key => $link) {
-      $output .= '<li class="' . (($count == 0) ? 'first primary ' : '') . 'tab">';
-      $output .= l($link['title'], $link['href'], array('query' => drupal_get_destination()));
-      $output .= '</li>';
-      $count++;
+        $output .= '<li class="' . (($count == 0) ? 'first primary ' : '') . 'tab">';
+        $output .= l($link['title'], $link['href'], array('query' => drupal_get_destination()));
+        $output .= '</li>';
+        $count++;
     }
     $output .= '<li class="' . (($count) ? '' : 'first ') . 'last tab">' . flag_create_link('abuse_user_meta', $account->uid) . '</li>';
     $output .= '</ul>';
-  }
-  return $output;
+    }
+    return $output;
 /*
 <ul class="tab-list">
   <li class="primary first tab">
@@ -2357,36 +2357,36 @@ 
  */
 function boincuser_apachesolr_index_documents_alter(array &$documents, $entity, $entity_type, $env_id) {
 
-  foreach ($documents as $document) {
+    foreach ($documents as $document) {
     if ( $document->entity_type=='node' AND $document->bundle=='profile' ) {
-      // Node information.
-      $nid = $document->entity_id;
-      $node = node_load($nid);
-      $account = user_load($node->uid);
-
-      // Use boincuser name and not drupal user name
-      $document->label = apachesolr_clean_text($account->boincuser_name);
-      // Author information
-      if ($node->uid == 0 || strlen($node->name) == 0) {
+        // Node information.
+        $nid = $document->entity_id;
+        $node = node_load($nid);
+        $account = user_load($node->uid);
+
+        // Use boincuser name and not drupal user name
+        $document->label = apachesolr_clean_text($account->boincuser_name);
+        // Author information
+        if ($node->uid == 0 || strlen($node->name) == 0) {
         // @see user_validate_name(). !'0' === TRUE.
         $document->ss_name = '0';
-      }
-      else {
+        }
+        else {
         $document->ss_name = $account->boincuser_name;
         // We want the name to be searchable for keywords.
         $document->tos_name = $account->boincuser_name;
-      }
+        }
 
-      // Rename "Profle" to "User"
-      $document->bundle = "User";
-      $document->bundle_name = "User";
+        // Rename "Profle" to "User"
+        $document->bundle = "User";
+        $document->bundle_name = "User";
 
-      // Replace the Solr document's created field with the date the user
-      // account was created. This replaces the node creation date typically
-      // used for indexing nodes.
-      $document->ds_created = apachesolr_date_iso($account->created);
+        // Replace the Solr document's created field with the date the user
+        // account was created. This replaces the node creation date typically
+        // used for indexing nodes.
+        $document->ds_created = apachesolr_date_iso($account->created);
+    }
     }
-  }
 
 }
 
@@ -2398,23 +2398,23 @@ 
  * Implementation of hook_privatemsg_name_lookup();
  */
 function boincuser_privatemsg_name_lookup($string) {
-  // Get the BOINC ID from the name string, and lookup the
-  // corresponding drupal user.
-  $boincname = substr($string, 0, strrpos($string, '_'));
-  $boincid = substr($string, strrpos($string, '_') + 1);
-  $drupalid = get_drupal_id($boincid);
-
-  // Name has spaced replaced with special UTF-8 characters in
-  // privatemsg module. We need to convert them back to spaces for the
-  // check below.
-  $boincname = preg_replace("/\\xc2\\xa0/", " ", $boincname);
-  if ($drupalid>0) {
+    // Get the BOINC ID from the name string, and lookup the
+    // corresponding drupal user.
+    $boincname = substr($string, 0, strrpos($string, '_'));
+    $boincid = substr($string, strrpos($string, '_') + 1);
+    $drupalid = get_drupal_id($boincid);
+
+    // Name has spaced replaced with special UTF-8 characters in
+    // privatemsg module. We need to convert them back to spaces for the
+    // check below.
+    $boincname = preg_replace("/\\xc2\\xa0/", " ", $boincname);
+    if ($drupalid>0) {
     if ($recipient = user_load(array('uid' => $drupalid))) {
-      // Double-check that the loaded user matches both boincuser_id
-      // and boincuser_name.
-      if ( ($boincid == $recipient->boincuser_id) AND ($boincname == $recipient->boincuser_name) ) {
+        // Double-check that the loaded user matches both boincuser_id
+        // and boincuser_name.
+        if ( ($boincid == $recipient->boincuser_id) AND ($boincname == $recipient->boincuser_name) ) {
         return $recipient;
-      }
+        }
+    }
     }
-  }
 }

Spacing +120 added lines, -120 removed lines

@@ -189,7 +189,7 @@ 
     'type' => MENU_CALLBACK
   );
   $items['account_finish.php'] = array(
-    'title' => 'Welcome to ' . variable_get('site_name', 'Drupal-BOINC'),
+    'title' => 'Welcome to '.variable_get('site_name', 'Drupal-BOINC'),
     'description' => 'RPC for after a user has created an account.',
     'page callback' => 'boincuser_account_finish',
     'access callback' => TRUE,
@@ -249,8 +249,8 @@ 
   // termsofuse is enabled, by having text in the termsofuse variable.
   $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
   $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-  if ( (!empty($termsofuse)) and ($user->uid) ) {
-    if ( !boincuser_check_termsofuse($user) and ($existinguser_tou) ) {
+  if ((!empty($termsofuse)) and ($user->uid)) {
+    if (!boincuser_check_termsofuse($user) and ($existinguser_tou)) {
 
       // Admins are exempt, otherwise the admin may not be able to
       // access the site!
@@ -264,14 +264,14 @@ 
           'user/termsofuse',
           'logout',
           'account/info/edit',
-          'user/' . $user->uid . '/edit',
-          'user/' . $user->uid . '/recoveremail/*',
+          'user/'.$user->uid.'/edit',
+          'user/'.$user->uid.'/recoveremail/*',
           'recover_email.php',
         );
         if (module_exists('boincuser_delete')) {
-          $paths0[] = 'user/' . $user->uid . '/delete';
-          $paths0[] = 'user/' . $user->uid . '/deleteconfirm/*';
-          $paths0[] = 'user/' . $user->uid . '/odeleteconfirm/*';
+          $paths0[] = 'user/'.$user->uid.'/delete';
+          $paths0[] = 'user/'.$user->uid.'/deleteconfirm/*';
+          $paths0[] = 'user/'.$user->uid.'/odeleteconfirm/*';
         }
 
         // Paths added by the admin
@@ -282,7 +282,7 @@ 
         }
 
         // paths to ignore
-        $paths_to_ignore = array_unique( array_merge($paths0, $paths2) );
+        $paths_to_ignore = array_unique(array_merge($paths0, $paths2));
 
         if (!_boincuser_ignore_paths($path, $paths_to_ignore)) {
           drupal_goto('user/termsofuse');
@@ -304,7 +304,7 @@ 
   require_boinc('password_compat/password');
   // Handle BOINC integration for users with UID > 1 (skip anonymous and admin)
   if (isset($account->uid) && ($account->uid > 1)) {
-    switch($op) {
+    switch ($op) {
     case 'load':
       // User loading; insert BOINC data into the user object
       $drupal_user = db_fetch_object(db_query("
@@ -334,11 +334,11 @@ 
       ));
       $account->boincuser_name = $boinc_user->name;
       $account->boincuser_account_key = $boinc_user->authenticator;
-      $account->boincuser_weak_auth = md5($boinc_user->authenticator . $boinc_user->passwd_hash);
+      $account->boincuser_weak_auth = md5($boinc_user->authenticator.$boinc_user->passwd_hash);
       $account->boincuser_total_credit = round($boinc_user->total_credit);
       $account->boincuser_expavg_credit = round($boinc_user->expavg_credit);
       $account->boincuser_expavg_time = round($boinc_user->expavg_time);
-      $account->boincuser_cpid = md5($boinc_user->cross_project_id . $account->mail);
+      $account->boincuser_cpid = md5($boinc_user->cross_project_id.$account->mail);
       $account->boincuser_default_pref_set = $boinc_user->venue;
       $account->boincteam_id = $boinc_user->teamid;
       $account->boincuser_previous_email_addr = $boinc_user->previous_email_addr;
@@ -507,7 +507,7 @@ 
 
             // Set password hash appropriately
             $passwd = ($edit['pass']) ? $edit['pass'] : $edit['current_pass'];
-            $passwd_hash = password_hash( md5($passwd.$lower_email_addr), PASSWORD_DEFAULT );
+            $passwd_hash = password_hash(md5($passwd.$lower_email_addr), PASSWORD_DEFAULT);
             // Algorithm for changing email and/or password
             if ($changing_email) {
               // locally store current email to set as previous email
@@ -595,8 +595,8 @@ 
   }
 
   // Check if user has agreed to terms of use.
-  if ( (!empty($termsofuse)) and ($account->uid) and
-       (!boincuser_check_termsofuse($account)) and ($existinguser_tou) ) {
+  if ((!empty($termsofuse)) and ($account->uid) and
+       (!boincuser_check_termsofuse($account)) and ($existinguser_tou)) {
 
     // Admins are exempted.
     $administrator_role = array_search('administrator', user_roles(true));
@@ -610,9 +610,9 @@ 
       $query_for_destination = '';
       $prevdest = $_REQUEST['destination'];
       if ($prevdest) {
-        $query_for_destination = '?destination=' . $prevdest;
+        $query_for_destination = '?destination='.$prevdest;
       }
-      $_REQUEST['destination'] = $path_for_destination . $query_for_destination;
+      $_REQUEST['destination'] = $path_for_destination.$query_for_destination;
 
     }
   }
@@ -645,7 +645,7 @@ 
   // In Drupal 7, these operation cases will all exist as their own hooks,
   // so let's approximate that here so that this function can simply be removed
   // upon migration to 7
-  switch($op) {
+  switch ($op) {
   case 'update':
     boincuser_node_update($node);
   }
@@ -656,7 +656,7 @@ 
  * is updated (forward compatible to Drupal 7)
  */
 function boincuser_node_update($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'profile':
     // Update the BOINC database directly
     $account = user_load($node->uid);
@@ -778,7 +778,7 @@ 
     }
 
     $form['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_dest) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_dest).'</li>',
       '#weight' => 1004,
     );
     $form['form control tabs suffix'] = array(
@@ -811,7 +811,7 @@ 
     $form['buttons']['preview_changes']['#suffix'] = '</li>';
     $form['buttons']['preview_changes']['#weight'] = 1004;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}").'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
@@ -843,7 +843,7 @@ 
     $form['actions']['submit']['#suffix'] = '</li>';
     $form['actions']['submit']['#weight'] = 1002;
     $form['actions']['cancel'] = array(
-        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
+        '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}").'</li>',
       '#weight' => 1005,
     );
     $form['actions']['form control tabs suffix'] = array(
@@ -870,7 +870,7 @@ 
     $form['privatemsg']['preview']['#suffix'] = '</li>';
     $form['privatemsg']['preview']['#weight'] = 1003;
     $form['privatemsg']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>',
       '#weight' => 1004,
     );
     $form['privatemsg']['form control tabs suffix'] = array(
@@ -958,11 +958,11 @@ 
     // Set special message if user has not agreed to TOU
     $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
     $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-    if ( (!boincuser_check_termsofuse($account)) and ($existinguser_tou) and (!empty($termsofuse)) and (!user_access('administer users')) ) {
+    if ((!boincuser_check_termsofuse($account)) and ($existinguser_tou) and (!empty($termsofuse)) and (!user_access('administer users'))) {
       drupal_set_message(
         bts('INFO: You have not agreed to the terms of use for @project. You may use this form to change your email address and/or password. Please note: you may not delete your account within seven (7) days of changing your email address.',
         array(
-          '@project' => variable_get('site_name','Drupal-BOINC'),
+          '@project' => variable_get('site_name', 'Drupal-BOINC'),
         ), NULL, 'boinc:account-credentials-change')
       , 'info');
     }
@@ -1027,36 +1027,36 @@ 
     $form['account']['boincuser_id'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('BOINC user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->boincuser_id . '</span>
+          <label>' . bts('BOINC user ID', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->boincuser_id.'</span>
         </div>',
     );
     $form['account']['user_id'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Drupal user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->uid . '</span>
+          <label>' . bts('Drupal user ID', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->uid.'</span>
         </div>',
     );
     $form['account']['account_key'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->boincuser_account_key . '</span>
+          <label>' . bts('Account key', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->boincuser_account_key.'</span>
         </div>',
     );
     $form['account']['weak_account_key'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Weak account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . "{$account->boincuser_id}_{$account->boincuser_weak_auth}" . '</span>
+          <label>' . bts('Weak account key', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . "{$account->boincuser_id}_{$account->boincuser_weak_auth}".'</span>
         </div>',
     );
     $form['account']['cpid'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Cross-project ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->boincuser_cpid . '</span>
+          <label>' . bts('Cross-project ID', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->boincuser_cpid.'</span>
         </div>',
     );
 
@@ -1074,7 +1074,7 @@ 
     $form['submit']['#suffix'] = '</li>';
     $form['submit']['#weight'] = 1002;
     $form['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>',
       '#weight' => 1003,
     );
     if (isset($form['delete']) AND is_array($form['delete'])) {
@@ -1170,7 +1170,7 @@ 
     $form['buttons']['preview_changes']['#suffix'] = '</li>';
     $form['buttons']['preview_changes']['#weight'] = 1004;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
@@ -1219,11 +1219,11 @@ 
     // Set name temporarily to dummy value to beat validation
     $form['name'] = array(
       '#type' => 'hidden',
-      '#value' => rand() . '.' . time()
+      '#value' => rand().'.'.time()
     );
 
     // Add JS for submit button disabling
-    drupal_add_js(drupal_get_path('module', 'boincuser') . '/boincuser.js');
+    drupal_add_js(drupal_get_path('module', 'boincuser').'/boincuser.js');
 
     // Terms of use section
     $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
@@ -1239,7 +1239,7 @@ 
 
       $form['termsofuse']['title1'] = array(
         '#weight' => -12,
-        '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:user-register' ) . '</h2>',
+        '#value' => '<h2>'.bts(variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:user-register').'</h2>',
         '#prefix' => '<div id="register-title1">',
         '#suffix' => '</div>',
       );
@@ -1262,7 +1262,7 @@ 
 
     $form['title2'] = array(
       '#weight' => -6,
-      '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), NULL, 'project:user-register') . '</h2>',
+      '#value' => '<h2>'.bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), NULL, 'project:user-register').'</h2>',
       '#prefix' => '<div id="register-title2">',
       '#suffix' => '</div>',
     );
@@ -1326,7 +1326,7 @@ 
     $form['buttons']['submit']['#suffix'] = '</li>';
     $form['buttons']['submit']['#weight'] = 1002;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/login') . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/login').'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -1408,7 +1408,7 @@ 
  */
 function boincuser_token_list($type = 'all') {
   if ($type == 'user' || $type == 'all') {
-    $tokens['user']['display-name']      = t("The user's name that should be displayed");
+    $tokens['user']['display-name'] = t("The user's name that should be displayed");
     return $tokens;
   }
 }
@@ -1420,9 +1420,9 @@ 
   if ($view->args) {
     $account_id = $view->args[0];
   }
-  if ($view->name=="user_activity") {
+  if ($view->name == "user_activity") {
     // Run the following custom query for the user_activity view
-    $view->build_info['query']= "
+    $view->build_info['query'] = "
       SELECT node_revisions.vid AS vid,
         node.nid AS node_nid,
         node.uid AS users_node_uid,
@@ -1462,13 +1462,13 @@ 
   // Delete expired users in the BOINC database, user_delete table.
   require_boinc('boinc_db');
   $num_deleted = BoincUserDeleted::delete_expired();
-  if ($num_deleted>0) {
+  if ($num_deleted > 0) {
     watchdog('boincuser', "Deleted ${num_deleted} users from user_deleted table", WATCHDOG_NOTICE);
   }
 
   // Delete expired tokens from token table
   $tokens_deleted = BoincToken::delete_expired();
-  if ($tokens_deleted>0) {
+  if ($tokens_deleted > 0) {
     watchdog('boincuser', "Deleted ${tokens_deleted} tokens from token table", WATCHDOG_NOTICE);
   }
 }
@@ -1553,38 +1553,38 @@ 
   case 'boinc':
     $output .= '<ol>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts('First !create_an_account here at @sitename.',
+      $output .= '<li>'.bts('First !create_an_account here at @sitename.',
       array(
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), NULL, 'boinc:join-page').'</li>';
     }
-    $output .= '  <li>' . bts("Install BOINC on this device if not already present.", array(), NULL, 'boinc:join-page') . '</li>';
-    $output .= '  <li>' . bts("Select <i>Tools / Add Project</i>. Choose @sitename from the list, or enter @siteurl.",
+    $output .= '  <li>'.bts("Install BOINC on this device if not already present.", array(), NULL, 'boinc:join-page').'</li>';
+    $output .= '  <li>'.bts("Select <i>Tools / Add Project</i>. Choose @sitename from the list, or enter @siteurl.",
     array(
       '@sitename' => $site_name,
       '@siteurl' => $base_url,
-    ), NULL, 'boinc:join-page') . '</li>';
+    ), NULL, 'boinc:join-page').'</li>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts("If you're running a command-line or pre-5.0 version of BOINC, use <b>!boinccmd</b> to add the project.",
+      $output .= '<li>'.bts("If you're running a command-line or pre-5.0 version of BOINC, use <b>!boinccmd</b> to add the project.",
         array(
           '!boinccmd' => l('boinccmd --project_attach', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
-        ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page').'</li>';
     }
     else {
-      $output .= '<li>' . bts("If you're running a command-line version of BOINC,
+      $output .= '<li>'.bts("If you're running a command-line version of BOINC,
         please follow the <b>!instructionslink</b> to first <i>create an account</i>, and then <i>attach</i> to this project. Use the same project URL as above.",
         array(
           '!instructionslink' => l('instructions', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
-        ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page').'</li>';
     }
-    $output .= '<li>' . bts("If you're running a pre-5.0 version of BOINC, please
+    $output .= '<li>'.bts("If you're running a pre-5.0 version of BOINC, please
       upgrade to a more recent version of BOINC to create an account
       at @this_project.",
       array(
         '@this_project' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
-    $output .=  '</ol>';
+      ), NULL, 'boinc:join-page').'</li>';
+    $output .= '</ol>';
     break;
   case 'new':
   default:
@@ -1596,37 +1596,37 @@ 
     //  $ruleslink = drupal_lookup_path('source', $ruleslinkB);
     //}
 
-    $ruleslink = drupal_lookup_path('source', variable_get('boinc_weboptions_rulespolicies', '') );
+    $ruleslink = drupal_lookup_path('source', variable_get('boinc_weboptions_rulespolicies', ''));
 
     // Join page output
     $output .= '<ol>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts('First !create_an_account here at @sitename.',
+      $output .= '<li>'.bts('First !create_an_account here at @sitename.',
       array(
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), NULL, 'boinc:join-page').'</li>';
     }
-    else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
-      $output .= '  <li>' . bts("Read our !rules_and_policies.", array(
+    else if (menu_valid_path(array('link_path' => $ruleslink))) {
+      $output .= '  <li>'.bts("Read our !rules_and_policies.", array(
         '!rules_and_policies' => l(bts('Rules and Policies', array(), NULL, 'boinc:join-page'), $ruleslink),
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), NULL, 'boinc:join-page').'</li>';
     }
-    $output .= '  <li>' . bts('Download the BOINC desktop software.', array(), NULL, 'boinc:join-page');
+    $output .= '  <li>'.bts('Download the BOINC desktop software.', array(), NULL, 'boinc:join-page');
     $output .= '    <p>';
     $output .= '      <a class="button" href="http://boinc.berkeley.edu/download.php">Download</a>';
     $output .= '    </p>';
-    $output .= '    ' . bts("For Android devices, visit !fdroid_link or download !apk_link directly.", array(
+    $output .= '    '.bts("For Android devices, visit !fdroid_link or download !apk_link directly.", array(
       '!fdroid_link' => '<a href="https://f-droid.org/en/packages/edu.berkeley.boinc">F-Droid</a>',
       '!apk_link' => '<a href="https://boinc.berkeley.edu/download_all.php">BOINC for Android</a>',
     ), NULL, 'boinc:join-page');
     $output .= '  </li>';
-    $output .= '  <li>' . bts('Run the installer.', array(), NULL, 'boinc:join-page') . '</li>';
-    $output .= '  <li>' . bts('Choose @sitename from the list, or enter @siteurl.', array(
+    $output .= '  <li>'.bts('Run the installer.', array(), NULL, 'boinc:join-page').'</li>';
+    $output .= '  <li>'.bts('Choose @sitename from the list, or enter @siteurl.', array(
       '@sitename' => $site_name,
       '@siteurl' => $base_url,
-    ), NULL, 'boinc:join-page') . '</li>';
-    $output .=  '</ol>';
+    ), NULL, 'boinc:join-page').'</li>';
+    $output .= '</ol>';
   }
   $output .= '</div>';
   return $output;
@@ -1639,7 +1639,7 @@ 
   global $user;
   $site_name = variable_get('site_name', 'Drupal-BOINC');
   // get the front page message from database; this is set in the admin interface under BOINC Other
-  $site_message = variable_get('boinc_other_frontpage','');
+  $site_message = variable_get('boinc_other_frontpage', '');
 
   // Determine the user of the day
   $current_uotd = db_fetch_object(db_query("
@@ -1661,30 +1661,30 @@ 
   $output .= ($user->uid) ? bts('Welcome back!', array(), NULL, 'boinc:front-page') : ($site_name ? bts('What is @this_project?', array('@this_project' => $site_name)) : bts('Welcome!', array(), NULL, 'boinc:front-page'));
   $output .= '</h2>';
   $output .= '<div class="boinc-overview balance-height-front">';
-  $output .= '  <div>' . bts($site_message, array(), NULL, "project:front page") . ' ' . l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about') . '</div>';
+  $output .= '  <div>'.bts($site_message, array(), NULL, "project:front page").' '.l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about').'</div>';
   if ($user->uid) {
-    $output .= '  <div>' . l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))) . '</div>';
+    $output .= '  <div>'.l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))).'</div>';
   }
   else {
-    $output .= '  <div>' . l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))) . '</div>';
+    $output .= '  <div>'.l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))).'</div>';
   }
   $output .= '</div>';
   $output .= '<div class="boinc-overview-details">';
   $output .= '  <div class="detail-container">';
-  $output .= '    <a class="user-of-the-day" href="account/' . $uotd->uid . '">';
+  $output .= '    <a class="user-of-the-day" href="account/'.$uotd->uid.'">';
   $output .= '      <div class="picture">';
   $output .= theme('imagefield_image', $uotd_image['image'], $uotd_image['alt'],
     $uotd_image['alt'], array(), FALSE);
   $output .= '      </div>';
-  $output .= '      <div class="text">' . bts('User of the day', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '      <div class="detail">' . $uotd->boincuser_name . '</div>';
+  $output .= '      <div class="text">'.bts('User of the day', array(), NULL, 'boinc:front-page').'</div>';
+  $output .= '      <div class="detail">'.$uotd->boincuser_name.'</div>';
   $output .= '    </a>';
   $output .= '    <div class="volunteers">';
-  $output .= '      <div class="text">' . bts('Over 500,000 volunteers and counting.', array(), NULL, 'boinc:front-page') . '</div>';
+  $output .= '      <div class="text">'.bts('Over 500,000 volunteers and counting.', array(), NULL, 'boinc:front-page').'</div>';
   $output .= '      <div class="platforms">';
-  $output .= '        <div class="detail platform windows">' . bts('Windows', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform mac">' .  bts('Mac', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform linux">' . bts('Linux', array(), NULL, 'boinc:front-page') . '</div>';
+  $output .= '        <div class="detail platform windows">'.bts('Windows', array(), NULL, 'boinc:front-page').'</div>';
+  $output .= '        <div class="detail platform mac">'.bts('Mac', array(), NULL, 'boinc:front-page').'</div>';
+  $output .= '        <div class="detail platform linux">'.bts('Linux', array(), NULL, 'boinc:front-page').'</div>';
   $output .= '      </div>';
   $output .= '    </div>';
   $output .= '  </div>';
@@ -1715,7 +1715,7 @@ 
   $enablethisRPC = variable_get('boinc_weboptions_enableaccountcreateRPC', TRUE);
   if (!$enablethisRPC) {
     $mess = bts('Account creation is done through our Web site. Please register at @url', array(
-      '@url' => $base_url . '/user/registration',
+      '@url' => $base_url.'/user/registration',
     ),
     NULL, 'boinc:create_account');
     xml_error(-208, $mess);
@@ -1747,8 +1747,8 @@ 
   $boinc_user = BoincUser::lookup_email_addr($params['email_addr']);
   if ($boinc_user) {
     // Return authenticator for existing users
-    if ( ($params['passwd_hash'] == $boinc_user->passwd_hash) or
-    password_verify($params['passwd_hash'], $boinc_user->passwd_hash) ) {
+    if (($params['passwd_hash'] == $boinc_user->passwd_hash) or
+    password_verify($params['passwd_hash'], $boinc_user->passwd_hash)) {
       $output = array('authenticator' => $boinc_user->authenticator);
     }
     else {
@@ -1804,7 +1804,7 @@ 
   // Ensure there is a authentication token before continuing
   if (empty($authtoken)) {
     drupal_not_found();
-    return ;
+    return;
   }
 
   if (strlen($authtoken) != 32) {
@@ -1826,8 +1826,8 @@ 
   }
 
   // Lookup path to custom account finish page
-  $customaccountfinishpath = drupal_lookup_path('source', variable_get('boinc_weboptions_accountfinish', '') );
-  if ( menu_valid_path(array('link_path' => $customaccountfinishpath)) ) {
+  $customaccountfinishpath = drupal_lookup_path('source', variable_get('boinc_weboptions_accountfinish', ''));
+  if (menu_valid_path(array('link_path' => $customaccountfinishpath))) {
     $node = menu_get_object('node', 1, $customaccountfinishpath);
     if ($node) {
       return node_page_view($node);
@@ -1836,12 +1836,12 @@ 
 
   // open links in new window
   $options = array(
-    'attributes' => array( 'target' => '_blank' ),
+    'attributes' => array('target' => '_blank'),
   );
 
   // Check moderation page exists
-  $moderationpath = drupal_lookup_path('source', variable_get('boinc_weboptions_moderationpage', '') );
-  if ( menu_valid_path(array('link_path' => $moderationpath)) ) {
+  $moderationpath = drupal_lookup_path('source', variable_get('boinc_weboptions_moderationpage', ''));
+  if (menu_valid_path(array('link_path' => $moderationpath))) {
     $modsentence = bts('Please note: user profiles are subject to !moderation.', array('!moderation' => l(bts('moderation', array(), NULL, 'boinc:account-finish'), $moderationpath, $options)), NULL, 'boinc:account-finish');
   } else {
     $modsentence = bts('Please note: user profiles are subject to moderation.', array(), NULL, 'boinc:account-finish');
@@ -1849,11 +1849,11 @@ 
 
   $username = $user->boincuser_name;
   $site_name = variable_get('site_name', 'Drupal-BOINC');
-  $output = "<p>" . bts('Thank you @user_name for joining @site_name. Your account has been created. Your BOINC client should start working on assigned tasks soon, without any additional action or configuration. Please visit the links below for more information and additional options. (Links will open in a new window.)',
+  $output = "<p>".bts('Thank you @user_name for joining @site_name. Your account has been created. Your BOINC client should start working on assigned tasks soon, without any additional action or configuration. Please visit the links below for more information and additional options. (Links will open in a new window.)',
   array(
     '@user_name' => $username,
     '@site_name' => $site_name,
-  ), NULL, 'boinc:account-finish') . "</p>";
+  ), NULL, 'boinc:account-finish')."</p>";
 
   $links = array(
     array(
@@ -1919,7 +1919,7 @@ 
   );
 
   //List of links
-  $output .= theme_item_list($links, $title = NULL, $type='ul');
+  $output .= theme_item_list($links, $title = NULL, $type = 'ul');
 
   return $output;
 }
@@ -2036,7 +2036,7 @@ 
     global $base_url;
     global $base_path;
     $site_name = variable_get('site_name', 'Drupal-BOINC');
-    $site_url = $base_url . $base_path;
+    $site_url = $base_url.$base_path;
     $moderator = user_load($user->uid);
     $profile->moderate = 0;
     $profile->status = 0;
@@ -2097,7 +2097,7 @@ 
       global $base_url;
       global $base_path;
       $site_name = variable_get('site_name', 'Drupal-BOINC');
-      $site_url = $base_url . $base_path;
+      $site_url = $base_url.$base_path;
       $moderator = user_load($user->uid);
       $settings = array(
         'from' => '',
@@ -2201,25 +2201,25 @@ 
   if (!$projects) return bts('no projects...', array(), NULL, 'boinc:account-dashboard');
 
   $output = '';
-  $output .= '<table class="user-projects">' . "\n";
-  $output .= '<thead>' . "\n";
-  $output .= '  <tr>' . "\n";
-  $output .= '    <th>' . bts('Name', array(), NULL, 'boinc:project-name:-1:ignoreoverwrite') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Avg credit', array(), NULL, 'boinc:account-dashboard') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . '</th>' . "\n";
-  $output .= '  </tr>' . "\n";
-  $output .= '</thead>' . "\n";
-  $output .= '<tbody>' . "\n";
+  $output .= '<table class="user-projects">'."\n";
+  $output .= '<thead>'."\n";
+  $output .= '  <tr>'."\n";
+  $output .= '    <th>'.bts('Name', array(), NULL, 'boinc:project-name:-1:ignoreoverwrite').'</th>'."\n";
+  $output .= '    <th class="numeric">'.bts('Avg credit', array(), NULL, 'boinc:account-dashboard').'</th>'."\n";
+  $output .= '    <th class="numeric">'.bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits').'</th>'."\n";
+  $output .= '  </tr>'."\n";
+  $output .= '</thead>'."\n";
+  $output .= '<tbody>'."\n";
   foreach ($projects AS $project) {
-    $url = rtrim($project->url, '/') . '/show_user.php?userid=' . $project->id;
-    $output .= '  <tr>' . "\n";
-    $output .= '    <td>' . l($project->name, $url) . '</td>' . "\n";
-    $output .= '    <td class="numeric">' . boincwork_format_stats((float) $project->expavg_credit) . '</td>' . "\n";
-    $output .= '    <td class="numeric">' . boincwork_format_stats((float) $project->total_credit) . '</td>' . "\n";
-    $output .= '  </tr>' . "\n";
+    $url = rtrim($project->url, '/').'/show_user.php?userid='.$project->id;
+    $output .= '  <tr>'."\n";
+    $output .= '    <td>'.l($project->name, $url).'</td>'."\n";
+    $output .= '    <td class="numeric">'.boincwork_format_stats((float)$project->expavg_credit).'</td>'."\n";
+    $output .= '    <td class="numeric">'.boincwork_format_stats((float)$project->total_credit).'</td>'."\n";
+    $output .= '  </tr>'."\n";
   }
-  $output .= '</tbody>' . "\n";
-  $output .= '</table>' . "\n";
+  $output .= '</tbody>'."\n";
+  $output .= '</table>'."\n";
   $more_link = ($account) ? "user/{$account->uid}/stats" : 'account/stats';
   //$output .= "<div class=\"more-link\"><a href=\"{$more_link}\">More stats</a></div>" . "\n";
   return $output;
@@ -2239,8 +2239,8 @@ 
     'cpid' => $cpid
   );
   $args = array();
-  foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
-  $query = '?' . implode('&', $args);
+  foreach ($get as $arg => $value) $args[] = "{$arg}=".rawurlencode($value);
+  $query = '?'.implode('&', $args);
 
   // Load XML from RPC
   $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
@@ -2312,12 +2312,12 @@ 
     $output .= '<ul class="tab-list">';
     $count = 0;
     foreach ($links as $key => $link) {
-      $output .= '<li class="' . (($count == 0) ? 'first primary ' : '') . 'tab">';
+      $output .= '<li class="'.(($count == 0) ? 'first primary ' : '').'tab">';
       $output .= l($link['title'], $link['href'], array('query' => drupal_get_destination()));
       $output .= '</li>';
       $count++;
     }
-    $output .= '<li class="' . (($count) ? '' : 'first ') . 'last tab">' . flag_create_link('abuse_user_meta', $account->uid) . '</li>';
+    $output .= '<li class="'.(($count) ? '' : 'first ').'last tab">'.flag_create_link('abuse_user_meta', $account->uid).'</li>';
     $output .= '</ul>';
   }
   return $output;
@@ -2358,7 +2358,7 @@ 
 function boincuser_apachesolr_index_documents_alter(array &$documents, $entity, $entity_type, $env_id) {
 
   foreach ($documents as $document) {
-    if ( $document->entity_type=='node' AND $document->bundle=='profile' ) {
+    if ($document->entity_type == 'node' AND $document->bundle == 'profile') {
       // Node information.
       $nid = $document->entity_id;
       $node = node_load($nid);
@@ -2408,11 +2408,11 @@ 
   // privatemsg module. We need to convert them back to spaces for the
   // check below.
   $boincname = preg_replace("/\\xc2\\xa0/", " ", $boincname);
-  if ($drupalid>0) {
+  if ($drupalid > 0) {
     if ($recipient = user_load(array('uid' => $drupalid))) {
       // Double-check that the loaded user matches both boincuser_id
       // and boincuser_name.
-      if ( ($boincid == $recipient->boincuser_id) AND ($boincname == $recipient->boincuser_name) ) {
+      if (($boincid == $recipient->boincuser_id) AND ($boincname == $recipient->boincuser_name)) {
         return $recipient;
       }
     }

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

@@ -83,7 +83,7 @@ 
     'weight' => 5
   );
   $items['moderate/profile/%/reject'] = array(
-    'title' => bts('Reject profile', array(), NULL, 'boinc:moderate-user'),
+    'title' => bts('Reject profile', array(), null, 'boinc:moderate-user'),
     'description' => 'Reject profile content',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_moderate_profile_reject_form', 2),
@@ -92,7 +92,7 @@ 
     'weight' => 5
   );
   $items['moderate/user/%/ban'] = array(
-    'title' => bts('Ban user', array(), NULL, 'boinc:moderate-ban-user'),
+    'title' => bts('Ban user', array(), null, 'boinc:moderate-ban-user'),
     'description' => 'Ban a user from using community features',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_moderate_user_ban_form', 2),
@@ -123,7 +123,7 @@ 
     'weight' => 5
   );
   $items['user/login/auth'] = array(
-    'title' => bts('Authenticator login', array(), NULL, 'boinc:authenticator-login-page'),
+    'title' => bts('Authenticator login', array(), null, 'boinc:authenticator-login-page'),
     'description' => 'Log in using a user authenticator',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_authloginform'),
@@ -131,7 +131,7 @@ 
     'type' => MENU_CALLBACK,
   );
   $items['user/termsofuse'] = array(
-    'title' => bts('Terms of Use', array(), NULL, 'boinc:termsofuse-form'),
+    'title' => bts('Terms of Use', array(), null, 'boinc:termsofuse-form'),
     'description' => 'A site\'s term of use.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincuser_termsofuse_form'),
@@ -185,19 +185,19 @@ 
     'title' => 'Create Account RPC',
     'description' => 'RPC for creating user accounts.',
     'page callback' => 'boincuser_create_account',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK
   );
   $items['account_finish.php'] = array(
     'title' => 'Welcome to ' . variable_get('site_name', 'Drupal-BOINC'),
     'description' => 'RPC for after a user has created an account.',
     'page callback' => 'boincuser_account_finish',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK,
   );
   $items['boincuser/autocomplete'] = array(
     'page callback' => '_boincuser_user_name_autocomplete',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK,
   );
   $items['user/%user/recoveremail/%'] = array(
@@ -212,7 +212,7 @@ 
     'title' => t('Recover previous email'),
     'description' => t('redirect'),
     'page callback' => '_boincuser_redirect_recover_email',
-    'access callback' => TRUE,
+    'access callback' => true,
     'type' => MENU_CALLBACK,
   );
   return $items;
@@ -247,7 +247,7 @@ 
   // Check if user has agreed to the terms of use. If not, send the
   // user to the terms-of-use form. This is only makes sense if the
   // termsofuse is enabled, by having text in the termsofuse variable.
-  $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
+  $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', false);
   $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
   if ( (!empty($termsofuse)) and ($user->uid) ) {
     if ( !boincuser_check_termsofuse($user) and ($existinguser_tou) ) {
@@ -296,7 +296,7 @@ 
  * Implementation of hook_user(); add custom actions to standard
  * Drupal user operations
  */
-function boincuser_user($op, &$edit, &$account, $category = NULL) {
+function boincuser_user($op, &$edit, &$account, $category = null) {
   require_boinc('boinc_db');
   require_boinc('user');
   require_boinc('xml');
@@ -345,7 +345,7 @@ 
       $account->boincuser_email_addr_change_time = $boinc_user->email_addr_change_time;
       db_set_active('default');
       // Set Drupal team ID
-      $account->team = NULL;
+      $account->team = null;
       if ($account->boincteam_id) {
         $account->team = db_result(db_query("
           SELECT nid FROM {boincteam} WHERE team_id = %d",
@@ -453,7 +453,7 @@ 
         $boinc_user = boincuser_register_make_user($user_params);
         if (!$boinc_user) {
           // Account exists with this email addr
-          form_set_error('email', bts('Error creating BOINC account.', array(), NULL, 'boinc:add-new-user'));
+          form_set_error('email', bts('Error creating BOINC account.', array(), null, 'boinc:add-new-user'));
           return;
         }
 
@@ -499,9 +499,9 @@ 
         case 'user_account':
           // Ensure that BOINC data is altered
 
-          $changing_email = ($edit['mail'] AND $edit['mail'] != $boinc_user->email_addr) ? true : false;
+          $changing_email = ($edit['mail'] and $edit['mail'] != $boinc_user->email_addr) ? true : false;
           $changing_pass = ($edit['pass']) ? true : false;
-          if ($changing_email OR $changing_pass) {
+          if ($changing_email or $changing_pass) {
             // set email address to lower-case
             $lower_email_addr = strtolower($edit['mail']);
 
@@ -583,13 +583,13 @@ 
  *(forward compatible to Drupal 7).
  */
 function boincuser_user_login(&$edit, $account) {
-  $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
+  $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', false);
   $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
 
   // Use the same code as boincuser_form_alter(), for case
   // 'user_profile_form', if the refering page is the user password
   // reset form, then do not check for terms of use.
-  $reset_pass = (strpos($_SERVER['HTTP_REFERER'], "/user/reset/$account->uid") === FALSE) ? 0 : 1;
+  $reset_pass = (strpos($_SERVER['HTTP_REFERER'], "/user/reset/$account->uid") === false) ? 0 : 1;
   if ($reset_pass) {
     return;
   }
@@ -737,7 +737,7 @@ 
 
       // General friend form overrides
       $form['flag_friend_submit']['#prefix'] = '<li class="first tab">';
-      $form['flag_friend_submit']['#value'] = bts('Send request', array(), NULL, 'boinc:friends-page');
+      $form['flag_friend_submit']['#value'] = bts('Send request', array(), null, 'boinc:friends-page');
       $form['flag_friend_submit']['#type'] = 'submit';
       $form['flag_friend_submit']['#suffix'] = '</li>';
       $form['flag_friend_submit']['#weight'] = 1002;
@@ -746,7 +746,7 @@ 
       case FLAG_FRIEND_BOTH:
       case FLAG_FRIEND_FLAGGED:
         unset($form['actions']);
-        $form['flag_friend_submit']['#value'] = bts('Remove friend', array(), NULL, 'boinc:friends-remove');
+        $form['flag_friend_submit']['#value'] = bts('Remove friend', array(), null, 'boinc:friends-remove');
         // Add in our hack handler to fix the flag_friend module
         $final_handler = array_pop($form['#submit']);
         $form['#submit'][] = 'boincuser_fix_unfriend_form_submit';
@@ -754,21 +754,21 @@ 
         break;
       case FLAG_FRIEND_PENDING:
         unset($form['actions']);
-        $form['flag_friend_submit']['#value'] = bts('Remove request', array(), NULL, 'boinc:friends-page');
+        $form['flag_friend_submit']['#value'] = bts('Remove request', array(), null, 'boinc:friends-page');
         break;
       case FLAG_FRIEND_APPROVAL:
         if ($action == 'flag') {
-          $form['flag_friend_submit']['#value'] = bts('Approve request', array(), NULL, 'boinc:friends-page');
+          $form['flag_friend_submit']['#value'] = bts('Approve request', array(), null, 'boinc:friends-page');
         }
         elseif ($action == 'unflag') {
           unset($form['actions']);
-          $form['flag_friend_submit']['#value'] = bts('Deny request', array(), NULL, 'boinc:friends-page');
+          $form['flag_friend_submit']['#value'] = bts('Deny request', array(), null, 'boinc:friends-page');
         }
         break;
       case FLAG_FRIEND_UNFLAGGED:
       default:
         $user_links[] = array(
-          'title' => bts('Add as friend', array(), NULL, 'boinc:friends-add'),
+          'title' => bts('Add as friend', array(), null, 'boinc:friends-add'),
           'href' => "flag/confirm/flag/friend/{$account->uid}"
         );
       }
@@ -778,7 +778,7 @@ 
     }
 
     $form['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_dest) . '</li>',
+      '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), $cancel_dest) . '</li>',
       '#weight' => 1004,
     );
     $form['form control tabs suffix'] = array(
@@ -801,7 +801,7 @@ 
       '#weight' => 1001,
     );
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
-    $form['buttons']['submit']['#value'] = bts('Save changes', array(), NULL, 'boinc:form-save');
+    $form['buttons']['submit']['#value'] = bts('Save changes', array(), null, 'boinc:form-save');
     $form['buttons']['submit']['#suffix'] = '</li>';
     $form['buttons']['submit']['#weight'] = 1002;
     $form['buttons']['preview']['#prefix'] = '<li class="tab">';
@@ -811,7 +811,7 @@ 
     $form['buttons']['preview_changes']['#suffix'] = '</li>';
     $form['buttons']['preview_changes']['#weight'] = 1004;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
+      '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
       '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
@@ -839,11 +839,11 @@ 
       '#weight' => 1001,
     );
     $form['actions']['submit']['#prefix'] = '<li class="first tab">';
-    $form['actions']['submit']['#value'] = bts('Delete', array(), NULL, 'boinc:form-delete');
+    $form['actions']['submit']['#value'] = bts('Delete', array(), null, 'boinc:form-delete');
     $form['actions']['submit']['#suffix'] = '</li>';
     $form['actions']['submit']['#weight'] = 1002;
     $form['actions']['cancel'] = array(
-        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
       '#weight' => 1005,
     );
     $form['actions']['form control tabs suffix'] = array(
@@ -863,14 +863,14 @@ 
       '#weight' => 1001,
     );
     $form['privatemsg']['submit']['#prefix'] = '<li class="first tab">';
-    $form['privatemsg']['submit']['#value'] = bts('Send message', array(), NULL, 'boinc:private-message');
+    $form['privatemsg']['submit']['#value'] = bts('Send message', array(), null, 'boinc:private-message');
     $form['privatemsg']['submit']['#suffix'] = '</li>';
     $form['privatemsg']['submit']['#weight'] = 1002;
     $form['privatemsg']['preview']['#prefix'] = '<li class="tab">';
     $form['privatemsg']['preview']['#suffix'] = '</li>';
     $form['privatemsg']['preview']['#weight'] = 1003;
     $form['privatemsg']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+      '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), $_GET['q']) . '</li>',
       '#weight' => 1004,
     );
     $form['privatemsg']['form control tabs suffix'] = array(
@@ -885,18 +885,18 @@ 
   // Login form
   case 'user_login':
   case 'user_login_block':
-      drupal_set_title(bts('Login', array(), NULL, 'boinc:menu-link'));
+      drupal_set_title(bts('Login', array(), null, 'boinc:menu-link'));
     // Replace name with email in login form
     unset($form['name']);
     array_unshift($form, array(
       'email' => array(
         '#type' => 'textfield',
-        '#title' => bts('Email address', array(), NULL, 'boinc:email-address-to-login'),
+        '#title' => bts('Email address', array(), null, 'boinc:email-address-to-login'),
         '#size' => ($form_id == 'user_login_block') ? 15 : 60,
         '#maxlength' => EMAIL_MAX_LENGTH,
-        '#required' => TRUE,
+        '#required' => true,
         '#attributes' => array('tabindex' => '1'),
-        '#description' => bts('Enter your @s email address.', array('@s' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:standard-login-page')
+        '#description' => bts('Enter your @s email address.', array('@s' => variable_get('site_name', 'Drupal-BOINC')), null, 'boinc:standard-login-page')
       ),
       'validation_source' => array(
         '#type' => 'hidden',
@@ -912,7 +912,7 @@ 
     );
     $form['buttons']['submit'] = $form['submit'];
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
-    $form['buttons']['submit']['#value'] = bts('Log in', array(), NULL, 'boinc:standard-login-page');
+    $form['buttons']['submit']['#value'] = bts('Log in', array(), null, 'boinc:standard-login-page');
     $form['buttons']['submit']['#suffix'] = '</li>';
     $form['buttons']['submit']['#weight'] = 1002;
     $form['buttons']['form control tabs suffix'] = array(
@@ -928,7 +928,7 @@ 
     if (isset($form_state['post']['email']) and isset($form_state['post']['pass'])) {
       // Find the local validation function's entry so we can replace it.
       $array_key = array_search('user_login_authenticate_validate', $form['#validate']);
-      if ($array_key === FALSE) {
+      if ($array_key === false) {
         // Could not find it. Some other module must have run form_alter().
         // We will simply add our validation just before the final validator.
         $final_validator = array_pop($form['#validate']);
@@ -956,26 +956,26 @@ 
     }
 
     // Set special message if user has not agreed to TOU
-    $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
+    $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', false);
     $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
     if ( (!boincuser_check_termsofuse($account)) and ($existinguser_tou) and (!empty($termsofuse)) and (!user_access('administer users')) ) {
       drupal_set_message(
         bts('INFO: You have not agreed to the terms of use for @project. You may use this form to change your email address and/or password. Please note: you may not delete your account within seven (7) days of changing your email address.',
         array(
           '@project' => variable_get('site_name','Drupal-BOINC'),
-        ), NULL, 'boinc:account-credentials-change')
+        ), null, 'boinc:account-credentials-change')
       , 'info');
     }
 
     // A bit hackish... but don't require the user to enter his password if
     // coming from the password reset function
-    $reset_pass = (strpos($_SERVER['HTTP_REFERER'], "/user/reset/{$form['#uid']}") === FALSE) ? 0 : 1;
+    $reset_pass = (strpos($_SERVER['HTTP_REFERER'], "/user/reset/{$form['#uid']}") === false) ? 0 : 1;
     if ($reset_pass) {
       $_SESSION['reset_pass'] = 1;
     }
 
     // Adjust form elements already present
-    $form['account']['name']['#title'] = bts('Drupal Username', array(), NULL, 'boinc:drupal-username');
+    $form['account']['name']['#title'] = bts('Drupal Username', array(), null, 'boinc:drupal-username');
     $form['account']['name']['#size'] = 40;
     $form['account']['name']['#attributes']['autocomplete'] = 'off';
     $form['account']['name']['#description'] .= '<p>This is the drupal (internal) username. The title above shows the BOINC username, which is the display name used publicly that the user can change in Community Preferences.';
@@ -986,11 +986,11 @@ 
       // Add BOINC username (aka displayname)
       $form['account']['boincuser_name'] = array(
         '#type' => 'textfield',
-        '#title' => bts('BOINC Username', array(), NULL, 'boinc:user-or-team-name'),
+        '#title' => bts('BOINC Username', array(), null, 'boinc:user-or-team-name'),
         '#default_value' => $account->boincuser_name,
         '#maxlength' => USERNAME_MAX_LENGTH,
-        '#required' => TRUE,
-        '#description' => bts('This is the BOINC (external) username. This is the same setting as found in Account -> Preferences -> Community.', array(), NULL, 'boinc:username-change'),
+        '#required' => true,
+        '#description' => bts('This is the BOINC (external) username. This is the same setting as found in Account -> Preferences -> Community.', array(), null, 'boinc:username-change'),
         '#size' => 40,
       );
     }
@@ -999,23 +999,23 @@ 
     // ago, it cannot be changed again.
     $duration = TOKEN_DURATION_ONE_WEEK;
     if (($account->boincuser_email_addr_change_time + $duration) > time() and (!user_access('administer users'))) {
-      $form['account']['mail']['#required'] = FALSE;
+      $form['account']['mail']['#required'] = false;
       $form['account']['mailhelp'] = array(
         '#value' => bts("You email address was changed within the past seven (7) days. Please look for an email to !prev_email if you need to revert this change. You may change your email address on !time.",
           array(
             '!prev_email' => $account->boincuser_previous_email_addr,
             '!time' => date('F j, Y \a\t G:i T', $account->boincuser_email_addr_change_time + $duration),
-          ), NULL, 'boinc:account-credentials-change'),
+          ), null, 'boinc:account-credentials-change'),
       );
     }
 
-    if (!$reset_pass AND ($user->uid == $account->uid OR !user_access('administer users'))) {
+    if (!$reset_pass and ($user->uid == $account->uid or !user_access('administer users'))) {
       // Add a password authenticator, required to change email or pw
       $form['account']['current_pass'] = array(
         '#type' => 'password',
-        '#title' => bts('Enter your password to save changes', array(), NULL, 'boinc:account-credentials-change'),
+        '#title' => bts('Enter your password to save changes', array(), null, 'boinc:account-credentials-change'),
         '#description' => bts('Enter your current password if changing your email
-          address or password.', array(), NULL, 'boinc:account-credentials-change'),
+          address or password.', array(), null, 'boinc:account-credentials-change'),
         '#size' => 17,
         '#attributes' => array(
           'autocomplete' => 'off',
@@ -1027,35 +1027,35 @@ 
     $form['account']['boincuser_id'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('BOINC user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
+          <label>' . bts('BOINC user ID', array(), null, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->boincuser_id . '</span>
         </div>',
     );
     $form['account']['user_id'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Drupal user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
+          <label>' . bts('Drupal user ID', array(), null, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->uid . '</span>
         </div>',
     );
     $form['account']['account_key'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
+          <label>' . bts('Account key', array(), null, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->boincuser_account_key . '</span>
         </div>',
     );
     $form['account']['weak_account_key'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Weak account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
+          <label>' . bts('Weak account key', array(), null, 'boinc:account-credentials-change') . '</label>
           <span>' . "{$account->boincuser_id}_{$account->boincuser_weak_auth}" . '</span>
         </div>',
     );
     $form['account']['cpid'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Cross-project ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
+          <label>' . bts('Cross-project ID', array(), null, 'boinc:account-credentials-change') . '</label>
           <span>' . $account->boincuser_cpid . '</span>
         </div>',
     );
@@ -1070,14 +1070,14 @@ 
       '#weight' => 1001,
     );
     $form['submit']['#prefix'] = '<li class="first tab">';
-    $form['submit']['#value'] = bts('Save changes', array(), NULL, 'boinc:form-save');
+    $form['submit']['#value'] = bts('Save changes', array(), null, 'boinc:form-save');
     $form['submit']['#suffix'] = '</li>';
     $form['submit']['#weight'] = 1002;
     $form['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+      '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), $_GET['q']) . '</li>',
       '#weight' => 1003,
     );
-    if (isset($form['delete']) AND is_array($form['delete'])) {
+    if (isset($form['delete']) and is_array($form['delete'])) {
       $form['delete']['#prefix'] = '<li class="first alt tab">';
       $form['delete']['#suffix'] = '</li>';
       $form['delete']['#weight'] = 1004;
@@ -1139,7 +1139,7 @@ 
 
     // Set form['title'], but hide it
     $form['title']['#default_value'] = $account->boincuser_name;
-    $form['title']['#access'] = FALSE;
+    $form['title']['#access'] = false;
 
     $form['separator_bottom'] = array(
       '#value' => '<div class="separator buttons"></div>',
@@ -1160,7 +1160,7 @@ 
       '#weight' => 1001,
     );
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
-    $form['buttons']['submit']['#value'] = bts('Save changes', array(), NULL, 'boinc:form-save');
+    $form['buttons']['submit']['#value'] = bts('Save changes', array(), null, 'boinc:form-save');
     $form['buttons']['submit']['#suffix'] = '</li>';
     $form['buttons']['submit']['#weight'] = 1002;
     $form['buttons']['preview']['#prefix'] = '<li class="tab">';
@@ -1170,12 +1170,12 @@ 
     $form['buttons']['preview_changes']['#suffix'] = '</li>';
     $form['buttons']['preview_changes']['#weight'] = 1004;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+      '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), $_GET['q']) . '</li>',
       '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
     $form['buttons']['delete']['#suffix'] = '</li>';
-    $form['buttons']['delete']['#value'] = bts('Clear User Profile', array(), NULL, 'boinc:form-save');
+    $form['buttons']['delete']['#value'] = bts('Clear User Profile', array(), null, 'boinc:form-save');
     $form['buttons']['delete']['#weight'] = 1006;
     $form['buttons']['delete']['#submit'] = array('_boincuser_node_profile_delete_submit');
     $form['buttons']['form control tabs suffix'] = array(
@@ -1209,11 +1209,11 @@ 
     array_unshift($form, array(
       'boincuser_name' => array(
         '#type' => 'textfield',
-        '#title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
+        '#title' => bts('Name', array(), null, 'boinc:user-or-team-name'),
         '#default_value' => $edit['boincuser_name'],
         '#maxlength' => USERNAME_MAX_LENGTH,
-        '#description' => bts('Spaces are allowed; punctuation is not allowed except for periods, hyphens, and underscores.', array(), NULL, 'boinc:user-register'),
-        '#required' => TRUE
+        '#description' => bts('Spaces are allowed; punctuation is not allowed except for periods, hyphens, and underscores.', array(), null, 'boinc:user-register'),
+        '#required' => true
       ),
     ));
     // Set name temporarily to dummy value to beat validation
@@ -1233,27 +1233,27 @@ 
         '#type'   => 'fieldset',
         '#prefix' => '<div id="termsofuse-wrapper">', // This is our wrapper div.
         '#suffix' => '</div>',
-        '#tree'   => TRUE,
+        '#tree'   => true,
         '#weight' => -15,
       );
 
       $form['termsofuse']['title1'] = array(
         '#weight' => -12,
-        '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:user-register' ) . '</h2>',
+        '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), null, 'project:user-register' ) . '</h2>',
         '#prefix' => '<div id="register-title1">',
         '#suffix' => '</div>',
       );
 
       $form['termsofuse']['body'] = array(
         '#weight' => -10,
-        '#value' => bts($termsofuse, array(), NULL, 'project:user-register'),
+        '#value' => bts($termsofuse, array(), null, 'project:user-register'),
         '#prefix' => '<div id="register-termsofuse">',
         '#suffix' => '</div>',
       );
 
       $form['termsofuse']['agreeTOU'] = array(
         '#type' => 'checkbox',
-        '#title' => bts(variable_get('boinc_weboptions_agreequestion', 'Do you agree with the above terms of use?'), array(), NULL, 'project:user-register'),
+        '#title' => bts(variable_get('boinc_weboptions_agreequestion', 'Do you agree with the above terms of use?'), array(), null, 'project:user-register'),
         '#weight' => -8,
         '#prefix' => '<div id="register-checkbox">',
         '#suffix' => '</div>',
@@ -1262,7 +1262,7 @@ 
 
     $form['title2'] = array(
       '#weight' => -6,
-      '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), NULL, 'project:user-register') . '</h2>',
+      '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), null, 'project:user-register') . '</h2>',
       '#prefix' => '<div id="register-title2">',
       '#suffix' => '</div>',
     );
@@ -1282,26 +1282,26 @@ 
 
   // Request new password form
   case 'user_pass':
-    drupal_set_title(bts('Forgot password', array(), NULL, 'boinc:forgot-password'));
+    drupal_set_title(bts('Forgot password', array(), null, 'boinc:forgot-password'));
     // Replace name/email text box with email only; retain "name" label
     // for compatibility with standard Drupal submit function
     unset($form['name']);
     array_unshift($form, array(
       'name' => array(
         '#type' => 'textfield',
-        '#title' => bts('Email address', array(), NULL, 'boinc:email-address-to-login'),
+        '#title' => bts('Email address', array(), null, 'boinc:email-address-to-login'),
         '#size' => 60,
         '#maxlength' => EMAIL_MAX_LENGTH,
-        '#required' => TRUE,
+        '#required' => true,
         '#description' => bts(
           'Enter your email address to receive instructions for resetting your password (or use the !authenticator_login).',
           array(
             '!authenticator_login' => l(
-              bts('authenticator-based login', array(), NULL, 'boinc:forgot-password'),
+              bts('authenticator-based login', array(), null, 'boinc:forgot-password'),
               'user/login/auth'
             )
           )
-        , NULL, 'boinc:forgot-password'),
+        , null, 'boinc:forgot-password'),
       ),
     ));
 
@@ -1322,11 +1322,11 @@ 
     );
     $form['buttons']['submit'] = $form['submit'];
     $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
-    $form['buttons']['submit']['#value'] = bts('Send', array(), NULL, 'boinc:form-send');
+    $form['buttons']['submit']['#value'] = bts('Send', array(), null, 'boinc:form-send');
     $form['buttons']['submit']['#suffix'] = '</li>';
     $form['buttons']['submit']['#weight'] = 1002;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/login') . '</li>',
+      '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), 'user/login') . '</li>',
       '#weight' => 1005,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -1343,7 +1343,7 @@ 
     break;
 
   case 'views_exposed_form':
-      $form['submit']['#value'] = bts('Search', array(), NULL, 'boinc:search-user');
+      $form['submit']['#value'] = bts('Search', array(), null, 'boinc:search-user');
     break;
   }
 }
@@ -1375,7 +1375,7 @@ 
 function boincuser_process_password_confirm($element) {
   // Check if parent element is "account".
   if ($element['#array_parents'][0] == 'account') {
-    $element['pass1']['#title'] = bts('Change password', array(), NULL, 'boinc:forgot-password');
+    $element['pass1']['#title'] = bts('Change password', array(), null, 'boinc:forgot-password');
   }
   return $element;
 }
@@ -1395,7 +1395,7 @@ 
 /**
  * Implementation of hook_token_values
  */
-function boincuser_token_values($type, $object = NULL, $options = array()) {
+function boincuser_token_values($type, $object = null, $options = array()) {
   if ($type == 'user') {
     $account = user_load($object->uid);
     $tokens['display-name'] = $account->boincuser_name;
@@ -1463,13 +1463,13 @@ 
   require_boinc('boinc_db');
   $num_deleted = BoincUserDeleted::delete_expired();
   if ($num_deleted>0) {
-    watchdog('boincuser', "Deleted ${num_deleted} users from user_deleted table", WATCHDOG_NOTICE);
+    watchdog('boincuser', "deleted ${num_deleted} users from user_deleted table", WATCHDOG_NOTICE);
   }
 
   // Delete expired tokens from token table
   $tokens_deleted = BoincToken::delete_expired();
   if ($tokens_deleted>0) {
-    watchdog('boincuser', "Deleted ${tokens_deleted} tokens from token table", WATCHDOG_NOTICE);
+    watchdog('boincuser', "deleted ${tokens_deleted} tokens from token table", WATCHDOG_NOTICE);
   }
 }
 
@@ -1511,8 +1511,8 @@ 
   if (!isset($account->roles[$verified_contributor])) {
     drupal_set_message(bts(
         'You may only create or modify your user profile after earning @count credits.',
-        array('@count' => $min_credit_to_post), NULL, 'boinc:view-profile'
-    ), 'warning', FALSE);
+        array('@count' => $min_credit_to_post), null, 'boinc:view-profile'
+    ), 'warning', false);
   }
 
   // For now, just call the user module profile view function
@@ -1555,35 +1555,35 @@ 
     if ($registration_enabled) {
       $output .= '<li>' . bts('First !create_an_account here at @sitename.',
       array(
-        '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
+        '!create_an_account' => l(bts('create an account', array(), null, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), null, 'boinc:join-page') . '</li>';
     }
-    $output .= '  <li>' . bts("Install BOINC on this device if not already present.", array(), NULL, 'boinc:join-page') . '</li>';
+    $output .= '  <li>' . bts("Install BOINC on this device if not already present.", array(), null, 'boinc:join-page') . '</li>';
     $output .= '  <li>' . bts("Select <i>Tools / Add Project</i>. Choose @sitename from the list, or enter @siteurl.",
     array(
       '@sitename' => $site_name,
       '@siteurl' => $base_url,
-    ), NULL, 'boinc:join-page') . '</li>';
+    ), null, 'boinc:join-page') . '</li>';
     if ($registration_enabled) {
       $output .= '<li>' . bts("If you're running a command-line or pre-5.0 version of BOINC, use <b>!boinccmd</b> to add the project.",
         array(
           '!boinccmd' => l('boinccmd --project_attach', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
-        ), NULL, 'boinc:join-page') . '</li>';
+        ), null, 'boinc:join-page') . '</li>';
     }
     else {
       $output .= '<li>' . bts("If you're running a command-line version of BOINC,
         please follow the <b>!instructionslink</b> to first <i>create an account</i>, and then <i>attach</i> to this project. Use the same project URL as above.",
         array(
           '!instructionslink' => l('instructions', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
-        ), NULL, 'boinc:join-page') . '</li>';
+        ), null, 'boinc:join-page') . '</li>';
     }
     $output .= '<li>' . bts("If you're running a pre-5.0 version of BOINC, please
       upgrade to a more recent version of BOINC to create an account
       at @this_project.",
       array(
         '@this_project' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), null, 'boinc:join-page') . '</li>';
     $output .=  '</ol>';
     break;
   case 'new':
@@ -1603,29 +1603,29 @@ 
     if ($registration_enabled) {
       $output .= '<li>' . bts('First !create_an_account here at @sitename.',
       array(
-        '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
+        '!create_an_account' => l(bts('create an account', array(), null, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), null, 'boinc:join-page') . '</li>';
     }
     else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
       $output .= '  <li>' . bts("Read our !rules_and_policies.", array(
-        '!rules_and_policies' => l(bts('Rules and Policies', array(), NULL, 'boinc:join-page'), $ruleslink),
-      ), NULL, 'boinc:join-page') . '</li>';
+        '!rules_and_policies' => l(bts('Rules and Policies', array(), null, 'boinc:join-page'), $ruleslink),
+      ), null, 'boinc:join-page') . '</li>';
     }
-    $output .= '  <li>' . bts('Download the BOINC desktop software.', array(), NULL, 'boinc:join-page');
+    $output .= '  <li>' . bts('Download the BOINC desktop software.', array(), null, 'boinc:join-page');
     $output .= '    <p>';
     $output .= '      <a class="button" href="http://boinc.berkeley.edu/download.php">Download</a>';
     $output .= '    </p>';
     $output .= '    ' . bts("For Android devices, visit !fdroid_link or download !apk_link directly.", array(
       '!fdroid_link' => '<a href="https://f-droid.org/en/packages/edu.berkeley.boinc">F-Droid</a>',
       '!apk_link' => '<a href="https://boinc.berkeley.edu/download_all.php">BOINC for Android</a>',
-    ), NULL, 'boinc:join-page');
+    ), null, 'boinc:join-page');
     $output .= '  </li>';
-    $output .= '  <li>' . bts('Run the installer.', array(), NULL, 'boinc:join-page') . '</li>';
+    $output .= '  <li>' . bts('Run the installer.', array(), null, 'boinc:join-page') . '</li>';
     $output .= '  <li>' . bts('Choose @sitename from the list, or enter @siteurl.', array(
       '@sitename' => $site_name,
       '@siteurl' => $base_url,
-    ), NULL, 'boinc:join-page') . '</li>';
+    ), null, 'boinc:join-page') . '</li>';
     $output .=  '</ol>';
   }
   $output .= '</div>';
@@ -1656,17 +1656,17 @@ 
   else {
     $uotd = user_load($current_uotd->uid);
   }
-  $uotd_image = boincuser_get_user_profile_image($uotd->uid, FALSE);
+  $uotd_image = boincuser_get_user_profile_image($uotd->uid, false);
   $output = '<h2 class="pane-title">';
-  $output .= ($user->uid) ? bts('Welcome back!', array(), NULL, 'boinc:front-page') : ($site_name ? bts('What is @this_project?', array('@this_project' => $site_name)) : bts('Welcome!', array(), NULL, 'boinc:front-page'));
+  $output .= ($user->uid) ? bts('Welcome back!', array(), null, 'boinc:front-page') : ($site_name ? bts('What is @this_project?', array('@this_project' => $site_name)) : bts('Welcome!', array(), null, 'boinc:front-page'));
   $output .= '</h2>';
   $output .= '<div class="boinc-overview balance-height-front">';
-  $output .= '  <div>' . bts($site_message, array(), NULL, "project:front page") . ' ' . l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about') . '</div>';
+  $output .= '  <div>' . bts($site_message, array(), null, "project:front page") . ' ' . l(bts('Learn more', array(), null, 'boinc:front-page'), 'about') . '</div>';
   if ($user->uid) {
-    $output .= '  <div>' . l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))) . '</div>';
+    $output .= '  <div>' . l(bts('View account', array(), null, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))) . '</div>';
   }
   else {
-    $output .= '  <div>' . l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))) . '</div>';
+    $output .= '  <div>' . l(bts('Join now', array(), null, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))) . '</div>';
   }
   $output .= '</div>';
   $output .= '<div class="boinc-overview-details">';
@@ -1674,17 +1674,17 @@ 
   $output .= '    <a class="user-of-the-day" href="account/' . $uotd->uid . '">';
   $output .= '      <div class="picture">';
   $output .= theme('imagefield_image', $uotd_image['image'], $uotd_image['alt'],
-    $uotd_image['alt'], array(), FALSE);
+    $uotd_image['alt'], array(), false);
   $output .= '      </div>';
-  $output .= '      <div class="text">' . bts('User of the day', array(), NULL, 'boinc:front-page') . '</div>';
+  $output .= '      <div class="text">' . bts('User of the day', array(), null, 'boinc:front-page') . '</div>';
   $output .= '      <div class="detail">' . $uotd->boincuser_name . '</div>';
   $output .= '    </a>';
   $output .= '    <div class="volunteers">';
-  $output .= '      <div class="text">' . bts('Over 500,000 volunteers and counting.', array(), NULL, 'boinc:front-page') . '</div>';
+  $output .= '      <div class="text">' . bts('Over 500,000 volunteers and counting.', array(), null, 'boinc:front-page') . '</div>';
   $output .= '      <div class="platforms">';
-  $output .= '        <div class="detail platform windows">' . bts('Windows', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform mac">' .  bts('Mac', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform linux">' . bts('Linux', array(), NULL, 'boinc:front-page') . '</div>';
+  $output .= '        <div class="detail platform windows">' . bts('Windows', array(), null, 'boinc:front-page') . '</div>';
+  $output .= '        <div class="detail platform mac">' .  bts('Mac', array(), null, 'boinc:front-page') . '</div>';
+  $output .= '        <div class="detail platform linux">' . bts('Linux', array(), null, 'boinc:front-page') . '</div>';
   $output .= '      </div>';
   $output .= '    </div>';
   $output .= '  </div>';
@@ -1712,12 +1712,12 @@ 
   xml_header();
 
   // Account creation disabled
-  $enablethisRPC = variable_get('boinc_weboptions_enableaccountcreateRPC', TRUE);
+  $enablethisRPC = variable_get('boinc_weboptions_enableaccountcreateRPC', true);
   if (!$enablethisRPC) {
     $mess = bts('Account creation is done through our Web site. Please register at @url', array(
       '@url' => $base_url . '/user/registration',
     ),
-    NULL, 'boinc:create_account');
+    null, 'boinc:create_account');
     xml_error(-208, $mess);
   }
   // Invalid invite code
@@ -1771,7 +1771,7 @@ 
       'init' => $params['email_addr'],
       'roles' => array($unrestricted_role => ''),
       'boincuser_name' => $params['user_name'],
-      'boinchash_flag' => TRUE,
+      'boinchash_flag' => true,
     );
 
     // Create the drupal user. If the drupal user cannot be created,
@@ -1808,20 +1808,20 @@ 
   }
 
   if (strlen($authtoken) != 32) {
-    drupal_set_message(bts('ERROR: There is no account with that authenticator.', array(), NULL, 'boinc:account-finish'), 'error');
+    drupal_set_message(bts('ERROR: There is no account with that authenticator.', array(), null, 'boinc:account-finish'), 'error');
     drupal_goto();
   }
 
   require_boinc('boinc_db');
   $boinc_user = BoincUser::lookup("authenticator='".addslashes($authtoken)."'");
   if (!$boinc_user) {
-    drupal_set_message(bts('ERROR: There is no account with that authenticator.', array(), NULL, 'boinc:account-finish'), 'error');
+    drupal_set_message(bts('ERROR: There is no account with that authenticator.', array(), null, 'boinc:account-finish'), 'error');
     drupal_goto();
   }
   $user = user_load(get_drupal_id($boinc_user->id));
 
   if (!$user) {
-    drupal_set_message(bts('ERROR: There was a problem loading your account. Try logging in with your user name and password.', array(), NULL, 'boinc:account-finish'), 'error');
+    drupal_set_message(bts('ERROR: There was a problem loading your account. Try logging in with your user name and password.', array(), null, 'boinc:account-finish'), 'error');
     drupal_goto();
   }
 
@@ -1842,9 +1842,9 @@ 
   // Check moderation page exists
   $moderationpath = drupal_lookup_path('source', variable_get('boinc_weboptions_moderationpage', '') );
   if ( menu_valid_path(array('link_path' => $moderationpath)) ) {
-    $modsentence = bts('Please note: user profiles are subject to !moderation.', array('!moderation' => l(bts('moderation', array(), NULL, 'boinc:account-finish'), $moderationpath, $options)), NULL, 'boinc:account-finish');
+    $modsentence = bts('Please note: user profiles are subject to !moderation.', array('!moderation' => l(bts('moderation', array(), null, 'boinc:account-finish'), $moderationpath, $options)), null, 'boinc:account-finish');
   } else {
-    $modsentence = bts('Please note: user profiles are subject to moderation.', array(), NULL, 'boinc:account-finish');
+    $modsentence = bts('Please note: user profiles are subject to moderation.', array(), null, 'boinc:account-finish');
   }
 
   $username = $user->boincuser_name;
@@ -1853,73 +1853,73 @@ 
   array(
     '@user_name' => $username,
     '@site_name' => $site_name,
-  ), NULL, 'boinc:account-finish') . "</p>";
+  ), null, 'boinc:account-finish') . "</p>";
 
   $links = array(
     array(
       'data' => bts('Change your username at !community_preferences.', array(
-        '!community_preferences' => l(bts('Community Preferences', array(), NULL, 'boinc:account-fininsh'), 'account/prefs/community', $options),
-      ), NULL, 'boinc:account-finish'),
+        '!community_preferences' => l(bts('Community Preferences', array(), null, 'boinc:account-fininsh'), 'account/prefs/community', $options),
+      ), null, 'boinc:account-finish'),
       'children' => array(
-        bts('Your username is used to identify yourself to other volunteers on this Web site.', array(), NULL, 'boinc:account-finish'),
-        bts('In addition, you may set your account\'s default language and adjust notification settings.', array(), NULL, 'boinc:account-finish'),
+        bts('Your username is used to identify yourself to other volunteers on this Web site.', array(), null, 'boinc:account-finish'),
+        bts('In addition, you may set your account\'s default language and adjust notification settings.', array(), null, 'boinc:account-finish'),
       ),
     ),
     array(
       'data' => bts('Change your !computing_preferences.', array(
-        '!computing_preferences' => l(bts('Computing Preferences', array(), NULL, 'boinc:account-finish'), 'account/prefs', $options),
-      ), NULL, 'boinc:account-finish'),
+        '!computing_preferences' => l(bts('Computing Preferences', array(), null, 'boinc:account-finish'), 'account/prefs', $options),
+      ), null, 'boinc:account-finish'),
       'children' => array(
-        bts('You may adjust how much CPU, RAM, and Disk space the BOINC client is allowed to use for tasks on your computer.', array(), NULL, 'boinc:account-finish'),
+        bts('You may adjust how much CPU, RAM, and Disk space the BOINC client is allowed to use for tasks on your computer.', array(), null, 'boinc:account-finish'),
         bts('By default, you will run @site_name tasks without any additional configuration.', array(
           '@site_name' => $site_name,
-        ), NULL, 'boinc:account-finish'),
+        ), null, 'boinc:account-finish'),
         bts('It is recommended new volunteers leave the default settings until they gain experience running some tasks. Ask questions in the !forums to get advice before making changes to a setting you don\'t understand.', array(
-          '!forums' => l(bts('forums', array(), NULL, 'boinc:account-finish'), 'community/forum', $options),
-        ), NULL, 'boinc:account-finish'),
+          '!forums' => l(bts('forums', array(), null, 'boinc:account-finish'), 'community/forum', $options),
+        ), null, 'boinc:account-finish'),
       ),
     ),
     array(
         'data' => bts('Create a !user_profile.', array(
-          '!user_profile' => l(bts('User Profile', array(), NULL, 'boinc:account-finish'), '/account/profile/edit', $options),
-        ), NULL, 'boinc:account-finish'),
+          '!user_profile' => l(bts('User Profile', array(), null, 'boinc:account-finish'), '/account/profile/edit', $options),
+        ), null, 'boinc:account-finish'),
       'children' => array(
         bts('A user profile will inform other volunteers who you are and why you joined @site_name.', array(
           '@site_name' => $site_name,
-        ), NULL, 'boinc:account-finish'),
+        ), null, 'boinc:account-finish'),
         $modsentence,
       ),
     ),
     array(
       'data' => bts('Join a !team.', array(
-        '!team' => l(bts('Team', array(), NULL, 'boinc:account-finish'), '/community/teams', $options),
-      ), NULL, 'boinc:account-finish'),
+        '!team' => l(bts('Team', array(), null, 'boinc:account-finish'), '/community/teams', $options),
+      ), null, 'boinc:account-finish'),
       'children' => array(
-        bts('You may join a team, made up of other volunteers.', array(), NULL, 'boinc:account-finish'),
+        bts('You may join a team, made up of other volunteers.', array(), null, 'boinc:account-finish'),
       ),
     ),
     array(
       'data' => bts('Go to your !account_dashboard.', array(
-        '!account_dashboard'=> l(bts('Account Dashboard', array(), NULL, 'boinc:account-finish'), 'account/dashboard', $options),
-      ), NULL, 'boinc:account-finish'),
+        '!account_dashboard'=> l(bts('Account Dashboard', array(), null, 'boinc:account-finish'), 'account/dashboard', $options),
+      ), null, 'boinc:account-finish'),
       'children' => array(
-        bts('Your account dashboard has information and links about your computer(s) and task(s) assigned.', array(), NULL, 'boinc:account-finish'),
+        bts('Your account dashboard has information and links about your computer(s) and task(s) assigned.', array(), null, 'boinc:account-finish'),
       ),
     ),
     array(
       'data' => bts('Visit our !help pages.', array(
-        '!help' => l(bts('Help', array(), NULL, 'boinc:account-finish'), '/help', $options)
-      ), NULL, 'boinc:account-finish'),
+        '!help' => l(bts('Help', array(), null, 'boinc:account-finish'), '/help', $options)
+      ), null, 'boinc:account-finish'),
       'children' => array(
         bts('Ask for help in our community\'s !forums.', array(
-          '!forums' => l(bts('forums', array(), NULL, 'boinc:account-finish'), 'community/forum', $options)
-        ), NULL, 'boinc:account-finish'),
+          '!forums' => l(bts('forums', array(), null, 'boinc:account-finish'), 'community/forum', $options)
+        ), null, 'boinc:account-finish'),
       ),
     ),
   );
 
   //List of links
-  $output .= theme_item_list($links, $title = NULL, $type='ul');
+  $output .= theme_item_list($links, $title = null, $type='ul');
 
   return $output;
 }
@@ -1929,20 +1929,20 @@ 
  */
 function boincuser_moderate_community_access() {
   if (user_access('assign community member role')
-  OR user_access('assign all roles')) {
-    return TRUE;
+  or user_access('assign all roles')) {
+    return true;
   }
-  return FALSE;
+  return false;
 }
 
 /**
  * Get the count of items in the moderation queue
  */
 function boincuser_moderation_queue_count($caller = 'user') {
-  $allowed = FALSE;
+  $allowed = false;
   switch ($caller) {
   case 'cron':
-    $allowed = TRUE;
+    $allowed = true;
     break;
   case 'user':
   default:
@@ -1956,7 +1956,7 @@ 
       AND moderate = 1"
     ));
   }
-  return NULL;
+  return null;
 }
 
 /**
@@ -1964,10 +1964,10 @@ 
  * Allow community membership status to be set for users by direct link rather
  * than through the user account info form.
  */
-function boincuser_control($uid = NULL, $action = NULL) {
-  if (!$uid OR !$account = user_load($uid)) {
+function boincuser_control($uid = null, $action = null) {
+  if (!$uid or !$account = user_load($uid)) {
     // What are you even doing here...
-    return FALSE;
+    return false;
   }
   switch ($action) {
   case 'ban':
@@ -2073,7 +2073,7 @@ 
  */
 function boincuser_moderate_user_ban($uid, $reason = '', $duration = '') {
   if (user_access('assign community member role')
-  OR user_access('assign all roles')) {
+  or user_access('assign all roles')) {
     $account = user_load($uid);
     if ($account->uid) {
       module_load_include('inc', 'rules', 'modules/system.rules');
@@ -2153,7 +2153,7 @@ 
  * User profile image is managed by the content_profile module rather than core
  * Drupal User so must be inserted into comments, etc. (not so by default)
  */
-function boincuser_get_user_profile_image($uid, $avatar = TRUE) {
+function boincuser_get_user_profile_image($uid, $avatar = true) {
   // Though the function name implies otherwise, get the avatar by default
   $image_field = ($avatar) ? 'field_image_fid' : 'field_profile_image_fid';
   $image_fid = db_result(db_query("
@@ -2166,7 +2166,7 @@ 
   if (!$user_image['image']['filepath']) {
     // Load the default image if one does not exist
     $account = user_load($uid);
-    if ($avatar AND module_exists('gravatar') AND user_access('use gravatar', $account) AND $account->gravatar) {
+    if ($avatar and module_exists('gravatar') and user_access('use gravatar', $account) and $account->gravatar) {
       // Use a Gravatar rather than the system default image
       $options = array(
         'size' => 100,
@@ -2194,23 +2194,23 @@ 
  * Generate a table of a user's projects
  */
 function boincuser_get_projects_table($account = null) {
-  if ($account AND is_numeric($account)) {
+  if ($account and is_numeric($account)) {
     $account = user_load($account);
   }
   $projects = boincuser_get_projects($account);
-  if (!$projects) return bts('no projects...', array(), NULL, 'boinc:account-dashboard');
+  if (!$projects) return bts('no projects...', array(), null, 'boinc:account-dashboard');
 
   $output = '';
   $output .= '<table class="user-projects">' . "\n";
   $output .= '<thead>' . "\n";
   $output .= '  <tr>' . "\n";
-  $output .= '    <th>' . bts('Name', array(), NULL, 'boinc:project-name:-1:ignoreoverwrite') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Avg credit', array(), NULL, 'boinc:account-dashboard') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . '</th>' . "\n";
+  $output .= '    <th>' . bts('Name', array(), null, 'boinc:project-name:-1:ignoreoverwrite') . '</th>' . "\n";
+  $output .= '    <th class="numeric">' . bts('Avg credit', array(), null, 'boinc:account-dashboard') . '</th>' . "\n";
+  $output .= '    <th class="numeric">' . bts('Total credit', array(), null, 'boinc:user-or-team-total-credits') . '</th>' . "\n";
   $output .= '  </tr>' . "\n";
   $output .= '</thead>' . "\n";
   $output .= '<tbody>' . "\n";
-  foreach ($projects AS $project) {
+  foreach ($projects as $project) {
     $url = rtrim($project->url, '/') . '/show_user.php?userid=' . $project->id;
     $output .= '  <tr>' . "\n";
     $output .= '    <td>' . l($project->name, $url) . '</td>' . "\n";
@@ -2248,7 +2248,7 @@ 
   if (in_array($result->code, array(200, 304)) || in_array($result->redirect_code, array(200, 304))) {
     return simplexml_load_string($result->data);
   }
-  return NULL;
+  return null;
 }
 
 /**
@@ -2264,7 +2264,7 @@ 
 
   $account_stats = boincuser_get_stats_user_data($account->boincuser_cpid);
 
-  return ($account_stats AND isset($account_stats->project)) ? $account_stats->project : null;
+  return ($account_stats and isset($account_stats->project)) ? $account_stats->project : null;
 }
 
 
@@ -2277,18 +2277,18 @@ 
   $profile = content_profile_load('profile', $account->uid);
   $output = '';
   if ($profile) {
-    $profile_is_approved = ($profile->status AND !$profile->moderate);
+    $profile_is_approved = ($profile->status and !$profile->moderate);
     $user_is_moderator = user_access('edit any profile content');
     $is_own_profile = ($user->uid == $account->uid);
     $profile_moderation_path = "moderate/profile/{$account->uid}";
     $links = array();
 
-    if ($profile->moderate AND $user_is_moderator) {
+    if ($profile->moderate and $user_is_moderator) {
       $links['approve_profile'] = array(
-        'title' => bts('Approve profile', array(), NULL, 'boinc:moderate-user'),
+        'title' => bts('Approve profile', array(), null, 'boinc:moderate-user'),
         'href' => "{$profile_moderation_path}/approve",
         'attributes' => array(
-          'title' => bts('Approve this profile content', array(), NULL, 'boinc:moderate-user'),
+          'title' => bts('Approve this profile content', array(), null, 'boinc:moderate-user'),
           'class' => 'first primary tab',
         )
       );
@@ -2301,10 +2301,10 @@ 
         )
       );*/
       $links['reject_profile'] = array(
-        'title' => bts('Reject profile', array(), NULL, 'boinc:moderate-user'),
+        'title' => bts('Reject profile', array(), null, 'boinc:moderate-user'),
         'href' => "{$profile_moderation_path}/reject",
         'attributes' => array(
-          'title' => bts('Reject this profile content', array(), NULL, 'boinc:moderate-user'),
+          'title' => bts('Reject this profile content', array(), null, 'boinc:moderate-user'),
           'class' => 'tab',
         )
       );
@@ -2358,7 +2358,7 @@ 
 function boincuser_apachesolr_index_documents_alter(array &$documents, $entity, $entity_type, $env_id) {
 
   foreach ($documents as $document) {
-    if ( $document->entity_type=='node' AND $document->bundle=='profile' ) {
+    if ( $document->entity_type=='node' and $document->bundle=='profile' ) {
       // Node information.
       $nid = $document->entity_id;
       $node = node_load($nid);
@@ -2412,7 +2412,7 @@ 
     if ($recipient = user_load(array('uid' => $drupalid))) {
       // Double-check that the loaded user matches both boincuser_id
       // and boincuser_name.
-      if ( ($boincid == $recipient->boincuser_id) AND ($boincname == $recipient->boincuser_name) ) {
+      if ( ($boincid == $recipient->boincuser_id) and ($boincname == $recipient->boincuser_name) ) {
         return $recipient;
       }
     }

html/inc/util.inc

Indentation +6 added lines, -6 removed lines

@@ -556,14 +556,14 @@
     $tnow = get_str('tnow', true);
     $ttok = get_str('ttok', true);
     if (!$tnow) {
-      if (isset($_POST['tnow'])) {
-          $tnow = $_POST['tnow'];
-      }
+        if (isset($_POST['tnow'])) {
+            $tnow = $_POST['tnow'];
+        }
     }
     if (!$ttok) {
-      if (isset($_POST['ttok'])) {
-          $ttok = $_POST['ttok'];
-      }
+        if (isset($_POST['ttok'])) {
+            $ttok = $_POST['ttok'];
+        }
     }
     if (!$tnow) return false;
     if (!$ttok) return false;

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

@@ -306,7 +306,7 @@
 <link rel="stylesheet" href="custom_dark.css" media="(prefers-color-scheme: dark)">
 <link rel="stylesheet" href="sample_bootstrap.min.css" media="(prefers-color-scheme: no-preference), (prefers-color-scheme: light)">
 <link rel="stylesheet" href="custom.css" media="(prefers-color-scheme: no-preference), (prefers-color-scheme: light)">
-EOT;
+eot;
     } else {
         echo '
             <link type="text/css" rel="stylesheet" href="'.secure_url_base().'/bootstrap.min.css" media="all">

Braces +6 added lines, -5 removed lines

@@ -254,7 +254,7 @@ 
 // with an existing web framework can more easily do so.
 // To do so, define page_head() in html/project/project.inc
 //
-if (!function_exists("page_head")){
+if (!function_exists("page_head")) {
 function page_head(
     $title,
         // page title. Put in <title>, used as title for browser tab.
@@ -375,7 +375,8 @@ 
     echo '<div class="container-fluid">
     ';
 
-    switch($title) {    //kludge
+    switch($title) {
+//kludge
     case tra("Log in"):
     case tra("Create an account"):
     case tra("Server status page"):
@@ -390,7 +391,7 @@ 
 
 // See the comments for page_head()
 //
-if (!function_exists("page_tail")){
+if (!function_exists("page_tail")) {
 function page_tail(
     $show_date=false,
         // true for pages that are generated periodically rather than on the fly
@@ -895,7 +896,7 @@ 
     return $str;
 }
 
-function strip_bbcode($string){
+function strip_bbcode($string) {
     return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
 }
 
@@ -1156,7 +1157,7 @@ 
 // Otherwise return 0.
 // Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
 //
-function boinc_client_version(){
+function boinc_client_version() {
     if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
     $x = $_SERVER['HTTP_USER_AGENT'];
     $e =  "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";

Spacing +77 added lines, -77 removed lines

@@ -30,7 +30,7 @@ 
 require_once("../inc/bootstrap.inc");
 
 function master_url() {
-    return parse_config(get_config() , "<master_url>");
+    return parse_config(get_config(), "<master_url>");
 }
 function recaptcha_public_key() {
     return parse_config(get_config(), "<recaptcha_public_key>");
@@ -42,10 +42,10 @@ 
 // Set parameters to defaults if not defined in config.xml
 
 $x = parse_config(get_config(), "<user_country>");
-define('USER_COUNTRY', ($x===null)?1:(int)$x);
+define('USER_COUNTRY', ($x === null) ? 1 : (int)$x);
 
 $x = parse_config(get_config(), "<user_url>");
-define('USER_URL', ($x===null)?1:(int)$x);
+define('USER_URL', ($x === null) ? 1 : (int)$x);
 
 // Set parameters to defaults if not defined in project.inc
 
@@ -155,10 +155,10 @@ 
 }
 
 function url_base() {
-    return is_https()?secure_url_base():URL_BASE;
+    return is_https() ?secure_url_base() : URL_BASE;
 }
 
-function send_cookie($name, $value, $permanent, $ops=false) {
+function send_cookie($name, $value, $permanent, $ops = false) {
     // the following allows independent login for projects on the same server
     //
     $url = parse_url(master_url());
@@ -167,28 +167,28 @@ 
         $path = substr($path, 0, -1);
         $path .= "_ops/";
     }
-    $expire = $permanent?time()+3600*24*365:0;
+    $expire = $permanent ?time() + 3600*24*365 : 0;
     setcookie($name, $value, $expire, $path,
         '',
-        is_https(),     // if this page is secure, make cookie secure
+        is_https(), // if this page is secure, make cookie secure
         true            // httponly; no JS access
     );
 }
 
-function clear_cookie($name, $ops=false) {
+function clear_cookie($name, $ops = false) {
     $url = parse_url(master_url());
     $path = $url['path'];
     if ($ops) {
         $path = substr($path, 0, -1);
         $path .= "_ops/";
     }
-    setcookie($name, '', time()-3600, $path);
+    setcookie($name, '', time() - 3600, $path);
 }
 
 $g_logged_in_user = null;
 $got_logged_in_user = false;
 
-function get_logged_in_user($must_be_logged_in=true) {
+function get_logged_in_user($must_be_logged_in = true) {
     global $g_logged_in_user, $got_logged_in_user;
     if ($got_logged_in_user) {
         // this could have been called earlier with $must_be_logged_in false
@@ -214,7 +214,7 @@ 
             $next_url = $_SERVER['REQUEST_URI'];
             $n = strrpos($next_url, "/");
             if ($n) {
-                $next_url = substr($next_url, $n+1);
+                $next_url = substr($next_url, $n + 1);
             }
         }
         $next_url = urlencode($next_url);
@@ -225,7 +225,7 @@ 
     return $g_logged_in_user;
 }
 
-function show_login_info($prefix="") {
+function show_login_info($prefix = "") {
     $user = get_logged_in_user(false);
     if ($user) {
         $url_tokens = url_tokens($user->authenticator);
@@ -235,7 +235,7 @@ 
     }
 }
 
-$cache_control_extra="";
+$cache_control_extra = "";
 $is_login_page = false;
 
 // Call this to start pages.
@@ -247,11 +247,11 @@ 
 // with an existing web framework can more easily do so.
 // To do so, define page_head() in html/project/project.inc
 //
-if (!function_exists("page_head")){
+if (!function_exists("page_head")) {
 function page_head(
     $title,
         // page title. Put in <title>, used as title for browser tab.
-    $body_attrs=null,
+    $body_attrs = null,
         // <body XXXX>
         // e.g. Javascript to put focus in an input field
         // (onload="document.form.foo.focus()")
@@ -260,10 +260,10 @@ 
         // if set, include schedulers.txt.
         // also pass to project_banner() in case you want a different
         // header for your main page.
-    $url_prefix="",
+    $url_prefix = "",
         // prepend this to links.
         // Use for web pages not in the top directory
-    $head_extra=null
+    $head_extra = null
         // extra stuff to put in <head>. E.g.:
         // reCAPTCHA code (create_profile.php)
         // bbcode javascript (forums)
@@ -285,7 +285,7 @@ 
         header("Content-type: text/html; charset=utf-8");
         header("Expires: Mon, 26 Jul 1997 05:00:00 UTC");
             // Date in the past
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " UTC");
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s")." UTC");
             // always modified
         header("Cache-Control: $cache_control_extra no-cache, must-revalidate, post-check=0, pre-check=0");
             // for HTTP/1.1
@@ -308,11 +308,11 @@ 
     if ($head_extra) {
         echo "\n$head_extra\n";
     }
-    if ($is_main && (!defined('NO_COMPUTING')||!NO_COMPUTING)) {
+    if ($is_main && (!defined('NO_COMPUTING') || !NO_COMPUTING)) {
         readfile("schedulers.txt");
     }
 
-    $t = $title?$title:PROJECT;
+    $t = $title ? $title : PROJECT;
     echo "<title>$t</title>\n";
     echo '
         <meta charset="utf-8">
@@ -368,7 +368,7 @@ 
     echo '<div class="container-fluid">
     ';
 
-    switch($title) {    //kludge
+    switch ($title) {    //kludge
     case tra("Log in"):
     case tra("Create an account"):
     case tra("Server status page"):
@@ -383,13 +383,13 @@ 
 
 // See the comments for page_head()
 //
-if (!function_exists("page_tail")){
+if (!function_exists("page_tail")) {
 function page_tail(
-    $show_date=false,
+    $show_date = false,
         // true for pages that are generated periodically rather than on the fly
-    $url_prefix="",
+    $url_prefix = "",
         // use for pages not at top level
-    $is_main=false
+    $is_main = false
         // passed to project_footer;
 ) {
     echo "<br>\n";
@@ -423,24 +423,24 @@ 
 // convert time interval in seconds to a string of the form
 // 'D days h hours m min s sec'.
 
-function time_diff($x, $res=3) {
+function time_diff($x, $res = 3) {
     $x = (int)$x;
     $days    = (int)($x/86400);
-    $hours   = (int)(($x-$days*86400)/3600);
-    $minutes = (int)(($x-$days*86400-$hours*3600)/60);
-    $seconds = $x % 60;
+    $hours   = (int)(($x - $days*86400)/3600);
+    $minutes = (int)(($x - $days*86400 - $hours*3600)/60);
+    $seconds = $x%60;
 
     $s = "";
     if ($days) {
         $s .= "$days ".tra("days")." ";
     }
-    if ($res>0 && ($hours || strlen($s))) {
+    if ($res > 0 && ($hours || strlen($s))) {
         $s .= "$hours ".tra("hours")." ";
     }
-    if ($res>1 && ($minutes || strlen($s))) {
+    if ($res > 1 && ($minutes || strlen($s))) {
         $s .= "$minutes ".tra("min")." ";
     }
-    if ($res>2) {
+    if ($res > 2) {
         $s .= "$seconds ".tra("sec")." ";
     }
     return $s;
@@ -454,7 +454,7 @@ 
 
 function time_str($x) {
     if ($x == 0) return "---";
-    return gmdate('j M Y, G:i:s', (int)$x) . " UTC";
+    return gmdate('j M Y, G:i:s', (int)$x)." UTC";
 }
 
 function local_time_str($x) {
@@ -466,14 +466,14 @@ 
     return time_str($x);
 }
 
-function start_table_str($class="", $style="") {
-    $s = $style?'style="'.$style.'"':'';
+function start_table_str($class = "", $style = "") {
+    $s = $style ? 'style="'.$style.'"' : '';
     return '<div class="table">
       <table '.$s.' width="100%" class="table table-condensed '.$class.'" >
     ';
 }
 
-function start_table($class="", $style="") {
+function start_table($class = "", $style = "") {
     echo start_table_str($class, $style);
 }
 
@@ -518,7 +518,7 @@ 
     echo "</tr>\n";
 }
 
-function row1($x, $ncols=2, $class="heading") {
+function row1($x, $ncols = 2, $class = "heading") {
     if ($class == "heading") {
         echo "<tr><th class=\"bg-primary\" colspan=\"$ncols\">$x</th></tr>\n";
     } else {
@@ -532,10 +532,10 @@ 
 
 // a table row with 2 columns, with the left on right-aligned
 
-function row2($x, $y, $show_error=false, $lwidth='40%') {
-    if ($x==="") $x="<br>";
-    if ($y==="") $y="<br>";
-    $attrs = $show_error?VALUE_ATTRS_ERR:VALUE_ATTRS;
+function row2($x, $y, $show_error = false, $lwidth = '40%') {
+    if ($x === "") $x = "<br>";
+    if ($y === "") $y = "<br>";
+    $attrs = $show_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
     echo "<tr>
         <td width=\"$lwidth\" ".NAME_ATTRS.">$x</td>
         <td $attrs >$y</td>
@@ -546,7 +546,7 @@ 
 // output the first part of row2();
 // then write the content, followed by </td></tr>
 
-function row2_init($x, $lwidth='40%') {
+function row2_init($x, $lwidth = '40%') {
     echo sprintf('<tr>
         <td width="%s" %s>%s</td>
         <td %s>',
@@ -562,31 +562,31 @@ 
     echo "<tr><td>$string</td></tr>";
 }
 
-function row_array($x, $attrs=null) {
+function row_array($x, $attrs = null) {
     echo "<tr>\n";
     $i = 0;
     foreach ($x as $h) {
-        $a = $attrs?$attrs[$i]:"";
+        $a = $attrs ? $attrs[$i] : "";
         echo "<td $a>$h</td>\n";
         $i++;
     }
     echo "</tr>\n";
 }
 
-define ('ALIGN_RIGHT', 'style="text-align:right;"');
+define('ALIGN_RIGHT', 'style="text-align:right;"');
 
-function row_heading_array($x, $attrs=null, $class='bg-primary') {
+function row_heading_array($x, $attrs = null, $class = 'bg-primary') {
     echo "<tr>";
     $i = 0;
     foreach ($x as $h) {
-        $a = $attrs?$attrs[$i]:"";
+        $a = $attrs ? $attrs[$i] : "";
         echo "<th $a class=\"$class\">$h</th>";
         $i++;
     }
     echo "</tr>\n";
 }
 
-function row_heading($x, $class='bg-primary') {
+function row_heading($x, $class = 'bg-primary') {
     echo sprintf('<tr><th class="%s" colspan=99>%s</th></tr>
         ', $class, $x
     );
@@ -646,7 +646,7 @@ 
 // If $ellipsis is true, then an ellipsis is added to any sentence which
 // is cut short.
 
-function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis=false) {
+function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis = false) {
     $words = explode($delimiter, $sentence);
     $total_chars = 0;
     $trunc = false;
@@ -729,8 +729,8 @@ 
 
 // returns null if the arg is optional and missing
 //
-function get_int($name, $optional=false) {
-    $x=null;
+function get_int($name, $optional = false) {
+    $x = null;
     if (isset($_GET[$name])) $x = $_GET[$name];
     if (!is_numeric($x)) {
         if ($optional) {
@@ -749,7 +749,7 @@ 
 
 // returns null if the arg is optional and missing
 //
-function post_num($name, $optional=false) {
+function post_num($name, $optional = false) {
     $x = null;
     if (isset($_POST[$name])) $x = $_POST[$name];
     if (!is_numeric($x)) {
@@ -764,7 +764,7 @@ 
 
 // returns null if the arg is optional and missing
 //
-function post_int($name, $optional=false) {
+function post_int($name, $optional = false) {
     $x = post_num($name, $optional);
     if (is_null($x)) return null;
     $y = (int)$x;
@@ -782,7 +782,7 @@ 
     }
 }
 
-function get_str($name, $optional=false) {
+function get_str($name, $optional = false) {
     if (isset($_GET[$name])) {
         $x = $_GET[$name];
     } else {
@@ -794,7 +794,7 @@ 
     return undo_magic_quotes($x);
 }
 
-function post_str($name, $optional=false) {
+function post_str($name, $optional = false) {
     if (isset($_POST[$name])) {
         $x = $_POST[$name];
     } else {
@@ -806,7 +806,7 @@ 
     return undo_magic_quotes($x);
 }
 
-function post_arr($name, $optional=false) {
+function post_arr($name, $optional = false) {
     if (isset($_POST[$name]) && is_array($_POST[$name])) {
         $x = $_POST[$name];
     } else {
@@ -822,7 +822,7 @@ 
     // the mb_* functions are not included by default
     // return (mb_detect_encoding($passwd) -= 'ASCII');
 
-    for ($i=0; $i<strlen($str); $i++) {
+    for ($i = 0; $i < strlen($str); $i++) {
         $c = ord(substr($str, $i));
         if ($c < 32 || $c > 127) return false;
     }
@@ -846,7 +846,7 @@ 
     $number = str_replace(',', '.', $number); // replace the german decimal separator
     // if no value was entered and this is ok
     //
-    if ($number=='' && !$low) return true;
+    if ($number == '' && !$low) return true;
 
     // the supplied value contains alphabetic characters
     //
@@ -863,7 +863,7 @@ 
 
 // Generate a "select" element from an array of values
 //
-function select_from_array($name, $array, $selection=null, $width=240) {
+function select_from_array($name, $array, $selection = null, $width = 240) {
     $out = '<select style="color:#000;"class="form-control input-sm" style="width:'.$width.'px" name="'.$name.'">"';
 
     foreach ($array as $key => $value) {
@@ -888,12 +888,12 @@ 
     return $str;
 }
 
-function strip_bbcode($string){
-    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
+function strip_bbcode($string) {
+    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/", "", $string);
 }
 
 function current_url() {
-    $url = is_https()?'https':'http';
+    $url = is_https() ? 'https' : 'http';
     $url .= "://";
     $url .= $_SERVER['SERVER_NAME'];
     $url .= ":".$_SERVER['SERVER_PORT'];
@@ -911,7 +911,7 @@ 
 // the colors for bootstrap's btn-success are almost illegible;
 // the green is too light.  Use a darker green.
 //
-function button_style($color='green', $font_size=null) {
+function button_style($color = 'green', $font_size = null) {
     $fs = '';
     if ($font_size) {
         $fs = sprintf('; font-size:%dpx', $font_size);
@@ -930,7 +930,7 @@ 
 // class: class of the button, e.g. btn
 // extra: Additional text in href tag
 //
-function button_text($url, $text, $desc=null, $class=null, $extra='') {
+function button_text($url, $text, $desc = null, $class = null, $extra = '') {
     if (!$desc) {
         $desc = $text;
     }
@@ -945,23 +945,23 @@ 
     );
 }
 
-function button_text_small($url, $text, $desc=null) {
+function button_text_small($url, $text, $desc = null) {
     return button_text($url, $text, $desc, "btn btn-xs", button_style());
 }
 
-function show_button($url, $text, $desc=null, $class=null, $extra=null) {
+function show_button($url, $text, $desc = null, $class = null, $extra = null) {
     echo button_text($url, $text, $desc, $class, $extra);
 }
 
 // for places with a bunch of buttons, like forum posts
 //
-function show_button_small($url, $text, $desc=null) {
+function show_button_small($url, $text, $desc = null) {
     echo button_text_small($url, $text, $desc);
 }
 
 // used for showing icons
 //
-function show_image($src, $title, $alt, $height=null) {
+function show_image($src, $title, $alt, $height = null) {
     $h = "";
     if ($height) {
         $h = "height=\"$height\"";
@@ -998,7 +998,7 @@ 
 // tries instead to connect to <replica_db_host> if tag exists.
 // DEPRECATED - use boinc_db.inc
 //
-function db_init($try_replica=false) {
+function db_init($try_replica = false) {
     check_web_stopped();
     $retval = db_init_aux($try_replica);
     if ($retval == 1) {
@@ -1074,7 +1074,7 @@ 
 // Check this to avoid XSS vulnerability
 //
 function sanitize_sort_by($x) {
-    switch($x) {
+    switch ($x) {
     case 'expavg_credit':
     case 'total_credit':
         return;
@@ -1092,7 +1092,7 @@ 
 }
 
 function do_download($path) {
-    $name=basename($path);
+    $name = basename($path);
     header('Content-Description: File Transfer');
     header('Content-Type: application/octet-stream');
     header('Content-Disposition: attachment; filename='.$name);
@@ -1100,7 +1100,7 @@ 
     header('Expires: 0');
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
-    header('Content-Length: ' . filesize($path));
+    header('Content-Length: '.filesize($path));
     flush();
     readfile($path);
 }
@@ -1149,10 +1149,10 @@ 
 // Otherwise return 0.
 // Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
 //
-function boinc_client_version(){
+function boinc_client_version() {
     if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
     $x = $_SERVER['HTTP_USER_AGENT'];
-    $e =  "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
+    $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
     if (preg_match($e, $x, $matches)) {
         return $matches[1]*10000 + $matches[2]*100 + $matches[3];
     }
@@ -1181,7 +1181,7 @@ 
     $rem_name = $name."_remaining";
     return "<textarea name=\"$name\" class=\"form-control\" rows=3 id=\"$name\" onkeydown=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\"
         onkeyup=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\">".$text."</textarea>
-        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen-strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
+        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen - strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
     ;
 }
 
@@ -1211,7 +1211,7 @@ 
 // use the following around text with long lines,
 // to limit the width and make it more readable.
 //
-function text_start($width=640) {
+function text_start($width = 640) {
     echo sprintf("<div style=\"max-width: %dpx;\">\n", $width);
 }
 function text_end() {
@@ -1237,7 +1237,7 @@ 
 }
 
 function cert_filename() {
-    return defined("CERT_FILENAME")?CERT_FILENAME:"cert1.php";
+    return defined("CERT_FILENAME") ?CERT_FILENAME:"cert1.php";
 }
 
 // if user hasn't validated their email addr, tell them to

html/ops/mass_email_script.php

Spacing +6 added lines, -6 removed lines

@@ -55,7 +55,7 @@ 
 $globals->batch = 1000;
 $globals->lapsed_interval = 60*86400;
 
-for ($i=1; $i<$argc; $i++) {
+for ($i = 1; $i < $argc; $i++) {
     if ($argv[$i] == "--batch") {
         $i++;
         $globals->batch = $argv[$i];
@@ -169,7 +169,7 @@ 
         gmdate('d F Y', $user->create_time),
         number_format($user->total_credit, 0),
         opt_out_url($user),
-        floor((time() - $user->last_rpc_time) / 86400),
+        floor((time() - $user->last_rpc_time)/86400),
     );
     return preg_replace($pat, $rep, $template);
 }
@@ -238,7 +238,7 @@ 
     while ($user = _mysql_fetch_object($result)) {
         handle_user($user);
         $startid = $user->id;
-        fputs($log, $user->id . "\n");
+        fputs($log, $user->id."\n");
         fflush($log);
     }
     _mysql_free_result($result);
@@ -252,7 +252,7 @@ 
     $user = _mysql_fetch_object($result);
     if ($user) {
         handle_user($user);
-        fputs($log, $user->id . "\n");
+        fputs($log, $user->id."\n");
         fflush($log);
     }
     _mysql_free_result($result);
@@ -289,7 +289,7 @@ 
     } else {
         $fid = fopen($id_file, 'r');
         if (!$fid) {
-            echo  $id_file . ' not found - create ID list and run again\n';
+            echo  $id_file.' not found - create ID list and run again\n';
             exit();
         }
         $thisid = 0;
@@ -300,7 +300,7 @@ 
         }
         fclose($fid);
     }
-    echo 'All done!' . "\n";
+    echo 'All done!'."\n";
 }
 
 if (!function_exists('make_php_mailer')) {

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

Braces +17 added lines, -34 removed lines

@@ -127,8 +127,7 @@ 
         if (isset($prefs[$name]['@value'])) {
           $default[$name] = $prefs[$name]['@value'];
         }
-      }
-      else {
+      } else {
         $default[$name] = $prefs[$name];
       }
     }
@@ -655,8 +654,7 @@ 
   // Save the preset selection (or lack thereof)
   if (!$preset OR $preset == 'custom') {
     $prefs['preset'] = 'custom';
-  }
-  else {
+  } else {
     $prefs['preset'] = $preset;
   }
   
@@ -671,8 +669,7 @@ 
   if (!$result) {
     watchdog('boincwork', 'Error updating global prefs for user @id: @message', array('@id' => $account->id, '@message' => mysqli_error()), WATCHDOG_ERROR);
     drupal_set_message(t('Your changes could not be saved. Please contact support!'), 'error');
-  }
-  elseif (!drupal_get_messages('status', FALSE)) {
+  } elseif (!drupal_get_messages('status', FALSE)) {
     // Show this message if the set wasn't created automatically (in which case
     // there is a message tailored to that) {
     drupal_set_message(t('Your preferences have been updated.
@@ -927,8 +924,7 @@ 
     if (boincwork_host_merge($old_host, $current_host, $message)) {
       $merged[$old_host->id] = $old_host->id;
       $current_host = boincwork_host_get_info($current_host_id);
-    }
-    else {
+    } else {
       $errors[$old_host->id] = $message;
     }
   }
@@ -944,8 +940,7 @@ 
         $oxford_comma = '';
       }
       $list = implode(', ', $list) . $oxford_comma . ' ' . $conjunction . ' ' . $last;
-    }
-    else {
+    } else {
       $list = $last;
     }
     if (count($merged) == 1) {
@@ -956,8 +951,7 @@ 
           '@id' => $current_host_id
         ),
         NULL, 'boinc:account-host-merge'));
-    }
-    else {
+    } else {
       drupal_set_message(bts(
         'Computers @old_ids have been merged successfully into @id.',
         array(
@@ -1023,11 +1017,9 @@ 
     if ($account->boincuser_default_pref_set == $venue) {
       $venue_is_default = TRUE;
     }
-  }
-  elseif (!$venue OR $venue == 'generic') {
+  } elseif (!$venue OR $venue == 'generic') {
     $venue_is_default = TRUE;
-  }
-  else {
+  } else {
     $venue_is_default = FALSE;
   }
   
@@ -1047,8 +1039,7 @@ 
         if (isset($prefs[$name]['@value'])) {
           $default[$name] = $prefs[$name]['@value'];
         }
-      }
-      else {
+      } else {
         $default[$name] = $prefs[$name];
       }
     }
@@ -1232,16 +1223,13 @@ 
       foreach ($element as $ordered_element) {
         if (isset($ordered_element['@position'])) {
           $ordered_array[$ordered_element['@position']] = array($type => $ordered_element);
-        }
-        else {
+        } else {
           $unordered_array[] = array($type => $ordered_element);
         }
       }
-    }
-    elseif (isset($element['@position'])) {
+    } elseif (isset($element['@position'])) {
       $ordered_array[$element['@position']] = array($type => $element);
-    }
-    else {
+    } else {
       $unordered_array[] = array($type => $element);
     }
   }
@@ -1356,8 +1344,7 @@ 
   // Update the user's default preference set
   if ($edit['default_set']['default_venue']) {
     boincwork_set_default_venue($venue);
-  }
-  elseif ($venue == $account->boincuser_default_pref_set) {
+  } elseif ($venue == $account->boincuser_default_pref_set) {
     // User has cleared out the default venue setting
     boincwork_set_default_venue();
   }
@@ -1365,8 +1352,7 @@ 
   if (!$result) {
     watchdog('boincwork', 'Error updating project prefs for user @id: @message', array('@id' => $user->id, '@message' => mysqli_error()), WATCHDOG_ERROR);
     drupal_set_message(t('Your changes could not be saved. Please contact support!'), 'error');
-  }
-  elseif (!drupal_get_messages('status', FALSE)) {
+  } elseif (!drupal_get_messages('status', FALSE)) {
     // Show this message if the set wasn't created automatically (in which case
     // there is a message tailored to that)
     drupal_set_message(t('Your preferences have been updated.
@@ -1519,8 +1505,7 @@ 
   // Upload an avatar (pulled from profile_node_form):
   if (!empty($profile_form['field_image'])) {
     $form['field_image'] = $profile_form['field_image'];
-  }
-  else {
+  } else {
     $form['field_image'] = array(
       '#value' => '<div class="form-item">'
         . '<label class="placeholder">'
@@ -1690,8 +1675,7 @@ 
       global $base_url;
       if ($edit['language'] != language_default('language')) {
         $form_state['redirect'] = $base_url . '/' . $edit['language'] . '/' . $_GET['q'];
-      }
-      else {
+      } else {
         $form_state['redirect'] = $base_url . '/' . $_GET['q'];
       }
     }
@@ -1882,8 +1866,7 @@ 
       $row[] = drupal_render($form['ignoreblock']['delete'][$key]);
       $rows[] = $row;
     }
-  }
-  else {
+  } else {
     $rows[] = array(
       array(
         'data' => bts('You have not added any users to your Ignore List.', array(), NULL, 'boinc:ignore-user-list'),

Spacing +46 added lines, -46 removed lines

@@ -71,7 +71,7 @@ 
       }// switch
   } else {
       $form_state['storage']['wip'] = TRUE;
-      if ( !in_array($prefs_preset, array('standard','maximum','green','minimum','custom')) ) {
+      if (!in_array($prefs_preset, array('standard', 'maximum', 'green', 'minimum', 'custom'))) {
           if ($established) {
               $prefs_preset = 'custom';
           } else {
@@ -141,10 +141,10 @@ 
   );
   $form['hour_options'] = array(
     '#type' => 'value',
-    '#value' => array('0:00','1:00','2:00','3:00','4:00',
-     '5:00','6:00','7:00','8:00','9:00','10:00','11:00',
-     '12:00','13:00','14:00','15:00','16:00','17:00',
-     '18:00','19:00','20:00','21:00','22:00','23:00')
+    '#value' => array('0:00', '1:00', '2:00', '3:00', '4:00',
+     '5:00', '6:00', '7:00', '8:00', '9:00', '10:00', '11:00',
+     '12:00', '13:00', '14:00', '15:00', '16:00', '17:00',
+     '18:00', '19:00', '20:00', '21:00', '22:00', '23:00')
   );
 
   // Identify preference sets that are established to distinguish what has been
@@ -281,7 +281,7 @@ 
     '#description' => bts('Suspend computing when your computer is busy running other programs.', array(), NULL, 'boinc:account-preferences-computing'),
   );
   $form['prefs']['advanced']['processor']['hour_label'] = array(
-    '#value' => '<div class="form-item"><label>' . bts('Compute only between:', array(), NULL, 'boinc:account-preferences-computing') . '</label></div>'
+    '#value' => '<div class="form-item"><label>'.bts('Compute only between:', array(), NULL, 'boinc:account-preferences-computing').'</label></div>'
   );
   $form['prefs']['advanced']['processor']['start_hour'] = array(
     '#type' => 'select',
@@ -289,7 +289,7 @@ 
     '#default_value' => $default['start_hour']
   );
   $form['prefs']['advanced']['processor']['hour_delimiter'] = array(
-    '#value' => '<span>' . bts('and', array(), NULL, 'boinc:account-preference') . '</span>'
+    '#value' => '<span>'.bts('and', array(), NULL, 'boinc:account-preference').'</span>'
   );
   $form['prefs']['advanced']['processor']['end_hour'] = array(
     '#type' => 'select',
@@ -297,7 +297,7 @@ 
     '#default_value' => $default['end_hour']
   );
   $form['prefs']['advanced']['processor']['hour_description'] = array(
-    '#value' => '<div class="form-item slim"><div class="description">' . bts('Compute only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing') . '</div></div>'
+    '#value' => '<div class="form-item slim"><div class="description">'.bts('Compute only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing').'</div></div>'
   );
   $form['prefs']['advanced']['processor']['leave_apps_in_memory'] = array(
     '#title' => bts('Leave non-GPU tasks in memory while suspended?', array(), NULL, 'boinc:account-preferences-computing'),
@@ -454,7 +454,7 @@ 
     '#description' => bts('Limit the upload rate of file transfers.', array(), NULL, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['network']['hour_label'] = array(
-    '#value' => '<div class="form-item"><label>' . bts('Transfer files only between', array(), NULL, 'boinc:account-preferences-computing') . '</label></div>'
+    '#value' => '<div class="form-item"><label>'.bts('Transfer files only between', array(), NULL, 'boinc:account-preferences-computing').'</label></div>'
   );
   $form['prefs']['advanced']['network']['net_start_hour'] = array(
     '#type' => 'select',
@@ -462,7 +462,7 @@ 
     '#default_value' => $default['net_start_hour']
   );
   $form['prefs']['advanced']['network']['hour_delimiter'] = array(
-    '#value' => '<span>' . bts('and', array(), NULL, 'boinc:account-preference') . '</span>'
+    '#value' => '<span>'.bts('and', array(), NULL, 'boinc:account-preference').'</span>'
   );
   $form['prefs']['advanced']['network']['net_end_hour'] = array(
     '#type' => 'select',
@@ -470,7 +470,7 @@ 
     '#default_value' => $default['net_end_hour']
   );
   $form['prefs']['advanced']['network']['hour_description'] = array(
-    '#value' => '<div class="form-item slim"><div class="description">' . bts('Transfer files only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing') . '</div></div>'
+    '#value' => '<div class="form-item slim"><div class="description">'.bts('Transfer files only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing').'</div></div>'
   );
   $form['prefs']['advanced']['network']['daily_xfer_limit_mb'] = array(
     '#title' => bts('Limit usage to', array(), NULL, 'boinc:account-preferences-computing'),
@@ -530,23 +530,23 @@ 
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), drupal_get_path_alias("account/prefs/computing/edit")) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), drupal_get_path_alias("account/prefs/computing/edit")).'</li>'
   );
   if ($venue AND $venue != 'generic') {
     global $base_path;
-    $form['prefs']['form control tabs']['#value'] .= '<li class="tab">' .
+    $form['prefs']['form control tabs']['#value'] .= '<li class="tab">'.
       l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$venue}",
         array(
-          'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/computing/combined')),
+          'query' => 'destination='.urlencode(drupal_get_path_alias('account/prefs/computing/combined')),
           'attributes' => array(
-            'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the @name preference set. Are you sure?',
-              array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
+            'onclick' => 'return confirm(\''.bts('This will remove all of your settings from the @name preference set. Are you sure?',
+              array('@name' => $venue), NULL, 'boinc:account-preferences').'\')'
           )
         )
-      ) . '</li>';
+      ).'</li>';
   }
   $form['prefs']['view control'] = array(
-    '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/computing/combined') . '</li>'
+    '#value' => '<li class="first alt tab">'.l('('.bts('Show comparison view', array(), NULL, 'boinc:account-preferences').')', 'account/prefs/computing/combined').'</li>'
   );
   $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
@@ -784,7 +784,7 @@ 
     return FALSE;
   }
 
-  if ($new_host->userid==0) {
+  if ($new_host->userid == 0) {
     rules_invoke_event('boincwork_zombie_merge_error', $old_host->id, $new_host->id, variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('boincwork',
       'Zombie merge attempted, target host has userid=0: old host id=%old_host, target host id=%new_host',
@@ -880,9 +880,9 @@ 
   }
 
   $form['overview'] = array(
-    '#value' => '<p>' . bts('Sometimes BOINC assigns separate identities to'
+    '#value' => '<p>'.bts('Sometimes BOINC assigns separate identities to'
       . ' the same computer by mistake. You can correct this by merging old'
-      . ' identities with the newest one.', array(), NULL, 'boinc:account-host-merge') . '</p>'
+      . ' identities with the newest one.', array(), NULL, 'boinc:account-host-merge').'</p>'
       . '<p>'
       . bts('Check the computers that are the same as @name'
       . ' (created on @date at @time with computer ID @id)',
@@ -892,7 +892,7 @@ 
           '@time' => date('G:i:s T', $current_host->create_time),
           '@id' => $current_host->id,
         ),
-        NULL, 'boinc:account-host-merge') . '</p>',
+        NULL, 'boinc:account-host-merge').'</p>',
   );
 
   $options = array();
@@ -926,7 +926,7 @@ 
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "host/{$host_id}") . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "host/{$host_id}").'</li>'
   );
 
   return $form;
@@ -971,7 +971,7 @@ 
       if (count($merged) == 2) {
         $oxford_comma = '';
       }
-      $list = implode(', ', $list) . $oxford_comma . ' ' . $conjunction . ' ' . $last;
+      $list = implode(', ', $list).$oxford_comma.' '.$conjunction.' '.$last;
     }
     else {
       $list = $last;
@@ -1220,23 +1220,23 @@ 
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>'
   );
   if ($venue AND $venue != 'generic') {
     global $base_path;
-    $form['prefs']['form control tabs']['#value'] .= '<li class="tab">' .
+    $form['prefs']['form control tabs']['#value'] .= '<li class="tab">'.
       l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$venue}",
         array(
-          'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/project/combined')),
+          'query' => 'destination='.urlencode(drupal_get_path_alias('account/prefs/project/combined')),
           'attributes' => array(
-            'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the @name preference set. Are you sure?',
-              array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
+            'onclick' => 'return confirm(\''.bts('This will remove all of your settings from the @name preference set. Are you sure?',
+              array('@name' => $venue), NULL, 'boinc:account-preferences').'\')'
           )
         )
-      ) . '</li>';
+      ).'</li>';
   }
   $form['prefs']['view control'] = array(
-      '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project/combined') . '</li>'
+      '#value' => '<li class="first alt tab">'.l('('.bts('Show comparison view', array(), NULL, 'boinc:account-preferences').')', 'account/prefs/project/combined').'</li>'
   );
   $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
@@ -1279,7 +1279,7 @@ 
 
   foreach ($xml['project_specific_preferences'] as $wrapped_element) {
     $type = key($wrapped_element);
-    $element= reset($wrapped_element);
+    $element = reset($wrapped_element);
     boincwork_generate_prefs_element($form, $type, $element, $prefs['project_specific']);
   }
 }
@@ -1505,7 +1505,7 @@ 
     $names = array();
     foreach ($languages as $langcode => $item) {
       $name = t($item->name);
-      $names[check_plain($langcode)] = check_plain($name . ($item->native != $name ? ' ('. $item->native .')' : ''));
+      $names[check_plain($langcode)] = check_plain($name.($item->native != $name ? ' ('.$item->native.')' : ''));
     }
     $form['locale'] = array(
       '#type' => 'fieldset',
@@ -1530,20 +1530,20 @@ 
   // Avatar options
   $form['gravatar'] = array(
     '#type' => 'item',
-    '#value' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, it will be used for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), NULL, 'boinc:account-preferences-community'),
+    '#value' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, it will be used for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/'.$account->mail), NULL, 'boinc:account-preferences-community'),
     '#description' => bts('Your Gravatar will not be shown if you upload a user picture.', array(), NULL, 'boinc:account-preferences-community'),
   );
   if (user_access('disable own gravatar', $account)) {
     $form['gravatar'] = array(
       '#type' => 'checkbox',
-      '#title' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, use it for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), NULL, 'boinc:account-preferences-community'),
+      '#title' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, use it for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/'.$account->mail), NULL, 'boinc:account-preferences-community'),
       '#description' => bts('Gravatar will not be shown if an avatar is uploaded.', array(), NULL, 'boinc:account-preferences-community'),
       '#default_value' => isset($account->gravatar) ? $account->gravatar : 0,
       '#disabled' => !empty($account->picture),
     );
   }
   $form['gravatar']['#weight'] = 15;
-  $form['gravatar']['#prefix'] = '<fieldset class="collapsible"><legend><a href="#">' . bts('Avatar settings', array(), NULL, 'boinc:account-preferences-community') . '</a></legend>';
+  $form['gravatar']['#prefix'] = '<fieldset class="collapsible"><legend><a href="#">'.bts('Avatar settings', array(), NULL, 'boinc:account-preferences-community').'</a></legend>';
   // Upload an avatar (pulled from profile_node_form):
   if (!empty($profile_form['field_image'])) {
     $form['field_image'] = $profile_form['field_image'];
@@ -1578,7 +1578,7 @@ 
   );
   // Can't have a typical Drupal form suffix on a select box?
   $form['forums']['comments_per_page_suffix'] = array(
-    '#value' => '<span>' . bts('comments per page', array(), NULL, 'boinc:account-preferences-community') . '</span>'
+    '#value' => '<span>'.bts('comments per page', array(), NULL, 'boinc:account-preferences-community').'</span>'
   );
   $form['forums']['comments_order'] = array(
     '#type' => 'select',
@@ -1631,7 +1631,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -1717,10 +1717,10 @@ 
     if ($user->language != $edit['language']) {
       global $base_url;
       if ($edit['language'] != language_default('language')) {
-        $form_state['redirect'] = $base_url . '/' . $edit['language'] . '/' . $_GET['q'];
+        $form_state['redirect'] = $base_url.'/'.$edit['language'].'/'.$_GET['q'];
       }
       else {
-        $form_state['redirect'] = $base_url . '/' . $_GET['q'];
+        $form_state['redirect'] = $base_url.'/'.$_GET['q'];
       }
     }
   }
@@ -1790,7 +1790,7 @@ 
   // option that deals with privacy.
   foreach ($privacy_consent_types as $ct) {
 
-    $currstate = (check_user_consent($boincuser, $ct['shortname'])) ? 1 : 0 ;
+    $currstate = (check_user_consent($boincuser, $ct['shortname'])) ? 1 : 0;
     // Set name to 'privacyconsent_SHORTNAME', which can be parsed
     // later in the submit function.
     $form['privacy']['privacyconsent_'.$ct['shortname']] = array(
@@ -1804,7 +1804,7 @@ 
     // Add a description with link to the question 'Do you consent to
     // exporting your data...'.
     $mypatt = '/Do you consent to exporting your data/';
-    if (preg_match($mypatt, $ct['description']) ) {
+    if (preg_match($mypatt, $ct['description'])) {
       $form['privacy']['privacyconsent_'.$ct['shortname']]['#description'] = bts('See our !privacy_policy_link for the current list of statistics exports.',
       array(
         '!privacy_policy_link' => l(
@@ -1843,7 +1843,7 @@ 
       $form['ignoreblock']['delete'][$ignored_user['iuid']] = array(
         '#value' => l(
           bts('delete', array(), NULL, 'boinc:ignore-user-delete-button'),
-          'account/prefs/privacy/ignore_user/remove/'. $ignored_user['iuid'],
+          'account/prefs/privacy/ignore_user/remove/'.$ignored_user['iuid'],
           array()
         ),
       );
@@ -1894,7 +1894,7 @@ 
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>'
   );
   $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
@@ -1981,7 +1981,7 @@ 
   $privacyconsent_prefs = array_intersect_key($form_state['values'], array_flip($result));
   foreach ($privacyconsent_prefs as $name => $newstate) {
     $subname = explode('_', $name)[1];
-    $currstate = (check_user_consent($boincuser, $subname)) ? 1 : 0 ;
+    $currstate = (check_user_consent($boincuser, $subname)) ? 1 : 0;
     list($checkct, $ctid) = check_consent_type($subname);
     if ($checkct && ($currstate != $newstate)) {
       consent_to_a_policy($boincuser, $ctid, $newstate, 0, 'Webform', time());
@@ -2047,7 +2047,7 @@ 
 function boincwork_selectapp_form_submit($form, &$form_state) {
   $myargs = arg();
   array_pop($myargs);
-  $newpath = implode('/', $myargs ) . '/' . $form['selectapp']['#value'];
+  $newpath = implode('/', $myargs).'/'.$form['selectapp']['#value'];
   $form_state['redirect'] = $newpath;
 }
 

Indentation +965 added lines, -965 removed lines

@@ -15,16 +15,16 @@ 
  * The structure of the general preferences form
  */
 function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null, $advanced = FALSE) {
-  $form = array();
-  $prefs = null;
-  $established = TRUE;
+    $form = array();
+    $prefs = null;
+    $established = TRUE;
 
-  // Enable AHAH form support for dynamically updating content based on preset
-  ahah_helper_register($form, $form_state);
+    // Enable AHAH form support for dynamically updating content based on preset
+    ahah_helper_register($form, $form_state);
 
-  if (!$prefs_preset) {
+    if (!$prefs_preset) {
     if (isset($form_state['storage']['prefs']['preset'])) {
-      $prefs_preset = $form_state['storage']['prefs']['preset'];
+        $prefs_preset = $form_state['storage']['prefs']['preset'];
     }
 
     // Load preferences from BOINC account
@@ -32,7 +32,7 @@ 
 
     // Take note if this is not an established preference set on the account
     if (isset($prefs['@attributes']['cleared'])) {
-      $established = FALSE;
+        $established = FALSE;
     }
 
     // Determine if a preset is selected or if these are custom settings
@@ -47,45 +47,45 @@ 
             $prefs_preset = $prefs['preset']['@value'];
         }
     }// if !$prefs_preset
-  }
-  // Extract mod_time tag if present, because it will be erased with
-  // boincwork_get_preset_prefs() below.
-  $mod_time = null;
-  if (isset($prefs['mod_time']['@value'])) {
-      $mod_time = $prefs['mod_time']['@value'];
-  }
-
-  if (isset($form_state['storage']['wip'])) {
-      switch ($prefs_preset) {
-      case 'standard':
+    }
+    // Extract mod_time tag if present, because it will be erased with
+    // boincwork_get_preset_prefs() below.
+    $mod_time = null;
+    if (isset($prefs['mod_time']['@value'])) {
+        $mod_time = $prefs['mod_time']['@value'];
+    }
+
+    if (isset($form_state['storage']['wip'])) {
+        switch ($prefs_preset) {
+        case 'standard':
       case 'maximum':
       case 'green':
       case 'minimum':
           $prefs = boincwork_get_preset_prefs($prefs_preset);
-          break;
-      case 'custom':
+            break;
+        case 'custom':
       default:
           // Just keeps prefs as they are
           unset($prefs['preset']);
-          break;
-      }// switch
-  } else {
-      $form_state['storage']['wip'] = TRUE;
-      if ( !in_array($prefs_preset, array('standard','maximum','green','minimum','custom')) ) {
-          if ($established) {
-              $prefs_preset = 'custom';
-          } else {
-              $prefs_preset = 'standard';
-              $prefs = boincwork_get_preset_prefs($prefs_preset);
-          }// if $established
-      }// if $prefs_preset
-  }// if WIP
-
-  // This set of preferences is used in the form if no preferences
-  // have been set above, in variable $prefs.
-  require_boinc(array('db', 'prefs'));
-  $disk_space_config = get_disk_space_config();
-  $default = array(
+            break;
+        }// switch
+    } else {
+        $form_state['storage']['wip'] = TRUE;
+        if ( !in_array($prefs_preset, array('standard','maximum','green','minimum','custom')) ) {
+            if ($established) {
+                $prefs_preset = 'custom';
+            } else {
+                $prefs_preset = 'standard';
+                $prefs = boincwork_get_preset_prefs($prefs_preset);
+            }// if $established
+        }// if $prefs_preset
+    }// if WIP
+
+    // This set of preferences is used in the form if no preferences
+    // have been set above, in variable $prefs.
+    require_boinc(array('db', 'prefs'));
+    $disk_space_config = get_disk_space_config();
+    $default = array(
     'preset' => $prefs_preset,
     // Processing...
     'run_on_batteries' => 0,
@@ -120,385 +120,385 @@ 
     'daily_xfer_limit_mb' => 0,
     'daily_xfer_period_days' => 0,
     'dont_verify_images' => 0
-  );
-  foreach ($default as $name => $value) {
+    );
+    foreach ($default as $name => $value) {
     if (isset($prefs[$name])) {
-      if (is_array($prefs[$name])) {
+        if (is_array($prefs[$name])) {
         if (isset($prefs[$name]['@value'])) {
-          $default[$name] = $prefs[$name]['@value'];
+            $default[$name] = $prefs[$name]['@value'];
+        }
         }
-      }
-      else {
+        else {
         $default[$name] = $prefs[$name];
-      }
+        }
+    }
     }
-  }
 
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
-  );
-  $form['hour_options'] = array(
+    );
+    $form['hour_options'] = array(
     '#type' => 'value',
     '#value' => array('0:00','1:00','2:00','3:00','4:00',
-     '5:00','6:00','7:00','8:00','9:00','10:00','11:00',
-     '12:00','13:00','14:00','15:00','16:00','17:00',
-     '18:00','19:00','20:00','21:00','22:00','23:00')
-  );
+        '5:00','6:00','7:00','8:00','9:00','10:00','11:00',
+        '12:00','13:00','14:00','15:00','16:00','17:00',
+        '18:00','19:00','20:00','21:00','22:00','23:00')
+    );
 
-  // Identify preference sets that are established to distinguish what has been
-  // saved to the database from what is just showing default values
-  $form['#established'] = $established;
+    // Identify preference sets that are established to distinguish what has been
+    // saved to the database from what is just showing default values
+    $form['#established'] = $established;
 
-  // Set up the preference container for AHAH
-  $form['prefs'] = array(
+    // Set up the preference container for AHAH
+    $form['prefs'] = array(
     '#title' => '',
     '#type' => 'fieldset',
     '#prefix' => '<div id="prefs-wrapper">', // This is our wrapper div.
     '#attributes' => array('class' => 'ahah-container'),
     '#suffix' => '</div>',
     '#tree'   => TRUE
-  );
-  //$form['prefs']['debug'] = array('#value' => '<pre>' . print_r($form_state, true) . '</pre>');
+    );
+    //$form['prefs']['debug'] = array('#value' => '<pre>' . print_r($form_state, true) . '</pre>');
 
-  // Hidden elements
-  $form['prefs']['modified'] = array(
+    // Hidden elements
+    $form['prefs']['modified'] = array(
     '#type' => 'hidden',
     '#value' => $mod_time
-  );
-  $form['prefs']['venue'] = array(
+    );
+    $form['prefs']['venue'] = array(
     '#type' => 'hidden',
     '#value' => $venue
-  );
+    );
 
-  $form['prefs']['separator_top'] = array(
+    $form['prefs']['separator_top'] = array(
     '#value' => '<div class="separator"></div>'
-  );
+    );
 
-  // Simplified selectors
-  $form['prefs']['preset'] = array(
-      '#title' => bts('Presets', array(), NULL, 'boinc:account-preferences-preset:-1:for a user to choose a computing or project preference preset.'),
+    // Simplified selectors
+    $form['prefs']['preset'] = array(
+        '#title' => bts('Presets', array(), NULL, 'boinc:account-preferences-preset:-1:for a user to choose a computing or project preference preset.'),
     '#type' => 'radios',
     '#description' => ' ',
     '#options' => array(
-      'standard' => bts('Standard', array(), NULL, 'boinc:account-preferences-preset'),
-      'maximum' => bts('Maximum', array(), NULL, 'boinc:account-preferences-preset'),
-      'green' => bts('Green', array(), NULL, 'boinc:account-preferences-preset'),
-      'minimum' => bts('Minimum', array(), NULL, 'boinc:account-preferences-preset'),
-      'custom' => bts('Custom', array(), NULL, 'boinc:account-preferences-preset')
+        'standard' => bts('Standard', array(), NULL, 'boinc:account-preferences-preset'),
+        'maximum' => bts('Maximum', array(), NULL, 'boinc:account-preferences-preset'),
+        'green' => bts('Green', array(), NULL, 'boinc:account-preferences-preset'),
+        'minimum' => bts('Minimum', array(), NULL, 'boinc:account-preferences-preset'),
+        'custom' => bts('Custom', array(), NULL, 'boinc:account-preferences-preset')
     ),
     '#prefix' => '<div class="simple-form-controls">',
     '#suffix' => '</div>',
     '#default_value' => $default['preset'],
     '#ahah' => array(
-      'event' => 'change',
-      'path' => ahah_helper_path(array('prefs')),
-      'wrapper' => 'prefs-wrapper'
+        'event' => 'change',
+        'path' => ahah_helper_path(array('prefs')),
+        'wrapper' => 'prefs-wrapper'
     )
-  );
-  $form['prefs']['select preset'] = array(
+    );
+    $form['prefs']['select preset'] = array(
     '#type'  => 'submit',
     '#value' => bts('Update preset', array(), NULL, 'boinc:account-preferences-preset'),
     '#submit' => array('ahah_helper_generic_submit'),
     // The 'no-js' class only displays this button if javascript is disabled
     '#attributes' => array('class' => 'no-js'),
-  );
+    );
 
-  // Advanced preferences
-  $form['prefs']['advanced'] = array(
+    // Advanced preferences
+    $form['prefs']['advanced'] = array(
     '#title' => bts('Advanced settings', array(), NULL, 'boinc:account-preferences-option'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => TRUE,
     '#collapsed' => !$advanced,
     '#attributes' => array('class' => 'advanced-settings'),
-  );
+    );
 
-  // Processing preferences
+    // Processing preferences
 
-  $form['prefs']['advanced']['anchor'] = array(
+    $form['prefs']['advanced']['anchor'] = array(
     '#value' => '<a name="advanced"></a>'
-  );
+    );
 
-  $form['prefs']['advanced']['separator_top'] = array(
+    $form['prefs']['advanced']['separator_top'] = array(
     '#value' => '<div class="separator"></div>'
-  );
+    );
 
-  $form['prefs']['advanced']['processor'] = array(
+    $form['prefs']['advanced']['processor'] = array(
     '#title' => bts('Processor usage', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => FALSE,
     '#collapsed' => FALSE
-  );
-  $form['prefs']['advanced']['processor']['run_on_batteries'] = array(
+    );
+    $form['prefs']['advanced']['processor']['run_on_batteries'] = array(
     '#title' => bts('Suspend when computer is on battery?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#description' => bts('Suspends computing on portables when running on battery power.', array(), NULL, 'boinc:account-preferences-computing'),
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => ($default['run_on_batteries']) ? 0 : 1 // intentional inversion of setting
-  );
-  $form['prefs']['advanced']['processor']['run_if_user_active'] = array(
+    );
+    $form['prefs']['advanced']['processor']['run_if_user_active'] = array(
     '#title' => bts('Suspend when computer is in use?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#description' => bts("Suspends computing and file transfers when you're using the computer.", array(), NULL, 'boinc:account-preferences-computing'),
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => ($default['run_if_user_active']) ? 0 : 1 // intentional inversion of setting
-  );
-  $form['prefs']['advanced']['processor']['run_gpu_if_user_active'] = array(
+    );
+    $form['prefs']['advanced']['processor']['run_gpu_if_user_active'] = array(
     '#title' => bts('Suspend GPU computing when computer is in use?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#description' => bts("Suspends GPU computing when you're using the computer.", array(), NULL, 'boinc:account-preferences-computing'),
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => ($default['run_gpu_if_user_active']) ? 0 : 1 // intentional inversion of setting
-  );
-  $form['prefs']['advanced']['processor']['idle_time_to_run'] = array(
-      '#title' => bts('"In use" means mouse/keyboard input in last', array(), NULL, 'boinc:account-preferences-computing'),
+    );
+    $form['prefs']['advanced']['processor']['idle_time_to_run'] = array(
+        '#title' => bts('"In use" means mouse/keyboard input in last', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('minutes', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['idle_time_to_run'],
     '#size' => 1,
     '#description' => bts('This determines when the computer is considered "in use".', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['processor']['suspend_if_no_recent_input'] = array(
+    );
+    $form['prefs']['advanced']['processor']['suspend_if_no_recent_input'] = array(
     '#title' => bts('Suspend when no mouse/keyboard input in last', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('minutes', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['suspend_if_no_recent_input'],
     '#size' => 1,
     '#description' => bts('This allows some computers to enter low-power mode when not in use.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['processor']['suspend_cpu_usage'] = array(
+    );
+    $form['prefs']['advanced']['processor']['suspend_cpu_usage'] = array(
     '#title' => bts('Suspend when non-BOINC CPU usage is above', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => '%',
     '#default_value' => $default['suspend_cpu_usage'],
     '#size' => 1,
     '#description' => bts('Suspend computing when your computer is busy running other programs.', array(), NULL, 'boinc:account-preferences-computing'),
-  );
-  $form['prefs']['advanced']['processor']['hour_label'] = array(
+    );
+    $form['prefs']['advanced']['processor']['hour_label'] = array(
     '#value' => '<div class="form-item"><label>' . bts('Compute only between:', array(), NULL, 'boinc:account-preferences-computing') . '</label></div>'
-  );
-  $form['prefs']['advanced']['processor']['start_hour'] = array(
+    );
+    $form['prefs']['advanced']['processor']['start_hour'] = array(
     '#type' => 'select',
     '#options' => $form['hour_options']['#value'],
     '#default_value' => $default['start_hour']
-  );
-  $form['prefs']['advanced']['processor']['hour_delimiter'] = array(
+    );
+    $form['prefs']['advanced']['processor']['hour_delimiter'] = array(
     '#value' => '<span>' . bts('and', array(), NULL, 'boinc:account-preference') . '</span>'
-  );
-  $form['prefs']['advanced']['processor']['end_hour'] = array(
+    );
+    $form['prefs']['advanced']['processor']['end_hour'] = array(
     '#type' => 'select',
     '#options' => $form['hour_options']['#value'],
     '#default_value' => $default['end_hour']
-  );
-  $form['prefs']['advanced']['processor']['hour_description'] = array(
+    );
+    $form['prefs']['advanced']['processor']['hour_description'] = array(
     '#value' => '<div class="form-item slim"><div class="description">' . bts('Compute only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing') . '</div></div>'
-  );
-  $form['prefs']['advanced']['processor']['leave_apps_in_memory'] = array(
+    );
+    $form['prefs']['advanced']['processor']['leave_apps_in_memory'] = array(
     '#title' => bts('Leave non-GPU tasks in memory while suspended?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['leave_apps_in_memory'],
     '#description' => bts('If "Yes", suspended tasks stay in memory, and resume with no work lost. If "No", suspended tasks are removed from memory, and resume from their last checkpoint.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes'] = array(
+    );
+    $form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes'] = array(
     '#title' => bts('Switch between tasks every', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('minutes', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['cpu_scheduling_period_minutes'],
     '#size' => 1,
     '#description' => bts('If you run several projects, BOINC may switch between them this often.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['processor']['max_ncpus_pct'] = array(
+    );
+    $form['prefs']['advanced']['processor']['max_ncpus_pct'] = array(
     '#title' => bts('Use at most', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of the processors', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['max_ncpus_pct'],
     '#size' => 1,
     '#description' => bts('Keep some CPUs free for other applications. Example: 75% means use 6 cores on an 8-core CPU.', array(), NULL, 'boinc:account-preferences-computing'),
-  );
-  $form['prefs']['advanced']['processor']['cpu_usage_limit'] = array(
+    );
+    $form['prefs']['advanced']['processor']['cpu_usage_limit'] = array(
     '#title' => bts('Use at most', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of the CPU time', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['cpu_usage_limit'],
     '#size' => 1,
     '#description' => bts('Suspend/resume computing every few seconds to reduce CPU temperature and energy usage. Example: 75% means compute for 3 seconds, wait for 1 second, and repeat.', array(), NULL, 'boinc:account-preferences-computing')
-  );
+    );
 
-  // Disk and memory preferences
-  $form['prefs']['advanced']['storage'] = array(
+    // Disk and memory preferences
+    $form['prefs']['advanced']['storage'] = array(
     '#title' => bts('Disk and memory usage', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => FALSE,
     '#collapsed' => FALSE
-  );
-  $form['prefs']['advanced']['storage']['disk_max_used_gb'] = array(
+    );
+    $form['prefs']['advanced']['storage']['disk_max_used_gb'] = array(
     '#title' => bts('Disk: use no more than', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'GB',
     '#default_value' => $default['disk_max_used_gb'],
     '#size' => 1,
     '#description' => bts('Limit the total amount of disk space used by BOINC.', array(), NULL, 'boinc:account-preferences-computing'),
-  );
-  $form['prefs']['advanced']['storage']['disk_min_free_gb'] = array(
+    );
+    $form['prefs']['advanced']['storage']['disk_min_free_gb'] = array(
     '#title' => bts('Disk: leave at least', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'GB free',
     '#default_value' => $default['disk_min_free_gb'],
     '#size' => 1,
     '#description' => bts('Limit disk usage to leave this much free space on the volume where BOINC stores data.', array(), NULL, 'boinc:account-preferences-computing'),
-  );
-  $form['prefs']['advanced']['storage']['disk_max_used_pct'] = array(
+    );
+    $form['prefs']['advanced']['storage']['disk_max_used_pct'] = array(
     '#title' => bts('Disk: use no more than', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['disk_max_used_pct'],
     '#size' => 1,
     '#description' => bts('Limit the percentage of disk space used by BOINC on the volume where it stores data.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['storage']['disk_interval'] = array(
+    );
+    $form['prefs']['advanced']['storage']['disk_interval'] = array(
     '#title' => bts('Request tasks to checkpoint at most every', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('seconds', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['disk_interval'],
     '#size' => 1,
     '#description' => bts('This controls how often tasks save their state to disk, so that later they can be continued from that point.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['storage']['vm_max_used_pct'] = array(
+    );
+    $form['prefs']['advanced']['storage']['vm_max_used_pct'] = array(
     '#title' => bts('Page/swap file: use at most', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['vm_max_used_pct'],
     '#size' => 1,
     '#description' => bts('Limit the swap space (page file) used by BOINC.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['storage']['ram_max_used_busy_pct'] = array(
+    );
+    $form['prefs']['advanced']['storage']['ram_max_used_busy_pct'] = array(
     '#title' => bts('Memory: when computer is in use, use at most', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['ram_max_used_busy_pct'],
     '#size' => 1,
     '#description' => bts("Limit the memory used by BOINC when you're using the computer.", array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['storage']['ram_max_used_idle_pct'] = array(
+    );
+    $form['prefs']['advanced']['storage']['ram_max_used_idle_pct'] = array(
     '#title' => bts('Memory: when computer is not in use, use at most', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['ram_max_used_idle_pct'],
     '#size' => 1,
     '#description' => bts("Limit the memory used by BOINC when you're not using the computer.", array(), NULL, 'boinc:account-preferences-computing')
-  );
+    );
 
-  // Network preferences
-  $form['prefs']['advanced']['network'] = array(
+    // Network preferences
+    $form['prefs']['advanced']['network'] = array(
     '#title' => bts('Network usage', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => FALSE,
     '#collapsed' => FALSE
-  );
-  $form['prefs']['advanced']['network']['work_buf_min_days'] = array(
+    );
+    $form['prefs']['advanced']['network']['work_buf_min_days'] = array(
     '#title' => bts('Store at least', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('days of work', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['work_buf_min_days'],
     '#size' => 1,
     '#description' => bts('Store at least enough tasks to keep the computer busy for this long.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['network']['work_buf_additional_days'] = array(
+    );
+    $form['prefs']['advanced']['network']['work_buf_additional_days'] = array(
     '#title' => bts('Store up to an additional', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('days', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['work_buf_additional_days'],
     '#size' => 1,
     '#description' => bts('Store additional tasks above the minimum level.  Determines how much work is requested when contacting a project.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['network']['confirm_before_connecting'] = array(
+    );
+    $form['prefs']['advanced']['network']['confirm_before_connecting'] = array(
     '#title' => bts('Confirm before connecting to Internet?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['confirm_before_connecting'],
     '#description' => bts('Useful only if you have a modem, ISDN or VPN connection.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['network']['hangup_if_dialed'] = array(
+    );
+    $form['prefs']['advanced']['network']['hangup_if_dialed'] = array(
     '#title' => bts('Disconnect when done?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['hangup_if_dialed'],
     '#description' => bts('Useful only if you have a modem, ISDN or VPN connection.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['network']['max_bytes_sec_down'] = array(
+    );
+    $form['prefs']['advanced']['network']['max_bytes_sec_down'] = array(
     '#title' => bts('Limit download rate to', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'Kbytes/sec',
     '#default_value' => $default['max_bytes_sec_down']/1000,
     '#size' => 1,
     '#description' => bts('Limit the download rate of file transfers.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['network']['max_bytes_sec_up'] = array(
+    );
+    $form['prefs']['advanced']['network']['max_bytes_sec_up'] = array(
     '#title' => bts('Limit upload rate to', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'Kbytes/sec',
     '#default_value' => $default['max_bytes_sec_up']/1000,
     '#size' => 1,
     '#description' => bts('Limit the upload rate of file transfers.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['network']['hour_label'] = array(
+    );
+    $form['prefs']['advanced']['network']['hour_label'] = array(
     '#value' => '<div class="form-item"><label>' . bts('Transfer files only between', array(), NULL, 'boinc:account-preferences-computing') . '</label></div>'
-  );
-  $form['prefs']['advanced']['network']['net_start_hour'] = array(
+    );
+    $form['prefs']['advanced']['network']['net_start_hour'] = array(
     '#type' => 'select',
     '#options' => $form['hour_options']['#value'],
     '#default_value' => $default['net_start_hour']
-  );
-  $form['prefs']['advanced']['network']['hour_delimiter'] = array(
+    );
+    $form['prefs']['advanced']['network']['hour_delimiter'] = array(
     '#value' => '<span>' . bts('and', array(), NULL, 'boinc:account-preference') . '</span>'
-  );
-  $form['prefs']['advanced']['network']['net_end_hour'] = array(
+    );
+    $form['prefs']['advanced']['network']['net_end_hour'] = array(
     '#type' => 'select',
     '#options' => $form['hour_options']['#value'],
     '#default_value' => $default['net_end_hour']
-  );
-  $form['prefs']['advanced']['network']['hour_description'] = array(
+    );
+    $form['prefs']['advanced']['network']['hour_description'] = array(
     '#value' => '<div class="form-item slim"><div class="description">' . bts('Transfer files only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing') . '</div></div>'
-  );
-  $form['prefs']['advanced']['network']['daily_xfer_limit_mb'] = array(
+    );
+    $form['prefs']['advanced']['network']['daily_xfer_limit_mb'] = array(
     '#title' => bts('Limit usage to', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'Mbytes',
     '#default_value' => $default['daily_xfer_limit_mb'],
     '#size' => 1
-  );
-  $form['prefs']['advanced']['network']['daily_xfer_period_days'] = array(
+    );
+    $form['prefs']['advanced']['network']['daily_xfer_period_days'] = array(
     '#field_prefix' => 'every',
     '#type' => 'textfield',
     '#field_suffix' => bts('days', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['daily_xfer_period_days'],
     '#size' => 1,
     '#description' => bts('Example: BOINC should transfer at most 2000 MB of data every 30 days.', array(), NULL, 'boinc:account-preferences-computing'),
-  );
-  $form['prefs']['advanced']['network']['dont_verify_images'] = array(
+    );
+    $form['prefs']['advanced']['network']['dont_verify_images'] = array(
     '#title' => bts('Skip data verification for image files?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['dont_verify_images'],
     '#description' => bts('Only select "Yes" if your Internet provider modifies image files. Skipping verification reduces the security of BOINC.', array(), NULL, 'boinc:account-preferences-computing')
-  );
+    );
 
-  // The "fancy radios" are made via javascript on document load. In order for
-  // these to work with AHAH, we need this crazy setTimeout() call.
-  $form['prefs']['fancy-radios'] = array(
+    // The "fancy radios" are made via javascript on document load. In order for
+    // these to work with AHAH, we need this crazy setTimeout() call.
+    $form['prefs']['fancy-radios'] = array(
     '#value' => '
       <script>
         setTimeout(
@@ -509,177 +509,177 @@ 
           300
         )
       </script>'
-  );
-  $form['prefs']['view advanced'] = array(
+    );
+    $form['prefs']['view advanced'] = array(
     '#type' => 'hidden',
     '#value' => 1
-  );
+    );
 
-  $form['prefs']['separator_bottom'] = array(
+    $form['prefs']['separator_bottom'] = array(
     '#value' => '<div class="separator buttons"></div>'
-  );
+    );
 
-  // Form control
-  $form['prefs']['form control tabs prefix'] = array(
+    // Form control
+    $form['prefs']['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['prefs']['submit'] = array(
+    );
+    $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
     '#suffix' => '</li>'
-  );
-  $form['prefs']['form control tabs'] = array(
+    );
+    $form['prefs']['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), drupal_get_path_alias("account/prefs/computing/edit")) . '</li>'
-  );
-  if ($venue AND $venue != 'generic') {
+    );
+    if ($venue AND $venue != 'generic') {
     global $base_path;
     $form['prefs']['form control tabs']['#value'] .= '<li class="tab">' .
-      l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$venue}",
+        l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$venue}",
         array(
-          'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/computing/combined')),
-          'attributes' => array(
+            'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/computing/combined')),
+            'attributes' => array(
             'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the @name preference set. Are you sure?',
-              array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
-          )
+                array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
+            )
         )
-      ) . '</li>';
-  }
-  $form['prefs']['view control'] = array(
+        ) . '</li>';
+    }
+    $form['prefs']['view control'] = array(
     '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/computing/combined') . '</li>'
-  );
-  $form['prefs']['form control tabs suffix'] = array(
+    );
+    $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
-  );
-  $form['#submit'][] = 'boincwork_generalprefs_form_submit';
+    );
+    $form['#submit'][] = 'boincwork_generalprefs_form_submit';
 
-  return $form;
+    return $form;
 }
 
 /**
-  * Validate the general preferences form.
-  */
+ * Validate the general preferences form.
+ */
 function boincwork_generalprefs_form_validate($form, &$form_state) {
-  require_boinc('util');
-  $values = $form_state['values']['prefs']['advanced'];
-
-  //drupal_set_message('<pre>' . print_r($form_state['values'], true) . '</pre>');
-  // Verify all non-boolean user input values and notify form API of failures
-
-  // Processing preferences
-  if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['idle_time_to_run']['#title']} [x] {$form['prefs']['advanced']['processor']['idle_time_to_run']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['start_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['start_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['end_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['end_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['max_ncpus_pct']['#title']} [x] {$form['prefs']['advanced']['processor']['max_ncpus_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_usage_limit']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_usage_limit']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-
-  // Storage preferences
-  if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_gb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_min_free_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_min_free_gb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_interval']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_interval']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['vm_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['vm_max_used_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-
-  // Network preferences
-  if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_min_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_min_days']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_additional_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_additional_days']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_down']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_down']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_up']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_up']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_start_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_start_hour']['#field_suffix']}"), NULL, 'boinc:account-prefrences-computing'));
-  if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_end_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_end_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    require_boinc('util');
+    $values = $form_state['values']['prefs']['advanced'];
+
+    //drupal_set_message('<pre>' . print_r($form_state['values'], true) . '</pre>');
+    // Verify all non-boolean user input values and notify form API of failures
+
+    // Processing preferences
+    if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['idle_time_to_run']['#title']} [x] {$form['prefs']['advanced']['processor']['idle_time_to_run']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['start_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['start_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['end_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['end_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['max_ncpus_pct']['#title']} [x] {$form['prefs']['advanced']['processor']['max_ncpus_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_usage_limit']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_usage_limit']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+
+    // Storage preferences
+    if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_gb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_min_free_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_min_free_gb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_interval']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_interval']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['vm_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['vm_max_used_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+
+    // Network preferences
+    if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_min_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_min_days']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_additional_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_additional_days']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_down']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_down']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_up']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_up']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_start_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_start_hour']['#field_suffix']}"), NULL, 'boinc:account-prefrences-computing'));
+    if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_end_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_end_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
 }
 
 /**
-  * Handle post-validation submission of general preferences form.
-  */
+ * Handle post-validation submission of general preferences form.
+ */
 function boincwork_generalprefs_form_submit($form, &$form_state) {
-  global $user;
-  $account = user_load($user->uid);
-
-  $values = $form_state['values']['prefs']['advanced'];
-  $venue = $form_state['values']['prefs']['venue'];
-  $preset = $form_state['values']['prefs']['preset'];
-
-  // Load preferences from BOINC account
-  $prefs = boincwork_load_prefs('general', $venue);
-
-  // Processing preferences
-  $prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
-  $prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
-  $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0 : 1;
-  $prefs['idle_time_to_run'] = $values['processor']['idle_time_to_run'];
-  $prefs['suspend_if_no_recent_input'] = $values['processor']['suspend_if_no_recent_input'];
-  $prefs['suspend_cpu_usage'] = $values['processor']['suspend_cpu_usage'];
-  $prefs['start_hour'] = $values['processor']['start_hour'];
-  $prefs['end_hour'] = $values['processor']['end_hour'];
-  $prefs['leave_apps_in_memory'] = ($values['processor']['leave_apps_in_memory']) ? 1 : 0;
-  $prefs['cpu_scheduling_period_minutes'] = $values['processor']['cpu_scheduling_period_minutes'];
-  $prefs['max_ncpus_pct'] = $values['processor']['max_ncpus_pct'];
-  $prefs['cpu_usage_limit'] = $values['processor']['cpu_usage_limit'];
-
-  // Storage preferences
-  $prefs['disk_max_used_gb'] = $values['storage']['disk_max_used_gb'];
-  $prefs['disk_min_free_gb'] = $values['storage']['disk_min_free_gb'];
-  $prefs['disk_max_used_pct'] = $values['storage']['disk_max_used_pct'];
-  $prefs['disk_interval'] = $values['storage']['disk_interval'];
-  $prefs['vm_max_used_pct'] = $values['storage']['vm_max_used_pct'];
-  $prefs['ram_max_used_busy_pct'] = $values['storage']['ram_max_used_busy_pct'];
-  $prefs['ram_max_used_idle_pct'] = $values['storage']['ram_max_used_idle_pct'];
-
-  // Network preferences
-  $prefs['work_buf_min_days'] = $values['network']['work_buf_min_days'];
-  $prefs['work_buf_additional_days'] = $values['network']['work_buf_additional_days'];
-  $prefs['confirm_before_connecting'] = ($values['network']['confirm_before_connecting']) ? 1 : 0;
-  $prefs['hangup_if_dialed'] = ($values['network']['hangup_if_dialed']) ? 1 : 0;
-  $prefs['max_bytes_sec_down'] = $values['network']['max_bytes_sec_down']*1000;
-  $prefs['max_bytes_sec_up'] = $values['network']['max_bytes_sec_up']*1000;
-  $prefs['net_start_hour'] = $values['network']['net_start_hour'];
-  $prefs['net_end_hour'] = $values['network']['net_end_hour'];
-  $prefs['daily_xfer_limit_mb'] = $values['network']['daily_xfer_limit_mb'];
-  $prefs['daily_xfer_period_days'] = $values['network']['daily_xfer_period_days'];
-  $prefs['dont_verify_images'] = ($values['network']['dont_verify_images']) ? 1 : 0;
-
-  // transform old way to store the preset into new way
-  // ideally this should already have happened in boincwork_generalprefs_form()
-  if (isset($prefs['@attributes']['preset'])) {
+    global $user;
+    $account = user_load($user->uid);
+
+    $values = $form_state['values']['prefs']['advanced'];
+    $venue = $form_state['values']['prefs']['venue'];
+    $preset = $form_state['values']['prefs']['preset'];
+
+    // Load preferences from BOINC account
+    $prefs = boincwork_load_prefs('general', $venue);
+
+    // Processing preferences
+    $prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
+    $prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
+    $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0 : 1;
+    $prefs['idle_time_to_run'] = $values['processor']['idle_time_to_run'];
+    $prefs['suspend_if_no_recent_input'] = $values['processor']['suspend_if_no_recent_input'];
+    $prefs['suspend_cpu_usage'] = $values['processor']['suspend_cpu_usage'];
+    $prefs['start_hour'] = $values['processor']['start_hour'];
+    $prefs['end_hour'] = $values['processor']['end_hour'];
+    $prefs['leave_apps_in_memory'] = ($values['processor']['leave_apps_in_memory']) ? 1 : 0;
+    $prefs['cpu_scheduling_period_minutes'] = $values['processor']['cpu_scheduling_period_minutes'];
+    $prefs['max_ncpus_pct'] = $values['processor']['max_ncpus_pct'];
+    $prefs['cpu_usage_limit'] = $values['processor']['cpu_usage_limit'];
+
+    // Storage preferences
+    $prefs['disk_max_used_gb'] = $values['storage']['disk_max_used_gb'];
+    $prefs['disk_min_free_gb'] = $values['storage']['disk_min_free_gb'];
+    $prefs['disk_max_used_pct'] = $values['storage']['disk_max_used_pct'];
+    $prefs['disk_interval'] = $values['storage']['disk_interval'];
+    $prefs['vm_max_used_pct'] = $values['storage']['vm_max_used_pct'];
+    $prefs['ram_max_used_busy_pct'] = $values['storage']['ram_max_used_busy_pct'];
+    $prefs['ram_max_used_idle_pct'] = $values['storage']['ram_max_used_idle_pct'];
+
+    // Network preferences
+    $prefs['work_buf_min_days'] = $values['network']['work_buf_min_days'];
+    $prefs['work_buf_additional_days'] = $values['network']['work_buf_additional_days'];
+    $prefs['confirm_before_connecting'] = ($values['network']['confirm_before_connecting']) ? 1 : 0;
+    $prefs['hangup_if_dialed'] = ($values['network']['hangup_if_dialed']) ? 1 : 0;
+    $prefs['max_bytes_sec_down'] = $values['network']['max_bytes_sec_down']*1000;
+    $prefs['max_bytes_sec_up'] = $values['network']['max_bytes_sec_up']*1000;
+    $prefs['net_start_hour'] = $values['network']['net_start_hour'];
+    $prefs['net_end_hour'] = $values['network']['net_end_hour'];
+    $prefs['daily_xfer_limit_mb'] = $values['network']['daily_xfer_limit_mb'];
+    $prefs['daily_xfer_period_days'] = $values['network']['daily_xfer_period_days'];
+    $prefs['dont_verify_images'] = ($values['network']['dont_verify_images']) ? 1 : 0;
+
+    // transform old way to store the preset into new way
+    // ideally this should already have happened in boincwork_generalprefs_form()
+    if (isset($prefs['@attributes']['preset'])) {
     $prefs['preset'] = $prefs['@attributes']['preset'];
     unset($prefs['@attributes']['preset']);
-  }
-  // Save the preset selection (or lack thereof)
-  if (!$preset OR $preset == 'custom') {
+    }
+    // Save the preset selection (or lack thereof)
+    if (!$preset OR $preset == 'custom') {
     $prefs['preset'] = 'custom';
-  }
-  else {
+    }
+    else {
     $prefs['preset'] = $preset;
-  }
+    }
 
-  // If this is a new preference set, be sure to unset the "cleared" attribute
-  if (isset($prefs['@attributes']['cleared'])) {
+    // If this is a new preference set, be sure to unset the "cleared" attribute
+    if (isset($prefs['@attributes']['cleared'])) {
     unset($prefs['@attributes']['cleared']);
-  }
+    }
 
-  // Update database
-  $result = boincwork_save_prefs($prefs, 'general', $venue);
+    // Update database
+    $result = boincwork_save_prefs($prefs, 'general', $venue);
 
-  if (!$result) {
+    if (!$result) {
     watchdog('boincwork', 'Error updating global prefs for user @id: @message', array('@id' => $account->id, '@message' => mysqli_error()), WATCHDOG_ERROR);
     drupal_set_message(t('Your changes could not be saved. Please contact support!'), 'error');
-  }
-  elseif (!drupal_get_messages('status', FALSE)) {
+    }
+    elseif (!drupal_get_messages('status', FALSE)) {
     // Show this message if the set wasn't created automatically (in which case
     // there is a message tailored to that) {
     drupal_set_message(t('Your preferences have been updated.
       Client-related preferences will take effect when your computer
       communicates with @project or you issue the "Update"
       command from the BOINC client.', array('@project' => PROJECT)));
-  }
+    }
 }
 
 
@@ -691,116 +691,116 @@ 
  * Find compatible hosts for merging
  */
 function boincwork_host_get_compatible_hosts($host_id) {
-  require_boinc('host');
-  global $user;
-  $account = user_load($user->uid);
-  $compatible_hosts = array();
-  $host_count = 0;
-  db_set_active('boinc_ro');
-  $current_host = db_fetch_object(db_query("
+    require_boinc('host');
+    global $user;
+    $account = user_load($user->uid);
+    $compatible_hosts = array();
+    $host_count = 0;
+    db_set_active('boinc_ro');
+    $current_host = db_fetch_object(db_query("
     SELECT id, domain_name, create_time, total_credit, rpc_time, os_name,
       p_vendor, p_model
     FROM {host}
     WHERE userid = '%d' AND id = '%d'",
     $account->boincuser_id, $host_id
-  ));
-  db_set_active('default');
-  $current_host->task_count = boincwork_host_get_task_count($current_host->id);
-  $current_host->is_new = !$current_host->total_credit AND !$current_host->task_count;
-  // Get the list of all other hosts owned by this user for comparison
-  db_set_active('boinc_ro');
-  $all_other_hosts = db_query("
+    ));
+    db_set_active('default');
+    $current_host->task_count = boincwork_host_get_task_count($current_host->id);
+    $current_host->is_new = !$current_host->total_credit AND !$current_host->task_count;
+    // Get the list of all other hosts owned by this user for comparison
+    db_set_active('boinc_ro');
+    $all_other_hosts = db_query("
     SELECT id, domain_name, create_time, total_credit, rpc_time, os_name,
       p_vendor, p_model
     FROM {host}
     WHERE userid = '%d' AND id <> '%d'",
     $account->boincuser_id, $host_id
-  );
-  db_set_active('default');
-  // Compare all hosts to see if any are plausible duplicates
-  while ($other_host = db_fetch_object($all_other_hosts)) {
+    );
+    db_set_active('default');
+    // Compare all hosts to see if any are plausible duplicates
+    while ($other_host = db_fetch_object($all_other_hosts)) {
     // First, disqualify if hosts were active at the same time
     if (!$current_host->is_new) {
-      $other_host->task_count = boincwork_host_get_task_count($other_host->id);
-      $other_host->is_new = !$other_host->total_credit AND !$other_host->task_count;
-      if (!$other_host->is_new) {
+        $other_host->task_count = boincwork_host_get_task_count($other_host->id);
+        $other_host->is_new = !$other_host->total_credit AND !$other_host->task_count;
+        if (!$other_host->is_new) {
         // If both hosts being compared are not new, see if times overlap
         if (!times_disjoint($current_host, $other_host)) {
-          // Hosts were active at the same time; can't be a duplicate
-          continue;
+            // Hosts were active at the same time; can't be a duplicate
+            continue;
+        }
         }
-      }
     }
     // Next, disqualify if hosts have different OS platforms
     if (!os_compatible($current_host, $other_host)) {
-      // Hosts have different OS platforms; not really a duplicate
-      continue;
+        // Hosts have different OS platforms; not really a duplicate
+        continue;
     }
     // Finally, disqualify if hosts have different CPUs
     if (!cpus_compatible($current_host, $other_host)) {
-      // CPUs don't match; not a duplicate
-      continue;
+        // CPUs don't match; not a duplicate
+        continue;
     }
     // If not disqualified, this host is available for merging
     $hosts[] = $other_host;
     $host_count++;
     if ($host_count == 500) {
-      // This is enough!
-      break;
+        // This is enough!
+        break;
     }
-  }
-  return $hosts;
+    }
+    return $hosts;
 }
 
 /**
  * Perform the database updates to merge the old host into the new host
  */
 function boincwork_host_merge($old_host, $new_host, &$message = NULL) {
-  // Decay the average credit of the two hosts
-  require_boinc('credit');
-  $now = time();
-  update_average($now, 0, 0, $old_host->expavg_credit, $old_host->expavg_time);
-  update_average($now, 0, 0, $new_host->expavg_credit, $new_host->expavg_time);
+    // Decay the average credit of the two hosts
+    require_boinc('credit');
+    $now = time();
+    update_average($now, 0, 0, $old_host->expavg_credit, $old_host->expavg_time);
+    update_average($now, 0, 0, $new_host->expavg_credit, $new_host->expavg_time);
 
-  // Update the database:
-  // - add credit from old host to new host
-  // - change results to refer to the new host
-  // - put old host in "zombie" state (userid=0, rpc_seqno=[new_host_id])
+    // Update the database:
+    // - add credit from old host to new host
+    // - change results to refer to the new host
+    // - put old host in "zombie" state (userid=0, rpc_seqno=[new_host_id])
 
-  $total_credit = $old_host->total_credit + $new_host->total_credit;
-  $recent_credit = $old_host->expavg_credit + $new_host->expavg_credit;
+    $total_credit = $old_host->total_credit + $new_host->total_credit;
+    $recent_credit = $old_host->expavg_credit + $new_host->expavg_credit;
 
-  if ($new_host->rpc_seqno == $old_host->id) {
+    if ($new_host->rpc_seqno == $old_host->id) {
     rules_invoke_event('boincwork_circular_merge_error', $old_host->id, $new_host->id, variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('boincwork',
-      'Circular merge attempted, target host rpc_seqno is equal to old host\'s id: old host id=%old_host, target host id=%new_host',
-      array(
+        'Circular merge attempted, target host rpc_seqno is equal to old host\'s id: old host id=%old_host, target host id=%new_host',
+        array(
         '%old_host' => $old_host->id,
         '%new_host' => $new_host->id,
-      ),
-      WATCHDOG_WARNING
+        ),
+        WATCHDOG_WARNING
     );
     $message = 'Could not merge due to a circular merge error. The site administrators have been contacted about this issue, and will investigate further.';
     return FALSE;
-  }
+    }
 
-  if ($new_host->userid==0) {
+    if ($new_host->userid==0) {
     rules_invoke_event('boincwork_zombie_merge_error', $old_host->id, $new_host->id, variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('boincwork',
-      'Zombie merge attempted, target host has userid=0: old host id=%old_host, target host id=%new_host',
-      array(
+        'Zombie merge attempted, target host has userid=0: old host id=%old_host, target host id=%new_host',
+        array(
         '%old_host' => $old_host->id,
         '%new_host' => $new_host->id,
-      ),
-      WATCHDOG_WARNING
+        ),
+        WATCHDOG_WARNING
     );
     $message = 'Could not merge because the target host has userid=0. The site administrators have been contacted about this issue, and will investigate further.';
     return FALSE;
-  }
+    }
 
-  // Move credit from the old host to the new host
-  db_set_active('boinc_rw');
-  $credit_updated = db_query("
+    // Move credit from the old host to the new host
+    db_set_active('boinc_rw');
+    $credit_updated = db_query("
     UPDATE {host}
     SET
       total_credit = '%d',
@@ -808,34 +808,34 @@ 
       expavg_time = '%d'
     WHERE id = '%d'",
     $total_credit, $recent_credit, $now, $new_host->id
-  );
-  db_set_active('default');
-  if (!$credit_updated) {
+    );
+    db_set_active('default');
+    if (!$credit_updated) {
     if ($message !== NULL) {
-      $message = bts('Could not update credit', array(), NULL, 'boinc:account-host-merge');
+        $message = bts('Could not update credit', array(), NULL, 'boinc:account-host-merge');
     }
     return FALSE;
-  }
+    }
 
-  // Move results from the old host to the new host
-  db_set_active('boinc_rw');
-  $results_updated = db_query("
+    // Move results from the old host to the new host
+    db_set_active('boinc_rw');
+    $results_updated = db_query("
     UPDATE {result}
     SET hostid = '%d'
     WHERE hostid = '%d'",
     $new_host->id, $old_host->id
-  );
-  db_set_active('default');
-  if (!$results_updated) {
+    );
+    db_set_active('default');
+    if (!$results_updated) {
     if ($message !== NULL) {
-      $message = bts('Could not update results', array(), NULL, 'boinc:account-host-merge');
+        $message = bts('Could not update results', array(), NULL, 'boinc:account-host-merge');
     }
     return FALSE;
-  }
+    }
 
-  // Retire the old host
-  db_set_active('boinc_rw');
-  $old_host_retired = db_query("
+    // Retire the old host
+    db_set_active('boinc_rw');
+    $old_host_retired = db_query("
     UPDATE {host}
     SET
       total_credit = '0',
@@ -844,16 +844,16 @@ 
       rpc_seqno = '%d'
     WHERE id = '%d'",
     $new_host->id, $old_host->id
-  );
-  db_set_active('default');
-  if (!$old_host_retired) {
+    );
+    db_set_active('default');
+    if (!$old_host_retired) {
     if ($message !== NULL) {
-      $message = bts('Could not retire old computer', array(), NULL, 'boinc:account-host-merge');
+        $message = bts('Could not retire old computer', array(), NULL, 'boinc:account-host-merge');
     }
     return FALSE;
-  }
+    }
 
-  return TRUE;
+    return TRUE;
 }
 
 /**
@@ -861,75 +861,75 @@ 
  */
 function boincwork_host_merge_form(&$form_state, $host_id) {
 
-  if (!boincwork_host_user_is_owner($host_id)) {
+    if (!boincwork_host_user_is_owner($host_id)) {
     drupal_goto("host/{$host_id}");
-  }
+    }
 
-  $form = array();
-  $form_state['storage']['current_host_id'] = $host_id;
-  $current_host = boincwork_host_get_info($host_id);
+    $form = array();
+    $form_state['storage']['current_host_id'] = $host_id;
+    $current_host = boincwork_host_get_info($host_id);
 
-  // Get hosts that could be merged with this one
-  $hosts = boincwork_host_get_compatible_hosts($host_id);
+    // Get hosts that could be merged with this one
+    $hosts = boincwork_host_get_compatible_hosts($host_id);
 
-  if (!$hosts) {
+    if (!$hosts) {
     drupal_set_message(t('There are no computers eligible for merging with this
       one'), 'warning'
     );
     drupal_goto("host/{$host_id}");
-  }
+    }
 
-  $form['overview'] = array(
+    $form['overview'] = array(
     '#value' => '<p>' . bts('Sometimes BOINC assigns separate identities to'
-      . ' the same computer by mistake. You can correct this by merging old'
-      . ' identities with the newest one.', array(), NULL, 'boinc:account-host-merge') . '</p>'
-      . '<p>'
-      . bts('Check the computers that are the same as @name'
-      . ' (created on @date at @time with computer ID @id)',
+        . ' the same computer by mistake. You can correct this by merging old'
+        . ' identities with the newest one.', array(), NULL, 'boinc:account-host-merge') . '</p>'
+        . '<p>'
+        . bts('Check the computers that are the same as @name'
+        . ' (created on @date at @time with computer ID @id)',
         array(
-          '@name' => $current_host->domain_name,
-          '@date' => date('j M Y', $current_host->create_time),
-          '@time' => date('G:i:s T', $current_host->create_time),
-          '@id' => $current_host->id,
+            '@name' => $current_host->domain_name,
+            '@date' => date('j M Y', $current_host->create_time),
+            '@time' => date('G:i:s T', $current_host->create_time),
+            '@id' => $current_host->id,
         ),
         NULL, 'boinc:account-host-merge') . '</p>',
-  );
+    );
 
-  $options = array();
-  foreach ($hosts as $host) {
+    $options = array();
+    foreach ($hosts as $host) {
     $options[$host->id] = array(
-      $host->domain_name,
-      date('j M Y G:i:s T', $host->create_time),
-      $host->id,
+        $host->domain_name,
+        date('j M Y G:i:s T', $host->create_time),
+        $host->id,
     );
-  }
+    }
 
-  $form['merge'] = array(
+    $form['merge'] = array(
     '#title' => '',
     '#type' => 'tableselect',
     '#header' => array(bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'), bts('Created', array(), NULL, 'boinc:host-details'), bts('Computer ID', array(), NULL, 'boinc:host-list')),
     '#options' => $options,
-  );
+    );
 
-  $form['prefs']['separator_bottom'] = array(
-  //  '#value' => '<div class="separator buttons"></div>'
-  );
+    $form['prefs']['separator_bottom'] = array(
+    //  '#value' => '<div class="separator buttons"></div>'
+    );
 
-  // Form control
-  $form['prefs']['form control tabs prefix'] = array(
+    // Form control
+    $form['prefs']['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['prefs']['submit'] = array(
+    );
+    $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Merge', array(), NULL, 'boinc:form-merge'),
     '#suffix' => '</li>'
-  );
-  $form['prefs']['form control tabs'] = array(
+    );
+    $form['prefs']['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "host/{$host_id}") . '</li>'
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -942,76 +942,76 @@ 
  * Handle submission of the merge host form
  */
 function boincwork_host_merge_form_submit($form, &$form_state) {
-  $merged = array();
-  $errors = array();
-  $current_host_id = $form_state['storage']['current_host_id'];
-  $current_host = boincwork_host_get_info($current_host_id);
-  $selected_hosts = array_filter($form_state['values']['merge']);
+    $merged = array();
+    $errors = array();
+    $current_host_id = $form_state['storage']['current_host_id'];
+    $current_host = boincwork_host_get_info($current_host_id);
+    $selected_hosts = array_filter($form_state['values']['merge']);
 
-  foreach ($selected_hosts as $host_id) {
+    foreach ($selected_hosts as $host_id) {
     // Attempt to merge each host, noting the results
     $message = '';
     $old_host = boincwork_host_get_info($host_id);
     if (boincwork_host_merge($old_host, $current_host, $message)) {
-      $merged[$old_host->id] = $old_host->id;
-      $current_host = boincwork_host_get_info($current_host_id);
+        $merged[$old_host->id] = $old_host->id;
+        $current_host = boincwork_host_get_info($current_host_id);
     }
     else {
-      $errors[$old_host->id] = $message;
+        $errors[$old_host->id] = $message;
+    }
     }
-  }
 
-  if ($merged) {
+    if ($merged) {
     // Generate a natural language list of IDs that were merged
     $oxford_comma = ',';
     $conjunction = bts('and', array(), NULL, 'boinc:account-preference');
     $list = array_keys($merged);
     $last = array_pop($list);
     if ($list) {
-      if (count($merged) == 2) {
+        if (count($merged) == 2) {
         $oxford_comma = '';
-      }
-      $list = implode(', ', $list) . $oxford_comma . ' ' . $conjunction . ' ' . $last;
+        }
+        $list = implode(', ', $list) . $oxford_comma . ' ' . $conjunction . ' ' . $last;
     }
     else {
-      $list = $last;
+        $list = $last;
     }
     if (count($merged) == 1) {
-      drupal_set_message(bts(
+        drupal_set_message(bts(
         'Computer @old_id has been merged successfully into @id.',
         array(
-          '@old_id' => $list,
-          '@id' => $current_host_id
+            '@old_id' => $list,
+            '@id' => $current_host_id
         ),
         NULL, 'boinc:account-host-merge'));
     }
     else {
-      drupal_set_message(bts(
+        drupal_set_message(bts(
         'Computers @old_ids have been merged successfully into @id.',
         array(
-          '@old_ids' => $list,
-          '@id' => $current_host_id
+            '@old_ids' => $list,
+            '@id' => $current_host_id
         ),
         NULL, 'boinc:account-host-merge'));
     }
-  }
+    }
 
-  if ($errors) {
+    if ($errors) {
     // Report any hosts that failed to merge
     foreach ($errors as $id => $error) {
-      drupal_set_message(
+        drupal_set_message(
         bts('Computer @old_id failed to merge: @message',
-          array(
+            array(
             '@old_id' => $id,
             '@message' => $error,
-          ),
-          NULL, 'boinc:account-host-merge'),
+            ),
+            NULL, 'boinc:account-host-merge'),
         'warning'
-      );
+        );
+    }
     }
-  }
 
-  drupal_goto("host/{$current_host_id}");
+    drupal_goto("host/{$current_host_id}");
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1023,44 +1023,44 @@ 
  */
 function boincwork_projectprefs_form(&$form_state, $venue) {
 
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
 
-  $established = TRUE;
+    $established = TRUE;
 
-  // Get availability of special BOINC preferences
-  require_boinc(array('app_types'));
-  $app_types = get_app_types();
+    // Get availability of special BOINC preferences
+    require_boinc(array('app_types'));
+    $app_types = get_app_types();
 
-  // Load any existing preferences from BOINC account
-  $prefs = boincwork_load_prefs('project', $venue);
+    // Load any existing preferences from BOINC account
+    $prefs = boincwork_load_prefs('project', $venue);
 
-  // Take note if this is not an established preference set on the account
-  if (isset($prefs['@attributes']['cleared'])) {
+    // Take note if this is not an established preference set on the account
+    if (isset($prefs['@attributes']['cleared'])) {
     $established = FALSE;
-  }
+    }
 
-  // Extract modified tag if present
-  $modified = NULL;
-  if (isset($prefs['modified']['@value'])) {
+    // Extract modified tag if present
+    $modified = NULL;
+    if (isset($prefs['modified']['@value'])) {
     $modified = $prefs['modified']['@value'];
-  }
+    }
 
-  $venue_is_default = FALSE;
-  if ($account->boincuser_default_pref_set) {
+    $venue_is_default = FALSE;
+    if ($account->boincuser_default_pref_set) {
     if ($account->boincuser_default_pref_set == $venue) {
-      $venue_is_default = TRUE;
+        $venue_is_default = TRUE;
     }
-  }
-  elseif (!$venue OR $venue == 'generic') {
+    }
+    elseif (!$venue OR $venue == 'generic') {
     $venue_is_default = TRUE;
-  }
-  else {
+    }
+    else {
     $venue_is_default = FALSE;
-  }
+    }
 
-  // Define form defaults
-  $default = array(
+    // Define form defaults
+    $default = array(
     'resource_share' => 100,
     'no_cpu' => 0,
     'no_cuda' => 0,
@@ -1069,344 +1069,344 @@ 
     'no_apple_gpu' => 0,
     'default_venue' => $venue_is_default,
     'allow_beta_work' => $prefs['allow_beta_work'],
-  );
-  foreach ($default as $name => $value) {
+    );
+    foreach ($default as $name => $value) {
     if (isset($prefs[$name])) {
-      if (is_array($prefs[$name])) {
+        if (is_array($prefs[$name])) {
         if (isset($prefs[$name]['@value'])) {
-          $default[$name] = $prefs[$name]['@value'];
+            $default[$name] = $prefs[$name]['@value'];
+        }
         }
-      }
-      else {
+        else {
         $default[$name] = $prefs[$name];
-      }
+        }
+    }
     }
-  }
 
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
-  );
+    );
 
-  // Identify preference sets that are established to distinguish what has been
-  // saved to the database from what is just showing default values
-  $form['#established'] = $established;
+    // Identify preference sets that are established to distinguish what has been
+    // saved to the database from what is just showing default values
+    $form['#established'] = $established;
 
-  // Top level form options
-  $form['#tree'] = TRUE;
+    // Top level form options
+    $form['#tree'] = TRUE;
 
-  // Hidden elements
-  $form['modified'] = array(
+    // Hidden elements
+    $form['modified'] = array(
     '#type' => 'hidden',
     '#value' => $modified,
-  );
-  $form['venue'] = array(
+    );
+    $form['venue'] = array(
     '#type' => 'hidden',
     '#value' => $venue,
-  );
+    );
 
-  $form['separator_top'] = array(
+    $form['separator_top'] = array(
     '#value' => '<div class="separator"></div>'
-  );
+    );
 
-  // Common project preferences
-  $form['resource'] = array(
+    // Common project preferences
+    $form['resource'] = array(
     '#title' => bts('Resource settings', array(), NULL, 'boinc:account-preferences-project'),
     '#type' => 'fieldset',
     '#description' => null,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  $form['resource']['resource_share'] = array(
+    );
+    $form['resource']['resource_share'] = array(
     '#title' => bts('Resource share', array(), NULL, 'boinc:account-preferences-project'),
     '#type' => 'textfield',
     '#default_value' => $default['resource_share'],
     '#size' => 5,
     '#description' => bts("Determines the proportion of your computer's resources allocated to this project. Example: if you participate in two BOINC projects with resource shares of 100 and 200, the first will get 1/3 of your resources and the second will get 2/3.", array(), NULL, 'boinc:account-preferences-project')
-  );
-  if ($app_types->count > 1) {
+    );
+    if ($app_types->count > 1) {
     if ($app_types->cpu) {
-      $form['resource']['no_cpu'] = array(
+        $form['resource']['no_cpu'] = array(
         '#title' => bts('Use CPU', array(), NULL, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_cpu'] ? 0 : 1,
         '#description' => bts('Request CPU-only tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     if ($app_types->cuda) {
-      $form['resource']['no_cuda'] = array(
+        $form['resource']['no_cuda'] = array(
         '#title' => bts('Use NVIDIA GPU', array(), NULL, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_cuda'] ? 0 : 1,
         '#description' => bts('Request NVIDIA GPU tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     if ($app_types->ati) {
-      $form['resource']['no_ati'] = array(
+        $form['resource']['no_ati'] = array(
         '#title' => bts('Use AMD GPU', array(), NULL, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_ati'] ? 0 : 1,
         '#description' => bts('Request AMD GPU tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     if ($app_types->intel_gpu) {
-      $form['resource']['no_intel_gpu'] = array(
+        $form['resource']['no_intel_gpu'] = array(
         '#title' => bts('Use INTEL GPU', array(), NULL, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_intel_gpu'] ? 0 : 1,
         '#description' => bts('Request Intel GPU tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     if ($app_types->apple_gpu) {
-      $form['resource']['no_apple_gpu'] = array(
+        $form['resource']['no_apple_gpu'] = array(
         '#title' => bts('Use Apple GPU', array(), NULL, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_apple_gpu'] ? 0 : 1,
         '#description' => bts('Request Apple GPU tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
-      );
+        );
+    }
     }
-  }
 
-  if (variable_get('boinc_prefs_options_beta', FALSE)) {
+    if (variable_get('boinc_prefs_options_beta', FALSE)) {
     $form['beta'] = array(
-      '#title' => bts('Beta settings', array(), NULL, 'boinc:account-preferences-project'),
-      '#type' => 'fieldset',
-      '#description' => null,
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE
+        '#title' => bts('Beta settings', array(), NULL, 'boinc:account-preferences-project'),
+        '#type' => 'fieldset',
+        '#description' => null,
+        '#collapsible' => TRUE,
+        '#collapsed' => FALSE
     );
     $form['beta']['allow_beta_work'] = array(
-      '#title' => bts('Run test applications?', array(), NULL, 'boinc:account-preferences-project'),
-      '#type' => 'radios',
-      '#options' => $form['boolean_options']['#value'],
-      '#attributes' => array('class' => 'fancy'),
-      '#default_value' => ($default['allow_beta_work']) ? 1 : 0,
-      '#description' => bts('This helps us develop applications, but may cause jobs to fail on your computer', array(), NULL, 'boinc:account-preferences-project')
+        '#title' => bts('Run test applications?', array(), NULL, 'boinc:account-preferences-project'),
+        '#type' => 'radios',
+        '#options' => $form['boolean_options']['#value'],
+        '#attributes' => array('class' => 'fancy'),
+        '#default_value' => ($default['allow_beta_work']) ? 1 : 0,
+        '#description' => bts('This helps us develop applications, but may cause jobs to fail on your computer', array(), NULL, 'boinc:account-preferences-project')
     );
-  }
+    }
 
-  // Add project specific prefs to the form
-  boincwork_add_project_specific_prefs($form, $prefs);
+    // Add project specific prefs to the form
+    boincwork_add_project_specific_prefs($form, $prefs);
 
-  // Set whether to use this preference set by default for new computers
-  $form['default_set'] = array(
+    // Set whether to use this preference set by default for new computers
+    $form['default_set'] = array(
     '#title' => bts('Default set', array(), NULL, 'boinc:account-preferences-project'),
     '#type' => 'fieldset',
     '#description' => null,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  $form['default_set']['default_venue'] = array(
+    );
+    $form['default_set']['default_venue'] = array(
     '#title' => bts('Set used for new computers', array(), NULL, 'boinc:account-preferences-project'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['default_venue'] ? 1 : 0,
     '#description' => ''
-  );
+    );
 
-  $form['prefs']['separator_bottom'] = array(
+    $form['prefs']['separator_bottom'] = array(
     '#value' => '<div class="separator buttons"></div>'
-  );
+    );
 
-  // Form control
-  $form['prefs']['form control tabs prefix'] = array(
+    // Form control
+    $form['prefs']['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['prefs']['submit'] = array(
+    );
+    $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
     '#suffix' => '</li>'
-  );
-  $form['prefs']['form control tabs'] = array(
+    );
+    $form['prefs']['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
-  );
-  if ($venue AND $venue != 'generic') {
+    );
+    if ($venue AND $venue != 'generic') {
     global $base_path;
     $form['prefs']['form control tabs']['#value'] .= '<li class="tab">' .
-      l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$venue}",
+        l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$venue}",
         array(
-          'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/project/combined')),
-          'attributes' => array(
+            'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/project/combined')),
+            'attributes' => array(
             'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the @name preference set. Are you sure?',
-              array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
-          )
+                array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
+            )
         )
-      ) . '</li>';
-  }
-  $form['prefs']['view control'] = array(
-      '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project/combined') . '</li>'
-  );
-  $form['prefs']['form control tabs suffix'] = array(
+        ) . '</li>';
+    }
+    $form['prefs']['view control'] = array(
+        '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project/combined') . '</li>'
+    );
+    $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
  * Add project specific preferences to the project preferences form
  */
 function boincwork_add_project_specific_prefs(&$form, $prefs) {
-  // Load project specific preferences from XML config
-  $xml = boincwork_get_project_specific_config();
+    // Load project specific preferences from XML config
+    $xml = boincwork_get_project_specific_config();
 
-  // Respect the order of the top level elements
-  $ordered_array = array();
-  $unordered_array = array();
-  foreach ($xml['project_specific_preferences'] as $type => $element) {
+    // Respect the order of the top level elements
+    $ordered_array = array();
+    $unordered_array = array();
+    foreach ($xml['project_specific_preferences'] as $type => $element) {
     if (is_array($element) AND is_numeric(key($element))) {
-      foreach ($element as $ordered_element) {
+        foreach ($element as $ordered_element) {
         if (isset($ordered_element['@position'])) {
-          $ordered_array[$ordered_element['@position']] = array($type => $ordered_element);
+            $ordered_array[$ordered_element['@position']] = array($type => $ordered_element);
         }
         else {
-          $unordered_array[] = array($type => $ordered_element);
+            $unordered_array[] = array($type => $ordered_element);
+        }
         }
-      }
     }
     elseif (isset($element['@position'])) {
-      $ordered_array[$element['@position']] = array($type => $element);
+        $ordered_array[$element['@position']] = array($type => $element);
     }
     else {
-      $unordered_array[] = array($type => $element);
+        $unordered_array[] = array($type => $element);
     }
-  }
-  ksort($ordered_array);
-  $primed_array = array_merge($ordered_array, $unordered_array);
-  $xml = array('project_specific_preferences' => $primed_array);
+    }
+    ksort($ordered_array);
+    $primed_array = array_merge($ordered_array, $unordered_array);
+    $xml = array('project_specific_preferences' => $primed_array);
 
-  foreach ($xml['project_specific_preferences'] as $wrapped_element) {
+    foreach ($xml['project_specific_preferences'] as $wrapped_element) {
     $type = key($wrapped_element);
     $element= reset($wrapped_element);
     boincwork_generate_prefs_element($form, $type, $element, $prefs['project_specific']);
-  }
+    }
 }
 
 /**
-  * Validate the project preferences form.
-  */
+ * Validate the project preferences form.
+ */
 function boincwork_projectprefs_form_validate($form, &$form_state) {
 
-  // Verify all text user input values and notify form API of failures
-  $validation_rules = array(
+    // Verify all text user input values and notify form API of failures
+    $validation_rules = array(
     'resource' => array(
-      'resource_share' => array(
+        'resource_share' => array(
         'datatype' => 'integer',
         'min' => 0
-      ),
+        ),
     ),
-  );
+    );
 
-  // Add validation rules for project specific settings
-  $validation_rules += boincwork_get_project_specific_config_validation_rules();
+    // Add validation rules for project specific settings
+    $validation_rules += boincwork_get_project_specific_config_validation_rules();
 
-  // Perform validation
-  boincwork_validate_form($validation_rules, $form_state['values']);
+    // Perform validation
+    boincwork_validate_form($validation_rules, $form_state['values']);
 
-  // Check for app validation
-  if (isset($validation_rules['apps'])) {
+    // Check for app validation
+    if (isset($validation_rules['apps'])) {
     if (isset($validation_rules['apps']['minimum selected'])
         AND $validation_rules['apps']['minimum selected'] > 0) {
-      $apps_selected = 0;
-      foreach ($validation_rules['apps']['list'] as $app) {
+        $apps_selected = 0;
+        foreach ($validation_rules['apps']['list'] as $app) {
         if ($form_state['values']['applications'][$app]) $apps_selected++;
-      }
-      if ($apps_selected < $validation_rules['apps']['minimum selected']) {
+        }
+        if ($apps_selected < $validation_rules['apps']['minimum selected']) {
         form_set_error(
-          'applications',
-          bts('At least one application must be selected', array(), NULL, 'boinc:account-preferences-project')
+            'applications',
+            bts('At least one application must be selected', array(), NULL, 'boinc:account-preferences-project')
         );
-      }
-      if ($apps_selected == count($validation_rules['apps']['list'])) {
+        }
+        if ($apps_selected == count($validation_rules['apps']['list'])) {
         foreach ($validation_rules['apps']['list'] as $app) {
-          unset($form_state['values']['applications'][$app]);
+            unset($form_state['values']['applications'][$app]);
         }
         $form_state['storage']['all apps selected'] = TRUE;
-      }
+        }
+    }
     }
-  }
 }
 
 /**
-  * Handle post-validation submission of project preferences form.
-  */
+ * Handle post-validation submission of project preferences form.
+ */
 function boincwork_projectprefs_form_submit($form, &$form_state) {
-  global $user;
-  global $site_name;
+    global $user;
+    global $site_name;
 
-  require_boinc(array('app_types'));
-  $app_types = get_app_types();
+    require_boinc(array('app_types'));
+    $app_types = get_app_types();
 
-  $account = user_load($user->uid);
-  $edit = $form_state['values'];
-  $venue = $edit['venue'];
+    $account = user_load($user->uid);
+    $edit = $form_state['values'];
+    $venue = $edit['venue'];
 
-  // Load preferences from BOINC account
-  $prefs = boincwork_load_prefs('project', $venue);
+    // Load preferences from BOINC account
+    $prefs = boincwork_load_prefs('project', $venue);
 
-  // Resource preferences
-  $prefs['resource_share'] = $edit['resource']['resource_share'];
-  if ($app_types->count > 1) {
+    // Resource preferences
+    $prefs['resource_share'] = $edit['resource']['resource_share'];
+    if ($app_types->count > 1) {
     if ($app_types->cpu) $prefs['no_cpu'] = ($edit['resource']['no_cpu']) ? 0 : 1;
     if ($app_types->cuda) $prefs['no_cuda'] = ($edit['resource']['no_cuda']) ? 0 : 1;
     if ($app_types->ati) $prefs['no_ati'] = ($edit['resource']['no_ati']) ? 0 : 1;
     if ($app_types->intel_gpu) $prefs['no_intel_gpu'] = ($edit['resource']['no_intel_gpu']) ? 0 : 1;
     if ($app_types->apple_gpu) $prefs['no_apple_gpu'] = ($edit['resource']['no_apple_gpu']) ? 0 : 1;
-  }
+    }
 
-  // Beta preferences
-  if (variable_get('boinc_prefs_options_beta', FALSE)) {
+    // Beta preferences
+    if (variable_get('boinc_prefs_options_beta', FALSE)) {
     $prefs['allow_beta_work'] = ($edit['beta']['allow_beta_work']) ? 1 : 0;
-  }
+    }
 
-  // Load project specific preferences from XML config
-  $xml = boincwork_get_project_specific_config();
-  $updated_prefs = array(
+    // Load project specific preferences from XML config
+    $xml = boincwork_get_project_specific_config();
+    $updated_prefs = array(
     'project_specific' => boincwork_format_project_specific_prefs_data($edit)
-  );
-  $prefs = $updated_prefs + $prefs;
+    );
+    $prefs = $updated_prefs + $prefs;
 
-  // Don't specify apps if all are selected
-  if (isset($form_state['storage']['all apps selected'])) {
+    // Don't specify apps if all are selected
+    if (isset($form_state['storage']['all apps selected'])) {
     unset($prefs['project_specific']['app_id']);
     unset($form_state['storage']['all apps selected']);
-  }
+    }
 
-  // If this is a new preference set, be sure to unset the "cleared" attribute
-  if (isset($prefs['@attributes']['cleared'])) {
+    // If this is a new preference set, be sure to unset the "cleared" attribute
+    if (isset($prefs['@attributes']['cleared'])) {
     unset($prefs['@attributes']['cleared']);
-  }
+    }
 
-  // Save preferences back to the BOINC account
-  $result = boincwork_save_prefs($prefs, 'project', $venue);
+    // Save preferences back to the BOINC account
+    $result = boincwork_save_prefs($prefs, 'project', $venue);
 
-  // Update the user's default preference set
-  if ($edit['default_set']['default_venue']) {
+    // Update the user's default preference set
+    if ($edit['default_set']['default_venue']) {
     boincwork_set_default_venue($venue);
-  }
-  elseif ($venue == $account->boincuser_default_pref_set) {
+    }
+    elseif ($venue == $account->boincuser_default_pref_set) {
     // User has cleared out the default venue setting
     boincwork_set_default_venue();
-  }
+    }
 
-  if (!$result) {
+    if (!$result) {
     watchdog('boincwork', 'Error updating project prefs for user @id: @message', array('@id' => $user->id, '@message' => mysqli_error()), WATCHDOG_ERROR);
     drupal_set_message(t('Your changes could not be saved. Please contact support!'), 'error');
-  }
-  elseif (!drupal_get_messages('status', FALSE)) {
+    }
+    elseif (!drupal_get_messages('status', FALSE)) {
     // Show this message if the set wasn't created automatically (in which case
     // there is a message tailored to that)
     drupal_set_message(t('Your preferences have been updated.
@@ -1414,53 +1414,53 @@ 
         communicates with @project or you issue the "Update"
         command from the BOINC client.',
         array('@project' => $site_name)));
-  }
+    }
 }
 
 /**
  * The structure of the community preferences form
  */
 function communityprefs_form(&$form_state) {
-  global $user;
-  $account = user_load($user->uid);
-  $form = array();
-
-  // Pull in some elements from the profile form
-  $profile_form_state = array();
-  $profile = new stdClass();
-  $profile->type = 'profile';
-  $profile->language = '';
-  if ($profile_nid = content_profile_profile_exists($profile, $account->uid)) {
+    global $user;
+    $account = user_load($user->uid);
+    $form = array();
+
+    // Pull in some elements from the profile form
+    $profile_form_state = array();
+    $profile = new stdClass();
+    $profile->type = 'profile';
+    $profile->language = '';
+    if ($profile_nid = content_profile_profile_exists($profile, $account->uid)) {
     $profile_node = node_load($profile_nid);
     $form_state['storage']['profile_node'] = $profile_node;
     module_load_include('inc', 'node', 'node.pages');
     $profile_form = drupal_retrieve_form('profile_node_form', $profile_form_state, $profile_node);
     drupal_prepare_form('profile_node_form', $profile_form, $profile_form_state);
-  }
+    }
 
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
-  );
+    );
 
-  $default = array(
+    $default = array(
     'pm_send_notification' => '', // This is set already in pm_email_notify_user
     'friend_notification' => isset($account->friend_notification) ? $account->friend_notification : 0,
     'comments_per_page' => (isset($account->comments_per_page) AND $account->comments_per_page) ? $account->comments_per_page : variable_get('comment_default_per_page_forum', 50),
     'comments_order' => (isset($account->sort) AND $account->sort) ? $account->sort : variable_get('comment_default_order_forum', COMMENT_ORDER_OLDEST_FIRST),
-  );
+    );
 
-  // General options
-  $form['general'] = array(
+    // General options
+    $form['general'] = array(
     '#type' => 'fieldset',
     '#title' => bts('General settings', array(), NULL, 'boinc:account-preferences-community'),
     '#weight' => 0,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  // Add the BOINC user name (non-unique, user editable)
-  $form['general']['boincuser_name'] = array(
+    );
+    // Add the BOINC user name (non-unique, user editable)
+    $form['general']['boincuser_name'] = array(
     '#type' => 'textfield',
     '#title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
     '#default_value' => $account->boincuser_name,
@@ -1468,252 +1468,252 @@ 
     '#required' => TRUE,
     '#description' => '',
     '#size' => 40
-  );
-  // Time zone
-  if (variable_get('configurable_timezones', 1)) {
+    );
+    // Time zone
+    if (variable_get('configurable_timezones', 1)) {
     $zones = _system_zonelist();
     $form['general']['timezone'] = array(
-      '#type' => 'select',
-      '#title' => bts('Time zone', array(), NULL, 'boinc:account-preferences-community'),
-      '#default_value' => ($account->timezone !== NULL) ? $account->timezone : variable_get('date_default_timezone', 0),
-      '#options' => $zones,
-      '#description' => '',
+        '#type' => 'select',
+        '#title' => bts('Time zone', array(), NULL, 'boinc:account-preferences-community'),
+        '#default_value' => ($account->timezone !== NULL) ? $account->timezone : variable_get('date_default_timezone', 0),
+        '#options' => $zones,
+        '#description' => '',
     );
-  }
+    }
 
-  // Notification options
-  $form['notifications'] = array(
+    // Notification options
+    $form['notifications'] = array(
     '#type' => 'fieldset',
     '#title' => bts('Notification settings', array(), NULL, 'boinc:account-preferences-community'),
     '#weight' => 5,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  // Pull in private message notification handling and tweak the form
-  $pm_notify = pm_email_notify_user('form', $edit, $account, 'account');
-  $form['notifications']['pm_send_notifications'] = array_replace(
+    );
+    // Pull in private message notification handling and tweak the form
+    $pm_notify = pm_email_notify_user('form', $edit, $account, 'account');
+    $form['notifications']['pm_send_notifications'] = array_replace(
     $pm_notify['enable_pm_mail']['pm_send_notifications'],
     array(
-      '#type' => 'radios',
-      '#title' => bts('Receive email notification for private messages?', array(), NULL, 'boinc:account-preferences-community'),
-      '#description' => ' ',
-      '#options' => $form['boolean_options']['#value'],
-      '#attributes' => array('class' => 'fancy')
+        '#type' => 'radios',
+        '#title' => bts('Receive email notification for private messages?', array(), NULL, 'boinc:account-preferences-community'),
+        '#description' => ' ',
+        '#options' => $form['boolean_options']['#value'],
+        '#attributes' => array('class' => 'fancy')
     )
-  );
-  $form['notifications']['friend_notification'] = array(
+    );
+    $form['notifications']['friend_notification'] = array(
     '#type' => 'radios',
     '#title' => bts('Receive email notification for friend requests?', array(), NULL, 'boinc:account-preferences-community'),
     '#description' => ' ',
     '#options' => array(0 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), -1 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['friend_notification']
-  );
+    );
 
-  // Internationalization options
-  if (module_exists('internationalization')) {
+    // Internationalization options
+    if (module_exists('internationalization')) {
     $languages = language_list('enabled');
     $languages = $languages[1];
     $names = array();
     foreach ($languages as $langcode => $item) {
-      $name = t($item->name);
-      $names[check_plain($langcode)] = check_plain($name . ($item->native != $name ? ' ('. $item->native .')' : ''));
+        $name = t($item->name);
+        $names[check_plain($langcode)] = check_plain($name . ($item->native != $name ? ' ('. $item->native .')' : ''));
     }
     $form['locale'] = array(
-      '#type' => 'fieldset',
-      '#title' => bts('Language settings', array(), NULL, 'boinc:account-preferences-community'),
-      '#weight' => 10,
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE,
+        '#type' => 'fieldset',
+        '#title' => bts('Language settings', array(), NULL, 'boinc:account-preferences-community'),
+        '#weight' => 10,
+        '#collapsible' => TRUE,
+        '#collapsed' => FALSE,
     );
 
     // Get language negotiation settings.
     $mode = variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE);
     $user_preferred_language = user_preferred_language($account);
     $form['locale']['language'] = array(
-      '#type' => 'select',
-      '#title' => bts('Language', array(), NULL, 'boinc:account-preferences-community'),
-      '#default_value' => check_plain($user_preferred_language->language),
-      '#options' => $names,
-      '#description' => ($mode == LANGUAGE_NEGOTIATION_PATH) ? bts("This account's default language for e-mails and preferred language for site presentation.", array(), NULL, 'boinc:account-preferences-community') : bts("This account's default language for e-mails.", array(), NULL, 'boinc:account-preferences-community'),
+        '#type' => 'select',
+        '#title' => bts('Language', array(), NULL, 'boinc:account-preferences-community'),
+        '#default_value' => check_plain($user_preferred_language->language),
+        '#options' => $names,
+        '#description' => ($mode == LANGUAGE_NEGOTIATION_PATH) ? bts("This account's default language for e-mails and preferred language for site presentation.", array(), NULL, 'boinc:account-preferences-community') : bts("This account's default language for e-mails.", array(), NULL, 'boinc:account-preferences-community'),
     );
-  }
+    }
 
-  // Avatar options
-  $form['gravatar'] = array(
+    // Avatar options
+    $form['gravatar'] = array(
     '#type' => 'item',
     '#value' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, it will be used for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), NULL, 'boinc:account-preferences-community'),
     '#description' => bts('Your Gravatar will not be shown if you upload a user picture.', array(), NULL, 'boinc:account-preferences-community'),
-  );
-  if (user_access('disable own gravatar', $account)) {
+    );
+    if (user_access('disable own gravatar', $account)) {
     $form['gravatar'] = array(
-      '#type' => 'checkbox',
-      '#title' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, use it for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), NULL, 'boinc:account-preferences-community'),
-      '#description' => bts('Gravatar will not be shown if an avatar is uploaded.', array(), NULL, 'boinc:account-preferences-community'),
-      '#default_value' => isset($account->gravatar) ? $account->gravatar : 0,
-      '#disabled' => !empty($account->picture),
-    );
-  }
-  $form['gravatar']['#weight'] = 15;
-  $form['gravatar']['#prefix'] = '<fieldset class="collapsible"><legend><a href="#">' . bts('Avatar settings', array(), NULL, 'boinc:account-preferences-community') . '</a></legend>';
-  // Upload an avatar (pulled from profile_node_form):
-  if (!empty($profile_form['field_image'])) {
+        '#type' => 'checkbox',
+        '#title' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, use it for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), NULL, 'boinc:account-preferences-community'),
+        '#description' => bts('Gravatar will not be shown if an avatar is uploaded.', array(), NULL, 'boinc:account-preferences-community'),
+        '#default_value' => isset($account->gravatar) ? $account->gravatar : 0,
+        '#disabled' => !empty($account->picture),
+    );
+    }
+    $form['gravatar']['#weight'] = 15;
+    $form['gravatar']['#prefix'] = '<fieldset class="collapsible"><legend><a href="#">' . bts('Avatar settings', array(), NULL, 'boinc:account-preferences-community') . '</a></legend>';
+    // Upload an avatar (pulled from profile_node_form):
+    if (!empty($profile_form['field_image'])) {
     $form['field_image'] = $profile_form['field_image'];
-  }
-  else {
+    }
+    else {
     $form['field_image'] = array(
-      '#value' => '<div class="form-item">'
+        '#value' => '<div class="form-item">'
         . '<label class="placeholder">'
         . bts('This is not available until your profile is set up.', array(), NULL, 'boinc:account-preferences-community')
         . '</label>'
         . l(bts('Create a profile', array(), NULL, 'boinc:account-preferences-community'), 'account/profile/edit', array('attributes' => array('class' => 'form-link')))
         . '</div>',
     );
-  }
-  $form['field_image'][0]['#title'] = bts('Upload an avatar', array(), NULL, 'boinc:account-preferences-community');
-  $form['field_image']['#weight'] = 20;
-  $form['field_image']['#suffix'] = '</fieldset>';
+    }
+    $form['field_image'][0]['#title'] = bts('Upload an avatar', array(), NULL, 'boinc:account-preferences-community');
+    $form['field_image']['#weight'] = 20;
+    $form['field_image']['#suffix'] = '</fieldset>';
 
-  // Forum options
-  $form['forums'] = array(
+    // Forum options
+    $form['forums'] = array(
     '#type' => 'fieldset',
     '#title' => bts('Forum settings', array(), NULL, 'boinc:account-preferences-community'),
     '#weight' => 25,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  $form['forums']['comments_per_page'] = array(
+    );
+    $form['forums']['comments_per_page'] = array(
     '#type' => 'select',
     '#title' => bts('In discussion topics, show at most @comments_per_page', array('@comments_per_page' => ''), NULL, 'boinc:account-preferences-community'),
     '#options' => array(10 => 10, 20 => 20, 30 => 30, 50 => 50, 100 => 100),
     '#default_value' => $default['comments_per_page']
-  );
-  // Can't have a typical Drupal form suffix on a select box?
-  $form['forums']['comments_per_page_suffix'] = array(
+    );
+    // Can't have a typical Drupal form suffix on a select box?
+    $form['forums']['comments_per_page_suffix'] = array(
     '#value' => '<span>' . bts('comments per page', array(), NULL, 'boinc:account-preferences-community') . '</span>'
-  );
-  $form['forums']['comments_order'] = array(
+    );
+    $form['forums']['comments_order'] = array(
     '#type' => 'select',
     '#title' => bts('Sort comments in discussions', array(), NULL, 'boinc:account-preferences-community'),
     '#options' => array(1 => bts('Newest post first', array(), NULL, 'boinc:account-preferences-community'), 2 => bts('Oldest post first', array(), NULL, 'boinc:account-preferences-community')),
     '#default_value' => $default['comments_order']
-  );
-  // Signature (pulled from user_edit_form):
-  if (variable_get('user_signatures', 0) && module_exists('comment')) {
+    );
+    // Signature (pulled from user_edit_form):
+    if (variable_get('user_signatures', 0) && module_exists('comment')) {
     $form['forums']['signature'] = array(
-      '#type' => 'textarea',
-      '#title' => bts('Signature', array(), NULL, 'boinc:account-preferences-community'),
-      '#description' => bts('Your signature will be publicly displayed at the end of your comments.', array(), NULL, 'boinc:account-preferences-community'),
-      '#default_value' => $account->signature
-      );
+        '#type' => 'textarea',
+        '#title' => bts('Signature', array(), NULL, 'boinc:account-preferences-community'),
+        '#description' => bts('Your signature will be publicly displayed at the end of your comments.', array(), NULL, 'boinc:account-preferences-community'),
+        '#default_value' => $account->signature
+        );
     // Prevent a "validation error" message when the user attempts to save with a default value they
     // do not have access to.
     if (!filter_access($account->signature_format) && empty($_POST)) {
-      drupal_set_message(t("The signature input format has been set to a format you don't have access to. It will be changed to a format you have access to when you save this page."));
-      $edit['signature_format'] = FILTER_FORMAT_DEFAULT;
+        drupal_set_message(t("The signature input format has been set to a format you don't have access to. It will be changed to a format you have access to when you save this page."));
+        $edit['signature_format'] = FILTER_FORMAT_DEFAULT;
     }
     $form['forums']['signature_format'] = filter_form($account->signature_format, NULL, array('signature_format'));
     // Optionally hide signatures from comments
     $form['forums']['hide_signatures'] = array(
-      '#type' => 'radios',
-      '#title' => bts('Hide signatures in forums', array(), NULL, 'boinc:account-preferences-community'),
-      '#description' => ' ',
-      '#options' => $form['boolean_options']['#value'],
-      '#attributes' => array('class' => 'fancy'),
-      '#default_value' => isset($account->hide_signatures) ? $account->hide_signatures : 0,
+        '#type' => 'radios',
+        '#title' => bts('Hide signatures in forums', array(), NULL, 'boinc:account-preferences-community'),
+        '#description' => ' ',
+        '#options' => $form['boolean_options']['#value'],
+        '#attributes' => array('class' => 'fancy'),
+        '#default_value' => isset($account->hide_signatures) ? $account->hide_signatures : 0,
     );
-  }
+    }
 
-  //Bottom separator
-  $form['separator_bottom'] = array(
+    //Bottom separator
+    $form['separator_bottom'] = array(
     '#value' => '<div class="separator buttons"></div>',
     '#weight' => 999,
-  );
+    );
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 /**
-  * Handle validation submission of community preferences form.
-  */
+ * Handle validation submission of community preferences form.
+ */
 function communityprefs_form_validate($form, &$form_state) {
-  // require_boinc();
-  global $user;
-  $account = user_load($user->uid);
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
-  $edit = $form_state['values'];
+    // require_boinc();
+    global $user;
+    $account = user_load($user->uid);
+    $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+    $edit = $form_state['values'];
 
-  if ($edit['boincuser_name'] != $boinc_user->name) {
+    if ($edit['boincuser_name'] != $boinc_user->name) {
     $blacklist1 = preg_split('/\r\n|\r|\n/', variable_get('boinc_weboptions_blacklisted_usernames', "admin\nadministrator\nmoderator"));
     $blacklist2 = array();
     if (is_array($blacklist1)) {
-      $blacklist2 = array_map('strtolower', $blacklist1);
+        $blacklist2 = array_map('strtolower', $blacklist1);
     }
     if (in_array(strtolower($edit['boincuser_name']), $blacklist2)) {
-      form_set_error('boincuser_name',
+        form_set_error('boincuser_name',
         bts('You may not use username @blname, as that name is not allowed. Please choose another name.',
             array('@blname' => $edit['boincuser_name']),
             NULL, 'boinc:account-preferences-community'));
-      return false;
+        return false;
+    }
     }
-  }
 
-  return true;
+    return true;
 }
 
 /**
-  * Handle post-validation submission of community preferences form.
-  */
+ * Handle post-validation submission of community preferences form.
+ */
 function communityprefs_form_submit($form, &$form_state) {
-  require_boinc('boinc_db');
-  global $user;
-  $account = user_load($user->uid);
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
-  $edit = $form_state['values'];
-  $profile_node = $form_state['storage']['profile_node'];
-
-  // Display name
-  if ($edit['boincuser_name'] != $boinc_user->name) {
+    require_boinc('boinc_db');
+    global $user;
+    $account = user_load($user->uid);
+    $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+    $edit = $form_state['values'];
+    $profile_node = $form_state['storage']['profile_node'];
+
+    // Display name
+    if ($edit['boincuser_name'] != $boinc_user->name) {
     $boincuser_name = $edit['boincuser_name'];
     $result = $boinc_user->update(
         "name='{$boincuser_name}'"
     );
-  }
+    }
 
-  // Private message settings
-  pm_email_notify_user('submit', $edit, $user);
+    // Private message settings
+    pm_email_notify_user('submit', $edit, $user);
 
-  // Avatar settings - only set if profile_node exists.
-  if ($profile_node) {
+    // Avatar settings - only set if profile_node exists.
+    if ($profile_node) {
     if (!$edit['field_image']) $edit['field_image'] = array();
     $profile_node->field_image = $edit['field_image'];
     node_save($profile_node);
     // Flush this from the node cache or changes won't show up immediately!
     $profile_node = node_load($profile_node->nid, NULL, TRUE);
-  }
+    }
 
-  // All other settings
-  $settings = array(
+    // All other settings
+    $settings = array(
     'signature' => $edit['signature'],
     'signature_format' => $edit['signature_format'],
     'timezone' => $edit['timezone'],
@@ -1722,197 +1722,197 @@ 
     'hide_signatures' => $edit['hide_signatures'],
     'sort' => $edit['comments_order'],
     'gravatar' => $edit['gravatar'],
-  );
-  if (module_exists('internationalization')) {
+    );
+    if (module_exists('internationalization')) {
     $settings['language'] = $edit['language'];
     global $language;
     if ($user->language != $edit['language']) {
-      global $base_url;
-      if ($edit['language'] != language_default('language')) {
+        global $base_url;
+        if ($edit['language'] != language_default('language')) {
         $form_state['redirect'] = $base_url . '/' . $edit['language'] . '/' . $_GET['q'];
-      }
-      else {
+        }
+        else {
         $form_state['redirect'] = $base_url . '/' . $_GET['q'];
-      }
+        }
+    }
     }
-  }
-  user_save($user, $settings);
+    user_save($user, $settings);
 
-  drupal_set_message(bts('Your community preferences have been updated.', array(), NULL, 'boinc:account-preferences-community'));
+    drupal_set_message(bts('Your community preferences have been updated.', array(), NULL, 'boinc:account-preferences-community'));
 
-  // Form will not redirect if storage is set; not good if language changes
-  unset($form_state['storage']);
+    // Form will not redirect if storage is set; not good if language changes
+    unset($form_state['storage']);
 }
 
 /**
  * The structure of the privacy preferences form
  */
 function boincwork_privacyprefs_form(&$form_state) {
-  require_boinc(array('user', 'prefs', 'util', 'consent'));
+    require_boinc(array('user', 'prefs', 'util', 'consent'));
 
-  global $user;
-  $account = user_load($user->uid);
-  $boincuser = BoincUser::lookup_id($account->boincuser_id);
+    global $user;
+    $account = user_load($user->uid);
+    $boincuser = BoincUser::lookup_id($account->boincuser_id);
 
-  // Load preferences from BOINC account
-  $prefs = boincwork_load_prefs('project');
+    // Load preferences from BOINC account
+    $prefs = boincwork_load_prefs('project');
 
-  //if (!$prefs AND !$initialize_if_empty) return null;
+    //if (!$prefs AND !$initialize_if_empty) return null;
 
-  $privacy_consent_types = boincwork_load_privacyconsenttypes();
+    $privacy_consent_types = boincwork_load_privacyconsenttypes();
 
-  // Define form defaults
-  $default = array(
+    // Define form defaults
+    $default = array(
     'privacy' => array(
-      'send_email' => ($boincuser->send_email) ? 1 : 0,
-      'show_hosts' => ($boincuser->show_hosts) ? 1 : 0
+        'send_email' => ($boincuser->send_email) ? 1 : 0,
+        'show_hosts' => ($boincuser->show_hosts) ? 1 : 0
     )
-  );
+    );
 
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
-  );
+    );
 
-  $form['privacy'] = array(
+    $form['privacy'] = array(
     '#title' => bts('Privacy settings', array(), NULL, 'boinc:account-preferences-privacy'),
     '#type' => 'fieldset',
     '#description' => null,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  $form['privacy']['send_email'] = array(
+    );
+    $form['privacy']['send_email'] = array(
     '#title' => bts('Is it OK for @project and your team (if any) to email you?', array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:account-preferences-privacy'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['privacy']['send_email']
-  );
-  $form['privacy']['show_hosts'] = array(
+    );
+    $form['privacy']['show_hosts'] = array(
     '#title' => bts('Should @project show your computers on its website?', array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:account-preferences-privacy'),
     '#description' => bts('At times, you may be asked to enable this option in order to receive help from the forums. Advanced users may need to be able to inspect your computers\' information in order to help diagnose any problems.', array(), NULL, 'boinc:account-preferences-privacy'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['privacy']['show_hosts']
-  );
+    );
 
-  // Loop over privacy consent types and create form question for each
-  // option that deals with privacy.
-  foreach ($privacy_consent_types as $ct) {
+    // Loop over privacy consent types and create form question for each
+    // option that deals with privacy.
+    foreach ($privacy_consent_types as $ct) {
 
     $currstate = (check_user_consent($boincuser, $ct['shortname'])) ? 1 : 0 ;
     // Set name to 'privacyconsent_SHORTNAME', which can be parsed
     // later in the submit function.
     $form['privacy']['privacyconsent_'.$ct['shortname']] = array(
-      '#title' => bts($ct['description'], array(), NULL, 'boinc:account-preferences-privacy'),
-      '#type' => 'radios',
-      '#options' => $form['boolean_options']['#value'],
-      '#attributes' => array('class' => 'fancy'),
-      '#default_value' => $currstate,
+        '#title' => bts($ct['description'], array(), NULL, 'boinc:account-preferences-privacy'),
+        '#type' => 'radios',
+        '#options' => $form['boolean_options']['#value'],
+        '#attributes' => array('class' => 'fancy'),
+        '#default_value' => $currstate,
     );
 
     // Add a description with link to the question 'Do you consent to
     // exporting your data...'.
     $mypatt = '/Do you consent to exporting your data/';
     if (preg_match($mypatt, $ct['description']) ) {
-      $form['privacy']['privacyconsent_'.$ct['shortname']]['#description'] = bts('See our !privacy_policy_link for the current list of statistics exports.',
-      array(
+        $form['privacy']['privacyconsent_'.$ct['shortname']]['#description'] = bts('See our !privacy_policy_link for the current list of statistics exports.',
+        array(
         '!privacy_policy_link' => l(
-          bts('privacy policy', array(), NULL, 'boinc:account-preferences-privacy'),
-          '/privacy'
+            bts('privacy policy', array(), NULL, 'boinc:account-preferences-privacy'),
+            '/privacy'
         )
-      ),
-      NULL, 'boinc:account-preferences-privacy');
+        ),
+        NULL, 'boinc:account-preferences-privacy');
+    }
     }
-  }
 
-  // Ignore and block users
-  if (module_exists('ignore_user')) {
+    // Ignore and block users
+    if (module_exists('ignore_user')) {
     $form['ignoreblock'] = array(
-      '#title' => bts('Ignore Users', array(), NULL, 'boinc:account-preferences-privacy'),
-      '#type' => 'fieldset',
-      '#description' => bts('<p>You may ignore users in the forums and block users from sending you private messages.<p>', array(), NULL, 'boinc:ignore-user-help'),
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE
+        '#title' => bts('Ignore Users', array(), NULL, 'boinc:account-preferences-privacy'),
+        '#type' => 'fieldset',
+        '#description' => bts('<p>You may ignore users in the forums and block users from sending you private messages.<p>', array(), NULL, 'boinc:ignore-user-help'),
+        '#collapsible' => TRUE,
+        '#collapsed' => FALSE
     );
 
     // Table for ignored users
     $form['ignoreblock']['current_ignore_section'] = array(
-      '#type' => 'item',
-      '#value' => bts('Current users on your Ignore List', array(), NULL, 'boinc:ignore-user-list'),
-      '#prefix' => '<h4>',
-      '#suffix' => '</h4>',
-      '#weight' => -20,
+        '#type' => 'item',
+        '#value' => bts('Current users on your Ignore List', array(), NULL, 'boinc:ignore-user-list'),
+        '#prefix' => '<h4>',
+        '#suffix' => '</h4>',
+        '#weight' => -20,
     );
 
     $ignored_users = _ignore_user_ignored_users();
     foreach ($ignored_users as $ignored_user) {
-      $form['ignoreblock']['username'][$ignored_user['iuid']] = array(
+        $form['ignoreblock']['username'][$ignored_user['iuid']] = array(
         '#value' => $ignored_user['username'],
-      );
-      $form['ignoreblock']['delete'][$ignored_user['iuid']] = array(
+        );
+        $form['ignoreblock']['delete'][$ignored_user['iuid']] = array(
         '#value' => l(
-          bts('delete', array(), NULL, 'boinc:ignore-user-delete-button'),
-          'account/prefs/privacy/ignore_user/remove/'. $ignored_user['iuid'],
-          array()
+            bts('delete', array(), NULL, 'boinc:ignore-user-delete-button'),
+            'account/prefs/privacy/ignore_user/remove/'. $ignored_user['iuid'],
+            array()
         ),
-      );
+        );
     }
     $form['ignoreblock']['pager'] = array('#value' => theme('pager', NULL, 10, 0));
 
     // Sub-form to add user to ignore list
     $form['ignoreblock']['add_ignore_user_section'] = array(
-      '#type' => 'item',
-      '#value' => bts('Add user to Ignore List', array(), NULL, 'boinc:ignore-user-add'),
-      '#prefix' => '<h4>',
-      '#suffix' => '</h4>',
-      '#weight' => 10,
+        '#type' => 'item',
+        '#value' => bts('Add user to Ignore List', array(), NULL, 'boinc:ignore-user-add'),
+        '#prefix' => '<h4>',
+        '#suffix' => '</h4>',
+        '#weight' => 10,
     );
 
     $form['ignoreblock']['addusername_toignorelist'] = array(
-      '#type' => 'textfield',
-      '#title' => bts('Username', array(), NULL, 'boinc:ignore-user-searchbox'),
-      '#description' => bts('To lookup a username start typing in the search box. A list of usernames will appear as you type. The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.', array(), NULL, 'boinc:ignore-user-searchbox-help'),
-      '#weight' => 11,
-      '#size' => 50,
-      '#autocomplete_path' => 'boincuser/autocomplete',
+        '#type' => 'textfield',
+        '#title' => bts('Username', array(), NULL, 'boinc:ignore-user-searchbox'),
+        '#description' => bts('To lookup a username start typing in the search box. A list of usernames will appear as you type. The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.', array(), NULL, 'boinc:ignore-user-searchbox-help'),
+        '#weight' => 11,
+        '#size' => 50,
+        '#autocomplete_path' => 'boincuser/autocomplete',
     );
 
     $form['ignoreblock']['addusername_submit'] = array(
-      '#type' => 'submit',
-      '#value' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
-      '#submit' => array('_boincwork_ignore_list_form_submit'),
-      '#weight' => 12,
-      '#attributes' => array('class' => 'add_ignore_user'),
+        '#type' => 'submit',
+        '#value' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
+        '#submit' => array('_boincwork_ignore_list_form_submit'),
+        '#weight' => 12,
+        '#attributes' => array('class' => 'add_ignore_user'),
     );
-  }// endif module_exists
+    }// endif module_exists
 
-  $form['prefs']['separator_bottom'] = array(
+    $form['prefs']['separator_bottom'] = array(
     '#value' => '<div class="separator buttons"></div>'
-  );
+    );
 
-  // Form control
-  $form['prefs']['form control tabs prefix'] = array(
+    // Form control
+    $form['prefs']['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['prefs']['submit'] = array(
+    );
+    $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
     '#validate' => array('boincwork_privacyprefs_form_validate'),
     '#submit' => array('boincwork_privacyprefs_form_submit'),
     '#suffix' => '</li>'
-  );
-  $form['prefs']['form control tabs'] = array(
+    );
+    $form['prefs']['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
-  );
-  $form['prefs']['form control tabs suffix'] = array(
+    );
+    $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -1920,93 +1920,93 @@ 
  */
 function theme_boincwork_privacyprefs_form($form) {
 
-  $output = '';
-  $output .= drupal_render($form['privacy']);
+    $output = '';
+    $output .= drupal_render($form['privacy']);
 
-  $header = array(
+    $header = array(
     bts('Username', array(), NULL, 'boinc:ignore-user-list'),
     bts('Operations', array(), NULL, 'boinc:ignore-user-list')
-  );
+    );
 
-  $rows = array();
-  if (isset($form['ignoreblock']['username']) && is_array($form['ignoreblock']['username'])) {
+    $rows = array();
+    if (isset($form['ignoreblock']['username']) && is_array($form['ignoreblock']['username'])) {
     foreach (element_children($form['ignoreblock']['username']) as $key) {
-      $row = array();
-      $row[] = drupal_render($form['ignoreblock']['username'][$key]);
-      $row[] = drupal_render($form['ignoreblock']['delete'][$key]);
-      $rows[] = $row;
+        $row = array();
+        $row[] = drupal_render($form['ignoreblock']['username'][$key]);
+        $row[] = drupal_render($form['ignoreblock']['delete'][$key]);
+        $rows[] = $row;
     }
-  }
-  else {
+    }
+    else {
     $rows[] = array(
-      array(
+        array(
         'data' => bts('You have not added any users to your Ignore List.', array(), NULL, 'boinc:ignore-user-list'),
         'colspan' => '2',
-      )
+        )
     );
-  }
+    }
 
-  $attr = array('class' => 'ignore_user');
-  $form['ignoreblock']['current_list']['ignored_users']['#value'] = theme('table', $header, $rows, $attr);
-  $output .= drupal_render($form['current_list']);
+    $attr = array('class' => 'ignore_user');
+    $form['ignoreblock']['current_list']['ignored_users']['#value'] = theme('table', $header, $rows, $attr);
+    $output .= drupal_render($form['current_list']);
 
-  if ($form['pager']['#value']) {
+    if ($form['pager']['#value']) {
     $output .= drupal_render($form['pager']);
-  }
+    }
 
-  $output .= drupal_render($form);
+    $output .= drupal_render($form);
 
-  return $output;
+    return $output;
 }
 
 /**
-  * Validate the privacy preferences form.
-  */
+ * Validate the privacy preferences form.
+ */
 function boincwork_privacyprefs_form_validate($form, &$form_state) {
-  require_boinc('util');
+    require_boinc('util');
 
-  // Verify all non-boolean user input values and notify form API of failures
-  // ... currently there are no non-boolean values!
+    // Verify all non-boolean user input values and notify form API of failures
+    // ... currently there are no non-boolean values!
 }
 
 /**
-  * Handle post-validation submission of privacy preferences form.
-  */
+ * Handle post-validation submission of privacy preferences form.
+ */
 function boincwork_privacyprefs_form_submit($form, &$form_state) {
-  require_boinc(array('user', 'prefs', 'consent'));
+    require_boinc(array('user', 'prefs', 'consent'));
 
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
 
-  // Load BOINC account
-  $boincuser = BoincUser::lookup_id($account->boincuser_id);
+    // Load BOINC account
+    $boincuser = BoincUser::lookup_id($account->boincuser_id);
 
-  // Privacy preferences
-  $boincuser->send_email = ($form_state['values']['send_email']) ? true : false;
-  $boincuser->show_hosts = ($form_state['values']['show_hosts']) ? true : false;
+    // Privacy preferences
+    $boincuser->send_email = ($form_state['values']['send_email']) ? true : false;
+    $boincuser->show_hosts = ($form_state['values']['show_hosts']) ? true : false;
 
-  // Privacy consent options, extract the 'privacyconsent_SHORTNAME'
-  // from values array, and loop over them; each is checked with
-  // check_consent_type(). Also check the current state of the option
-  // in the database. If the form value is a new state, then set it.
-  $result = preg_grep("/^privacyconsent/", array_keys($form_state['values']));
-  $privacyconsent_prefs = array_intersect_key($form_state['values'], array_flip($result));
-  foreach ($privacyconsent_prefs as $name => $newstate) {
+    // Privacy consent options, extract the 'privacyconsent_SHORTNAME'
+    // from values array, and loop over them; each is checked with
+    // check_consent_type(). Also check the current state of the option
+    // in the database. If the form value is a new state, then set it.
+    $result = preg_grep("/^privacyconsent/", array_keys($form_state['values']));
+    $privacyconsent_prefs = array_intersect_key($form_state['values'], array_flip($result));
+    foreach ($privacyconsent_prefs as $name => $newstate) {
     $subname = explode('_', $name)[1];
     $currstate = (check_user_consent($boincuser, $subname)) ? 1 : 0 ;
     list($checkct, $ctid) = check_consent_type($subname);
     if ($checkct && ($currstate != $newstate)) {
-      consent_to_a_policy($boincuser, $ctid, $newstate, 0, 'Webform', time());
+        consent_to_a_policy($boincuser, $ctid, $newstate, 0, 'Webform', time());
+    }
     }
-  }
 
-  //project_prefs_update($boincuser, $main_prefs);
+    //project_prefs_update($boincuser, $main_prefs);
 
-  db_set_active('boinc_rw');
-  db_query("UPDATE user SET send_email = '{$boincuser->send_email}', show_hosts = '{$boincuser->show_hosts}' WHERE id = '{$boincuser->id}'");
-  db_set_active('default');
+    db_set_active('boinc_rw');
+    db_query("UPDATE user SET send_email = '{$boincuser->send_email}', show_hosts = '{$boincuser->show_hosts}' WHERE id = '{$boincuser->id}'");
+    db_set_active('default');
 
-  drupal_set_message(t('Your privacy preferences have been updated.'));
+    drupal_set_message(t('Your privacy preferences have been updated.'));
 }
 
 /**
@@ -2014,14 +2014,14 @@ 
  * ignore list.
  */
 function _boincwork_ignore_list_form_submit($form, $form_state) {
-  boincwork_ignore_user_add_user_username($form_state['values']['addusername_toignorelist']);
-  drupal_set_message(
+    boincwork_ignore_user_add_user_username($form_state['values']['addusername_toignorelist']);
+    drupal_set_message(
     bts('@username has been added to your ignore list. See your !privacy_preferences for more details.',
-      array(
+        array(
         '@username' => $form_state['values']['addusername_toignorelist'],
         '!privacy_preferences' => l(bts('privacy preferences', array(), NULL, 'boinc:ignore-user-add'), 'account/prefs/privacy'),
-      ),
-      NULL, 'boinc:ignore-user-add'),
+        ),
+        NULL, 'boinc:ignore-user-add'),
     'status');
 }
 
@@ -2030,37 +2030,37 @@ 
  */
 function boincwork_selectapp_form(&$form_state, $apps, $current_app) {
 
-  $form['selectapp'] = array(
+    $form['selectapp'] = array(
     '#type' => 'select',
     '#attributes' => array(
-      'class' => 'task-app-filter',
-      'onchange' => 'this.form.submit();',
+        'class' => 'task-app-filter',
+        'onchange' => 'this.form.submit();',
     ),
     '#default_value' => $current_app,
     '#options' => $apps,
     '#post_render' => array('_boincwork_selectapp_form_callback'),
-  );
+    );
 
-  // Class task-app-filter-submit for this form is used in
-  // theming. CSS sets 'display:none' if javascript is present. Thus
-  // only non-js users/browsers will see the Apply Filter button.
-  $form['submit'] = array(
+    // Class task-app-filter-submit for this form is used in
+    // theming. CSS sets 'display:none' if javascript is present. Thus
+    // only non-js users/browsers will see the Apply Filter button.
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => bts('Apply Filter', array(), NULL, 'boinc:form-save'),
     '#attributes' => array('class' => 'js-hide',),
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
  * Submit function for select appliacation form.
  */
 function boincwork_selectapp_form_submit($form, &$form_state) {
-  $myargs = arg();
-  array_pop($myargs);
-  $newpath = implode('/', $myargs ) . '/' . $form['selectapp']['#value'];
-  $form_state['redirect'] = $newpath;
+    $myargs = arg();
+    array_pop($myargs);
+    $newpath = implode('/', $myargs ) . '/' . $form['selectapp']['#value'];
+    $form_state['redirect'] = $newpath;
 }
 
 /**
@@ -2070,7 +2070,7 @@ 
  * 'title' for the Application drop down box.
  */
 function _boincwork_selectapp_form_callback($theContent, $theElement) {
-  $disabled = '<option value="-1" disabled hidden';
-  $newContent = preg_replace('/<option value="-1"/', $disabled, $theContent);
-  return $newContent;
+    $disabled = '<option value="-1" disabled hidden';
+    $newContent = preg_replace('/<option value="-1"/', $disabled, $theContent);
+    return $newContent;
 }

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

@@ -14,10 +14,10 @@ 
 /**
  * The structure of the general preferences form
  */
-function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null, $advanced = FALSE) {
+function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null, $advanced = false) {
   $form = array();
   $prefs = null;
-  $established = TRUE;
+  $established = true;
 
   // Enable AHAH form support for dynamically updating content based on preset
   ahah_helper_register($form, $form_state);
@@ -32,7 +32,7 @@ 
 
     // Take note if this is not an established preference set on the account
     if (isset($prefs['@attributes']['cleared'])) {
-      $established = FALSE;
+      $established = false;
     }
 
     // Determine if a preset is selected or if these are custom settings
@@ -70,7 +70,7 @@ 
           break;
       }// switch
   } else {
-      $form_state['storage']['wip'] = TRUE;
+      $form_state['storage']['wip'] = true;
       if ( !in_array($prefs_preset, array('standard','maximum','green','minimum','custom')) ) {
           if ($established) {
               $prefs_preset = 'custom';
@@ -137,7 +137,7 @@ 
   // Standard option sets
   $form['boolean_options'] = array(
     '#type' => 'value',
-    '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
+    '#value' => array(1 => bts('yes', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
   );
   $form['hour_options'] = array(
     '#type' => 'value',
@@ -158,7 +158,7 @@ 
     '#prefix' => '<div id="prefs-wrapper">', // This is our wrapper div.
     '#attributes' => array('class' => 'ahah-container'),
     '#suffix' => '</div>',
-    '#tree'   => TRUE
+    '#tree'   => true
   );
   //$form['prefs']['debug'] = array('#value' => '<pre>' . print_r($form_state, true) . '</pre>');
 
@@ -178,15 +178,15 @@ 
 
   // Simplified selectors
   $form['prefs']['preset'] = array(
-      '#title' => bts('Presets', array(), NULL, 'boinc:account-preferences-preset:-1:for a user to choose a computing or project preference preset.'),
+      '#title' => bts('Presets', array(), null, 'boinc:account-preferences-preset:-1:for a user to choose a computing or project preference preset.'),
     '#type' => 'radios',
     '#description' => ' ',
     '#options' => array(
-      'standard' => bts('Standard', array(), NULL, 'boinc:account-preferences-preset'),
-      'maximum' => bts('Maximum', array(), NULL, 'boinc:account-preferences-preset'),
-      'green' => bts('Green', array(), NULL, 'boinc:account-preferences-preset'),
-      'minimum' => bts('Minimum', array(), NULL, 'boinc:account-preferences-preset'),
-      'custom' => bts('Custom', array(), NULL, 'boinc:account-preferences-preset')
+      'standard' => bts('Standard', array(), null, 'boinc:account-preferences-preset'),
+      'maximum' => bts('Maximum', array(), null, 'boinc:account-preferences-preset'),
+      'green' => bts('Green', array(), null, 'boinc:account-preferences-preset'),
+      'minimum' => bts('Minimum', array(), null, 'boinc:account-preferences-preset'),
+      'custom' => bts('Custom', array(), null, 'boinc:account-preferences-preset')
     ),
     '#prefix' => '<div class="simple-form-controls">',
     '#suffix' => '</div>',
@@ -199,7 +199,7 @@ 
   );
   $form['prefs']['select preset'] = array(
     '#type'  => 'submit',
-    '#value' => bts('Update preset', array(), NULL, 'boinc:account-preferences-preset'),
+    '#value' => bts('Update preset', array(), null, 'boinc:account-preferences-preset'),
     '#submit' => array('ahah_helper_generic_submit'),
     // The 'no-js' class only displays this button if javascript is disabled
     '#attributes' => array('class' => 'no-js'),
@@ -207,10 +207,10 @@ 
 
   // Advanced preferences
   $form['prefs']['advanced'] = array(
-    '#title' => bts('Advanced settings', array(), NULL, 'boinc:account-preferences-option'),
+    '#title' => bts('Advanced settings', array(), null, 'boinc:account-preferences-option'),
     '#type' => 'fieldset',
     '#description' => '',
-    '#collapsible' => TRUE,
+    '#collapsible' => true,
     '#collapsed' => !$advanced,
     '#attributes' => array('class' => 'advanced-settings'),
   );
@@ -226,62 +226,62 @@ 
   );
 
   $form['prefs']['advanced']['processor'] = array(
-    '#title' => bts('Processor usage', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Processor usage', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'fieldset',
     '#description' => '',
-    '#collapsible' => FALSE,
-    '#collapsed' => FALSE
+    '#collapsible' => false,
+    '#collapsed' => false
   );
   $form['prefs']['advanced']['processor']['run_on_batteries'] = array(
-    '#title' => bts('Suspend when computer is on battery?', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Suspend when computer is on battery?', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
-    '#description' => bts('Suspends computing on portables when running on battery power.', array(), NULL, 'boinc:account-preferences-computing'),
+    '#description' => bts('Suspends computing on portables when running on battery power.', array(), null, 'boinc:account-preferences-computing'),
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => ($default['run_on_batteries']) ? 0 : 1 // intentional inversion of setting
   );
   $form['prefs']['advanced']['processor']['run_if_user_active'] = array(
-    '#title' => bts('Suspend when computer is in use?', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Suspend when computer is in use?', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
-    '#description' => bts("Suspends computing and file transfers when you're using the computer.", array(), NULL, 'boinc:account-preferences-computing'),
+    '#description' => bts("Suspends computing and file transfers when you're using the computer.", array(), null, 'boinc:account-preferences-computing'),
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => ($default['run_if_user_active']) ? 0 : 1 // intentional inversion of setting
   );
   $form['prefs']['advanced']['processor']['run_gpu_if_user_active'] = array(
-    '#title' => bts('Suspend GPU computing when computer is in use?', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Suspend GPU computing when computer is in use?', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
-    '#description' => bts("Suspends GPU computing when you're using the computer.", array(), NULL, 'boinc:account-preferences-computing'),
+    '#description' => bts("Suspends GPU computing when you're using the computer.", array(), null, 'boinc:account-preferences-computing'),
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => ($default['run_gpu_if_user_active']) ? 0 : 1 // intentional inversion of setting
   );
   $form['prefs']['advanced']['processor']['idle_time_to_run'] = array(
-      '#title' => bts('"In use" means mouse/keyboard input in last', array(), NULL, 'boinc:account-preferences-computing'),
+      '#title' => bts('"In use" means mouse/keyboard input in last', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
-    '#field_suffix' => bts('minutes', array(), NULL, 'boinc:unit-of-time'),
+    '#field_suffix' => bts('minutes', array(), null, 'boinc:unit-of-time'),
     '#default_value' => $default['idle_time_to_run'],
     '#size' => 1,
-    '#description' => bts('This determines when the computer is considered "in use".', array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts('This determines when the computer is considered "in use".', array(), null, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['processor']['suspend_if_no_recent_input'] = array(
-    '#title' => bts('Suspend when no mouse/keyboard input in last', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Suspend when no mouse/keyboard input in last', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
-    '#field_suffix' => bts('minutes', array(), NULL, 'boinc:unit-of-time'),
+    '#field_suffix' => bts('minutes', array(), null, 'boinc:unit-of-time'),
     '#default_value' => $default['suspend_if_no_recent_input'],
     '#size' => 1,
-    '#description' => bts('This allows some computers to enter low-power mode when not in use.', array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts('This allows some computers to enter low-power mode when not in use.', array(), null, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['processor']['suspend_cpu_usage'] = array(
-    '#title' => bts('Suspend when non-BOINC CPU usage is above', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Suspend when non-BOINC CPU usage is above', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => '%',
     '#default_value' => $default['suspend_cpu_usage'],
     '#size' => 1,
-    '#description' => bts('Suspend computing when your computer is busy running other programs.', array(), NULL, 'boinc:account-preferences-computing'),
+    '#description' => bts('Suspend computing when your computer is busy running other programs.', array(), null, 'boinc:account-preferences-computing'),
   );
   $form['prefs']['advanced']['processor']['hour_label'] = array(
-    '#value' => '<div class="form-item"><label>' . bts('Compute only between:', array(), NULL, 'boinc:account-preferences-computing') . '</label></div>'
+    '#value' => '<div class="form-item"><label>' . bts('Compute only between:', array(), null, 'boinc:account-preferences-computing') . '</label></div>'
   );
   $form['prefs']['advanced']['processor']['start_hour'] = array(
     '#type' => 'select',
@@ -289,7 +289,7 @@ 
     '#default_value' => $default['start_hour']
   );
   $form['prefs']['advanced']['processor']['hour_delimiter'] = array(
-    '#value' => '<span>' . bts('and', array(), NULL, 'boinc:account-preference') . '</span>'
+    '#value' => '<span>' . bts('and', array(), null, 'boinc:account-preference') . '</span>'
   );
   $form['prefs']['advanced']['processor']['end_hour'] = array(
     '#type' => 'select',
@@ -297,164 +297,164 @@ 
     '#default_value' => $default['end_hour']
   );
   $form['prefs']['advanced']['processor']['hour_description'] = array(
-    '#value' => '<div class="form-item slim"><div class="description">' . bts('Compute only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing') . '</div></div>'
+    '#value' => '<div class="form-item slim"><div class="description">' . bts('Compute only during a particular period each day.', array(), null, 'boinc:account-preferences-computing') . '</div></div>'
   );
   $form['prefs']['advanced']['processor']['leave_apps_in_memory'] = array(
-    '#title' => bts('Leave non-GPU tasks in memory while suspended?', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Leave non-GPU tasks in memory while suspended?', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['leave_apps_in_memory'],
-    '#description' => bts('If "Yes", suspended tasks stay in memory, and resume with no work lost. If "No", suspended tasks are removed from memory, and resume from their last checkpoint.', array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts('If "Yes", suspended tasks stay in memory, and resume with no work lost. If "No", suspended tasks are removed from memory, and resume from their last checkpoint.', array(), null, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes'] = array(
-    '#title' => bts('Switch between tasks every', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Switch between tasks every', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
-    '#field_suffix' => bts('minutes', array(), NULL, 'boinc:unit-of-time'),
+    '#field_suffix' => bts('minutes', array(), null, 'boinc:unit-of-time'),
     '#default_value' => $default['cpu_scheduling_period_minutes'],
     '#size' => 1,
-    '#description' => bts('If you run several projects, BOINC may switch between them this often.', array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts('If you run several projects, BOINC may switch between them this often.', array(), null, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['processor']['max_ncpus_pct'] = array(
-    '#title' => bts('Use at most', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Use at most', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
-    '#field_suffix' => bts('% of the processors', array(), NULL, 'boinc:account-preferences-computing'),
+    '#field_suffix' => bts('% of the processors', array(), null, 'boinc:account-preferences-computing'),
     '#default_value' => $default['max_ncpus_pct'],
     '#size' => 1,
-    '#description' => bts('Keep some CPUs free for other applications. Example: 75% means use 6 cores on an 8-core CPU.', array(), NULL, 'boinc:account-preferences-computing'),
+    '#description' => bts('Keep some CPUs free for other applications. Example: 75% means use 6 cores on an 8-core CPU.', array(), null, 'boinc:account-preferences-computing'),
   );
   $form['prefs']['advanced']['processor']['cpu_usage_limit'] = array(
-    '#title' => bts('Use at most', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Use at most', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
-    '#field_suffix' => bts('% of the CPU time', array(), NULL, 'boinc:account-preferences-computing'),
+    '#field_suffix' => bts('% of the CPU time', array(), null, 'boinc:account-preferences-computing'),
     '#default_value' => $default['cpu_usage_limit'],
     '#size' => 1,
-    '#description' => bts('Suspend/resume computing every few seconds to reduce CPU temperature and energy usage. Example: 75% means compute for 3 seconds, wait for 1 second, and repeat.', array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts('Suspend/resume computing every few seconds to reduce CPU temperature and energy usage. Example: 75% means compute for 3 seconds, wait for 1 second, and repeat.', array(), null, 'boinc:account-preferences-computing')
   );
 
   // Disk and memory preferences
   $form['prefs']['advanced']['storage'] = array(
-    '#title' => bts('Disk and memory usage', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Disk and memory usage', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'fieldset',
     '#description' => '',
-    '#collapsible' => FALSE,
-    '#collapsed' => FALSE
+    '#collapsible' => false,
+    '#collapsed' => false
   );
   $form['prefs']['advanced']['storage']['disk_max_used_gb'] = array(
-    '#title' => bts('Disk: use no more than', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Disk: use no more than', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'GB',
     '#default_value' => $default['disk_max_used_gb'],
     '#size' => 1,
-    '#description' => bts('Limit the total amount of disk space used by BOINC.', array(), NULL, 'boinc:account-preferences-computing'),
+    '#description' => bts('Limit the total amount of disk space used by BOINC.', array(), null, 'boinc:account-preferences-computing'),
   );
   $form['prefs']['advanced']['storage']['disk_min_free_gb'] = array(
-    '#title' => bts('Disk: leave at least', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Disk: leave at least', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'GB free',
     '#default_value' => $default['disk_min_free_gb'],
     '#size' => 1,
-    '#description' => bts('Limit disk usage to leave this much free space on the volume where BOINC stores data.', array(), NULL, 'boinc:account-preferences-computing'),
+    '#description' => bts('Limit disk usage to leave this much free space on the volume where BOINC stores data.', array(), null, 'boinc:account-preferences-computing'),
   );
   $form['prefs']['advanced']['storage']['disk_max_used_pct'] = array(
-    '#title' => bts('Disk: use no more than', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Disk: use no more than', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
-    '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
+    '#field_suffix' => bts('% of total', array(), null, 'boinc:account-preferences-computing'),
     '#default_value' => $default['disk_max_used_pct'],
     '#size' => 1,
-    '#description' => bts('Limit the percentage of disk space used by BOINC on the volume where it stores data.', array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts('Limit the percentage of disk space used by BOINC on the volume where it stores data.', array(), null, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['storage']['disk_interval'] = array(
-    '#title' => bts('Request tasks to checkpoint at most every', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Request tasks to checkpoint at most every', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
-    '#field_suffix' => bts('seconds', array(), NULL, 'boinc:unit-of-time'),
+    '#field_suffix' => bts('seconds', array(), null, 'boinc:unit-of-time'),
     '#default_value' => $default['disk_interval'],
     '#size' => 1,
-    '#description' => bts('This controls how often tasks save their state to disk, so that later they can be continued from that point.', array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts('This controls how often tasks save their state to disk, so that later they can be continued from that point.', array(), null, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['storage']['vm_max_used_pct'] = array(
-    '#title' => bts('Page/swap file: use at most', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Page/swap file: use at most', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
-    '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
+    '#field_suffix' => bts('% of total', array(), null, 'boinc:account-preferences-computing'),
     '#default_value' => $default['vm_max_used_pct'],
     '#size' => 1,
-    '#description' => bts('Limit the swap space (page file) used by BOINC.', array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts('Limit the swap space (page file) used by BOINC.', array(), null, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['storage']['ram_max_used_busy_pct'] = array(
-    '#title' => bts('Memory: when computer is in use, use at most', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Memory: when computer is in use, use at most', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
-    '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
+    '#field_suffix' => bts('% of total', array(), null, 'boinc:account-preferences-computing'),
     '#default_value' => $default['ram_max_used_busy_pct'],
     '#size' => 1,
-    '#description' => bts("Limit the memory used by BOINC when you're using the computer.", array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts("Limit the memory used by BOINC when you're using the computer.", array(), null, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['storage']['ram_max_used_idle_pct'] = array(
-    '#title' => bts('Memory: when computer is not in use, use at most', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Memory: when computer is not in use, use at most', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
-    '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
+    '#field_suffix' => bts('% of total', array(), null, 'boinc:account-preferences-computing'),
     '#default_value' => $default['ram_max_used_idle_pct'],
     '#size' => 1,
-    '#description' => bts("Limit the memory used by BOINC when you're not using the computer.", array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts("Limit the memory used by BOINC when you're not using the computer.", array(), null, 'boinc:account-preferences-computing')
   );
 
   // Network preferences
   $form['prefs']['advanced']['network'] = array(
-    '#title' => bts('Network usage', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Network usage', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'fieldset',
     '#description' => '',
-    '#collapsible' => FALSE,
-    '#collapsed' => FALSE
+    '#collapsible' => false,
+    '#collapsed' => false
   );
   $form['prefs']['advanced']['network']['work_buf_min_days'] = array(
-    '#title' => bts('Store at least', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Store at least', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
-    '#field_suffix' => bts('days of work', array(), NULL, 'boinc:account-preferences-computing'),
+    '#field_suffix' => bts('days of work', array(), null, 'boinc:account-preferences-computing'),
     '#default_value' => $default['work_buf_min_days'],
     '#size' => 1,
-    '#description' => bts('Store at least enough tasks to keep the computer busy for this long.', array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts('Store at least enough tasks to keep the computer busy for this long.', array(), null, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['network']['work_buf_additional_days'] = array(
-    '#title' => bts('Store up to an additional', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Store up to an additional', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
-    '#field_suffix' => bts('days', array(), NULL, 'boinc:unit-of-time'),
+    '#field_suffix' => bts('days', array(), null, 'boinc:unit-of-time'),
     '#default_value' => $default['work_buf_additional_days'],
     '#size' => 1,
-    '#description' => bts('Store additional tasks above the minimum level.  Determines how much work is requested when contacting a project.', array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts('Store additional tasks above the minimum level.  Determines how much work is requested when contacting a project.', array(), null, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['network']['confirm_before_connecting'] = array(
-    '#title' => bts('Confirm before connecting to Internet?', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Confirm before connecting to Internet?', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['confirm_before_connecting'],
-    '#description' => bts('Useful only if you have a modem, ISDN or VPN connection.', array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts('Useful only if you have a modem, ISDN or VPN connection.', array(), null, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['network']['hangup_if_dialed'] = array(
-    '#title' => bts('Disconnect when done?', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Disconnect when done?', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['hangup_if_dialed'],
-    '#description' => bts('Useful only if you have a modem, ISDN or VPN connection.', array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts('Useful only if you have a modem, ISDN or VPN connection.', array(), null, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['network']['max_bytes_sec_down'] = array(
-    '#title' => bts('Limit download rate to', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Limit download rate to', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'Kbytes/sec',
     '#default_value' => $default['max_bytes_sec_down']/1000,
     '#size' => 1,
-    '#description' => bts('Limit the download rate of file transfers.', array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts('Limit the download rate of file transfers.', array(), null, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['network']['max_bytes_sec_up'] = array(
-    '#title' => bts('Limit upload rate to', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Limit upload rate to', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'Kbytes/sec',
     '#default_value' => $default['max_bytes_sec_up']/1000,
     '#size' => 1,
-    '#description' => bts('Limit the upload rate of file transfers.', array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts('Limit the upload rate of file transfers.', array(), null, 'boinc:account-preferences-computing')
   );
   $form['prefs']['advanced']['network']['hour_label'] = array(
-    '#value' => '<div class="form-item"><label>' . bts('Transfer files only between', array(), NULL, 'boinc:account-preferences-computing') . '</label></div>'
+    '#value' => '<div class="form-item"><label>' . bts('Transfer files only between', array(), null, 'boinc:account-preferences-computing') . '</label></div>'
   );
   $form['prefs']['advanced']['network']['net_start_hour'] = array(
     '#type' => 'select',
@@ -462,7 +462,7 @@ 
     '#default_value' => $default['net_start_hour']
   );
   $form['prefs']['advanced']['network']['hour_delimiter'] = array(
-    '#value' => '<span>' . bts('and', array(), NULL, 'boinc:account-preference') . '</span>'
+    '#value' => '<span>' . bts('and', array(), null, 'boinc:account-preference') . '</span>'
   );
   $form['prefs']['advanced']['network']['net_end_hour'] = array(
     '#type' => 'select',
@@ -470,10 +470,10 @@ 
     '#default_value' => $default['net_end_hour']
   );
   $form['prefs']['advanced']['network']['hour_description'] = array(
-    '#value' => '<div class="form-item slim"><div class="description">' . bts('Transfer files only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing') . '</div></div>'
+    '#value' => '<div class="form-item slim"><div class="description">' . bts('Transfer files only during a particular period each day.', array(), null, 'boinc:account-preferences-computing') . '</div></div>'
   );
   $form['prefs']['advanced']['network']['daily_xfer_limit_mb'] = array(
-    '#title' => bts('Limit usage to', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Limit usage to', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'Mbytes',
     '#default_value' => $default['daily_xfer_limit_mb'],
@@ -482,18 +482,18 @@ 
   $form['prefs']['advanced']['network']['daily_xfer_period_days'] = array(
     '#field_prefix' => 'every',
     '#type' => 'textfield',
-    '#field_suffix' => bts('days', array(), NULL, 'boinc:unit-of-time'),
+    '#field_suffix' => bts('days', array(), null, 'boinc:unit-of-time'),
     '#default_value' => $default['daily_xfer_period_days'],
     '#size' => 1,
-    '#description' => bts('Example: BOINC should transfer at most 2000 MB of data every 30 days.', array(), NULL, 'boinc:account-preferences-computing'),
+    '#description' => bts('Example: BOINC should transfer at most 2000 MB of data every 30 days.', array(), null, 'boinc:account-preferences-computing'),
   );
   $form['prefs']['advanced']['network']['dont_verify_images'] = array(
-    '#title' => bts('Skip data verification for image files?', array(), NULL, 'boinc:account-preferences-computing'),
+    '#title' => bts('Skip data verification for image files?', array(), null, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['dont_verify_images'],
-    '#description' => bts('Only select "Yes" if your Internet provider modifies image files. Skipping verification reduces the security of BOINC.', array(), NULL, 'boinc:account-preferences-computing')
+    '#description' => bts('Only select "Yes" if your Internet provider modifies image files. Skipping verification reduces the security of BOINC.', array(), null, 'boinc:account-preferences-computing')
   );
 
   // The "fancy radios" are made via javascript on document load. In order for
@@ -526,27 +526,27 @@ 
   $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
+    '#value' => bts('Save changes', array(), null, 'boinc:form-save'),
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), drupal_get_path_alias("account/prefs/computing/edit")) . '</li>'
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), drupal_get_path_alias("account/prefs/computing/edit")) . '</li>'
   );
-  if ($venue AND $venue != 'generic') {
+  if ($venue and $venue != 'generic') {
     global $base_path;
     $form['prefs']['form control tabs']['#value'] .= '<li class="tab">' .
-      l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$venue}",
+      l(bts('Clear', array(), null, 'boinc:form-clear'), "account/prefs/computing/clear/{$venue}",
         array(
           'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/computing/combined')),
           'attributes' => array(
             'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the @name preference set. Are you sure?',
-              array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
+              array('@name' => $venue), null, 'boinc:account-preferences') . '\')'
           )
         )
       ) . '</li>';
   }
   $form['prefs']['view control'] = array(
-    '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/computing/combined') . '</li>'
+    '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), null, 'boinc:account-preferences') . ')', 'account/prefs/computing/combined') . '</li>'
   );
   $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
@@ -567,33 +567,33 @@ 
   // Verify all non-boolean user input values and notify form API of failures
 
   // Processing preferences
-  if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['idle_time_to_run']['#title']} [x] {$form['prefs']['advanced']['processor']['idle_time_to_run']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['start_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['start_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['end_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['end_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['max_ncpus_pct']['#title']} [x] {$form['prefs']['advanced']['processor']['max_ncpus_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_usage_limit']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_usage_limit']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['idle_time_to_run']['#title']} [x] {$form['prefs']['advanced']['processor']['idle_time_to_run']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['start_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['start_hour']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['end_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['end_hour']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['max_ncpus_pct']['#title']} [x] {$form['prefs']['advanced']['processor']['max_ncpus_pct']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_usage_limit']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_usage_limit']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
 
   // Storage preferences
-  if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_gb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_min_free_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_min_free_gb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_interval']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_interval']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['vm_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['vm_max_used_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_gb']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_min_free_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_min_free_gb']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_pct']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_interval']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_interval']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['vm_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['vm_max_used_pct']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
 
   // Network preferences
-  if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_min_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_min_days']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_additional_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_additional_days']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_down']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_down']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_up']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_up']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_start_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_start_hour']['#field_suffix']}"), NULL, 'boinc:account-prefrences-computing'));
-  if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_end_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_end_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_min_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_min_days']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_additional_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_additional_days']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_down']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_down']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_up']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_up']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_start_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_start_hour']['#field_suffix']}"), null, 'boinc:account-prefrences-computing'));
+  if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_end_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_end_hour']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
+  if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), null, 'boinc:account-preferences-computing'));
 }
 
 /**
@@ -653,7 +653,7 @@ 
     unset($prefs['@attributes']['preset']);
   }
   // Save the preset selection (or lack thereof)
-  if (!$preset OR $preset == 'custom') {
+  if (!$preset or $preset == 'custom') {
     $prefs['preset'] = 'custom';
   }
   else {
@@ -672,7 +672,7 @@ 
     watchdog('boincwork', 'Error updating global prefs for user @id: @message', array('@id' => $account->id, '@message' => mysqli_error()), WATCHDOG_ERROR);
     drupal_set_message(t('Your changes could not be saved. Please contact support!'), 'error');
   }
-  elseif (!drupal_get_messages('status', FALSE)) {
+  elseif (!drupal_get_messages('status', false)) {
     // Show this message if the set wasn't created automatically (in which case
     // there is a message tailored to that) {
     drupal_set_message(t('Your preferences have been updated.
@@ -706,7 +706,7 @@ 
   ));
   db_set_active('default');
   $current_host->task_count = boincwork_host_get_task_count($current_host->id);
-  $current_host->is_new = !$current_host->total_credit AND !$current_host->task_count;
+  $current_host->is_new = !$current_host->total_credit and !$current_host->task_count;
   // Get the list of all other hosts owned by this user for comparison
   db_set_active('boinc_ro');
   $all_other_hosts = db_query("
@@ -722,7 +722,7 @@ 
     // First, disqualify if hosts were active at the same time
     if (!$current_host->is_new) {
       $other_host->task_count = boincwork_host_get_task_count($other_host->id);
-      $other_host->is_new = !$other_host->total_credit AND !$other_host->task_count;
+      $other_host->is_new = !$other_host->total_credit and !$other_host->task_count;
       if (!$other_host->is_new) {
         // If both hosts being compared are not new, see if times overlap
         if (!times_disjoint($current_host, $other_host)) {
@@ -755,7 +755,7 @@ 
 /**
  * Perform the database updates to merge the old host into the new host
  */
-function boincwork_host_merge($old_host, $new_host, &$message = NULL) {
+function boincwork_host_merge($old_host, $new_host, &$message = null) {
   // Decay the average credit of the two hosts
   require_boinc('credit');
   $now = time();
@@ -781,7 +781,7 @@ 
       WATCHDOG_WARNING
     );
     $message = 'Could not merge due to a circular merge error. The site administrators have been contacted about this issue, and will investigate further.';
-    return FALSE;
+    return false;
   }
 
   if ($new_host->userid==0) {
@@ -795,7 +795,7 @@ 
       WATCHDOG_WARNING
     );
     $message = 'Could not merge because the target host has userid=0. The site administrators have been contacted about this issue, and will investigate further.';
-    return FALSE;
+    return false;
   }
 
   // Move credit from the old host to the new host
@@ -811,10 +811,10 @@ 
   );
   db_set_active('default');
   if (!$credit_updated) {
-    if ($message !== NULL) {
-      $message = bts('Could not update credit', array(), NULL, 'boinc:account-host-merge');
+    if ($message !== null) {
+      $message = bts('Could not update credit', array(), null, 'boinc:account-host-merge');
     }
-    return FALSE;
+    return false;
   }
 
   // Move results from the old host to the new host
@@ -827,10 +827,10 @@ 
   );
   db_set_active('default');
   if (!$results_updated) {
-    if ($message !== NULL) {
-      $message = bts('Could not update results', array(), NULL, 'boinc:account-host-merge');
+    if ($message !== null) {
+      $message = bts('Could not update results', array(), null, 'boinc:account-host-merge');
     }
-    return FALSE;
+    return false;
   }
 
   // Retire the old host
@@ -847,13 +847,13 @@ 
   );
   db_set_active('default');
   if (!$old_host_retired) {
-    if ($message !== NULL) {
-      $message = bts('Could not retire old computer', array(), NULL, 'boinc:account-host-merge');
+    if ($message !== null) {
+      $message = bts('Could not retire old computer', array(), null, 'boinc:account-host-merge');
     }
-    return FALSE;
+    return false;
   }
 
-  return TRUE;
+  return true;
 }
 
 /**
@@ -882,7 +882,7 @@ 
   $form['overview'] = array(
     '#value' => '<p>' . bts('Sometimes BOINC assigns separate identities to'
       . ' the same computer by mistake. You can correct this by merging old'
-      . ' identities with the newest one.', array(), NULL, 'boinc:account-host-merge') . '</p>'
+      . ' identities with the newest one.', array(), null, 'boinc:account-host-merge') . '</p>'
       . '<p>'
       . bts('Check the computers that are the same as @name'
       . ' (created on @date at @time with computer ID @id)',
@@ -892,7 +892,7 @@ 
           '@time' => date('G:i:s T', $current_host->create_time),
           '@id' => $current_host->id,
         ),
-        NULL, 'boinc:account-host-merge') . '</p>',
+        null, 'boinc:account-host-merge') . '</p>',
   );
 
   $options = array();
@@ -907,7 +907,7 @@ 
   $form['merge'] = array(
     '#title' => '',
     '#type' => 'tableselect',
-    '#header' => array(bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'), bts('Created', array(), NULL, 'boinc:host-details'), bts('Computer ID', array(), NULL, 'boinc:host-list')),
+    '#header' => array(bts('Name', array(), null, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'), bts('Created', array(), null, 'boinc:host-details'), bts('Computer ID', array(), null, 'boinc:host-list')),
     '#options' => $options,
   );
 
@@ -922,11 +922,11 @@ 
   $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Merge', array(), NULL, 'boinc:form-merge'),
+    '#value' => bts('Merge', array(), null, 'boinc:form-merge'),
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "host/{$host_id}") . '</li>'
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), "host/{$host_id}") . '</li>'
   );
 
   return $form;
@@ -964,7 +964,7 @@ 
   if ($merged) {
     // Generate a natural language list of IDs that were merged
     $oxford_comma = ',';
-    $conjunction = bts('and', array(), NULL, 'boinc:account-preference');
+    $conjunction = bts('and', array(), null, 'boinc:account-preference');
     $list = array_keys($merged);
     $last = array_pop($list);
     if ($list) {
@@ -983,7 +983,7 @@ 
           '@old_id' => $list,
           '@id' => $current_host_id
         ),
-        NULL, 'boinc:account-host-merge'));
+        null, 'boinc:account-host-merge'));
     }
     else {
       drupal_set_message(bts(
@@ -992,7 +992,7 @@ 
           '@old_ids' => $list,
           '@id' => $current_host_id
         ),
-        NULL, 'boinc:account-host-merge'));
+        null, 'boinc:account-host-merge'));
     }
   }
 
@@ -1005,7 +1005,7 @@ 
             '@old_id' => $id,
             '@message' => $error,
           ),
-          NULL, 'boinc:account-host-merge'),
+          null, 'boinc:account-host-merge'),
         'warning'
       );
     }
@@ -1026,7 +1026,7 @@ 
   global $user;
   $account = user_load($user->uid);
 
-  $established = TRUE;
+  $established = true;
 
   // Get availability of special BOINC preferences
   require_boinc(array('app_types'));
@@ -1037,26 +1037,26 @@ 
 
   // Take note if this is not an established preference set on the account
   if (isset($prefs['@attributes']['cleared'])) {
-    $established = FALSE;
+    $established = false;
   }
 
   // Extract modified tag if present
-  $modified = NULL;
+  $modified = null;
   if (isset($prefs['modified']['@value'])) {
     $modified = $prefs['modified']['@value'];
   }
 
-  $venue_is_default = FALSE;
+  $venue_is_default = false;
   if ($account->boincuser_default_pref_set) {
     if ($account->boincuser_default_pref_set == $venue) {
-      $venue_is_default = TRUE;
+      $venue_is_default = true;
     }
   }
-  elseif (!$venue OR $venue == 'generic') {
-    $venue_is_default = TRUE;
+  elseif (!$venue or $venue == 'generic') {
+    $venue_is_default = true;
   }
   else {
-    $venue_is_default = FALSE;
+    $venue_is_default = false;
   }
 
   // Define form defaults
@@ -1086,7 +1086,7 @@ 
   // Standard option sets
   $form['boolean_options'] = array(
     '#type' => 'value',
-    '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
+    '#value' => array(1 => bts('yes', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
   );
 
   // Identify preference sets that are established to distinguish what has been
@@ -1094,7 +1094,7 @@ 
   $form['#established'] = $established;
 
   // Top level form options
-  $form['#tree'] = TRUE;
+  $form['#tree'] = true;
 
   // Hidden elements
   $form['modified'] = array(
@@ -1112,87 +1112,87 @@ 
 
   // Common project preferences
   $form['resource'] = array(
-    '#title' => bts('Resource settings', array(), NULL, 'boinc:account-preferences-project'),
+    '#title' => bts('Resource settings', array(), null, 'boinc:account-preferences-project'),
     '#type' => 'fieldset',
     '#description' => null,
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE
+    '#collapsible' => true,
+    '#collapsed' => false
   );
   $form['resource']['resource_share'] = array(
-    '#title' => bts('Resource share', array(), NULL, 'boinc:account-preferences-project'),
+    '#title' => bts('Resource share', array(), null, 'boinc:account-preferences-project'),
     '#type' => 'textfield',
     '#default_value' => $default['resource_share'],
     '#size' => 5,
-    '#description' => bts("Determines the proportion of your computer's resources allocated to this project. Example: if you participate in two BOINC projects with resource shares of 100 and 200, the first will get 1/3 of your resources and the second will get 2/3.", array(), NULL, 'boinc:account-preferences-project')
+    '#description' => bts("Determines the proportion of your computer's resources allocated to this project. Example: if you participate in two BOINC projects with resource shares of 100 and 200, the first will get 1/3 of your resources and the second will get 2/3.", array(), null, 'boinc:account-preferences-project')
   );
   if ($app_types->count > 1) {
     if ($app_types->cpu) {
       $form['resource']['no_cpu'] = array(
-        '#title' => bts('Use CPU', array(), NULL, 'boinc:account-preferences-project'),
+        '#title' => bts('Use CPU', array(), null, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_cpu'] ? 0 : 1,
-        '#description' => bts('Request CPU-only tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
+        '#description' => bts('Request CPU-only tasks from this project.', array(), null, 'boinc:account-preferences-project')
       );
     }
     if ($app_types->cuda) {
       $form['resource']['no_cuda'] = array(
-        '#title' => bts('Use NVIDIA GPU', array(), NULL, 'boinc:account-preferences-project'),
+        '#title' => bts('Use NVIDIA GPU', array(), null, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_cuda'] ? 0 : 1,
-        '#description' => bts('Request NVIDIA GPU tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
+        '#description' => bts('Request NVIDIA GPU tasks from this project.', array(), null, 'boinc:account-preferences-project')
       );
     }
     if ($app_types->ati) {
       $form['resource']['no_ati'] = array(
-        '#title' => bts('Use AMD GPU', array(), NULL, 'boinc:account-preferences-project'),
+        '#title' => bts('Use AMD GPU', array(), null, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_ati'] ? 0 : 1,
-        '#description' => bts('Request AMD GPU tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
+        '#description' => bts('Request AMD GPU tasks from this project.', array(), null, 'boinc:account-preferences-project')
       );
     }
     if ($app_types->intel_gpu) {
       $form['resource']['no_intel_gpu'] = array(
-        '#title' => bts('Use INTEL GPU', array(), NULL, 'boinc:account-preferences-project'),
+        '#title' => bts('Use INTEL GPU', array(), null, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_intel_gpu'] ? 0 : 1,
-        '#description' => bts('Request Intel GPU tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
+        '#description' => bts('Request Intel GPU tasks from this project.', array(), null, 'boinc:account-preferences-project')
       );
     }
     if ($app_types->apple_gpu) {
       $form['resource']['no_apple_gpu'] = array(
-        '#title' => bts('Use Apple GPU', array(), NULL, 'boinc:account-preferences-project'),
+        '#title' => bts('Use Apple GPU', array(), null, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_apple_gpu'] ? 0 : 1,
-        '#description' => bts('Request Apple GPU tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
+        '#description' => bts('Request Apple GPU tasks from this project.', array(), null, 'boinc:account-preferences-project')
       );
     }
   }
 
-  if (variable_get('boinc_prefs_options_beta', FALSE)) {
+  if (variable_get('boinc_prefs_options_beta', false)) {
     $form['beta'] = array(
-      '#title' => bts('Beta settings', array(), NULL, 'boinc:account-preferences-project'),
+      '#title' => bts('Beta settings', array(), null, 'boinc:account-preferences-project'),
       '#type' => 'fieldset',
       '#description' => null,
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE
+      '#collapsible' => true,
+      '#collapsed' => false
     );
     $form['beta']['allow_beta_work'] = array(
-      '#title' => bts('Run test applications?', array(), NULL, 'boinc:account-preferences-project'),
+      '#title' => bts('Run test applications?', array(), null, 'boinc:account-preferences-project'),
       '#type' => 'radios',
       '#options' => $form['boolean_options']['#value'],
       '#attributes' => array('class' => 'fancy'),
       '#default_value' => ($default['allow_beta_work']) ? 1 : 0,
-      '#description' => bts('This helps us develop applications, but may cause jobs to fail on your computer', array(), NULL, 'boinc:account-preferences-project')
+      '#description' => bts('This helps us develop applications, but may cause jobs to fail on your computer', array(), null, 'boinc:account-preferences-project')
     );
   }
 
@@ -1201,14 +1201,14 @@ 
 
   // Set whether to use this preference set by default for new computers
   $form['default_set'] = array(
-    '#title' => bts('Default set', array(), NULL, 'boinc:account-preferences-project'),
+    '#title' => bts('Default set', array(), null, 'boinc:account-preferences-project'),
     '#type' => 'fieldset',
     '#description' => null,
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE
+    '#collapsible' => true,
+    '#collapsed' => false
   );
   $form['default_set']['default_venue'] = array(
-    '#title' => bts('Set used for new computers', array(), NULL, 'boinc:account-preferences-project'),
+    '#title' => bts('Set used for new computers', array(), null, 'boinc:account-preferences-project'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
@@ -1227,27 +1227,27 @@ 
   $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
+    '#value' => bts('Save changes', array(), null, 'boinc:form-save'),
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), $_GET['q']) . '</li>'
   );
-  if ($venue AND $venue != 'generic') {
+  if ($venue and $venue != 'generic') {
     global $base_path;
     $form['prefs']['form control tabs']['#value'] .= '<li class="tab">' .
-      l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$venue}",
+      l(bts('Clear', array(), null, 'boinc:form-clear'), "account/prefs/project/clear/{$venue}",
         array(
           'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/project/combined')),
           'attributes' => array(
             'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the @name preference set. Are you sure?',
-              array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
+              array('@name' => $venue), null, 'boinc:account-preferences') . '\')'
           )
         )
       ) . '</li>';
   }
   $form['prefs']['view control'] = array(
-      '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project/combined') . '</li>'
+      '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), null, 'boinc:account-preferences') . ')', 'account/prefs/project/combined') . '</li>'
   );
   $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
@@ -1267,7 +1267,7 @@ 
   $ordered_array = array();
   $unordered_array = array();
   foreach ($xml['project_specific_preferences'] as $type => $element) {
-    if (is_array($element) AND is_numeric(key($element))) {
+    if (is_array($element) and is_numeric(key($element))) {
       foreach ($element as $ordered_element) {
         if (isset($ordered_element['@position'])) {
           $ordered_array[$ordered_element['@position']] = array($type => $ordered_element);
@@ -1319,7 +1319,7 @@ 
   // Check for app validation
   if (isset($validation_rules['apps'])) {
     if (isset($validation_rules['apps']['minimum selected'])
-        AND $validation_rules['apps']['minimum selected'] > 0) {
+        and $validation_rules['apps']['minimum selected'] > 0) {
       $apps_selected = 0;
       foreach ($validation_rules['apps']['list'] as $app) {
         if ($form_state['values']['applications'][$app]) $apps_selected++;
@@ -1327,14 +1327,14 @@ 
       if ($apps_selected < $validation_rules['apps']['minimum selected']) {
         form_set_error(
           'applications',
-          bts('At least one application must be selected', array(), NULL, 'boinc:account-preferences-project')
+          bts('At least one application must be selected', array(), null, 'boinc:account-preferences-project')
         );
       }
       if ($apps_selected == count($validation_rules['apps']['list'])) {
         foreach ($validation_rules['apps']['list'] as $app) {
           unset($form_state['values']['applications'][$app]);
         }
-        $form_state['storage']['all apps selected'] = TRUE;
+        $form_state['storage']['all apps selected'] = true;
       }
     }
   }
@@ -1368,7 +1368,7 @@ 
   }
 
   // Beta preferences
-  if (variable_get('boinc_prefs_options_beta', FALSE)) {
+  if (variable_get('boinc_prefs_options_beta', false)) {
     $prefs['allow_beta_work'] = ($edit['beta']['allow_beta_work']) ? 1 : 0;
   }
 
@@ -1406,7 +1406,7 @@ 
     watchdog('boincwork', 'Error updating project prefs for user @id: @message', array('@id' => $user->id, '@message' => mysqli_error()), WATCHDOG_ERROR);
     drupal_set_message(t('Your changes could not be saved. Please contact support!'), 'error');
   }
-  elseif (!drupal_get_messages('status', FALSE)) {
+  elseif (!drupal_get_messages('status', false)) {
     // Show this message if the set wasn't created automatically (in which case
     // there is a message tailored to that)
     drupal_set_message(t('Your preferences have been updated.
@@ -1441,31 +1441,31 @@ 
   // Standard option sets
   $form['boolean_options'] = array(
     '#type' => 'value',
-    '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
+    '#value' => array(1 => bts('yes', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
   );
 
   $default = array(
     'pm_send_notification' => '', // This is set already in pm_email_notify_user
     'friend_notification' => isset($account->friend_notification) ? $account->friend_notification : 0,
-    'comments_per_page' => (isset($account->comments_per_page) AND $account->comments_per_page) ? $account->comments_per_page : variable_get('comment_default_per_page_forum', 50),
-    'comments_order' => (isset($account->sort) AND $account->sort) ? $account->sort : variable_get('comment_default_order_forum', COMMENT_ORDER_OLDEST_FIRST),
+    'comments_per_page' => (isset($account->comments_per_page) and $account->comments_per_page) ? $account->comments_per_page : variable_get('comment_default_per_page_forum', 50),
+    'comments_order' => (isset($account->sort) and $account->sort) ? $account->sort : variable_get('comment_default_order_forum', COMMENT_ORDER_OLDEST_FIRST),
   );
 
   // General options
   $form['general'] = array(
     '#type' => 'fieldset',
-    '#title' => bts('General settings', array(), NULL, 'boinc:account-preferences-community'),
+    '#title' => bts('General settings', array(), null, 'boinc:account-preferences-community'),
     '#weight' => 0,
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE
+    '#collapsible' => true,
+    '#collapsed' => false
   );
   // Add the BOINC user name (non-unique, user editable)
   $form['general']['boincuser_name'] = array(
     '#type' => 'textfield',
-    '#title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
+    '#title' => bts('Name', array(), null, 'boinc:user-or-team-name'),
     '#default_value' => $account->boincuser_name,
     '#maxlength' => USERNAME_MAX_LENGTH,
-    '#required' => TRUE,
+    '#required' => true,
     '#description' => '',
     '#size' => 40
   );
@@ -1474,8 +1474,8 @@ 
     $zones = _system_zonelist();
     $form['general']['timezone'] = array(
       '#type' => 'select',
-      '#title' => bts('Time zone', array(), NULL, 'boinc:account-preferences-community'),
-      '#default_value' => ($account->timezone !== NULL) ? $account->timezone : variable_get('date_default_timezone', 0),
+      '#title' => bts('Time zone', array(), null, 'boinc:account-preferences-community'),
+      '#default_value' => ($account->timezone !== null) ? $account->timezone : variable_get('date_default_timezone', 0),
       '#options' => $zones,
       '#description' => '',
     );
@@ -1484,10 +1484,10 @@ 
   // Notification options
   $form['notifications'] = array(
     '#type' => 'fieldset',
-    '#title' => bts('Notification settings', array(), NULL, 'boinc:account-preferences-community'),
+    '#title' => bts('Notification settings', array(), null, 'boinc:account-preferences-community'),
     '#weight' => 5,
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE
+    '#collapsible' => true,
+    '#collapsed' => false
   );
   // Pull in private message notification handling and tweak the form
   $pm_notify = pm_email_notify_user('form', $edit, $account, 'account');
@@ -1495,7 +1495,7 @@ 
     $pm_notify['enable_pm_mail']['pm_send_notifications'],
     array(
       '#type' => 'radios',
-      '#title' => bts('Receive email notification for private messages?', array(), NULL, 'boinc:account-preferences-community'),
+      '#title' => bts('Receive email notification for private messages?', array(), null, 'boinc:account-preferences-community'),
       '#description' => ' ',
       '#options' => $form['boolean_options']['#value'],
       '#attributes' => array('class' => 'fancy')
@@ -1503,9 +1503,9 @@ 
   );
   $form['notifications']['friend_notification'] = array(
     '#type' => 'radios',
-    '#title' => bts('Receive email notification for friend requests?', array(), NULL, 'boinc:account-preferences-community'),
+    '#title' => bts('Receive email notification for friend requests?', array(), null, 'boinc:account-preferences-community'),
     '#description' => ' ',
-    '#options' => array(0 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), -1 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
+    '#options' => array(0 => bts('yes', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), -1 => bts('no', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['friend_notification']
   );
@@ -1521,10 +1521,10 @@ 
     }
     $form['locale'] = array(
       '#type' => 'fieldset',
-      '#title' => bts('Language settings', array(), NULL, 'boinc:account-preferences-community'),
+      '#title' => bts('Language settings', array(), null, 'boinc:account-preferences-community'),
       '#weight' => 10,
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE,
+      '#collapsible' => true,
+      '#collapsed' => false,
     );
 
     // Get language negotiation settings.
@@ -1532,30 +1532,30 @@ 
     $user_preferred_language = user_preferred_language($account);
     $form['locale']['language'] = array(
       '#type' => 'select',
-      '#title' => bts('Language', array(), NULL, 'boinc:account-preferences-community'),
+      '#title' => bts('Language', array(), null, 'boinc:account-preferences-community'),
       '#default_value' => check_plain($user_preferred_language->language),
       '#options' => $names,
-      '#description' => ($mode == LANGUAGE_NEGOTIATION_PATH) ? bts("This account's default language for e-mails and preferred language for site presentation.", array(), NULL, 'boinc:account-preferences-community') : bts("This account's default language for e-mails.", array(), NULL, 'boinc:account-preferences-community'),
+      '#description' => ($mode == LANGUAGE_NEGOTIATION_PATH) ? bts("This account's default language for e-mails and preferred language for site presentation.", array(), null, 'boinc:account-preferences-community') : bts("This account's default language for e-mails.", array(), null, 'boinc:account-preferences-community'),
     );
   }
 
   // Avatar options
   $form['gravatar'] = array(
     '#type' => 'item',
-    '#value' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, it will be used for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), NULL, 'boinc:account-preferences-community'),
-    '#description' => bts('Your Gravatar will not be shown if you upload a user picture.', array(), NULL, 'boinc:account-preferences-community'),
+    '#value' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, it will be used for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), null, 'boinc:account-preferences-community'),
+    '#description' => bts('Your Gravatar will not be shown if you upload a user picture.', array(), null, 'boinc:account-preferences-community'),
   );
   if (user_access('disable own gravatar', $account)) {
     $form['gravatar'] = array(
       '#type' => 'checkbox',
-      '#title' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, use it for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), NULL, 'boinc:account-preferences-community'),
-      '#description' => bts('Gravatar will not be shown if an avatar is uploaded.', array(), NULL, 'boinc:account-preferences-community'),
+      '#title' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, use it for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), null, 'boinc:account-preferences-community'),
+      '#description' => bts('Gravatar will not be shown if an avatar is uploaded.', array(), null, 'boinc:account-preferences-community'),
       '#default_value' => isset($account->gravatar) ? $account->gravatar : 0,
       '#disabled' => !empty($account->picture),
     );
   }
   $form['gravatar']['#weight'] = 15;
-  $form['gravatar']['#prefix'] = '<fieldset class="collapsible"><legend><a href="#">' . bts('Avatar settings', array(), NULL, 'boinc:account-preferences-community') . '</a></legend>';
+  $form['gravatar']['#prefix'] = '<fieldset class="collapsible"><legend><a href="#">' . bts('Avatar settings', array(), null, 'boinc:account-preferences-community') . '</a></legend>';
   // Upload an avatar (pulled from profile_node_form):
   if (!empty($profile_form['field_image'])) {
     $form['field_image'] = $profile_form['field_image'];
@@ -1564,46 +1564,46 @@ 
     $form['field_image'] = array(
       '#value' => '<div class="form-item">'
         . '<label class="placeholder">'
-        . bts('This is not available until your profile is set up.', array(), NULL, 'boinc:account-preferences-community')
+        . bts('This is not available until your profile is set up.', array(), null, 'boinc:account-preferences-community')
         . '</label>'
-        . l(bts('Create a profile', array(), NULL, 'boinc:account-preferences-community'), 'account/profile/edit', array('attributes' => array('class' => 'form-link')))
+        . l(bts('Create a profile', array(), null, 'boinc:account-preferences-community'), 'account/profile/edit', array('attributes' => array('class' => 'form-link')))
         . '</div>',
     );
   }
-  $form['field_image'][0]['#title'] = bts('Upload an avatar', array(), NULL, 'boinc:account-preferences-community');
+  $form['field_image'][0]['#title'] = bts('Upload an avatar', array(), null, 'boinc:account-preferences-community');
   $form['field_image']['#weight'] = 20;
   $form['field_image']['#suffix'] = '</fieldset>';
 
   // Forum options
   $form['forums'] = array(
     '#type' => 'fieldset',
-    '#title' => bts('Forum settings', array(), NULL, 'boinc:account-preferences-community'),
+    '#title' => bts('Forum settings', array(), null, 'boinc:account-preferences-community'),
     '#weight' => 25,
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE
+    '#collapsible' => true,
+    '#collapsed' => false
   );
   $form['forums']['comments_per_page'] = array(
     '#type' => 'select',
-    '#title' => bts('In discussion topics, show at most @comments_per_page', array('@comments_per_page' => ''), NULL, 'boinc:account-preferences-community'),
+    '#title' => bts('In discussion topics, show at most @comments_per_page', array('@comments_per_page' => ''), null, 'boinc:account-preferences-community'),
     '#options' => array(10 => 10, 20 => 20, 30 => 30, 50 => 50, 100 => 100),
     '#default_value' => $default['comments_per_page']
   );
   // Can't have a typical Drupal form suffix on a select box?
   $form['forums']['comments_per_page_suffix'] = array(
-    '#value' => '<span>' . bts('comments per page', array(), NULL, 'boinc:account-preferences-community') . '</span>'
+    '#value' => '<span>' . bts('comments per page', array(), null, 'boinc:account-preferences-community') . '</span>'
   );
   $form['forums']['comments_order'] = array(
     '#type' => 'select',
-    '#title' => bts('Sort comments in discussions', array(), NULL, 'boinc:account-preferences-community'),
-    '#options' => array(1 => bts('Newest post first', array(), NULL, 'boinc:account-preferences-community'), 2 => bts('Oldest post first', array(), NULL, 'boinc:account-preferences-community')),
+    '#title' => bts('Sort comments in discussions', array(), null, 'boinc:account-preferences-community'),
+    '#options' => array(1 => bts('Newest post first', array(), null, 'boinc:account-preferences-community'), 2 => bts('Oldest post first', array(), null, 'boinc:account-preferences-community')),
     '#default_value' => $default['comments_order']
   );
   // Signature (pulled from user_edit_form):
   if (variable_get('user_signatures', 0) && module_exists('comment')) {
     $form['forums']['signature'] = array(
       '#type' => 'textarea',
-      '#title' => bts('Signature', array(), NULL, 'boinc:account-preferences-community'),
-      '#description' => bts('Your signature will be publicly displayed at the end of your comments.', array(), NULL, 'boinc:account-preferences-community'),
+      '#title' => bts('Signature', array(), null, 'boinc:account-preferences-community'),
+      '#description' => bts('Your signature will be publicly displayed at the end of your comments.', array(), null, 'boinc:account-preferences-community'),
       '#default_value' => $account->signature
       );
     // Prevent a "validation error" message when the user attempts to save with a default value they
@@ -1612,11 +1612,11 @@ 
       drupal_set_message(t("The signature input format has been set to a format you don't have access to. It will be changed to a format you have access to when you save this page."));
       $edit['signature_format'] = FILTER_FORMAT_DEFAULT;
     }
-    $form['forums']['signature_format'] = filter_form($account->signature_format, NULL, array('signature_format'));
+    $form['forums']['signature_format'] = filter_form($account->signature_format, null, array('signature_format'));
     // Optionally hide signatures from comments
     $form['forums']['hide_signatures'] = array(
       '#type' => 'radios',
-      '#title' => bts('Hide signatures in forums', array(), NULL, 'boinc:account-preferences-community'),
+      '#title' => bts('Hide signatures in forums', array(), null, 'boinc:account-preferences-community'),
       '#description' => ' ',
       '#options' => $form['boolean_options']['#value'],
       '#attributes' => array('class' => 'fancy'),
@@ -1638,12 +1638,12 @@ 
   $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
+    '#value' => bts('Save changes', array(), null, 'boinc:form-save'),
     '#suffix' => '</li>',
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), $_GET['q']) . '</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -1673,7 +1673,7 @@ 
       form_set_error('boincuser_name',
         bts('You may not use username @blname, as that name is not allowed. Please choose another name.',
             array('@blname' => $edit['boincuser_name']),
-            NULL, 'boinc:account-preferences-community'));
+            null, 'boinc:account-preferences-community'));
       return false;
     }
   }
@@ -1709,7 +1709,7 @@ 
     $profile_node->field_image = $edit['field_image'];
     node_save($profile_node);
     // Flush this from the node cache or changes won't show up immediately!
-    $profile_node = node_load($profile_node->nid, NULL, TRUE);
+    $profile_node = node_load($profile_node->nid, null, true);
   }
 
   // All other settings
@@ -1738,7 +1738,7 @@ 
   }
   user_save($user, $settings);
 
-  drupal_set_message(bts('Your community preferences have been updated.', array(), NULL, 'boinc:account-preferences-community'));
+  drupal_set_message(bts('Your community preferences have been updated.', array(), null, 'boinc:account-preferences-community'));
 
   // Form will not redirect if storage is set; not good if language changes
   unset($form_state['storage']);
@@ -1772,26 +1772,26 @@ 
   // Standard option sets
   $form['boolean_options'] = array(
     '#type' => 'value',
-    '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
+    '#value' => array(1 => bts('yes', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes'))
   );
 
   $form['privacy'] = array(
-    '#title' => bts('Privacy settings', array(), NULL, 'boinc:account-preferences-privacy'),
+    '#title' => bts('Privacy settings', array(), null, 'boinc:account-preferences-privacy'),
     '#type' => 'fieldset',
     '#description' => null,
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE
+    '#collapsible' => true,
+    '#collapsed' => false
   );
   $form['privacy']['send_email'] = array(
-    '#title' => bts('Is it OK for @project and your team (if any) to email you?', array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:account-preferences-privacy'),
+    '#title' => bts('Is it OK for @project and your team (if any) to email you?', array('@project' => variable_get('site_name', 'Drupal-BOINC')), null, 'boinc:account-preferences-privacy'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['privacy']['send_email']
   );
   $form['privacy']['show_hosts'] = array(
-    '#title' => bts('Should @project show your computers on its website?', array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:account-preferences-privacy'),
-    '#description' => bts('At times, you may be asked to enable this option in order to receive help from the forums. Advanced users may need to be able to inspect your computers\' information in order to help diagnose any problems.', array(), NULL, 'boinc:account-preferences-privacy'),
+    '#title' => bts('Should @project show your computers on its website?', array('@project' => variable_get('site_name', 'Drupal-BOINC')), null, 'boinc:account-preferences-privacy'),
+    '#description' => bts('At times, you may be asked to enable this option in order to receive help from the forums. Advanced users may need to be able to inspect your computers\' information in order to help diagnose any problems.', array(), null, 'boinc:account-preferences-privacy'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
@@ -1806,7 +1806,7 @@ 
     // Set name to 'privacyconsent_SHORTNAME', which can be parsed
     // later in the submit function.
     $form['privacy']['privacyconsent_'.$ct['shortname']] = array(
-      '#title' => bts($ct['description'], array(), NULL, 'boinc:account-preferences-privacy'),
+      '#title' => bts($ct['description'], array(), null, 'boinc:account-preferences-privacy'),
       '#type' => 'radios',
       '#options' => $form['boolean_options']['#value'],
       '#attributes' => array('class' => 'fancy'),
@@ -1820,28 +1820,28 @@ 
       $form['privacy']['privacyconsent_'.$ct['shortname']]['#description'] = bts('See our !privacy_policy_link for the current list of statistics exports.',
       array(
         '!privacy_policy_link' => l(
-          bts('privacy policy', array(), NULL, 'boinc:account-preferences-privacy'),
+          bts('privacy policy', array(), null, 'boinc:account-preferences-privacy'),
           '/privacy'
         )
       ),
-      NULL, 'boinc:account-preferences-privacy');
+      null, 'boinc:account-preferences-privacy');
     }
   }
 
   // Ignore and block users
   if (module_exists('ignore_user')) {
     $form['ignoreblock'] = array(
-      '#title' => bts('Ignore Users', array(), NULL, 'boinc:account-preferences-privacy'),
+      '#title' => bts('Ignore Users', array(), null, 'boinc:account-preferences-privacy'),
       '#type' => 'fieldset',
-      '#description' => bts('<p>You may ignore users in the forums and block users from sending you private messages.<p>', array(), NULL, 'boinc:ignore-user-help'),
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE
+      '#description' => bts('<p>You may ignore users in the forums and block users from sending you private messages.<p>', array(), null, 'boinc:ignore-user-help'),
+      '#collapsible' => true,
+      '#collapsed' => false
     );
 
     // Table for ignored users
     $form['ignoreblock']['current_ignore_section'] = array(
       '#type' => 'item',
-      '#value' => bts('Current users on your Ignore List', array(), NULL, 'boinc:ignore-user-list'),
+      '#value' => bts('Current users on your Ignore List', array(), null, 'boinc:ignore-user-list'),
       '#prefix' => '<h4>',
       '#suffix' => '</h4>',
       '#weight' => -20,
@@ -1854,18 +1854,18 @@ 
       );
       $form['ignoreblock']['delete'][$ignored_user['iuid']] = array(
         '#value' => l(
-          bts('delete', array(), NULL, 'boinc:ignore-user-delete-button'),
+          bts('delete', array(), null, 'boinc:ignore-user-delete-button'),
           'account/prefs/privacy/ignore_user/remove/'. $ignored_user['iuid'],
           array()
         ),
       );
     }
-    $form['ignoreblock']['pager'] = array('#value' => theme('pager', NULL, 10, 0));
+    $form['ignoreblock']['pager'] = array('#value' => theme('pager', null, 10, 0));
 
     // Sub-form to add user to ignore list
     $form['ignoreblock']['add_ignore_user_section'] = array(
       '#type' => 'item',
-      '#value' => bts('Add user to Ignore List', array(), NULL, 'boinc:ignore-user-add'),
+      '#value' => bts('Add user to Ignore List', array(), null, 'boinc:ignore-user-add'),
       '#prefix' => '<h4>',
       '#suffix' => '</h4>',
       '#weight' => 10,
@@ -1873,8 +1873,8 @@ 
 
     $form['ignoreblock']['addusername_toignorelist'] = array(
       '#type' => 'textfield',
-      '#title' => bts('Username', array(), NULL, 'boinc:ignore-user-searchbox'),
-      '#description' => bts('To lookup a username start typing in the search box. A list of usernames will appear as you type. The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.', array(), NULL, 'boinc:ignore-user-searchbox-help'),
+      '#title' => bts('Username', array(), null, 'boinc:ignore-user-searchbox'),
+      '#description' => bts('To lookup a username start typing in the search box. A list of usernames will appear as you type. The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.', array(), null, 'boinc:ignore-user-searchbox-help'),
       '#weight' => 11,
       '#size' => 50,
       '#autocomplete_path' => 'boincuser/autocomplete',
@@ -1882,7 +1882,7 @@ 
 
     $form['ignoreblock']['addusername_submit'] = array(
       '#type' => 'submit',
-      '#value' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
+      '#value' => bts('Ignore user', array(), null, 'boinc:ignore-user-add'),
       '#submit' => array('_boincwork_ignore_list_form_submit'),
       '#weight' => 12,
       '#attributes' => array('class' => 'add_ignore_user'),
@@ -1900,13 +1900,13 @@ 
   $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
+    '#value' => bts('Save changes', array(), null, 'boinc:form-save'),
     '#validate' => array('boincwork_privacyprefs_form_validate'),
     '#submit' => array('boincwork_privacyprefs_form_submit'),
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), $_GET['q']) . '</li>'
   );
   $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
@@ -1924,8 +1924,8 @@ 
   $output .= drupal_render($form['privacy']);
 
   $header = array(
-    bts('Username', array(), NULL, 'boinc:ignore-user-list'),
-    bts('Operations', array(), NULL, 'boinc:ignore-user-list')
+    bts('Username', array(), null, 'boinc:ignore-user-list'),
+    bts('Operations', array(), null, 'boinc:ignore-user-list')
   );
 
   $rows = array();
@@ -1940,7 +1940,7 @@ 
   else {
     $rows[] = array(
       array(
-        'data' => bts('You have not added any users to your Ignore List.', array(), NULL, 'boinc:ignore-user-list'),
+        'data' => bts('You have not added any users to your Ignore List.', array(), null, 'boinc:ignore-user-list'),
         'colspan' => '2',
       )
     );
@@ -2019,9 +2019,9 @@ 
     bts('@username has been added to your ignore list. See your !privacy_preferences for more details.',
       array(
         '@username' => $form_state['values']['addusername_toignorelist'],
-        '!privacy_preferences' => l(bts('privacy preferences', array(), NULL, 'boinc:ignore-user-add'), 'account/prefs/privacy'),
+        '!privacy_preferences' => l(bts('privacy preferences', array(), null, 'boinc:ignore-user-add'), 'account/prefs/privacy'),
       ),
-      NULL, 'boinc:ignore-user-add'),
+      null, 'boinc:ignore-user-add'),
     'status');
 }
 
@@ -2046,7 +2046,7 @@ 
   // only non-js users/browsers will see the Apply Filter button.
   $form['submit'] = array(
     '#type' => 'submit',
-    '#value' => bts('Apply Filter', array(), NULL, 'boinc:form-save'),
+    '#value' => bts('Apply Filter', array(), null, 'boinc:form-save'),
     '#attributes' => array('class' => 'js-hide',),
   );
 

drupal/sites/default/boinc/modules/boincteam/includes/boincteam.forms.inc

Spacing +14 added lines, -14 removed lines

@@ -119,7 +119,7 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>'
   );
   
   return $form;
@@ -163,7 +163,7 @@ 
   
   // Create the team in the BOINC db
   
-  require_boinc(array('user','team'));
+  require_boinc(array('user', 'team'));
   $boinc_team = make_team(
     $account->boincuser_id,
     $values['name'],
@@ -199,10 +199,10 @@ 
     'teaser' => $teaser,
     'uid' => $user->uid,
     'path' => null,
-    'status' => 1,  // published or not - always publish
+    'status' => 1, // published or not - always publish
     'promote' => 0,
     'created' => $created_time,
-    'comment' => 0,  // comments disabled
+    'comment' => 0, // comments disabled
     'moderate' => 0,
     'sticky' => 0,
     'format' => $input_format
@@ -229,7 +229,7 @@ 
   $node['og_private'] = 0;
   */
   
-  $node = (object) $node; // node_save requires an object form
+  $node = (object)$node; // node_save requires an object form
   
   /*
   $node->field_description[]['value'] = $boincteam->description;
@@ -379,12 +379,12 @@ 
       '#suffix' => '</li>',
     );
     $form['form control tabs'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)).'</li>'
     );
   }
   else {
     $form['description'] = array(
-      '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
+      '#prefix' => '<div class="form-item"><label>'.bts('Description', array(), NULL, 'boinc:team-description').':</label></div><div class="form-item">',
       '#value' => $default['description'],
       '#suffix' => '</div>',
     );
@@ -540,7 +540,7 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)).'</li>'
   );
   
   //$form['#redirect'] = "community/teams/{$team_id}";
@@ -656,7 +656,7 @@ 
   drupal_set_title($mytitle);
 
   $form['emailteam']['header'] = array(
-    '#value'              => '<h1>' . $mytitle . '</h1>',
+    '#value'              => '<h1>'.$mytitle.'</h1>',
     '#weight'             => '-10',
     '#prefix'             => "<div id='sendmessageteammembers-header'>",
     '#suffix'             => "</div>",
@@ -778,7 +778,7 @@ 
   }
 
   // Check body
-  if ( ($message['body'] === NULL || $message['body'] === '') ) {
+  if (($message['body'] === NULL || $message['body'] === '')) {
     form_set_error('body',
       bts('Not allowed to send an empty message.', array(), NULL, 'boinc:team-message-form')
     );
@@ -803,8 +803,8 @@ 
   global $base_path;
 
   $suid = $form_state['values']['_senderuid'];
-  $account = user_load(array('uid' => $suid ));
-  $site_url = $base_url . $base_path . "messages/new/" . $suid;
+  $account = user_load(array('uid' => $suid));
+  $site_url = $base_url.$base_path."messages/new/".$suid;
 
   // Form is validated, now send to all team members. Lookup boinc
   // id of all team members, and then use user_load() to load user
@@ -815,7 +815,7 @@ 
   // emails removed.
   $member_emails = _boincteam_emails($boinc_id);
   // Remove sender's email address, unless selfsend is true.
-  if ( !$form_state['values']['selfsend'] ) {
+  if (!$form_state['values']['selfsend']) {
     $pos = array_search($account->mail, $member_emails);
     unset($member_emails[$pos]);
   }
@@ -839,7 +839,7 @@ 
 
   $om = bts(
     'Sent your email message to !number team members.',
-    array( '!number' => count($member_emails) ),
+    array('!number' => count($member_emails)),
     'NULL',
     'boinc:team-message-sent'
   );

Braces +11 added lines, -22 removed lines

@@ -135,8 +135,7 @@ 
   
   if (!$name) {
     form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+  } else {
     require_boinc('boinc_db');
     if (BoincTeam::lookup_name($name)) {
       form_set_error('name', bts('A team named "@name" already exists.',
@@ -177,8 +176,7 @@ 
   if ($boinc_team) {
     $boinc_user = BoincUser::lookup_id($account->boincuser_id);
     user_join_team($boinc_team, $boinc_user);
-  }
-  else {
+  } else {
     drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT)));
     rules_invoke_event('boincteam_create_team_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
@@ -212,8 +210,7 @@ 
   if (module_exists('pathauto')) {
     module_load_include('inc', 'pathauto', 'pathauto');
     $node['path'] = pathauto_cleanstring($values['name']);
-  }
-  else {
+  } else {
     drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT)));
     rules_invoke_event('boincteam_create_team_nopathauto_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('BOINC team', 'BOINC teams require the Pathauto module. Teams
@@ -381,8 +378,7 @@ 
     $form['form control tabs'] = array(
       '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
     );
-  }
-  else {
+  } else {
     $form['description'] = array(
       '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
       '#value' => $default['description'],
@@ -412,12 +408,10 @@ 
   
   if ($form_state['storage']['is_boinc_wide']) {
     form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+  } else {
     if (!$name) {
       form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
-    }
-    else {
+    } else {
       $team = node_load($form_state['storage']['team_id']);
       if ($name != $team->title) {
         // If changing the name ("title" in Drupal terms), check that the new name is available
@@ -559,8 +553,7 @@ 
   
   if (!$values['username']) {
     form_set_error('username', bts('BOINC username is required.', array(), NULL, 'boinc:team-add-admin'));
-  }
-  else {
+  } else {
     // Load user account associated with username
     $account = boincuser_privatemsg_name_lookup($values['username']);
     // Validate the account
@@ -570,24 +563,21 @@ 
           '@username' => $account->boincuser_name
         ),
       NULL, 'boinc:team-add-admin'));
-    }
-    elseif (boincteam_is_founder($team_id, $account->uid)) {
+    } elseif (boincteam_is_founder($team_id, $account->uid)) {
       form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
         array(
           '@user' => $account->boincuser_name,
           '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
-    }
-    elseif (boincteam_is_admin($team_id, $account->uid)) {
+    } elseif (boincteam_is_admin($team_id, $account->uid)) {
       form_set_error('username', bts('@user is already an admin of @team.',
         array(
           '@user' => $account->boincuser_name,
           '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
-    }
-    else {
+    } else {
       $form_state['storage']['boincuser_id'] = $account->boincuser_id;
       $form_state['storage']['boincuser_name'] = $account->boincuser_name;
     }
@@ -645,8 +635,7 @@ 
   if (isset($form_state['values'])) {
     $subject   = $form_state['values']['subject'];
     $body      = $form_state['values']['body'];
-  }
-  else {
+  } else {
     $subject   = '';
     $body      = '';
   }

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

@@ -22,22 +22,22 @@ 
     'website' => '',
     'type' => 0,
     'country' => 0,
-    'joinable' => TRUE,
+    'joinable' => true,
     'description' => '',
   );
   
   // Standard option sets
   $form['boolean_options'] = array(
     '#type' => 'value',
-    '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
+    '#value' => array(1 => bts('yes', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
   );
   
   // Vocabulary based option sets
   $form['type_options'] = array(
     '#type' => 'value',
-    '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
+    '#value' => array(0 => bts('Choose type', array(), null, 'boinc:form-choose'))
   );
-  $vocabs = taxonomy_get_vocabularies(NULL);
+  $vocabs = taxonomy_get_vocabularies(null);
   foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
@@ -59,40 +59,40 @@ 
   
   // Form elements
   $form['name'] = array(
-    '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Team name', array(), null, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
-    '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
+    '#description' => bts('Text only, no HTML tags', array(), null, 'boinc:team-form-help'),
   );
   $form['name_html'] = array(
-    '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Team name -- HTML version (optional)', array(), null, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
-    '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
+    '#description' => bts('You may use limited HTML tags', array(), null, 'boinc:team-form-help'),
   );
   $form['website'] = array(
-    '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Team website (optional)', array(), null, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
-    '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
+    '#description' => bts("Displayed on the team's page", array(), null, 'boinc:team-create/edit'),
   );
   $form['type'] = array(
-    '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Type of team', array(), null, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
   );
   $form['country'] = array(
-    '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
+    '#title' => bts('Country', array(), null, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
   );
   $form['joinable'] = array(
-    '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Accept new members?', array(), null, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
@@ -100,11 +100,11 @@ 
     '#size' => 34,
   );
   $form['description'] = array(
-    '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Description of team', array(), null, 'boinc:team-create/edit'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
-    '#description' => NULL,
+    '#description' => null,
   );
   $form['format'] = filter_form();
   
@@ -115,11 +115,11 @@ 
   $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Save team', array(), NULL, 'boinc:team-form-save'),
+    '#value' => bts('Save team', array(), null, 'boinc:team-form-save'),
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), $_GET['q']) . '</li>'
   );
   
   return $form;
@@ -134,18 +134,18 @@ 
   $name = $values['name'];
   
   if (!$name) {
-    form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
+    form_set_error('name', bts('Team name is required.', array(), null, 'boinc:team-create/edit'));
   }
   else {
     require_boinc('boinc_db');
     if (BoincTeam::lookup_name($name)) {
       form_set_error('name', bts('A team named "@name" already exists.',
-        array('@name' => $name), NULL, 'boinc:team-create/edit'));
+        array('@name' => $name), null, 'boinc:team-create/edit'));
     }
   }
   
-  if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
-    form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+  if (!$values['type'] or !isset($values['type_options'][$values['type']])) {
+    form_set_error('type', bts('Please select a team type.', array(), null, 'boinc:team-create/edit'));
   }
 }
 
@@ -183,7 +183,7 @@ 
     rules_invoke_event('boincteam_create_team_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
       reason.', 'error');
-    return FALSE;
+    return false;
   }
   
   // Create the team node in Drupal
@@ -264,7 +264,7 @@ 
   $team = node_load($team_id);
   $boincteam = boincteam_load(boincteam_lookup_id($team_id));
   
-  $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
+  $is_boinc_wide = ($boincteam->seti_id > 0) ? true : false;
   
   $form_state['storage']['team_id'] = $team_id;
   $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
@@ -282,15 +282,15 @@ 
   // Standard option sets
   $form['boolean_options'] = array(
     '#type' => 'value',
-    '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
+    '#value' => array(1 => bts('yes', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
   );
   
   // Vocabulary based option sets
   $form['type_options'] = array(
     '#type' => 'value',
-    '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
+    '#value' => array(0 => bts('Choose type', array(), null, 'boinc:form-choose'))
   );
-  $vocabs = taxonomy_get_vocabularies(NULL);
+  $vocabs = taxonomy_get_vocabularies(null);
   foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
@@ -312,45 +312,45 @@ 
   
   // Form elements
   $form['name'] = array(
-    '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Team name', array(), null, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
-    '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
+    '#description' => bts('Text only, no HTML tags', array(), null, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
   );
   $form['name_html'] = array(
-    '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Team name -- HTML version (optional)', array(), null, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
-    '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
+    '#description' => bts('You may use limited HTML tags', array(), null, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
   );
   $form['website'] = array(
-    '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Team website (optional)', array(), null, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
-    '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
+    '#description' => bts("Displayed on the team's page", array(), null, 'boinc:team-create/edit'),
     '#disabled' => $is_boinc_wide,
   );
   $form['type'] = array(
-    '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Type of team', array(), null, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
     '#disabled' => $is_boinc_wide,
   );
   $form['country'] = array(
-    '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
+    '#title' => bts('Country', array(), null, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
     '#disabled' => $is_boinc_wide,
   );
   $form['joinable'] = array(
-    '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
+    '#title' => bts('Accept new members?', array(), null, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
@@ -360,11 +360,11 @@ 
   );
   if (!$is_boinc_wide) {
     $form['description'] = array(
-      '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
+      '#title' => bts('Description of team', array(), null, 'boinc:team-create/edit'),
       '#type' => 'textarea',
       '#default_value' => $default['description'],
       '#size' => 5,
-      '#description' => NULL,
+      '#description' => null,
     );
     $form['format'] = filter_form();
     
@@ -375,25 +375,25 @@ 
     $form['submit'] = array(
       '#prefix' => '<li class="first tab">',
       '#type' => 'submit',
-      '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
+      '#value' => bts('Save changes', array(), null, 'boinc:form-save'),
       '#suffix' => '</li>',
     );
     $form['form control tabs'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+      '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', true)) . '</li>'
     );
   }
   else {
     $form['description'] = array(
-      '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
+      '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), null, 'boinc:team-description') . ':</label></div><div class="form-item">',
       '#value' => $default['description'],
       '#suffix' => '</div>',
     );
     drupal_set_message(
       bts('This is a BOINC-wide team. Changes can be made at the !site.',
-        array('!site' => l(bts('BOINC-wide teams site', array(), NULL, 'boinc:link-to-BOINC-wide-teams-Website'),
+        array('!site' => l(bts('BOINC-wide teams site', array(), null, 'boinc:link-to-BOINC-wide-teams-Website'),
           'http://boinc.berkeley.edu/teams/'
         )),
-        NULL, 'boinc:team-edit-warning-message'),
+        null, 'boinc:team-edit-warning-message'),
       'warning');
   }
   
@@ -411,11 +411,11 @@ 
   $name = $values['name'];
   
   if ($form_state['storage']['is_boinc_wide']) {
-    form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.', array(), NULL, 'boinc:team-create/edit'));
+    form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.', array(), null, 'boinc:team-create/edit'));
   }
   else {
     if (!$name) {
-      form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
+      form_set_error('name', bts('Team name is required.', array(), null, 'boinc:team-create/edit'));
     }
     else {
       $team = node_load($form_state['storage']['team_id']);
@@ -424,13 +424,13 @@ 
         require_boinc('boinc_db');
         if (BoincTeam::lookup_name($name)) {
           form_set_error('name', bts('A team named "@name" already exists.',
-            array('@name' => $name), NULL, 'boinc:team-create/edit'));
+            array('@name' => $name), null, 'boinc:team-create/edit'));
         }
       }
     }
   
-    if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
-      form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+    if (!$values['type'] or !isset($values['type_options'][$values['type']])) {
+      form_set_error('type', bts('Please select a team type.', array(), null, 'boinc:team-create/edit'));
     }
   }
 }
@@ -521,7 +521,7 @@ 
   
   // Form elements
   $form['username'] = array(
-    '#title' => bts('Enter BOINC username', array(), NULL, 'boinc:team--add-admin'),
+    '#title' => bts('Enter BOINC username', array(), null, 'boinc:team--add-admin'),
     '#description' => bts('The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.'),
     '#type' => 'textfield',
     '#default_value' => $default['username'],
@@ -536,11 +536,11 @@ 
   $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Add', array(), NULL, 'boinc:form-add'),
+    '#value' => bts('Add', array(), null, 'boinc:form-add'),
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', true)) . '</li>'
   );
   
   //$form['#redirect'] = "community/teams/{$team_id}";
@@ -558,18 +558,18 @@ 
   $team = node_load($team_id);
   
   if (!$values['username']) {
-    form_set_error('username', bts('BOINC username is required.', array(), NULL, 'boinc:team-add-admin'));
+    form_set_error('username', bts('BOINC username is required.', array(), null, 'boinc:team-add-admin'));
   }
   else {
     // Load user account associated with username
     $account = boincuser_privatemsg_name_lookup($values['username']);
     // Validate the account
-    if ((!$account) OR ($account->team != $team_id)) {
+    if ((!$account) or ($account->team != $team_id)) {
       form_set_error('username', bts('There is no user on your team with name @username.',
         array(
           '@username' => $account->boincuser_name
         ),
-      NULL, 'boinc:team-add-admin'));
+      null, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_founder($team_id, $account->uid)) {
       form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
@@ -577,7 +577,7 @@ 
           '@user' => $account->boincuser_name,
           '@team' => $team->title,
         ),
-        NULL, 'boinc:team-add-admin'));
+        null, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_admin($team_id, $account->uid)) {
       form_set_error('username', bts('@user is already an admin of @team.',
@@ -585,7 +585,7 @@ 
           '@user' => $account->boincuser_name,
           '@team' => $team->title,
         ),
-        NULL, 'boinc:team-add-admin'));
+        null, 'boinc:team-add-admin'));
     }
     else {
       $form_state['storage']['boincuser_id'] = $account->boincuser_id;
@@ -652,7 +652,7 @@ 
   }
 
   // Title
-  $mytitle = bts('Send E-mail To All Team Members', array(), NULL, 'boinc:team-message-form');
+  $mytitle = bts('Send E-mail To All Team Members', array(), null, 'boinc:team-message-form');
   drupal_set_title($mytitle);
 
   $form['emailteam']['header'] = array(
@@ -663,7 +663,7 @@ 
   );
 
   $form['emailteam']['instructions'] = array(
-    '#value'              => bts('This will send an email to all team members. If a team member has opt-ed out of notification e-mails, they will not receive your message. At the bottom of your message, there will be a link allowing team members to send you a Direct Message. This link is added automatically, you do not need to add it below in the Message box. Your email address will not be shown to the recipients.', array(), NULL, 'boinc:team-message-form'),
+    '#value'              => bts('This will send an email to all team members. If a team member has opt-ed out of notification e-mails, they will not receive your message. At the bottom of your message, there will be a link allowing team members to send you a Direct Message. This link is added automatically, you do not need to add it below in the Message box. Your email address will not be shown to the recipients.', array(), null, 'boinc:team-message-form'),
     '#weight'             => '-8',
     '#prefix'             => "<div id='sendmessageteammembers-instructions'>",
     '#suffix'             => "</div>",
@@ -672,7 +672,7 @@ 
   // Subject
   $form['emailteam']['subject'] = array(
     '#type'               => 'textfield',
-    '#title'              => bts('Subject', array(), NULL, 'boinc:team-message-form'),
+    '#title'              => bts('Subject', array(), null, 'boinc:team-message-form'),
     '#size'               => 50,
     '#maxlength'          => 255,
     '#default_value'      => $subject,
@@ -682,17 +682,17 @@ 
   // Body
   $form['emailteam']['body'] = array(
     '#type'               => 'textarea',
-    '#title'              => bts('Message', array(), NULL, 'boinc:team-message-form'),
+    '#title'              => bts('Message', array(), null, 'boinc:team-message-form'),
     '#rows'               => 8,
     '#weight'             => 0,
     '#default_value'      => $body,
-    '#resizable'          => TRUE,
+    '#resizable'          => true,
   );
 
   // checkbox for 'sent to self'
   $form['emailteam']['selfsend'] = array(
     '#type'    => 'checkbox',
-    '#title'   => bts('Check this box if you wish to be sent a copy of your message to your email address.', array(), NULL, 'boinc:team-message-form'),
+    '#title'   => bts('Check this box if you wish to be sent a copy of your message to your email address.', array(), null, 'boinc:team-message-form'),
     '#weight'  => 10,
     '#prefix'  => '<div class="clearfix" id="confirm-checkbox">',
     '#suffix'  => '</div>',
@@ -714,7 +714,7 @@ 
 
   $form['emailteam']['submit'] = array(
     '#type'               => 'submit',
-    '#value'              => bts('Send message', array(), NULL, 'boinc:form-submit'),
+    '#value'              => bts('Send message', array(), null, 'boinc:form-submit'),
     '#submit'             => array('boincteam_sendmessagetoteam_submit'),
     '#validate'           => array('boincteam_sendmessagetoteam_validate'),
     '#weight'             => 1001,
@@ -722,7 +722,7 @@ 
     '#suffix'             => '</li>'
   );
 
-  $title = bts('Cancel', array(), NULL, 'boinc:form-cancel');
+  $title = bts('Cancel', array(), null, 'boinc:form-cancel');
   $url = "community/teams/{$team_id}";
   $form['emailteam']['cancel'] = array(
     '#value'              => l($title, $url, array('attributes' => array('id' => 'edit-cancel'))),
@@ -763,7 +763,7 @@ 
   // Avoid subjects which only consist of a space as these can not be clicked.
   $message['subject'] = trim($message['subject']);
 
-  $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, TRUE, TRUE));
+  $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, true, true));
   if (empty($message['subject']) && !empty($trimed_body)) {
     $message['subject'] = $trimed_body;
     $form_state['values']['subject'] = $message['subject'];
@@ -773,21 +773,21 @@ 
   $message['subject'] = trim($message['subject']);
   if (empty($message['subject'])) {
     form_set_error('subject',
-      bts('Not allowed to send a message without subject', array(), NULL, 'boinc:team-message-form')
+      bts('Not allowed to send a message without subject', array(), null, 'boinc:team-message-form')
     );
   }
 
   // Check body
-  if ( ($message['body'] === NULL || $message['body'] === '') ) {
+  if ( ($message['body'] === null || $message['body'] === '') ) {
     form_set_error('body',
-      bts('Not allowed to send an empty message.', array(), NULL, 'boinc:team-message-form')
+      bts('Not allowed to send an empty message.', array(), null, 'boinc:team-message-form')
     );
   }
 
   // Check team id
   if (empty($message['_team_id'])) {
     form_set_error('team_id',
-      bts('Error, no team_id supplied.', array(), NULL, 'boinc:team-message-form')
+      bts('Error, no team_id supplied.', array(), null, 'boinc:team-message-form')
     );
   }
 

Indentation +333 added lines, -333 removed lines

@@ -14,9 +14,9 @@ 
  * The definition of the create team form
  */
 function boincteam_create_form(&$form_state) {
-  $form = array();
+    $form = array();
 
-  $default = array(
+    $default = array(
     'name' => '',
     'name_html' => '',
     'website' => '',
@@ -24,105 +24,105 @@ 
     'country' => 0,
     'joinable' => TRUE,
     'description' => '',
-  );
+    );
 
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
 
-  // Vocabulary based option sets
-  $form['type_options'] = array(
+    // Vocabulary based option sets
+    $form['type_options'] = array(
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
-  );
-  $vocabs = taxonomy_get_vocabularies(NULL);
-  foreach ($vocabs as $vocab) {
+    );
+    $vocabs = taxonomy_get_vocabularies(NULL);
+    foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
       $team_types = taxonomy_get_tree($vocab->vid);
-      if (module_exists('internationalization')) {
+        if (module_exists('internationalization')) {
         $team_types = i18ntaxonomy_localize_terms($team_types);
-      }
-      foreach ($team_types as $team_type) {
+        }
+        foreach ($team_types as $team_type) {
         $form['type_options']['#value'][$team_type->tid] = $team_type->name;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
-  $form['country_options'] = array(
+    }
+    $form['country_options'] = array(
     '#type' => 'value',
     '#value' => boinccore_get_country_list(),
-  );
+    );
 
-  // Form elements
-  $form['name'] = array(
+    // Form elements
+    $form['name'] = array(
     '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['name_html'] = array(
+    );
+    $form['name_html'] = array(
     '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
     '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['website'] = array(
+    );
+    $form['website'] = array(
     '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
     '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
-  );
-  $form['type'] = array(
+    );
+    $form['type'] = array(
     '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
-  );
-  $form['country'] = array(
+    );
+    $form['country'] = array(
     '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
-  );
-  $form['joinable'] = array(
+    );
+    $form['joinable'] = array(
     '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['joinable'],
     '#size' => 34,
-  );
-  $form['description'] = array(
+    );
+    $form['description'] = array(
     '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
     '#description' => NULL,
-  );
-  $form['format'] = filter_form();
+    );
+    $form['format'] = filter_form();
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save team', array(), NULL, 'boinc:team-form-save'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -130,41 +130,41 @@ 
  */
 function boincteam_create_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
-  $name = $values['name'];
+    $values = $form_state['values'];
+    $name = $values['name'];
 
-  if (!$name) {
+    if (!$name) {
     form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+    }
+    else {
     require_boinc('boinc_db');
     if (BoincTeam::lookup_name($name)) {
-      form_set_error('name', bts('A team named "@name" already exists.',
+        form_set_error('name', bts('A team named "@name" already exists.',
         array('@name' => $name), NULL, 'boinc:team-create/edit'));
     }
-  }
+    }
 
-  if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
+    if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
     form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
-  }
+    }
 }
 
 /**
  * The create team submit handler
  */
 function boincteam_create_form_submit($form, &$form_state) {
-  global $user;
-  $account = user_load($user->uid);
-  $values = $form_state['values'];
-  //drupal_set_message('<pre>' . print_r($values,true) . '</pre>');
+    global $user;
+    $account = user_load($user->uid);
+    $values = $form_state['values'];
+    //drupal_set_message('<pre>' . print_r($values,true) . '</pre>');
 
-  $input_format = !empty($values['format']) ? $values['format'] : 4;
-  $values['description'] = check_markup($values['description'], $input_format);
+    $input_format = !empty($values['format']) ? $values['format'] : 4;
+    $values['description'] = check_markup($values['description'], $input_format);
 
-  // Create the team in the BOINC db
+    // Create the team in the BOINC db
 
-  require_boinc(array('user','team'));
-  $boinc_team = make_team(
+    require_boinc(array('user','team'));
+    $boinc_team = make_team(
     $account->boincuser_id,
     $values['name'],
     $values['website'],
@@ -172,27 +172,27 @@ 
     $values['name_html'],
     $values['description'],
     $values['country']
-  );
+    );
 
-  if ($boinc_team) {
+    if ($boinc_team) {
     $boinc_user = BoincUser::lookup_id($account->boincuser_id);
     user_join_team($boinc_team, $boinc_user);
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT)));
     rules_invoke_event('boincteam_create_team_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
       reason.', 'error');
     return FALSE;
-  }
+    }
 
-  // Create the team node in Drupal
+    // Create the team node in Drupal
 
-  $teaser = node_teaser($values['description']);
-  $created_time = time();
-  $input_format = variable_get('filter_default_format', 1);
+    $teaser = node_teaser($values['description']);
+    $created_time = time();
+    $input_format = variable_get('filter_default_format', 1);
 
-  $node = array(
+    $node = array(
     'type' => 'team',
     'title' => $values['name'],
     'body' => $values['description'],
@@ -206,21 +206,21 @@ 
     'moderate' => 0,
     'sticky' => 0,
     'format' => $input_format
-  );
+    );
 
-  // Use pathauto function, if available, to clean up the path
-  if (module_exists('pathauto')) {
+    // Use pathauto function, if available, to clean up the path
+    if (module_exists('pathauto')) {
     module_load_include('inc', 'pathauto', 'pathauto');
     $node['path'] = pathauto_cleanstring($values['name']);
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT)));
     rules_invoke_event('boincteam_create_team_nopathauto_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('BOINC team', 'BOINC teams require the Pathauto module. Teams
       cannot be created.', 'error');
-  }
+    }
 
-  /*
+    /*
   // Add special organic group properties
   $node['og_description'] = strip_tags($boincteam->description);
   $node['og_selective'] = OG_OPEN;
@@ -229,26 +229,26 @@ 
   $node['og_private'] = 0;
   */
 
-  $node = (object) $node; // node_save requires an object form
+    $node = (object) $node; // node_save requires an object form
 
-  /*
+    /*
   $node->field_description[]['value'] = $boincteam->description;
   $node->field_url[]['value'] = $boincteam->url;
   $node->field_country[]['value'] = $boincteam->country;
   */
 
-  $node->taxonomy[] = taxonomy_get_term($values['type']);
+    $node->taxonomy[] = taxonomy_get_term($values['type']);
 
-  // Save the team node
-  node_save($node);
+    // Save the team node
+    node_save($node);
 
-  // Save the team IDs to a BOINC <--> Drupal reference table.
-  db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boinc_team->id, $node->nid);
+    // Save the team IDs to a BOINC <--> Drupal reference table.
+    db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boinc_team->id, $node->nid);
 
-  drupal_set_message(t('Team "@name" has been created.',
+    drupal_set_message(t('Team "@name" has been created.',
     array('@name' => $values['name'])));
 
-  $form_state['redirect'] = "community/teams/{$node->nid}";
+    $form_state['redirect'] = "community/teams/{$node->nid}";
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -259,17 +259,17 @@ 
  * The definition of the edit team form
  */
 function boincteam_edit_form(&$form_state, $team_id) {
-  $form = array();
+    $form = array();
 
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id));
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id));
 
-  $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
+    $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
 
-  $form_state['storage']['team_id'] = $team_id;
-  $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
+    $form_state['storage']['team_id'] = $team_id;
+    $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
 
-  $default = array(
+    $default = array(
     'name' => $boincteam->name,
     'name_html' => $boincteam->name_html,
     'website' => $boincteam->url,
@@ -277,79 +277,79 @@ 
     'country' => $boincteam->country,
     'joinable' => $boincteam->joinable,
     'description' => $boincteam->description,
-  );
+    );
 
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
 
-  // Vocabulary based option sets
-  $form['type_options'] = array(
+    // Vocabulary based option sets
+    $form['type_options'] = array(
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
-  );
-  $vocabs = taxonomy_get_vocabularies(NULL);
-  foreach ($vocabs as $vocab) {
+    );
+    $vocabs = taxonomy_get_vocabularies(NULL);
+    foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
       $team_types = taxonomy_get_tree($vocab->vid);
-      if (module_exists('internationalization')) {
+        if (module_exists('internationalization')) {
         $team_types = i18ntaxonomy_localize_terms($team_types);
-      }
-      foreach ($team_types as $team_type) {
+        }
+        foreach ($team_types as $team_type) {
         $form['type_options']['#value'][$team_type->tid] = $team_type->name;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
-  $form['country_options'] = array(
+    }
+    $form['country_options'] = array(
     '#type' => 'value',
     '#value' => boinccore_get_country_list(),
-  );
+    );
 
-  // Form elements
-  $form['name'] = array(
+    // Form elements
+    $form['name'] = array(
     '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['name_html'] = array(
+    );
+    $form['name_html'] = array(
     '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
     '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['website'] = array(
+    );
+    $form['website'] = array(
     '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
     '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['type'] = array(
+    );
+    $form['type'] = array(
     '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
     '#disabled' => $is_boinc_wide,
-  );
-  $form['country'] = array(
+    );
+    $form['country'] = array(
     '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
     '#disabled' => $is_boinc_wide,
-  );
-  $form['joinable'] = array(
+    );
+    $form['joinable'] = array(
     '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
@@ -357,49 +357,49 @@ 
     '#default_value' => $default['joinable'],
     '#size' => 34,
     '#disabled' => $is_boinc_wide,
-  );
-  if (!$is_boinc_wide) {
+    );
+    if (!$is_boinc_wide) {
     $form['description'] = array(
-      '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
-      '#type' => 'textarea',
-      '#default_value' => $default['description'],
-      '#size' => 5,
-      '#description' => NULL,
+        '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
+        '#type' => 'textarea',
+        '#default_value' => $default['description'],
+        '#size' => 5,
+        '#description' => NULL,
     );
     $form['format'] = filter_form();
 
     // Form control
     $form['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">'
+        '#value' => '<ul class="form-control tab-list">'
     );
     $form['submit'] = array(
-      '#prefix' => '<li class="first tab">',
-      '#type' => 'submit',
-      '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
-      '#suffix' => '</li>',
+        '#prefix' => '<li class="first tab">',
+        '#type' => 'submit',
+        '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
+        '#suffix' => '</li>',
     );
     $form['form control tabs'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
     );
-  }
-  else {
+    }
+    else {
     $form['description'] = array(
-      '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
-      '#value' => $default['description'],
-      '#suffix' => '</div>',
+        '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
+        '#value' => $default['description'],
+        '#suffix' => '</div>',
     );
     drupal_set_message(
-      bts('This is a BOINC-wide team. Changes can be made at the !site.',
+        bts('This is a BOINC-wide team. Changes can be made at the !site.',
         array('!site' => l(bts('BOINC-wide teams site', array(), NULL, 'boinc:link-to-BOINC-wide-teams-Website'),
-          'http://boinc.berkeley.edu/teams/'
+            'http://boinc.berkeley.edu/teams/'
         )),
         NULL, 'boinc:team-edit-warning-message'),
-      'warning');
-  }
+        'warning');
+    }
 
-  $form['#redirect'] = "community/teams/{$team_id}";
+    $form['#redirect'] = "community/teams/{$team_id}";
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -407,32 +407,32 @@ 
  */
 function boincteam_edit_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
-  $name = $values['name'];
+    $values = $form_state['values'];
+    $name = $values['name'];
 
-  if ($form_state['storage']['is_boinc_wide']) {
+    if ($form_state['storage']['is_boinc_wide']) {
     form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+    }
+    else {
     if (!$name) {
-      form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
+        form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
     }
     else {
-      $team = node_load($form_state['storage']['team_id']);
-      if ($name != $team->title) {
+        $team = node_load($form_state['storage']['team_id']);
+        if ($name != $team->title) {
         // If changing the name ("title" in Drupal terms), check that the new name is available
         require_boinc('boinc_db');
         if (BoincTeam::lookup_name($name)) {
-          form_set_error('name', bts('A team named "@name" already exists.',
+            form_set_error('name', bts('A team named "@name" already exists.',
             array('@name' => $name), NULL, 'boinc:team-create/edit'));
         }
-      }
+        }
     }
 
     if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
-      form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+        form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+    }
     }
-  }
 }
 
 /**
@@ -440,18 +440,18 @@ 
  */
 function boincteam_edit_form_submit($form, &$form_state) {
 
-  $team_id = $form_state['storage']['team_id'];
-  $values = $form_state['values'];
+    $team_id = $form_state['storage']['team_id'];
+    $values = $form_state['values'];
 
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
 
-  $input_format = !empty($values['format']) ? $values['format'] : 4;
-  $values['description'] = check_markup($values['description'], $input_format);
+    $input_format = !empty($values['format']) ? $values['format'] : 4;
+    $values['description'] = check_markup($values['description'], $input_format);
 
-  // Update the team in the BOINC db
-  db_set_active('boinc_rw');
-  db_query("
+    // Update the team in the BOINC db
+    db_set_active('boinc_rw');
+    db_query("
     UPDATE {team} SET
       name = '%s',
       name_lc = '%s',
@@ -471,32 +471,32 @@ 
     $values['country'],
     $values['joinable'],
     $boincteam_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
 
-  // Update the team node in Drupal
+    // Update the team node in Drupal
 
-  $team->title = $values['name'];
-  $team->body = $values['description'];
-  $team->teaser = node_teaser($values['description']);
+    $team->title = $values['name'];
+    $team->body = $values['description'];
+    $team->teaser = node_teaser($values['description']);
 
-  /*
+    /*
   $node->field_description[]['value'] = $boincteam->description;
   $node->field_url[]['value'] = $boincteam->url;
   $node->field_country[]['value'] = $boincteam->country;
   */
 
-  // Replace any existing taxonomy with the new one
-  $team->taxonomy = array(taxonomy_get_term($values['type']));
+    // Replace any existing taxonomy with the new one
+    $team->taxonomy = array(taxonomy_get_term($values['type']));
 
-  // Save the team node
-  node_save($team);
+    // Save the team node
+    node_save($team);
 
-  drupal_set_message(t('Details for "@team" have been updated.',
+    drupal_set_message(t('Details for "@team" have been updated.',
     array('@team' => $values['name'])));
 
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }
 
 
@@ -508,44 +508,44 @@ 
  * The definition of the add team admin form
  */
 function boincteam_add_admin_form(&$form_state, $team_id) {
-  $form = array();
+    $form = array();
 
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id));
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id));
 
-  $form_state['storage']['team_id'] = $team_id;
+    $form_state['storage']['team_id'] = $team_id;
 
-  $default = array(
+    $default = array(
     'username' => '',
-  );
+    );
 
-  // Form elements
-  $form['username'] = array(
+    // Form elements
+    $form['username'] = array(
     '#title' => bts('Enter BOINC username', array(), NULL, 'boinc:team--add-admin'),
     '#description' => bts('The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.'),
     '#type' => 'textfield',
     '#default_value' => $default['username'],
     '#size' => 34,
     '#autocomplete_path' => "community/teams/${team_id}/user-name-autocomplete",
-  );
+    );
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Add', array(), NULL, 'boinc:form-add'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
-  );
+    );
 
-  //$form['#redirect'] = "community/teams/{$team_id}";
+    //$form['#redirect'] = "community/teams/{$team_id}";
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -553,45 +553,45 @@ 
  */
 function boincteam_add_admin_form_validate($form, &$form_state) {
 
-  $team_id = $form_state['storage']['team_id'];
-  $values = $form_state['values'];
-  $team = node_load($team_id);
+    $team_id = $form_state['storage']['team_id'];
+    $values = $form_state['values'];
+    $team = node_load($team_id);
 
-  if (!$values['username']) {
+    if (!$values['username']) {
     form_set_error('username', bts('BOINC username is required.', array(), NULL, 'boinc:team-add-admin'));
-  }
-  else {
+    }
+    else {
     // Load user account associated with username
     $account = boincuser_privatemsg_name_lookup($values['username']);
     // Validate the account
     if ((!$account) OR ($account->team != $team_id)) {
-      form_set_error('username', bts('There is no user on your team with name @username.',
+        form_set_error('username', bts('There is no user on your team with name @username.',
         array(
-          '@username' => $account->boincuser_name
+            '@username' => $account->boincuser_name
         ),
-      NULL, 'boinc:team-add-admin'));
+        NULL, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_founder($team_id, $account->uid)) {
-      form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
+        form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
         array(
-          '@user' => $account->boincuser_name,
-          '@team' => $team->title,
+            '@user' => $account->boincuser_name,
+            '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_admin($team_id, $account->uid)) {
-      form_set_error('username', bts('@user is already an admin of @team.',
+        form_set_error('username', bts('@user is already an admin of @team.',
         array(
-          '@user' => $account->boincuser_name,
-          '@team' => $team->title,
+            '@user' => $account->boincuser_name,
+            '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
     }
     else {
-      $form_state['storage']['boincuser_id'] = $account->boincuser_id;
-      $form_state['storage']['boincuser_name'] = $account->boincuser_name;
+        $form_state['storage']['boincuser_id'] = $account->boincuser_id;
+        $form_state['storage']['boincuser_name'] = $account->boincuser_name;
+    }
     }
-  }
 }
 
 /**
@@ -599,17 +599,17 @@ 
  */
 function boincteam_add_admin_form_submit($form, &$form_state) {
 
-  $team_id = $form_state['storage']['team_id'];
-  $boincuser_id = $form_state['storage']['boincuser_id'];
-  $user_name = $form_state['storage']['boincuser_name'];
-  $values = $form_state['values'];
+    $team_id = $form_state['storage']['team_id'];
+    $boincuser_id = $form_state['storage']['boincuser_id'];
+    $user_name = $form_state['storage']['boincuser_name'];
+    $values = $form_state['values'];
 
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
 
-  // Update the team in the BOINC db
-  db_set_active('boinc_rw');
-  db_query("
+    // Update the team in the BOINC db
+    db_set_active('boinc_rw');
+    db_query("
     INSERT INTO {team_admin} SET
       teamid = '%d',
       userid = '%d',
@@ -617,17 +617,17 @@ 
     $boincteam_id,
     $boincuser_id,
     time()
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
 
-  // Could assign a role in Drupal here, as needed
+    // Could assign a role in Drupal here, as needed
 
 
-  drupal_set_message(t('@user has been added as an admin.',
+    drupal_set_message(t('@user has been added as an admin.',
     array('@user' => $user_name)));
 
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -639,80 +639,80 @@ 
  * Send all team members an email message function
  */
 function boincteam_sendmessagetoteam(&$form_state, $team_id) {
-  global $user;
-  $form = array();
+    global $user;
+    $form = array();
 
-  if (isset($form_state['values'])) {
+    if (isset($form_state['values'])) {
     $subject   = $form_state['values']['subject'];
     $body      = $form_state['values']['body'];
-  }
-  else {
+    }
+    else {
     $subject   = '';
     $body      = '';
-  }
+    }
 
-  // Title
-  $mytitle = bts('Send E-mail To All Team Members', array(), NULL, 'boinc:team-message-form');
-  drupal_set_title($mytitle);
+    // Title
+    $mytitle = bts('Send E-mail To All Team Members', array(), NULL, 'boinc:team-message-form');
+    drupal_set_title($mytitle);
 
-  $form['emailteam']['header'] = array(
+    $form['emailteam']['header'] = array(
     '#value'              => '<h1>' . $mytitle . '</h1>',
     '#weight'             => '-10',
     '#prefix'             => "<div id='sendmessageteammembers-header'>",
     '#suffix'             => "</div>",
-  );
+    );
 
-  $form['emailteam']['instructions'] = array(
+    $form['emailteam']['instructions'] = array(
     '#value'              => bts('This will send an email to all team members. If a team member has opt-ed out of notification e-mails, they will not receive your message. At the bottom of your message, there will be a link allowing team members to send you a Direct Message. This link is added automatically, you do not need to add it below in the Message box. Your email address will not be shown to the recipients.', array(), NULL, 'boinc:team-message-form'),
     '#weight'             => '-8',
     '#prefix'             => "<div id='sendmessageteammembers-instructions'>",
     '#suffix'             => "</div>",
-  );
+    );
 
-  // Subject
-  $form['emailteam']['subject'] = array(
+    // Subject
+    $form['emailteam']['subject'] = array(
     '#type'               => 'textfield',
     '#title'              => bts('Subject', array(), NULL, 'boinc:team-message-form'),
     '#size'               => 50,
     '#maxlength'          => 255,
     '#default_value'      => $subject,
     '#weight'             => -5,
-  );
+    );
 
-  // Body
-  $form['emailteam']['body'] = array(
+    // Body
+    $form['emailteam']['body'] = array(
     '#type'               => 'textarea',
     '#title'              => bts('Message', array(), NULL, 'boinc:team-message-form'),
     '#rows'               => 8,
     '#weight'             => 0,
     '#default_value'      => $body,
     '#resizable'          => TRUE,
-  );
+    );
 
-  // checkbox for 'sent to self'
-  $form['emailteam']['selfsend'] = array(
+    // checkbox for 'sent to self'
+    $form['emailteam']['selfsend'] = array(
     '#type'    => 'checkbox',
     '#title'   => bts('Check this box if you wish to be sent a copy of your message to your email address.', array(), NULL, 'boinc:team-message-form'),
     '#weight'  => 10,
     '#prefix'  => '<div class="clearfix" id="confirm-checkbox">',
     '#suffix'  => '</div>',
-  );
+    );
 
-  // Add a captcha to form
-  if (module_exists('captcha')) {
+    // Add a captcha to form
+    if (module_exists('captcha')) {
     $form['register_captcha'] = array(
         '#type' => 'captcha',
         '#weight' => 1000,
     );
-  }
+    }
 
-  // form buttons
-  $form['emailteam']['form control tabs prefix'] = array(
+    // form buttons
+    $form['emailteam']['form control tabs prefix'] = array(
     '#value'  => '<ul class="form-control tab-list">',
     '#weight' => 1000,
-  );
+    );
 
-  $form['emailteam']['submit'] = array(
+    $form['emailteam']['submit'] = array(
     '#type'               => 'submit',
     '#value'              => bts('Send message', array(), NULL, 'boinc:form-submit'),
     '#submit'             => array('boincteam_sendmessagetoteam_submit'),
@@ -720,133 +720,133 @@ 
     '#weight'             => 1001,
     '#prefix'             => '<li class="first tab">',
     '#suffix'             => '</li>'
-  );
+    );
 
-  $title = bts('Cancel', array(), NULL, 'boinc:form-cancel');
-  $url = "community/teams/{$team_id}";
-  $form['emailteam']['cancel'] = array(
+    $title = bts('Cancel', array(), NULL, 'boinc:form-cancel');
+    $url = "community/teams/{$team_id}";
+    $form['emailteam']['cancel'] = array(
     '#value'              => l($title, $url, array('attributes' => array('id' => 'edit-cancel'))),
     '#weight'             => 1005,
     '#prefix'             => '<li class="tab">',
     '#suffix'             => '</li>'
-  );
+    );
 
-  $form['emailteam']['form control tabs suffix'] = array(
+    $form['emailteam']['form control tabs suffix'] = array(
     '#value'  => '</ul>',
     '#weight' => 1010,
-  );
+    );
 
-  // Add team id information to form_state
-  $form['_team_id'] = array(
+    // Add team id information to form_state
+    $form['_team_id'] = array(
     '#type'  => 'value',
     '#value' => $team_id,
-  );
+    );
 
-  // Add sender user object to form_state
-  $form['_senderuid'] = array(
+    // Add sender user object to form_state
+    $form['_senderuid'] = array(
     '#type'  => 'value',
     '#value' => $user->uid,
-  );
+    );
 
-  // redirect after sending message
-  $form['#redirect'] = "community/teams/{$team_id}";
+    // redirect after sending message
+    $form['#redirect'] = "community/teams/{$team_id}";
 
-  return $form;
+    return $form;
 }
 
 /**
  * Send all team members validation handler
  */
 function boincteam_sendmessagetoteam_validate($form, &$form_state) {
-  $message = $form_state['values'];
-  $message['timestamp'] = time();
-  // Avoid subjects which only consist of a space as these can not be clicked.
-  $message['subject'] = trim($message['subject']);
+    $message = $form_state['values'];
+    $message['timestamp'] = time();
+    // Avoid subjects which only consist of a space as these can not be clicked.
+    $message['subject'] = trim($message['subject']);
 
-  $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, TRUE, TRUE));
-  if (empty($message['subject']) && !empty($trimed_body)) {
+    $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, TRUE, TRUE));
+    if (empty($message['subject']) && !empty($trimed_body)) {
     $message['subject'] = $trimed_body;
     $form_state['values']['subject'] = $message['subject'];
-  }
+    }
 
-  // Check subject line
-  $message['subject'] = trim($message['subject']);
-  if (empty($message['subject'])) {
+    // Check subject line
+    $message['subject'] = trim($message['subject']);
+    if (empty($message['subject'])) {
     form_set_error('subject',
-      bts('Not allowed to send a message without subject', array(), NULL, 'boinc:team-message-form')
+        bts('Not allowed to send a message without subject', array(), NULL, 'boinc:team-message-form')
     );
-  }
+    }
 
-  // Check body
-  if ( ($message['body'] === NULL || $message['body'] === '') ) {
+    // Check body
+    if ( ($message['body'] === NULL || $message['body'] === '') ) {
     form_set_error('body',
-      bts('Not allowed to send an empty message.', array(), NULL, 'boinc:team-message-form')
+        bts('Not allowed to send an empty message.', array(), NULL, 'boinc:team-message-form')
     );
-  }
+    }
 
-  // Check team id
-  if (empty($message['_team_id'])) {
+    // Check team id
+    if (empty($message['_team_id'])) {
     form_set_error('team_id',
-      bts('Error, no team_id supplied.', array(), NULL, 'boinc:team-message-form')
+        bts('Error, no team_id supplied.', array(), NULL, 'boinc:team-message-form')
     );
-  }
+    }
 
-  $form_state['validated_built_message'] = $message;
+    $form_state['validated_built_message'] = $message;
 }
 
 /**
  * Send all team members submit handler
  */
 function boincteam_sendmessagetoteam_submit($form, &$form_state) {
-  module_load_include('inc', 'rules', 'modules/system.rules');
-  global $base_url;
-  global $base_path;
-
-  $suid = $form_state['values']['_senderuid'];
-  $account = user_load(array('uid' => $suid ));
-  $site_url = $base_url . $base_path . "messages/new/" . $suid;
-
-  // Form is validated, now send to all team members. Lookup boinc
-  // id of all team members, and then use user_load() to load user
-  // object. Send message using email.
-  //
-  $boinc_id = boincteam_lookup_id($form_state['values']['_team_id']);
-  // Email addresses, with those who have opt-ed out of notification
-  // emails removed.
-  $member_emails = _boincteam_emails($boinc_id);
-  // Remove sender's email address, unless selfsend is true.
-  if ( !$form_state['values']['selfsend'] ) {
+    module_load_include('inc', 'rules', 'modules/system.rules');
+    global $base_url;
+    global $base_path;
+
+    $suid = $form_state['values']['_senderuid'];
+    $account = user_load(array('uid' => $suid ));
+    $site_url = $base_url . $base_path . "messages/new/" . $suid;
+
+    // Form is validated, now send to all team members. Lookup boinc
+    // id of all team members, and then use user_load() to load user
+    // object. Send message using email.
+    //
+    $boinc_id = boincteam_lookup_id($form_state['values']['_team_id']);
+    // Email addresses, with those who have opt-ed out of notification
+    // emails removed.
+    $member_emails = _boincteam_emails($boinc_id);
+    // Remove sender's email address, unless selfsend is true.
+    if ( !$form_state['values']['selfsend'] ) {
     $pos = array_search($account->mail, $member_emails);
     unset($member_emails[$pos]);
-  }
+    }
 
-  // Add link at bottom of body
-  $mybody = $form_state['validated_built_message']['body'];
-  $mybody .= "\n\n"
-      . "To reply to the sender using a Direct Message (DM), please use this link:\n"
-      . "${site_url}";
+    // Add link at bottom of body
+    $mybody = $form_state['validated_built_message']['body'];
+    $mybody .= "\n\n"
+        . "To reply to the sender using a Direct Message (DM), please use this link:\n"
+        . "${site_url}";
 
-  // Transform HTML body into plain text
-  $mybody = drupal_html_to_text($mybody);
+    // Transform HTML body into plain text
+    $mybody = drupal_html_to_text($mybody);
 
-  $emailsettings = array(
+    $emailsettings = array(
     'from'    => '',
     'to'      => "webmaster@{$base_url}",
     'boincteam_headers' => array(
-      'Bcc'     => implode(', ', $member_emails),
+        'Bcc'     => implode(', ', $member_emails),
     ),
     'subject' => $form_state['validated_built_message']['subject'],
     'message' => $mybody,
-  );
-  rules_action_mail($emailsettings);
+    );
+    rules_action_mail($emailsettings);
 
-  $om = bts(
+    $om = bts(
     'Sent your email message to !number team members.',
     array( '!number' => count($member_emails) ),
     'NULL',
     'boinc:team-message-sent'
-  );
-  drupal_set_message($om, 'info');
+    );
+    drupal_set_message($om, 'info');
 
-  $form_state['redirect'] = "community/teams/{$form_state['values']['_team_id']}";
+    $form_state['redirect'] = "community/teams/{$form_state['values']['_team_id']}";
 }

drupal/sites/default/boinc/modules/boincuser/includes/boincuser.forms.inc

Spacing +39 added lines, -39 removed lines

@@ -35,7 +35,7 @@ 
   // Call our custom authentication function to check for an existing BOINC user
   if (!boincuser_login_authenticate($form_state['values'])) {
     // Authentication failed; set an error accordingly
-    form_set_error('name', bts('Sorry, unrecognized email address or password.', array(), NULL, 'boinc:forgot-password') . ' ' . l(bts('Have you forgotten your password?', array(), NULL, 'boinc:forgot-password'), 'user/password'));
+    form_set_error('name', bts('Sorry, unrecognized email address or password.', array(), NULL, 'boinc:forgot-password').' '.l(bts('Have you forgotten your password?', array(), NULL, 'boinc:forgot-password'), 'user/password'));
   }
 }
 
@@ -84,7 +84,7 @@ 
   } else {
     // Create a Drupal user from the BOINC user
     if ($user = boincuser_register_make_drupal_user($boinc_user)) {
-      watchdog('user', 'New external user: %email using module %module.', array('%email' => $email_addr, '%module' => $module), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $user->uid .'/edit'));
+      watchdog('user', 'New external user: %email using module %module.', array('%email' => $email_addr, '%module' => $module), WATCHDOG_NOTICE, l(t('edit'), 'user/'.$user->uid.'/edit'));
     }
   }
 }
@@ -394,14 +394,14 @@ 
     // set email address lower-case
     $edit['mail'] = strtolower($edit['mail']);
 
-    $boinc_user_already_exists = ( BoincUser::lookup_email_addr($edit['mail']) || BoincUser::lookup_prev_email_addr($edit['mail']) );
+    $boinc_user_already_exists = (BoincUser::lookup_email_addr($edit['mail']) || BoincUser::lookup_prev_email_addr($edit['mail']));
     if ($boinc_user_already_exists) {
       form_set_error('mail', bts('A BOINC account already exists for @email.', array('@email' => $edit['mail']), NULL, 'boinc:add-new-user'));
     }
 
     // Check email has not been changed in last X days (default X=7).
-    $duration = 86400 * 7;
-    if ( (($boinc_user->email_addr_change_time + $duration) > time()) and (!(user_access('administer users'))) ) {
+    $duration = 86400*7;
+    if ((($boinc_user->email_addr_change_time + $duration) > time()) and (!(user_access('administer users')))) {
       form_set_error('email_addr_change_time',
         bts('Your email address was changed within the past seven (7) days. You must wait until !futuredate to change your email again. If you need to reverse this change, please look for an email sent to !prev_email_addr.',
         array(
@@ -422,11 +422,11 @@ 
       unset($_SESSION['reset_pass']);
     }
     else {
-      $given_hash = md5($edit['current_pass'] . strtolower($account->mail));
+      $given_hash = md5($edit['current_pass'].strtolower($account->mail));
       if (!$edit['current_pass']) {
         form_set_error('current_pass', bts('Authentication is required when changing E-mail address or setting new password.', array(), NULL, 'boinc:account-credentials-change'));
       }
-      elseif ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
+      elseif ((!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash)) {
         form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:account-credentials-change'));
       }
 
@@ -489,29 +489,29 @@ 
   $project_domain = $headers['Host'];
   $form['heading'] = array(
     '#type' => 'markup',
-    '#value' => '<h3>' . bts("If you forgot your account's email address, or you can't receive email there:", array(), NULL, 'boinc:authenticator-login-page') . '</h3>'
+    '#value' => '<h3>'.bts("If you forgot your account's email address, or you can't receive email there:", array(), NULL, 'boinc:authenticator-login-page').'</h3>'
   );
   $form['instructions'] = array(
     '#type' => 'markup',
-    '#value' => '' .
-      '<p>' . bts("If you have run BOINC under the account, you can still access it. Here's how:", array(), NULL, 'boinc:authenticator-login-page') .
-      '  <ul>' .
-      '    <li>' . bts('Go to the BOINC data directory on your computer (see !boinc_wiki for help finding this).', array('!boinc_wiki' => l(bts('BOINC documentation', array(), NULL, 'boinc:authenticator-login-page'), 'http://boinc.berkeley.edu/wiki/BOINC_Data_directory')), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts('Find your account file for this project; it will have a name like %file (where the project URL is %url).', array('%file' => "account_{$project_domain}.xml", '%url' => "http://{$project_domain}"), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts("Open the file in a text editor like Notepad. You'll see something like:", array(), NULL, 'boinc:authenticator-login-page') .
-      '      <pre>' .
-      '&lt;account&gt;' . "\n" .
-      "  &lt;master_url&gt;http://{$project_domain}/&lt;/master_url&gt;" . "\n" .
-      '  &lt;authenticator&gt;8b8496fdd26df7dc0423ecd43c09a56b&lt;/authenticator&gt;' . "\n" .
-      "  &lt;project_name&gt;{$project_name}&lt;/project_name&gt;" . "\n" .
-      '  ...' . "\n" .
-      '&lt;/account&gt;' .
-      '      </pre>' .
-      '    </li>' .
-      '    <li>' . bts('Select and Copy the string between &lt;authenticator&gt; and &lt;/authenticator&gt; (%auth in the above example).', array('%auth' => '8b8496fdd26df7dc0423ecd43c09a56b'), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts('Paste the string into the field below, and click OK.', array(), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts('You will now be logged in to your account; update the email and password of your account.', array(), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '  </ul>' .
+    '#value' => ''.
+      '<p>'.bts("If you have run BOINC under the account, you can still access it. Here's how:", array(), NULL, 'boinc:authenticator-login-page').
+      '  <ul>'.
+      '    <li>'.bts('Go to the BOINC data directory on your computer (see !boinc_wiki for help finding this).', array('!boinc_wiki' => l(bts('BOINC documentation', array(), NULL, 'boinc:authenticator-login-page'), 'http://boinc.berkeley.edu/wiki/BOINC_Data_directory')), NULL, 'boinc:authenticator-login-page').'</li>'.
+      '    <li>'.bts('Find your account file for this project; it will have a name like %file (where the project URL is %url).', array('%file' => "account_{$project_domain}.xml", '%url' => "http://{$project_domain}"), NULL, 'boinc:authenticator-login-page').'</li>'.
+      '    <li>'.bts("Open the file in a text editor like Notepad. You'll see something like:", array(), NULL, 'boinc:authenticator-login-page').
+      '      <pre>'.
+      '&lt;account&gt;'."\n".
+      "  &lt;master_url&gt;http://{$project_domain}/&lt;/master_url&gt;"."\n".
+      '  &lt;authenticator&gt;8b8496fdd26df7dc0423ecd43c09a56b&lt;/authenticator&gt;'."\n".
+      "  &lt;project_name&gt;{$project_name}&lt;/project_name&gt;"."\n".
+      '  ...'."\n".
+      '&lt;/account&gt;'.
+      '      </pre>'.
+      '    </li>'.
+      '    <li>'.bts('Select and Copy the string between &lt;authenticator&gt; and &lt;/authenticator&gt; (%auth in the above example).', array('%auth' => '8b8496fdd26df7dc0423ecd43c09a56b'), NULL, 'boinc:authenticator-login-page').'</li>'.
+      '    <li>'.bts('Paste the string into the field below, and click OK.', array(), NULL, 'boinc:authenticator-login-page').'</li>'.
+      '    <li>'.bts('You will now be logged in to your account; update the email and password of your account.', array(), NULL, 'boinc:authenticator-login-page').'</li>'.
+      '  </ul>'.
       '</p>'
   );
   $form['authenticator'] = array(
@@ -536,7 +536,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/password') . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/password').'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -599,7 +599,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -650,7 +650,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -667,7 +667,7 @@ 
   $uid = $form_state['storage']['ban_user_uid'];
   $reason = $form_state['values']['reason'];
   $duration = $form_state['values']['duration'];
-  if ($duration) $duration = $duration * 24*60*60;
+  if ($duration) $duration = $duration*24*60*60;
   boincuser_moderate_user_ban($uid, $reason, $duration);
 }
 
@@ -694,10 +694,10 @@ 
     drupal_goto();
   }
 
-  drupal_set_message( bts('WARNING: You have not agreed to our terms of use. Please agree to the terms of use before continuing.', array(), NULL, 'boinc:termsofuse-form'), 'warning' );
+  drupal_set_message(bts('WARNING: You have not agreed to our terms of use. Please agree to the terms of use before continuing.', array(), NULL, 'boinc:termsofuse-form'), 'warning');
 
   $form = array();
-  drupal_add_js(drupal_get_path('module', 'boincuser') . '/boincuser.js');
+  drupal_add_js(drupal_get_path('module', 'boincuser').'/boincuser.js');
   $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
 
   // Fieldset to hold all of the form as a container
@@ -710,7 +710,7 @@ 
 
   $form['termsofuse']['title1'] = array(
     '#weight' => -12,
-    '#value' => '<h2>' . bts( variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:termsofuse-form' ) . '</h2>',
+    '#value' => '<h2>'.bts(variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:termsofuse-form').'</h2>',
     '#prefix' => '<div id="register-title1">',
     '#suffix' => '</div>',
   );
@@ -745,12 +745,12 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('NO - LOGOUT', array(), NULL, 'boinc:form-cancel'), '/logout') . '</li>',
+    '#value' => '<li class="tab">'.l(bts('NO - LOGOUT', array(), NULL, 'boinc:form-cancel'), '/logout').'</li>',
   );
   if (module_exists('boincuser_delete')) {
-    $deletelink = '/user/' . $user->uid . '/delete';
+    $deletelink = '/user/'.$user->uid.'/delete';
     $form['deleteaccount'] = array(
-      '#value' => '<li class="tab">' . l(bts('NO - DELETE ACCOUNT', array(), NULL, 'boinc:form-delete-user'), $deletelink) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('NO - DELETE ACCOUNT', array(), NULL, 'boinc:form-delete-user'), $deletelink).'</li>',
     );
   }
 
@@ -843,7 +843,7 @@ 
   $form['buttons']['submit']['#suffix'] = '</li>';
   $form['buttons']['submit']['#weight'] = 1002;
   $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/info/edit') . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/info/edit').'</li>',
       '#weight' => 1005,
   );
   $form['buttons']['form control tabs suffix'] = array(
@@ -887,7 +887,7 @@ 
 
   // Set new password based on previous email address and entered
   // password.
-  $new_passwd_hash = password_hash( md5($form_state['values']['pass'].$pem), PASSWORD_DEFAULT);
+  $new_passwd_hash = password_hash(md5($form_state['values']['pass'].$pem), PASSWORD_DEFAULT);
 
   $boinc_user->update("email_addr='${pem}', previous_email_addr='', email_addr_change_time=0, passwd_hash='${new_passwd_hash}'");
 

Indentation +429 added lines, -429 removed lines

@@ -15,59 +15,59 @@ 
  * Form validation handler for login
  */
 function boincuser_login_validate($form, &$form_state) {
-  /* // SAMPLE: To try validation with Drupal first...
+    /* // SAMPLE: To try validation with Drupal first...
   global $user;
   if (!empty($user->uid)) {
     // Authentication with Drupal was successful
     return;
   }*/
 
-  // Set name for logging purposes
-  $form_state['values']['name'] = $form_state['values']['email'];
+    // Set name for logging purposes
+    $form_state['values']['name'] = $form_state['values']['email'];
 
-  // Bypass BOINC validation if passed the name of user 1
-  $user_1 = user_load(1);
-  if ($form_state['values']['email'] == $user_1->name) {
+    // Bypass BOINC validation if passed the name of user 1
+    $user_1 = user_load(1);
+    if ($form_state['values']['email'] == $user_1->name) {
     user_authenticate($form_state['values']);
     return;
-  }
+    }
 
-  // Call our custom authentication function to check for an existing BOINC user
-  if (!boincuser_login_authenticate($form_state['values'])) {
+    // Call our custom authentication function to check for an existing BOINC user
+    if (!boincuser_login_authenticate($form_state['values'])) {
     // Authentication failed; set an error accordingly
     form_set_error('name', bts('Sorry, unrecognized email address or password.', array(), NULL, 'boinc:forgot-password') . ' ' . l(bts('Have you forgotten your password?', array(), NULL, 'boinc:forgot-password'), 'user/password'));
-  }
+    }
 }
 
 /**
  * Custom authentication function to check BOINC account information
  */
 function boincuser_login_authenticate($form_values) {
-  global $boincuser_authenticated;
-  $lower_email_addr = strtolower($form_values['email']);
-  $passwd = $form_values['pass'];
-  $passwd_hash = md5($passwd.$lower_email_addr);
+    global $boincuser_authenticated;
+    $lower_email_addr = strtolower($form_values['email']);
+    $passwd = $form_values['pass'];
+    $passwd_hash = md5($passwd.$lower_email_addr);
 
-  // Include BOINC user library
-  require_boinc('boinc_db');
-  require_boinc('user_util');
+    // Include BOINC user library
+    require_boinc('boinc_db');
+    require_boinc('user_util');
 
-  // Get the BOINC user and check credentials
-  $boinc_user = BoincUser::lookup_email_addr($lower_email_addr);
-  if (!$boinc_user) return false;
+    // Get the BOINC user and check credentials
+    $boinc_user = BoincUser::lookup_email_addr($lower_email_addr);
+    if (!$boinc_user) return false;
 
-  if (!check_passwd_hash($boinc_user, $passwd_hash)) {
+    if (!check_passwd_hash($boinc_user, $passwd_hash)) {
     return false;
-  }
+    }
 
-  // BOINC authentication successful; log in and synchronize accounts
-  boincuser_login_register($boinc_user);
-  // Write session, update timestamp, run user 'login' hook.
-  user_authenticate_finalize($form_values);
-  // Use a global variable to save the fact that we did authentication.
-  $boincuser_authenticated = true;
+    // BOINC authentication successful; log in and synchronize accounts
+    boincuser_login_register($boinc_user);
+    // Write session, update timestamp, run user 'login' hook.
+    user_authenticate_finalize($form_values);
+    // Use a global variable to save the fact that we did authentication.
+    $boincuser_authenticated = true;
 
-  return true;
+    return true;
 }
 
 /**
@@ -75,18 +75,18 @@ 
  * Drupal accounts
  */
 function boincuser_login_register($boinc_user) {
-  global $user;
-  require_boinc('boinc_db');
-  // If a Drupal account already exists, log in
-  $existing_user = user_load(array('mail' => $boinc_user->email_addr));
-  if (!empty($existing_user->uid)) {
+    global $user;
+    require_boinc('boinc_db');
+    // If a Drupal account already exists, log in
+    $existing_user = user_load(array('mail' => $boinc_user->email_addr));
+    if (!empty($existing_user->uid)) {
     $user = $existing_user;
-  } else {
+    } else {
     // Create a Drupal user from the BOINC user
     if ($user = boincuser_register_make_drupal_user($boinc_user)) {
-      watchdog('user', 'New external user: %email using module %module.', array('%email' => $email_addr, '%module' => $module), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $user->uid .'/edit'));
+        watchdog('user', 'New external user: %email using module %module.', array('%email' => $email_addr, '%module' => $module), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $user->uid .'/edit'));
+    }
     }
-  }
 }
 
 
@@ -98,113 +98,113 @@ 
  * New user registration validation handler.
  */
 function boincuser_register_validate($form, &$form_state) {
-  // Include BOINC database objects library
-  require_boinc('boinc_db');
+    // Include BOINC database objects library
+    require_boinc('boinc_db');
 
-  // Check terms of use agreement
-  $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-  if (!empty($termsofuse)) {
+    // Check terms of use agreement
+    $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
+    if (!empty($termsofuse)) {
     if (!$form_state['values']['termsofuse']['agreeTOU']) {
-      form_set_error('termsofuse', bts('ERROR: You must acknowledge our terms of use by clicking the checkbox before registering for an account.', NULL, 'boinc:register-new-user'));
-      return false;
+        form_set_error('termsofuse', bts('ERROR: You must acknowledge our terms of use by clicking the checkbox before registering for an account.', NULL, 'boinc:register-new-user'));
+        return false;
+    }
     }
-  }
 
-  // Lower-case the email address
-  $lower_email_addr = strtolower($form_state['values']['mail']);
-  $tmp_user = BoincUser::lookup_prev_email_addr($lower_email_addr);
-  if ($tmp_user) {
+    // Lower-case the email address
+    $lower_email_addr = strtolower($form_state['values']['mail']);
+    $tmp_user = BoincUser::lookup_prev_email_addr($lower_email_addr);
+    if ($tmp_user) {
     // User already exists
     rules_invoke_event('boincuser_change_email_error', $lower_email_addr, variable_get('boinc_admin_mailing_list_subject_tag', ''));
     form_set_error('mail',
-      bts('An account already exists for @email. The @project administrators have been notified.',
+        bts('An account already exists for @email. The @project administrators have been notified.',
         array(
-          '@email' => $lower_email_addr,
-          '@project' => variable_get('site_name', 'Drupal-BOINC')
+            '@email' => $lower_email_addr,
+            '@project' => variable_get('site_name', 'Drupal-BOINC')
         ), NULL, 'boinc:register-new-user')
     );
-  }
+    }
 
-  // Check for an existing BOINC user
-  // This is somewhat redundent as Drupal will also check if the email
-  // is a duplicate. However, in the case where there is no Drupal
-  // account, but a BOINC account exists with this email, the check
-  // will fail.
-  $boinc_user = BoincUser::lookup_email_addr($lower_email_addr);
-  if ($boinc_user) {
+    // Check for an existing BOINC user
+    // This is somewhat redundent as Drupal will also check if the email
+    // is a duplicate. However, in the case where there is no Drupal
+    // account, but a BOINC account exists with this email, the check
+    // will fail.
+    $boinc_user = BoincUser::lookup_email_addr($lower_email_addr);
+    if ($boinc_user) {
     // User already exists
     form_set_error('mail', bts('An account already exists for @email. Log in or request password assistance to access your @project account.', array('@email' => $lower_email_addr, '@project' => PROJECT), NULL, 'boinc:add-new-user'));
     return false;
-  }
+    }
 
-  // Check Drupal name is not a duplicate, and create a proper drupal
-  // name from the boinc username.
-  $form_state['values']['name'] = create_proper_drupalname($form_state['values']['boincuser_name']);
+    // Check Drupal name is not a duplicate, and create a proper drupal
+    // name from the boinc username.
+    $form_state['values']['name'] = create_proper_drupalname($form_state['values']['boincuser_name']);
 
-  return true;
+    return true;
 }
 
 /**
  * Create BOINC account
  */
 function boincuser_register_make_user($params) {
-  // Include BOINC user library
-  require_boinc('user_util');
-  // Create the BOINC user
-  $boinc_user = make_user($params['email_addr'], $params['name'], $params['passwd_hash'], $params['country'], $params['postal_code']);
-  return $boinc_user;
+    // Include BOINC user library
+    require_boinc('user_util');
+    // Create the BOINC user
+    $boinc_user = make_user($params['email_addr'], $params['name'], $params['passwd_hash'], $params['country'], $params['postal_code']);
+    return $boinc_user;
 }
 
 /**
  * Create Drupal account from existing BOINC account
  */
 function boincuser_register_make_drupal_user($boinc_user) {
-  $account = null;
-  if (is_numeric($boinc_user)) {
+    $account = null;
+    if (is_numeric($boinc_user)) {
     $boinc_user = boincuser_load($boinc_user);
-  }
-  if ($boinc_user) {
+    }
+    if ($boinc_user) {
     $account = boincuser_create_drupal_user($boinc_user);
     if ($account) {
-      boincuser_create_drupal_profile($account, $boinc_user);
+        boincuser_create_drupal_profile($account, $boinc_user);
+    }
     }
-  }
-  return $account;
+    return $account;
 }
 
 function boincuser_create_drupal_user($boinc_user) {
-  require_boinc('forum_db');
-  BoincForumPrefs::lookup($boinc_user);
-  $account = NULL;
-  $module = 'boincuser';
+    require_boinc('forum_db');
+    BoincForumPrefs::lookup($boinc_user);
+    $account = NULL;
+    $module = 'boincuser';
 
-  // Verify that this account has not already been imported
-  $already_imported = db_result(db_query('
+    // Verify that this account has not already been imported
+    $already_imported = db_result(db_query('
     SELECT COUNT(*) FROM {boincuser} WHERE boinc_id = %d',
     $boinc_user->id)
-  );
-  if ($already_imported) {
+    );
+    if ($already_imported) {
     return NULL;
-  }
+    }
 
-  // Email is limited to 64 characters...
-  $boinc_email = substr($boinc_user->email_addr, 0, 64);
+    // Email is limited to 64 characters...
+    $boinc_email = substr($boinc_user->email_addr, 0, 64);
 
-  // Email should be unique
-  $already_imported = db_result(db_query("
+    // Email should be unique
+    $already_imported = db_result(db_query("
     SELECT COUNT(*) FROM {users} WHERE mail = '%s'",
     $boinc_email)
-  );
-  if ($already_imported) {
+    );
+    if ($already_imported) {
     drupal_set_message(t('An account for @email already exists', array('@email' => $boinc_email)), 'warning');
     watchdog('boincimport', 'An account for @email already exists', array('@email' => $boinc_email), WATCHDOG_WARNING);
     return NULL;
-  }
+    }
 
-  // Make sure name is unique
-  $unique_name = create_proper_drupalname($boinc_user->name);
+    // Make sure name is unique
+    $unique_name = create_proper_drupalname($boinc_user->name);
 
-  $userinfo = array(
+    $userinfo = array(
     'name' => $unique_name,
     'pass' => $boinc_user->passwd_hash,
     'mail' => $boinc_email,
@@ -214,126 +214,126 @@ 
     'status' => 1,
     "authname_{$module}" => $boinc_email,
     'access' => time()
-  );
+    );
 
-  $in_penalty = ($boinc_user->prefs->banished_until > time());
+    $in_penalty = ($boinc_user->prefs->banished_until > time());
 
-  // Add user to community member role (if no current penalty)
-  if (!$in_penalty) {
+    // Add user to community member role (if no current penalty)
+    if (!$in_penalty) {
     $community_role = array_search('community member', user_roles(true));
     $userinfo['roles'] = array(
-      $community_role => ''
+        $community_role => ''
     );
-  }
+    }
 
-  // Mark account as imported so a BOINC account is not created on Insert (i.e. user_save)
-  $_SESSION['importedUser'] = true;
-  $account = user_save('', $userinfo);
+    // Mark account as imported so a BOINC account is not created on Insert (i.e. user_save)
+    $_SESSION['importedUser'] = true;
+    $account = user_save('', $userinfo);
 
-  // Drupal overrides the original registration date, so update to the correct date
-  $account = user_save($account, array('created' => $userinfo['created']));
+    // Drupal overrides the original registration date, so update to the correct date
+    $account = user_save($account, array('created' => $userinfo['created']));
 
-  // Terminate if an error occured during user_save().
-  if (!$account) {
+    // Terminate if an error occured during user_save().
+    if (!$account) {
     drupal_set_message(t("Error saving user account."), 'error');
     return NULL;
-  }
+    }
 
-  // Cross reference the Drupal and BOINC accounts
-  boincuser_account_cross_reference($account->uid, $boinc_user->id);
+    // Cross reference the Drupal and BOINC accounts
+    boincuser_account_cross_reference($account->uid, $boinc_user->id);
 
-  if ($in_penalty) {
+    if ($in_penalty) {
     // Import the timestamp of when the penalty period will be over
     $boincuser_record = array(
-      'uid' => $account->uid,
-      'penalty_expiration' => $boinc_user->prefs->banished_until,
+        'uid' => $account->uid,
+        'penalty_expiration' => $boinc_user->prefs->banished_until,
     );
     drupal_write_record('boincuser', $boincuser_record, 'uid');
-  }
+    }
 
-  return $account;
+    return $account;
 }
 
 function boincuser_create_drupal_profile($account, $boinc_user) {
 
-  require_boinc('forum_db');
-  BoincForumPrefs::lookup($boinc_user);
+    require_boinc('forum_db');
+    BoincForumPrefs::lookup($boinc_user);
 
-  $image_dir = boinc_get_path('user_image');
+    $image_dir = boinc_get_path('user_image');
 
-  // Automatically create a content profile
-  $now = time();
-  $profile_background = null;
-  $profile_opinions = null;
-  $profile_image = null;
-  $avatar_image = null;
-  $profile_approved = NULL;
+    // Automatically create a content profile
+    $now = time();
+    $profile_background = null;
+    $profile_opinions = null;
+    $profile_image = null;
+    $avatar_image = null;
+    $profile_approved = NULL;
 
-  // Load the BOINC profile, if available
-  if ($boinc_user->has_profile) {
+    // Load the BOINC profile, if available
+    if ($boinc_user->has_profile) {
     $boinc_profile = BoincProfile::lookup("userid={$boinc_user->id}");
     $profile_background = $boinc_profile->response1;
     $profile_opinions = $boinc_profile->response2;
     if ($boinc_profile->has_picture) {
-      // Load picture; load validators; determine where to store it in Drupal
-      $image_path = "{$image_dir}/{$boinc_user->id}.jpg";
-      $profile_image = get_cck_image_object($image_path, 'field_profile_image', 'profile', TRUE);
-      // If the user does not have a different image as an avatar, use this one
-      if (!$boinc_user->prefs->avatar) {
+        // Load picture; load validators; determine where to store it in Drupal
+        $image_path = "{$image_dir}/{$boinc_user->id}.jpg";
+        $profile_image = get_cck_image_object($image_path, 'field_profile_image', 'profile', TRUE);
+        // If the user does not have a different image as an avatar, use this one
+        if (!$boinc_user->prefs->avatar) {
         $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
-      }
+        }
     }
     if ($boinc_user->prefs->avatar) {
-      $image_path = "{$image_dir}/{$boinc_user->id}_avatar.jpg";
-      $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
+        $image_path = "{$image_dir}/{$boinc_user->id}_avatar.jpg";
+        $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
     }
     $profile_approved = $boinc_profile->verification ? TRUE : FALSE;
-  }
-  $default_input_format = db_result(db_query("
+    }
+    $default_input_format = db_result(db_query("
     SELECT format FROM {filter_formats} WHERE name = '%s'", 'Rich text'));
-  if (!$default_input_format) $default_input_format = 1;
-
-  // Populate the profile object
-  $profile_node = new stdClass();
-  $profile_node->title = $boinc_user->name;
-  $profile_node->uid = $account->uid;
-  $profile_node->body = '';
-  $profile_node->type = 'profile';
-  $profile_node->created = $now;
-  $profile_node->changed = $now;
-  $profile_node->status = 1;
-  $profile_node->promote = 0;
-  $profile_node->sticky = 0;
-  $profile_node->format = $default_input_format;
-  $profile_node->name = $account->name; // Set to link profile to account uid!
-  $profile_node->field_country[]['value'] = $boinc_user->country;
-  $profile_node->field_zip[]['value'] = $boinc_user->postal_code;
-  $profile_node->field_url[]['value'] = $boinc_user->url;
-  $profile_node->field_background[]['value'] = $profile_background;
-  $profile_node->field_opinions[]['value'] = $profile_opinions;
-  $profile_node->field_image[] = $avatar_image;
-  $profile_node->field_profile_image[] = $profile_image;
-
-  // Save the profile object to the database
-  // This will automatically set the author uid if node->name has been set
-  $profile_node = node_submit($profile_node);
-  node_save($profile_node);
-
-  // Mark profile as approved if it has already been vetted somehow
-  if ($profile_approved OR !$boinc_user->has_profile) {
+    if (!$default_input_format) $default_input_format = 1;
+
+    // Populate the profile object
+    $profile_node = new stdClass();
+    $profile_node->title = $boinc_user->name;
+    $profile_node->uid = $account->uid;
+    $profile_node->body = '';
+    $profile_node->type = 'profile';
+    $profile_node->created = $now;
+    $profile_node->changed = $now;
+    $profile_node->status = 1;
+    $profile_node->promote = 0;
+    $profile_node->sticky = 0;
+    $profile_node->format = $default_input_format;
+    $profile_node->name = $account->name; // Set to link profile to account uid!
+    $profile_node->field_country[]['value'] = $boinc_user->country;
+    $profile_node->field_zip[]['value'] = $boinc_user->postal_code;
+    $profile_node->field_url[]['value'] = $boinc_user->url;
+    $profile_node->field_background[]['value'] = $profile_background;
+    $profile_node->field_opinions[]['value'] = $profile_opinions;
+    $profile_node->field_image[] = $avatar_image;
+    $profile_node->field_profile_image[] = $profile_image;
+
+    // Save the profile object to the database
+    // This will automatically set the author uid if node->name has been set
+    $profile_node = node_submit($profile_node);
+    node_save($profile_node);
+
+    // Mark profile as approved if it has already been vetted somehow
+    if ($profile_approved OR !$boinc_user->has_profile) {
     $profile_node->moderate = 0;
     node_save($profile_node);
-  }
+    }
 
-  return;
+    return;
 }
 
 function boincuser_account_cross_reference($uid, $boinc_id) {
     // Cross reference Drupal account with BOINC
     $reference = db_query("INSERT INTO {boincuser} SET uid=%d, boinc_id=%d", $uid, $boinc_id);
     if (!$reference) {
-      drupal_set_message(t("Error connecting BOINC account."), 'error');
-      return false;
+        drupal_set_message(t("Error connecting BOINC account."), 'error');
+        return false;
     }
     return true;
 }
@@ -342,35 +342,35 @@ 
  * Convert any BOINC forum thread subscriptions to Drupal flag subscriptions
  */
 function boincuser_pull_subscriptions($account = NULL) {
-  if (!$account) {
+    if (!$account) {
     global $user;
     $account = user_load($user->id);
-  }
-  elseif (is_numeric($account)) {
+    }
+    elseif (is_numeric($account)) {
     $account = user_load($account);
-  }
+    }
 
-  // Get any subscriptions for this user
-  db_set_active('boinc_rw');
-  $subscriptions = db_query('
+    // Get any subscriptions for this user
+    db_set_active('boinc_rw');
+    $subscriptions = db_query('
     SELECT threadid FROM {subscriptions}
     WHERE userid = %d', $account->boincuser_id);
-  db_set_active('default');
+    db_set_active('default');
 
-  $flag = flag_get_flag('subscriptions') or die('no "subscriptions" flag defined');
-  $count = 0;
-  while ($thread_id = db_result($subscriptions)) {
+    $flag = flag_get_flag('subscriptions') or die('no "subscriptions" flag defined');
+    $count = 0;
+    while ($thread_id = db_result($subscriptions)) {
     // For each BOINC thread ID subscribed, look up the corresponding node ID
     $nid = db_result(db_query('
       SELECT nid FROM {boincimport_temp_topic}
       WHERE topic_id = %d', $thread_id));
     // Flag this node for the user
     if ($nid > 0) {
-      $flag->flag('flag', $nid, $account);
-      $count++;
+        $flag->flag('flag', $nid, $account);
+        $count++;
+    }
     }
-  }
-  return $count;
+    return $count;
 }
 
 
@@ -382,12 +382,12 @@ 
  * User account update validation handler.
  */
 function boincuser_account_validate($edit, $account) {
-  // Include BOINC database objects library, load BOINC account data
-  require_boinc('boinc_db');
-  $boinc_user = BoincUser::lookup_email_addr($account->mail);
-  $changing_email = ($edit['mail'] AND $edit['mail'] != $account->mail) ? true : false;
-  $changing_pass = ($edit['pass']) ? true : false;
-  if ($changing_email) {
+    // Include BOINC database objects library, load BOINC account data
+    require_boinc('boinc_db');
+    $boinc_user = BoincUser::lookup_email_addr($account->mail);
+    $changing_email = ($edit['mail'] AND $edit['mail'] != $account->mail) ? true : false;
+    $changing_pass = ($edit['pass']) ? true : false;
+    if ($changing_email) {
     // E-mail address is set to change; check for an existing BOINC user
     // Check previous email addresses as well, this user's current
     // email cannot be the same as another user's previous email
@@ -398,50 +398,50 @@ 
 
     $boinc_user_already_exists = ( BoincUser::lookup_email_addr($edit['mail']) || BoincUser::lookup_prev_email_addr($edit['mail']) );
     if ($boinc_user_already_exists) {
-      form_set_error('mail', bts('A BOINC account already exists for @email.', array('@email' => $edit['mail']), NULL, 'boinc:add-new-user'));
+        form_set_error('mail', bts('A BOINC account already exists for @email.', array('@email' => $edit['mail']), NULL, 'boinc:add-new-user'));
     }
 
     // Check email has not been changed in last X days (default X=7).
     $duration = 86400 * 7;
     if ( (($boinc_user->email_addr_change_time + $duration) > time()) and (!(user_access('administer users'))) ) {
-      form_set_error('email_addr_change_time',
+        form_set_error('email_addr_change_time',
         bts('Your email address was changed within the past seven (7) days. You must wait until !futuredate to change your email again. If you need to reverse this change, please look for an email sent to !prev_email_addr.',
         array(
-          '!futuredate' => date('F j, Y \a\t H:i T', $boinc_user->email_addr_change_time + $duration),
-          '!prev_email_addr' => $boinc_user->previous_email_addr,
+            '!futuredate' => date('F j, Y \a\t H:i T', $boinc_user->email_addr_change_time + $duration),
+            '!prev_email_addr' => $boinc_user->previous_email_addr,
         ),
         NULL, 'boinc:account-credentials-change')
-      );
+        );
+    }
     }
-  }
 
-  // If user is changing email or password, require that the current
-  // password has been given as well.
-  if (($changing_email OR $changing_pass) AND !user_access('administer users')) {
+    // If user is changing email or password, require that the current
+    // password has been given as well.
+    if (($changing_email OR $changing_pass) AND !user_access('administer users')) {
     // If changing email or password, require current password
     // (except in cases where password is being reset)
     if (isset($_SESSION['reset_pass'])) {
-      unset($_SESSION['reset_pass']);
+        unset($_SESSION['reset_pass']);
     }
     else {
-      $given_hash = md5($edit['current_pass'] . strtolower($account->mail));
-      if (!$edit['current_pass']) {
+        $given_hash = md5($edit['current_pass'] . strtolower($account->mail));
+        if (!$edit['current_pass']) {
         form_set_error('current_pass', bts('Authentication is required when changing E-mail address or setting new password.', array(), NULL, 'boinc:account-credentials-change'));
-      }
-      elseif ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
+        }
+        elseif ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
         form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:account-credentials-change'));
-      }
+        }
 
     }
-  }
+    }
 
-  // If an admin tries to change the email and NOT the password, show
-  // error message. BOINC requires both to be changed together.
-  if ($changing_email AND !$changing_pass AND user_access('administer users')) {
+    // If an admin tries to change the email and NOT the password, show
+    // error message. BOINC requires both to be changed together.
+    if ($changing_email AND !$changing_pass AND user_access('administer users')) {
     form_set_error('pass', bts('If changing a user\'s email, you must also change the password simultaneously.', array(), NULL, 'boinc:account-credentials-change'));
-  }
+    }
 
-  // Expansion required to allow account key in place of passwd...?
+    // Expansion required to allow account key in place of passwd...?
 
 }
 
@@ -454,12 +454,12 @@ 
  * Password request validation handler.
  */
 function boincuser_request_pass_validate($form, &$form_state) {
-  $edit = $form_state['values'];
-  // The Drupal submit function expects a "name" field, even though
-  // it contains an email address and we will not allow a user name
-  if (!$edit['name']) form_set_error('name', bts('Please enter your email address', array(), NULL, 'boinc:forgot-password'));
-  elseif (!valid_email_address($edit['name'])) form_set_error('name', bts('@email is not a well formed email address, please verify', array('@email' => $edit['name']), NULL, 'boinc:forgot-password'));
-  else {
+    $edit = $form_state['values'];
+    // The Drupal submit function expects a "name" field, even though
+    // it contains an email address and we will not allow a user name
+    if (!$edit['name']) form_set_error('name', bts('Please enter your email address', array(), NULL, 'boinc:forgot-password'));
+    elseif (!valid_email_address($edit['name'])) form_set_error('name', bts('@email is not a well formed email address, please verify', array('@email' => $edit['name']), NULL, 'boinc:forgot-password'));
+    else {
     // set email addrress to lower case
     $lower_email_addr = strtolower($edit['name']);
 
@@ -469,110 +469,110 @@ 
     require_boinc('boinc_db');
     $boinc_user = BoincUser::lookup_email_addr($lower_email_addr);
     if ($boinc_user) {
-      // If the user is in BOINC but not Drupal, bring them over...
-      boincuser_register_make_drupal_user($boinc_user);
+        // If the user is in BOINC but not Drupal, bring them over...
+        boincuser_register_make_drupal_user($boinc_user);
     } else {
-      // If there is no existing BOINC user either, show an error
-      form_set_error('name', bts('No account exists for @email -- please create an account using a BOINC client -- !instructions',
-      array(
-          '@email' => $edit['name'],
-          '!instructions' => l(bts('Instructions', array(), NULL, 'boinc:forgot-password'), 'join')
-      ), NULL, 'boinc:forgot-password'));
-    }
-  }
+        // If there is no existing BOINC user either, show an error
+        form_set_error('name', bts('No account exists for @email -- please create an account using a BOINC client -- !instructions',
+        array(
+            '@email' => $edit['name'],
+            '!instructions' => l(bts('Instructions', array(), NULL, 'boinc:forgot-password'), 'join')
+        ), NULL, 'boinc:forgot-password'));
+    }
+    }
 }
 
 /**
  * The definition of the authenticator login form.
  */
 function boincuser_authloginform() {
-  $headers = apache_request_headers();
-  $project_name = variable_get('site_name', 'Drupal-BOINC');
-  $project_domain = $headers['Host'];
-  $form['heading'] = array(
+    $headers = apache_request_headers();
+    $project_name = variable_get('site_name', 'Drupal-BOINC');
+    $project_domain = $headers['Host'];
+    $form['heading'] = array(
     '#type' => 'markup',
     '#value' => '<h3>' . bts("If you forgot your account's email address, or you can't receive email there:", array(), NULL, 'boinc:authenticator-login-page') . '</h3>'
-  );
-  $form['instructions'] = array(
+    );
+    $form['instructions'] = array(
     '#type' => 'markup',
     '#value' => '' .
-      '<p>' . bts("If you have run BOINC under the account, you can still access it. Here's how:", array(), NULL, 'boinc:authenticator-login-page') .
-      '  <ul>' .
-      '    <li>' . bts('Go to the BOINC data directory on your computer (see !boinc_wiki for help finding this).', array('!boinc_wiki' => l(bts('BOINC documentation', array(), NULL, 'boinc:authenticator-login-page'), 'http://boinc.berkeley.edu/wiki/BOINC_Data_directory')), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts('Find your account file for this project; it will have a name like %file (where the project URL is %url).', array('%file' => "account_{$project_domain}.xml", '%url' => "http://{$project_domain}"), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts("Open the file in a text editor like Notepad. You'll see something like:", array(), NULL, 'boinc:authenticator-login-page') .
-      '      <pre>' .
-      '&lt;account&gt;' . "\n" .
-      "  &lt;master_url&gt;http://{$project_domain}/&lt;/master_url&gt;" . "\n" .
-      '  &lt;authenticator&gt;8b8496fdd26df7dc0423ecd43c09a56b&lt;/authenticator&gt;' . "\n" .
-      "  &lt;project_name&gt;{$project_name}&lt;/project_name&gt;" . "\n" .
-      '  ...' . "\n" .
-      '&lt;/account&gt;' .
-      '      </pre>' .
-      '    </li>' .
-      '    <li>' . bts('Select and Copy the string between &lt;authenticator&gt; and &lt;/authenticator&gt; (%auth in the above example).', array('%auth' => '8b8496fdd26df7dc0423ecd43c09a56b'), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts('Paste the string into the field below, and click OK.', array(), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts('You will now be logged in to your account; update the email and password of your account.', array(), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '  </ul>' .
-      '</p>'
-  );
-  $form['authenticator'] = array(
+        '<p>' . bts("If you have run BOINC under the account, you can still access it. Here's how:", array(), NULL, 'boinc:authenticator-login-page') .
+        '  <ul>' .
+        '    <li>' . bts('Go to the BOINC data directory on your computer (see !boinc_wiki for help finding this).', array('!boinc_wiki' => l(bts('BOINC documentation', array(), NULL, 'boinc:authenticator-login-page'), 'http://boinc.berkeley.edu/wiki/BOINC_Data_directory')), NULL, 'boinc:authenticator-login-page') . '</li>' .
+        '    <li>' . bts('Find your account file for this project; it will have a name like %file (where the project URL is %url).', array('%file' => "account_{$project_domain}.xml", '%url' => "http://{$project_domain}"), NULL, 'boinc:authenticator-login-page') . '</li>' .
+        '    <li>' . bts("Open the file in a text editor like Notepad. You'll see something like:", array(), NULL, 'boinc:authenticator-login-page') .
+        '      <pre>' .
+        '&lt;account&gt;' . "\n" .
+        "  &lt;master_url&gt;http://{$project_domain}/&lt;/master_url&gt;" . "\n" .
+        '  &lt;authenticator&gt;8b8496fdd26df7dc0423ecd43c09a56b&lt;/authenticator&gt;' . "\n" .
+        "  &lt;project_name&gt;{$project_name}&lt;/project_name&gt;" . "\n" .
+        '  ...' . "\n" .
+        '&lt;/account&gt;' .
+        '      </pre>' .
+        '    </li>' .
+        '    <li>' . bts('Select and Copy the string between &lt;authenticator&gt; and &lt;/authenticator&gt; (%auth in the above example).', array('%auth' => '8b8496fdd26df7dc0423ecd43c09a56b'), NULL, 'boinc:authenticator-login-page') . '</li>' .
+        '    <li>' . bts('Paste the string into the field below, and click OK.', array(), NULL, 'boinc:authenticator-login-page') . '</li>' .
+        '    <li>' . bts('You will now be logged in to your account; update the email and password of your account.', array(), NULL, 'boinc:authenticator-login-page') . '</li>' .
+        '  </ul>' .
+        '</p>'
+    );
+    $form['authenticator'] = array(
     '#title' => bts('Log in with authenticator', array(), NULL, 'boinc:authenticator-login-page'),
     '#type' => 'textfield',
     '#size' => 60,
     '#maxlength' => 32,
     '#required' => TRUE,
     '#description' => null
-  );
+    );
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('OK', array(), NULL, 'boinc:form-ok'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/password') . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 /**
  * The authenticator login validation handler
  */
 function boincuser_authloginform_validate($form, &$form_state) {
-  $authenticator = $form_state['values']['authenticator'];
-  if (strlen($authenticator) != 32) {
+    $authenticator = $form_state['values']['authenticator'];
+    if (strlen($authenticator) != 32) {
     // We notify the form API that this field has failed validation.
     form_set_error('authenticator', bts('That authenticator is not valid.', array(), NULL, 'boinc:authenticator-login-page'));
-  } else {
+    } else {
     require_boinc('boinc_db');
     $boinc_user = BoincUser::lookup("authenticator='".addslashes($authenticator)."'");
     if (!$boinc_user) form_set_error('authenticator', bts('There is no account with that authenticator.', array(), NULL, 'boinc:authenticator-login-page'));
-  }
+    }
 }
 
 /**
  * The authenticator login submit handler
  */
 function boincuser_authloginform_submit($form, &$form_state) {
-  global $user;
-  $authenticator = $form_state['values']['authenticator'];
-  require_boinc('boinc_db');
-  $boinc_user = BoincUser::lookup("authenticator='".addslashes($authenticator)."'");
-  if (!$user = user_load(get_drupal_id($boinc_user->id))) drupal_set_message(t('An unresolved error occurred while logging into this account.'));
-  else $form_state['redirect'] = 'account/info/edit';
+    global $user;
+    $authenticator = $form_state['values']['authenticator'];
+    require_boinc('boinc_db');
+    $boinc_user = BoincUser::lookup("authenticator='".addslashes($authenticator)."'");
+    if (!$user = user_load(get_drupal_id($boinc_user->id))) drupal_set_message(t('An unresolved error occurred while logging into this account.'));
+    else $form_state['redirect'] = 'account/info/edit';
 }
 
 
@@ -580,44 +580,44 @@ 
  * The definition of the moderator reject user profile form.
  */
 function boincuser_moderate_profile_reject_form(&$form_state, $uid) {
-  $form_state['storage']['reject_profile_uid'] = $uid;
-  $form['reason'] = array(
+    $form_state['storage']['reject_profile_uid'] = $uid;
+    $form['reason'] = array(
     '#title' => bts('Reason for rejecting this profile', array(), NULL, 'boinc:moderate-user'),
     '#type' => 'textarea',
     '#description' => bts('This reason will be included in an email to the user. Please write a brief explanation of the problem and how to fix it.', array(), NULL, 'boinc:moderate-user'),
     '#default_value' => '',
-  );
+    );
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 /**
  * The moderator reject user profile submit handler
  */
 function boincuser_moderate_profile_reject_form_submit($form, &$form_state) {
-  $uid = $form_state['storage']['reject_profile_uid'];
-  $reason = $form_state['values']['reason'];
-  boincuser_moderate_profile_reject($uid, $reason);
+    $uid = $form_state['storage']['reject_profile_uid'];
+    $reason = $form_state['values']['reason'];
+    boincuser_moderate_profile_reject($uid, $reason);
 }
 
 
@@ -625,52 +625,52 @@ 
  * The definition of the ban user form.
  */
 function boincuser_moderate_user_ban_form(&$form_state, $uid) {
-  $form_state['storage']['ban_user_uid'] = $uid;
-  $form['reason'] = array(
+    $form_state['storage']['ban_user_uid'] = $uid;
+    $form['reason'] = array(
     '#title' => bts('Reason for banning this user', array(), NULL, 'boinc:moderate-user'),
     '#type' => 'textarea',
     '#description' => bts('This reason will be included in an email to the user. Please write a brief explanation of why the user is being banned.', array(), NULL, 'boinc:moderate-user'),
     '#default_value' => '',
-  );
-  $form['duration'] = array(
+    );
+    $form['duration'] = array(
     '#title' => bts('Duration of the ban', array(), NULL, 'boinc:moderate-user'),
     '#type' => 'textfield',
     '#description' => bts('The number of days until the ban expires. Set to 0 to ban permanently.', array(), NULL, 'boinc:moderate-user'),
     '#default_value' => '',
-  );
+    );
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 /**
  * The ban user submit handler
  */
 function boincuser_moderate_user_ban_form_submit($form, &$form_state) {
-  $uid = $form_state['storage']['ban_user_uid'];
-  $reason = $form_state['values']['reason'];
-  $duration = $form_state['values']['duration'];
-  if ($duration) $duration = $duration * 24*60*60;
-  boincuser_moderate_user_ban($uid, $reason, $duration);
+    $uid = $form_state['storage']['ban_user_uid'];
+    $reason = $form_state['values']['reason'];
+    $duration = $form_state['values']['duration'];
+    if ($duration) $duration = $duration * 24*60*60;
+    boincuser_moderate_user_ban($uid, $reason, $duration);
 }
 
 
@@ -678,10 +678,10 @@ 
  * Hack to fix submission of the flag friend unfriend form
  */
 function boincuser_fix_unfriend_form_submit($form, &$form_state) {
-  // Leaving action as "unfriend" causes problems
-  if ($form_state['values']['action'] == 'unfriend') {
+    // Leaving action as "unfriend" causes problems
+    if ($form_state['values']['action'] == 'unfriend') {
     $form_state['values']['action'] = 'unflag';
-  }
+    }
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -689,102 +689,102 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 function boincuser_termsofuse_form() {
-  global $user;
+    global $user;
 
-  // If user has already signed terms of use, and got to this form in error, send them to site home.
-  if (boincuser_check_termsofuse($user)) {
+    // If user has already signed terms of use, and got to this form in error, send them to site home.
+    if (boincuser_check_termsofuse($user)) {
     drupal_goto();
-  }
+    }
 
-  drupal_set_message( bts('WARNING: You have not agreed to our terms of use. Please agree to the terms of use before continuing.', array(), NULL, 'boinc:termsofuse-form'), 'warning' );
+    drupal_set_message( bts('WARNING: You have not agreed to our terms of use. Please agree to the terms of use before continuing.', array(), NULL, 'boinc:termsofuse-form'), 'warning' );
 
-  $form = array();
-  drupal_add_js(drupal_get_path('module', 'boincuser') . '/boincuser.js');
-  $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
+    $form = array();
+    drupal_add_js(drupal_get_path('module', 'boincuser') . '/boincuser.js');
+    $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
 
-  // Fieldset to hold all of the form as a container
-  $form['termsofuse'] = array(
+    // Fieldset to hold all of the form as a container
+    $form['termsofuse'] = array(
     '#type'   => 'fieldset',
     '#prefix' => '<div id="termsofuse-wrapper">', // This is our wrapper div.
     '#suffix' => '</div>',
     '#tree'   => TRUE,
-  );
+    );
 
-  $form['termsofuse']['title1'] = array(
+    $form['termsofuse']['title1'] = array(
     '#weight' => -12,
     '#value' => '<h2>' . bts( variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:termsofuse-form' ) . '</h2>',
     '#prefix' => '<div id="register-title1">',
     '#suffix' => '</div>',
-  );
+    );
 
-  // Terms of use section
-  $form['termsofuse']['body'] = array(
+    // Terms of use section
+    $form['termsofuse']['body'] = array(
     '#weight' => -10,
     '#value' => bts($termsofuse, array(), NULL, 'project:termsofuse-form'),
     '#prefix' => '<div id="register-termsofuse">',
     '#suffix' => '</div>',
-  );
+    );
 
-  $form['termsofuse']['agreeTOU'] = array(
+    $form['termsofuse']['agreeTOU'] = array(
     '#type'   => 'checkbox',
     '#title'  => bts(variable_get('boinc_weboptions_agreequestion', 'Do you agree with the above terms of use?'), array(), NULL, 'project:termsofuse-form'),
     '#weight' => -8,
     '#prefix' => '<div id="register-checkbox">',
     '#suffix' => '</div>',
-  );
+    );
 
-  $form['termsofuse']['spacer'] = array(
+    $form['termsofuse']['spacer'] = array(
     '#prefix' => '<div class="clearfix" id="register-title2">',
     '#value'  => '&nbsp;',
     '#suffix' => '</div>',
-  );
+    );
 
-  // Form Control
-  $form['submit'] = array(
+    // Form Control
+    $form['submit'] = array(
     '#prefix' => '<p><p><p><li class="first tab" id="register-submit">',
     '#type' => 'submit',
     '#value' => bts('Yes', array(), NULL, 'boinc:form-submit'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('NO - LOGOUT', array(), NULL, 'boinc:form-cancel'), '/logout') . '</li>',
-  );
-  if (module_exists('boincuser_delete')) {
+    );
+    if (module_exists('boincuser_delete')) {
     $deletelink = '/user/' . $user->uid . '/delete';
     $form['deleteaccount'] = array(
-      '#value' => '<li class="tab">' . l(bts('NO - DELETE ACCOUNT', array(), NULL, 'boinc:form-delete-user'), $deletelink) . '</li>',
+        '#value' => '<li class="tab">' . l(bts('NO - DELETE ACCOUNT', array(), NULL, 'boinc:form-delete-user'), $deletelink) . '</li>',
     );
-  }
+    }
 
-  // Set form redirect
-  $form['#redirect'] = $_REQUEST['destination'];
+    // Set form redirect
+    $form['#redirect'] = $_REQUEST['destination'];
 
-  // Add the current user's data into the form
-  $form['#account'] = $user;
+    // Add the current user's data into the form
+    $form['#account'] = $user;
 
-  return $form;
+    return $form;
 }
 
 function boincuser_termsofuse_form_validate($form, &$form_state) {
-  // Check TOU agreement
-  if (!$form_state['values']['termsofuse']['agreeTOU']) {
+    // Check TOU agreement
+    if (!$form_state['values']['termsofuse']['agreeTOU']) {
     form_set_error('termsofuse', bts('ERROR: You must acknowledge our terms of use by clicking the checkbox before registering for an account.', array(), NULL, 'boinc:termsofuse-form'));
-  }
+    }
 }
 
 function boincuser_termsofuse_form_submit($form, &$form_state) {
-  $user = $form['#account'];
-  if (!boincuser_consentto_termsofuse($user)) {
+    $user = $form['#account'];
+    if (!boincuser_consentto_termsofuse($user)) {
     form_set_error('termsofuse',
-      bts('There was an error in agreeing to the terms of use. The @project administrators have been notified.',
+        bts('There was an error in agreeing to the terms of use. The @project administrators have been notified.',
         array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:termsofuse-form')
     );
-  }
+    }
 
-  // Delete session messages
-  if ($_SESSION['messages']['warning']) {
+    // Delete session messages
+    if ($_SESSION['messages']['warning']) {
     unset($_SESSION['messages']['warning']);
-  }
+    }
 }
 
 /**
@@ -793,89 +793,89 @@ 
  * removed after used.
  */
 function boincuser_revertemail(&$form_state, $token) {
-  require_boinc('token');
-  require_boinc('util');
+    require_boinc('token');
+    require_boinc('util');
 
-  global $user;
-  $form = array();
+    global $user;
+    $form = array();
 
-  // drupal JS for dynamic password validation
-  _user_password_dynamic_validation();
+    // drupal JS for dynamic password validation
+    _user_password_dynamic_validation();
 
-  // 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, 'E')) {
+    // 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, 'E')) {
     drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your email address.',
     array(
-      '!link' => l(bts('changing', array(), NULL, 'boinc:revert-email-change'), "/account/info/edit"),
+        '!link' => l(bts('changing', array(), NULL, 'boinc:revert-email-change'), "/account/info/edit"),
     ),
     NULL, 'boinc:revert-email-change'), 'error');
     drupal_goto();
-  }
+    }
 
-  // Attach account and token to this form.
-  $form['_account'] = array('#type' => 'value', '#value' => $account);
-  $form['_token'] = array('#type' => 'value', '#value' => $token);
+    // Attach account and token to this form.
+    $form['_account'] = array('#type' => 'value', '#value' => $account);
+    $form['_token'] = array('#type' => 'value', '#value' => $token);
 
-  // Instructions
-  $form['main']['instructions1'] = array(
+    // Instructions
+    $form['main']['instructions1'] = array(
     '#value' => '<p>'.
     bts('In order to change your email back to your previous email address, <strong>!prev_email</strong>, you must also change your password.',
-      array(
+        array(
         '!prev_email' => $account->boincuser_previous_email_addr,
-      ),
-      NULL, 'boinc:revert-email-change').
+        ),
+        NULL, 'boinc:revert-email-change').
     '</p>',
-  );
+    );
 
-  $form['main']['pass'] = array(
+    $form['main']['pass'] = array(
     '#type' => 'password_confirm',
     '#description' => 'Enter a new password in both fields',
     '#size' => 17,
-  );
-
-  // Wrap action buttons for styling consistency
-  $form['buttons']['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">',
-      '#weight' => 1001,
-  );
-  $form['buttons']['submit']['#type'] = 'submit';
-  $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
-  $form['buttons']['submit']['#value'] = bts('Submit', array(), NULL, 'boinc:form-submit');
-  $form['buttons']['submit']['#suffix'] = '</li>';
-  $form['buttons']['submit']['#weight'] = 1002;
-  $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/info/edit') . '</li>',
-      '#weight' => 1005,
-  );
-  $form['buttons']['form control tabs suffix'] = array(
-      '#value' => '</ul>',
-      '#weight' => 1010,
-  );
-
-  return $form;
+    );
+
+    // Wrap action buttons for styling consistency
+    $form['buttons']['form control tabs prefix'] = array(
+        '#value' => '<ul class="form-control tab-list">',
+        '#weight' => 1001,
+    );
+    $form['buttons']['submit']['#type'] = 'submit';
+    $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
+    $form['buttons']['submit']['#value'] = bts('Submit', array(), NULL, 'boinc:form-submit');
+    $form['buttons']['submit']['#suffix'] = '</li>';
+    $form['buttons']['submit']['#weight'] = 1002;
+    $form['buttons']['cancel'] = array(
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/info/edit') . '</li>',
+        '#weight' => 1005,
+    );
+    $form['buttons']['form control tabs suffix'] = array(
+        '#value' => '</ul>',
+        '#weight' => 1010,
+    );
+
+    return $form;
 }
 
 /**
  * Validation handler for revertemail form
  */
 function boincuser_revertemail_validate($form, &$form_state) {
-  // Load account and boincuser
-  $account = $form_state['values']['_account'];
-  $boinc_user = BoincUser::lookup_id_nocache($account->boincuser_id);
+    // Load account and boincuser
+    $account = $form_state['values']['_account'];
+    $boinc_user = BoincUser::lookup_id_nocache($account->boincuser_id);
 
-  if (BoincUser::lookup_email_addr($boinc_user->previous_email_addr)) {
+    if (BoincUser::lookup_email_addr($boinc_user->previous_email_addr)) {
     rules_invoke_event('boincuser_revert_email_error', $boinc_user->previous_email_addr, variable_get('boinc_admin_mailing_list_subject_tag', ''));
     form_set_error('mail',
-      bts('An account already exists for @email. Previous email address cannot be used because another account is using it as their email address. The @project administrators have been notified.',
+        bts('An account already exists for @email. Previous email address cannot be used because another account is using it as their email address. The @project administrators have been notified.',
         array(
-          '@email' => $boinc_user->previous_email_addr,
-          '@project' => variable_get('site_name', 'Drupal-BOINC'),
+            '@email' => $boinc_user->previous_email_addr,
+            '@project' => variable_get('site_name', 'Drupal-BOINC'),
         ), NULL, 'boinc:add-new-user'));
-  }
+    }
 
 }
 
@@ -883,25 +883,25 @@ 
  * Submit handler for revertemail form
  */
 function boincuser_revertemail_submit($form, &$form_state) {
-  require_boinc('password_compat/password');
+    require_boinc('password_compat/password');
 
-  // Load account and boincuser
-  $account = $form_state['values']['_account'];
-  $boinc_user = BoincUser::lookup_id_nocache($account->boincuser_id);
+    // Load account and boincuser
+    $account = $form_state['values']['_account'];
+    $boinc_user = BoincUser::lookup_id_nocache($account->boincuser_id);
 
-  $pem = strtolower($boinc_user->previous_email_addr);
+    $pem = strtolower($boinc_user->previous_email_addr);
 
-  // Set new password based on previous email address and entered
-  // password.
-  $new_passwd_hash = password_hash( md5($form_state['values']['pass'].$pem), PASSWORD_DEFAULT);
+    // Set new password based on previous email address and entered
+    // password.
+    $new_passwd_hash = password_hash( md5($form_state['values']['pass'].$pem), PASSWORD_DEFAULT);
 
-  $boinc_user->update("email_addr='${pem}', previous_email_addr='', email_addr_change_time=0, passwd_hash='${new_passwd_hash}'");
+    $boinc_user->update("email_addr='${pem}', previous_email_addr='', email_addr_change_time=0, passwd_hash='${new_passwd_hash}'");
 
-  // Set email in drupal database to previous email
-  user_save($account, array('mail' => $pem));
+    // Set email in drupal database to previous email
+    user_save($account, array('mail' => $pem));
 
-  // delete the token
-  $result = delete_token($account->boincuser_id, $form_state['values']['_token'], 'E');
+    // delete the token
+    $result = delete_token($account->boincuser_id, $form_state['values']['_token'], 'E');
 
-  drupal_goto('account');
+    drupal_goto('account');
 }

Braces +3 added lines, -6 removed lines

@@ -345,8 +345,7 @@ 
   if (!$account) {
     global $user;
     $account = user_load($user->id);
-  }
-  elseif (is_numeric($account)) {
+  } elseif (is_numeric($account)) {
     $account = user_load($account);
   }
 
@@ -422,13 +421,11 @@ 
     // (except in cases where password is being reset)
     if (isset($_SESSION['reset_pass'])) {
       unset($_SESSION['reset_pass']);
-    }
-    else {
+    } else {
       $given_hash = md5($edit['current_pass'] . strtolower($account->mail));
       if (!$edit['current_pass']) {
         form_set_error('current_pass', bts('Authentication is required when changing E-mail address or setting new password.', array(), NULL, 'boinc:account-credentials-change'));
-      }
-      elseif ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
+      } elseif ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
         form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:account-credentials-change'));
       }
 

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

@@ -35,7 +35,7 @@ 
   // Call our custom authentication function to check for an existing BOINC user
   if (!boincuser_login_authenticate($form_state['values'])) {
     // Authentication failed; set an error accordingly
-    form_set_error('name', bts('Sorry, unrecognized email address or password.', array(), NULL, 'boinc:forgot-password') . ' ' . l(bts('Have you forgotten your password?', array(), NULL, 'boinc:forgot-password'), 'user/password'));
+    form_set_error('name', bts('Sorry, unrecognized email address or password.', array(), null, 'boinc:forgot-password') . ' ' . l(bts('Have you forgotten your password?', array(), null, 'boinc:forgot-password'), 'user/password'));
   }
 }
 
@@ -105,7 +105,7 @@ 
   $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
   if (!empty($termsofuse)) {
     if (!$form_state['values']['termsofuse']['agreeTOU']) {
-      form_set_error('termsofuse', bts('ERROR: You must acknowledge our terms of use by clicking the checkbox before registering for an account.', NULL, 'boinc:register-new-user'));
+      form_set_error('termsofuse', bts('ERROR: You must acknowledge our terms of use by clicking the checkbox before registering for an account.', null, 'boinc:register-new-user'));
       return false;
     }
   }
@@ -121,7 +121,7 @@ 
         array(
           '@email' => $lower_email_addr,
           '@project' => variable_get('site_name', 'Drupal-BOINC')
-        ), NULL, 'boinc:register-new-user')
+        ), null, 'boinc:register-new-user')
     );
   }
 
@@ -133,7 +133,7 @@ 
   $boinc_user = BoincUser::lookup_email_addr($lower_email_addr);
   if ($boinc_user) {
     // User already exists
-    form_set_error('mail', bts('An account already exists for @email. Log in or request password assistance to access your @project account.', array('@email' => $lower_email_addr, '@project' => PROJECT), NULL, 'boinc:add-new-user'));
+    form_set_error('mail', bts('An account already exists for @email. Log in or request password assistance to access your @project account.', array('@email' => $lower_email_addr, '@project' => PROJECT), null, 'boinc:add-new-user'));
     return false;
   }
 
@@ -175,7 +175,7 @@ 
 function boincuser_create_drupal_user($boinc_user) {
   require_boinc('forum_db');
   BoincForumPrefs::lookup($boinc_user);
-  $account = NULL;
+  $account = null;
   $module = 'boincuser';
 
   // Verify that this account has not already been imported
@@ -184,7 +184,7 @@ 
     $boinc_user->id)
   );
   if ($already_imported) {
-    return NULL;
+    return null;
   }
 
   // Email is limited to 64 characters...
@@ -198,7 +198,7 @@ 
   if ($already_imported) {
     drupal_set_message(t('An account for @email already exists', array('@email' => $boinc_email)), 'warning');
     watchdog('boincimport', 'An account for @email already exists', array('@email' => $boinc_email), WATCHDOG_WARNING);
-    return NULL;
+    return null;
   }
 
   // Make sure name is unique
@@ -236,7 +236,7 @@ 
   // Terminate if an error occured during user_save().
   if (!$account) {
     drupal_set_message(t("Error saving user account."), 'error');
-    return NULL;
+    return null;
   }
 
   // Cross reference the Drupal and BOINC accounts
@@ -267,7 +267,7 @@ 
   $profile_opinions = null;
   $profile_image = null;
   $avatar_image = null;
-  $profile_approved = NULL;
+  $profile_approved = null;
 
   // Load the BOINC profile, if available
   if ($boinc_user->has_profile) {
@@ -277,17 +277,17 @@ 
     if ($boinc_profile->has_picture) {
       // Load picture; load validators; determine where to store it in Drupal
       $image_path = "{$image_dir}/{$boinc_user->id}.jpg";
-      $profile_image = get_cck_image_object($image_path, 'field_profile_image', 'profile', TRUE);
+      $profile_image = get_cck_image_object($image_path, 'field_profile_image', 'profile', true);
       // If the user does not have a different image as an avatar, use this one
       if (!$boinc_user->prefs->avatar) {
-        $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
+        $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', true);
       }
     }
     if ($boinc_user->prefs->avatar) {
       $image_path = "{$image_dir}/{$boinc_user->id}_avatar.jpg";
-      $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', TRUE);
+      $avatar_image = get_cck_image_object($image_path, 'field_image', 'profile', true);
     }
-    $profile_approved = $boinc_profile->verification ? TRUE : FALSE;
+    $profile_approved = $boinc_profile->verification ? true : false;
   }
   $default_input_format = db_result(db_query("
     SELECT format FROM {filter_formats} WHERE name = '%s'", 'Rich text'));
@@ -320,7 +320,7 @@ 
   node_save($profile_node);
 
   // Mark profile as approved if it has already been vetted somehow
-  if ($profile_approved OR !$boinc_user->has_profile) {
+  if ($profile_approved or !$boinc_user->has_profile) {
     $profile_node->moderate = 0;
     node_save($profile_node);
   }
@@ -341,7 +341,7 @@ 
 /**
  * Convert any BOINC forum thread subscriptions to Drupal flag subscriptions
  */
-function boincuser_pull_subscriptions($account = NULL) {
+function boincuser_pull_subscriptions($account = null) {
   if (!$account) {
     global $user;
     $account = user_load($user->id);
@@ -385,7 +385,7 @@ 
   // Include BOINC database objects library, load BOINC account data
   require_boinc('boinc_db');
   $boinc_user = BoincUser::lookup_email_addr($account->mail);
-  $changing_email = ($edit['mail'] AND $edit['mail'] != $account->mail) ? true : false;
+  $changing_email = ($edit['mail'] and $edit['mail'] != $account->mail) ? true : false;
   $changing_pass = ($edit['pass']) ? true : false;
   if ($changing_email) {
     // E-mail address is set to change; check for an existing BOINC user
@@ -398,7 +398,7 @@ 
 
     $boinc_user_already_exists = ( BoincUser::lookup_email_addr($edit['mail']) || BoincUser::lookup_prev_email_addr($edit['mail']) );
     if ($boinc_user_already_exists) {
-      form_set_error('mail', bts('A BOINC account already exists for @email.', array('@email' => $edit['mail']), NULL, 'boinc:add-new-user'));
+      form_set_error('mail', bts('A BOINC account already exists for @email.', array('@email' => $edit['mail']), null, 'boinc:add-new-user'));
     }
 
     // Check email has not been changed in last X days (default X=7).
@@ -410,14 +410,14 @@ 
           '!futuredate' => date('F j, Y \a\t H:i T', $boinc_user->email_addr_change_time + $duration),
           '!prev_email_addr' => $boinc_user->previous_email_addr,
         ),
-        NULL, 'boinc:account-credentials-change')
+        null, 'boinc:account-credentials-change')
       );
     }
   }
 
   // If user is changing email or password, require that the current
   // password has been given as well.
-  if (($changing_email OR $changing_pass) AND !user_access('administer users')) {
+  if (($changing_email or $changing_pass) and !user_access('administer users')) {
     // If changing email or password, require current password
     // (except in cases where password is being reset)
     if (isset($_SESSION['reset_pass'])) {
@@ -426,10 +426,10 @@ 
     else {
       $given_hash = md5($edit['current_pass'] . strtolower($account->mail));
       if (!$edit['current_pass']) {
-        form_set_error('current_pass', bts('Authentication is required when changing E-mail address or setting new password.', array(), NULL, 'boinc:account-credentials-change'));
+        form_set_error('current_pass', bts('Authentication is required when changing E-mail address or setting new password.', array(), null, 'boinc:account-credentials-change'));
       }
       elseif ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
-        form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:account-credentials-change'));
+        form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), null, 'boinc:account-credentials-change'));
       }
 
     }
@@ -437,8 +437,8 @@ 
 
   // If an admin tries to change the email and NOT the password, show
   // error message. BOINC requires both to be changed together.
-  if ($changing_email AND !$changing_pass AND user_access('administer users')) {
-    form_set_error('pass', bts('If changing a user\'s email, you must also change the password simultaneously.', array(), NULL, 'boinc:account-credentials-change'));
+  if ($changing_email and !$changing_pass and user_access('administer users')) {
+    form_set_error('pass', bts('If changing a user\'s email, you must also change the password simultaneously.', array(), null, 'boinc:account-credentials-change'));
   }
 
   // Expansion required to allow account key in place of passwd...?
@@ -457,8 +457,8 @@ 
   $edit = $form_state['values'];
   // The Drupal submit function expects a "name" field, even though
   // it contains an email address and we will not allow a user name
-  if (!$edit['name']) form_set_error('name', bts('Please enter your email address', array(), NULL, 'boinc:forgot-password'));
-  elseif (!valid_email_address($edit['name'])) form_set_error('name', bts('@email is not a well formed email address, please verify', array('@email' => $edit['name']), NULL, 'boinc:forgot-password'));
+  if (!$edit['name']) form_set_error('name', bts('Please enter your email address', array(), null, 'boinc:forgot-password'));
+  elseif (!valid_email_address($edit['name'])) form_set_error('name', bts('@email is not a well formed email address, please verify', array('@email' => $edit['name']), null, 'boinc:forgot-password'));
   else {
     // set email addrress to lower case
     $lower_email_addr = strtolower($edit['name']);
@@ -476,8 +476,8 @@ 
       form_set_error('name', bts('No account exists for @email -- please create an account using a BOINC client -- !instructions',
       array(
           '@email' => $edit['name'],
-          '!instructions' => l(bts('Instructions', array(), NULL, 'boinc:forgot-password'), 'join')
-      ), NULL, 'boinc:forgot-password'));
+          '!instructions' => l(bts('Instructions', array(), null, 'boinc:forgot-password'), 'join')
+      ), null, 'boinc:forgot-password'));
     }
   }
 }
@@ -491,16 +491,16 @@ 
   $project_domain = $headers['Host'];
   $form['heading'] = array(
     '#type' => 'markup',
-    '#value' => '<h3>' . bts("If you forgot your account's email address, or you can't receive email there:", array(), NULL, 'boinc:authenticator-login-page') . '</h3>'
+    '#value' => '<h3>' . bts("If you forgot your account's email address, or you can't receive email there:", array(), null, 'boinc:authenticator-login-page') . '</h3>'
   );
   $form['instructions'] = array(
     '#type' => 'markup',
     '#value' => '' .
-      '<p>' . bts("If you have run BOINC under the account, you can still access it. Here's how:", array(), NULL, 'boinc:authenticator-login-page') .
+      '<p>' . bts("If you have run BOINC under the account, you can still access it. Here's how:", array(), null, 'boinc:authenticator-login-page') .
       '  <ul>' .
-      '    <li>' . bts('Go to the BOINC data directory on your computer (see !boinc_wiki for help finding this).', array('!boinc_wiki' => l(bts('BOINC documentation', array(), NULL, 'boinc:authenticator-login-page'), 'http://boinc.berkeley.edu/wiki/BOINC_Data_directory')), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts('Find your account file for this project; it will have a name like %file (where the project URL is %url).', array('%file' => "account_{$project_domain}.xml", '%url' => "http://{$project_domain}"), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts("Open the file in a text editor like Notepad. You'll see something like:", array(), NULL, 'boinc:authenticator-login-page') .
+      '    <li>' . bts('Go to the BOINC data directory on your computer (see !boinc_wiki for help finding this).', array('!boinc_wiki' => l(bts('BOINC documentation', array(), null, 'boinc:authenticator-login-page'), 'http://boinc.berkeley.edu/wiki/BOINC_Data_directory')), null, 'boinc:authenticator-login-page') . '</li>' .
+      '    <li>' . bts('Find your account file for this project; it will have a name like %file (where the project URL is %url).', array('%file' => "account_{$project_domain}.xml", '%url' => "http://{$project_domain}"), null, 'boinc:authenticator-login-page') . '</li>' .
+      '    <li>' . bts("Open the file in a text editor like Notepad. You'll see something like:", array(), null, 'boinc:authenticator-login-page') .
       '      <pre>' .
       '&lt;account&gt;' . "\n" .
       "  &lt;master_url&gt;http://{$project_domain}/&lt;/master_url&gt;" . "\n" .
@@ -510,18 +510,18 @@ 
       '&lt;/account&gt;' .
       '      </pre>' .
       '    </li>' .
-      '    <li>' . bts('Select and Copy the string between &lt;authenticator&gt; and &lt;/authenticator&gt; (%auth in the above example).', array('%auth' => '8b8496fdd26df7dc0423ecd43c09a56b'), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts('Paste the string into the field below, and click OK.', array(), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts('You will now be logged in to your account; update the email and password of your account.', array(), NULL, 'boinc:authenticator-login-page') . '</li>' .
+      '    <li>' . bts('Select and Copy the string between &lt;authenticator&gt; and &lt;/authenticator&gt; (%auth in the above example).', array('%auth' => '8b8496fdd26df7dc0423ecd43c09a56b'), null, 'boinc:authenticator-login-page') . '</li>' .
+      '    <li>' . bts('Paste the string into the field below, and click OK.', array(), null, 'boinc:authenticator-login-page') . '</li>' .
+      '    <li>' . bts('You will now be logged in to your account; update the email and password of your account.', array(), null, 'boinc:authenticator-login-page') . '</li>' .
       '  </ul>' .
       '</p>'
   );
   $form['authenticator'] = array(
-    '#title' => bts('Log in with authenticator', array(), NULL, 'boinc:authenticator-login-page'),
+    '#title' => bts('Log in with authenticator', array(), null, 'boinc:authenticator-login-page'),
     '#type' => 'textfield',
     '#size' => 60,
     '#maxlength' => 32,
-    '#required' => TRUE,
+    '#required' => true,
     '#description' => null
   );
 
@@ -533,12 +533,12 @@ 
   $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('OK', array(), NULL, 'boinc:form-ok'),
+    '#value' => bts('OK', array(), null, 'boinc:form-ok'),
     '#suffix' => '</li>',
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/password') . '</li>',
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), 'user/password') . '</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -555,11 +555,11 @@ 
   $authenticator = $form_state['values']['authenticator'];
   if (strlen($authenticator) != 32) {
     // We notify the form API that this field has failed validation.
-    form_set_error('authenticator', bts('That authenticator is not valid.', array(), NULL, 'boinc:authenticator-login-page'));
+    form_set_error('authenticator', bts('That authenticator is not valid.', array(), null, 'boinc:authenticator-login-page'));
   } else {
     require_boinc('boinc_db');
     $boinc_user = BoincUser::lookup("authenticator='".addslashes($authenticator)."'");
-    if (!$boinc_user) form_set_error('authenticator', bts('There is no account with that authenticator.', array(), NULL, 'boinc:authenticator-login-page'));
+    if (!$boinc_user) form_set_error('authenticator', bts('There is no account with that authenticator.', array(), null, 'boinc:authenticator-login-page'));
   }
 }
 
@@ -582,9 +582,9 @@ 
 function boincuser_moderate_profile_reject_form(&$form_state, $uid) {
   $form_state['storage']['reject_profile_uid'] = $uid;
   $form['reason'] = array(
-    '#title' => bts('Reason for rejecting this profile', array(), NULL, 'boinc:moderate-user'),
+    '#title' => bts('Reason for rejecting this profile', array(), null, 'boinc:moderate-user'),
     '#type' => 'textarea',
-    '#description' => bts('This reason will be included in an email to the user. Please write a brief explanation of the problem and how to fix it.', array(), NULL, 'boinc:moderate-user'),
+    '#description' => bts('This reason will be included in an email to the user. Please write a brief explanation of the problem and how to fix it.', array(), null, 'boinc:moderate-user'),
     '#default_value' => '',
   );
 
@@ -596,12 +596,12 @@ 
   $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
+    '#value' => bts('Submit', array(), null, 'boinc:form-submit'),
     '#suffix' => '</li>',
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -627,15 +627,15 @@ 
 function boincuser_moderate_user_ban_form(&$form_state, $uid) {
   $form_state['storage']['ban_user_uid'] = $uid;
   $form['reason'] = array(
-    '#title' => bts('Reason for banning this user', array(), NULL, 'boinc:moderate-user'),
+    '#title' => bts('Reason for banning this user', array(), null, 'boinc:moderate-user'),
     '#type' => 'textarea',
-    '#description' => bts('This reason will be included in an email to the user. Please write a brief explanation of why the user is being banned.', array(), NULL, 'boinc:moderate-user'),
+    '#description' => bts('This reason will be included in an email to the user. Please write a brief explanation of why the user is being banned.', array(), null, 'boinc:moderate-user'),
     '#default_value' => '',
   );
   $form['duration'] = array(
-    '#title' => bts('Duration of the ban', array(), NULL, 'boinc:moderate-user'),
+    '#title' => bts('Duration of the ban', array(), null, 'boinc:moderate-user'),
     '#type' => 'textfield',
-    '#description' => bts('The number of days until the ban expires. Set to 0 to ban permanently.', array(), NULL, 'boinc:moderate-user'),
+    '#description' => bts('The number of days until the ban expires. Set to 0 to ban permanently.', array(), null, 'boinc:moderate-user'),
     '#default_value' => '',
   );
 
@@ -647,12 +647,12 @@ 
   $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
-    '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
+    '#value' => bts('Submit', array(), null, 'boinc:form-submit'),
     '#suffix' => '</li>',
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
+    '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -696,7 +696,7 @@ 
     drupal_goto();
   }
 
-  drupal_set_message( bts('WARNING: You have not agreed to our terms of use. Please agree to the terms of use before continuing.', array(), NULL, 'boinc:termsofuse-form'), 'warning' );
+  drupal_set_message( bts('WARNING: You have not agreed to our terms of use. Please agree to the terms of use before continuing.', array(), null, 'boinc:termsofuse-form'), 'warning' );
 
   $form = array();
   drupal_add_js(drupal_get_path('module', 'boincuser') . '/boincuser.js');
@@ -707,12 +707,12 @@ 
     '#type'   => 'fieldset',
     '#prefix' => '<div id="termsofuse-wrapper">', // This is our wrapper div.
     '#suffix' => '</div>',
-    '#tree'   => TRUE,
+    '#tree'   => true,
   );
 
   $form['termsofuse']['title1'] = array(
     '#weight' => -12,
-    '#value' => '<h2>' . bts( variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:termsofuse-form' ) . '</h2>',
+    '#value' => '<h2>' . bts( variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), null, 'project:termsofuse-form' ) . '</h2>',
     '#prefix' => '<div id="register-title1">',
     '#suffix' => '</div>',
   );
@@ -720,14 +720,14 @@ 
   // Terms of use section
   $form['termsofuse']['body'] = array(
     '#weight' => -10,
-    '#value' => bts($termsofuse, array(), NULL, 'project:termsofuse-form'),
+    '#value' => bts($termsofuse, array(), null, 'project:termsofuse-form'),
     '#prefix' => '<div id="register-termsofuse">',
     '#suffix' => '</div>',
   );
 
   $form['termsofuse']['agreeTOU'] = array(
     '#type'   => 'checkbox',
-    '#title'  => bts(variable_get('boinc_weboptions_agreequestion', 'Do you agree with the above terms of use?'), array(), NULL, 'project:termsofuse-form'),
+    '#title'  => bts(variable_get('boinc_weboptions_agreequestion', 'Do you agree with the above terms of use?'), array(), null, 'project:termsofuse-form'),
     '#weight' => -8,
     '#prefix' => '<div id="register-checkbox">',
     '#suffix' => '</div>',
@@ -743,16 +743,16 @@ 
   $form['submit'] = array(
     '#prefix' => '<p><p><p><li class="first tab" id="register-submit">',
     '#type' => 'submit',
-    '#value' => bts('Yes', array(), NULL, 'boinc:form-submit'),
+    '#value' => bts('Yes', array(), null, 'boinc:form-submit'),
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('NO - LOGOUT', array(), NULL, 'boinc:form-cancel'), '/logout') . '</li>',
+    '#value' => '<li class="tab">' . l(bts('NO - LOGOUT', array(), null, 'boinc:form-cancel'), '/logout') . '</li>',
   );
   if (module_exists('boincuser_delete')) {
     $deletelink = '/user/' . $user->uid . '/delete';
     $form['deleteaccount'] = array(
-      '#value' => '<li class="tab">' . l(bts('NO - DELETE ACCOUNT', array(), NULL, 'boinc:form-delete-user'), $deletelink) . '</li>',
+      '#value' => '<li class="tab">' . l(bts('NO - DELETE ACCOUNT', array(), null, 'boinc:form-delete-user'), $deletelink) . '</li>',
     );
   }
 
@@ -768,7 +768,7 @@ 
 function boincuser_termsofuse_form_validate($form, &$form_state) {
   // Check TOU agreement
   if (!$form_state['values']['termsofuse']['agreeTOU']) {
-    form_set_error('termsofuse', bts('ERROR: You must acknowledge our terms of use by clicking the checkbox before registering for an account.', array(), NULL, 'boinc:termsofuse-form'));
+    form_set_error('termsofuse', bts('ERROR: You must acknowledge our terms of use by clicking the checkbox before registering for an account.', array(), null, 'boinc:termsofuse-form'));
   }
 }
 
@@ -777,7 +777,7 @@ 
   if (!boincuser_consentto_termsofuse($user)) {
     form_set_error('termsofuse',
       bts('There was an error in agreeing to the terms of use. The @project administrators have been notified.',
-        array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:termsofuse-form')
+        array('@project' => variable_get('site_name', 'Drupal-BOINC')), null, 'boinc:termsofuse-form')
     );
   }
 
@@ -810,9 +810,9 @@ 
   if (!is_valid_token($boincid, $token, 'E')) {
     drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your email address.',
     array(
-      '!link' => l(bts('changing', array(), NULL, 'boinc:revert-email-change'), "/account/info/edit"),
+      '!link' => l(bts('changing', array(), null, 'boinc:revert-email-change'), "/account/info/edit"),
     ),
-    NULL, 'boinc:revert-email-change'), 'error');
+    null, 'boinc:revert-email-change'), 'error');
     drupal_goto();
   }
 
@@ -827,7 +827,7 @@ 
       array(
         '!prev_email' => $account->boincuser_previous_email_addr,
       ),
-      NULL, 'boinc:revert-email-change').
+      null, 'boinc:revert-email-change').
     '</p>',
   );
 
@@ -844,11 +844,11 @@ 
   );
   $form['buttons']['submit']['#type'] = 'submit';
   $form['buttons']['submit']['#prefix'] = '<li class="first tab">';
-  $form['buttons']['submit']['#value'] = bts('Submit', array(), NULL, 'boinc:form-submit');
+  $form['buttons']['submit']['#value'] = bts('Submit', array(), null, 'boinc:form-submit');
   $form['buttons']['submit']['#suffix'] = '</li>';
   $form['buttons']['submit']['#weight'] = 1002;
   $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/info/edit') . '</li>',
+      '#value' => '<li class="tab">' . l(bts('Cancel', array(), null, 'boinc:form-cancel'), 'user/info/edit') . '</li>',
       '#weight' => 1005,
   );
   $form['buttons']['form control tabs suffix'] = array(
@@ -874,7 +874,7 @@ 
         array(
           '@email' => $boinc_user->previous_email_addr,
           '@project' => variable_get('site_name', 'Drupal-BOINC'),
-        ), NULL, 'boinc:add-new-user'));
+        ), null, 'boinc:add-new-user'));
   }
 
 }

drupal/sites/all/features/work_and_host_stats/work_and_host_stats.views_default.inc

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

@@ -14,7 +14,7 @@ 
   $view->base_table = 'result';
   $view->core = 6;
   $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $view->disabled = false; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
     'name' => array(
@@ -75,7 +75,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -116,7 +116,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -157,7 +157,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -360,7 +360,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -395,7 +395,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -430,7 +430,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -465,7 +465,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -500,7 +500,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -697,7 +697,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -735,7 +735,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -1024,9 +1024,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'server_state',
@@ -1045,9 +1045,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome',
@@ -1066,9 +1066,9 @@ 
         'max' => '7',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome_1',
@@ -1087,9 +1087,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome_2',
@@ -1126,9 +1126,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'server_state',
@@ -1165,9 +1165,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'server_state',
@@ -1191,9 +1191,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome',
@@ -1217,9 +1217,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome_1',
@@ -1243,9 +1243,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state',
@@ -1269,9 +1269,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state_1',
@@ -1295,9 +1295,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state_2',
@@ -1344,9 +1344,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'server_state',
@@ -1365,9 +1365,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome',
@@ -1386,9 +1386,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state',
@@ -1407,9 +1407,9 @@ 
         'max' => '4',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state_1',
@@ -1428,9 +1428,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state_2',
@@ -1467,9 +1467,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'server_state',
@@ -1488,9 +1488,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome',
@@ -1509,9 +1509,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state',
@@ -1549,7 +1549,7 @@ 
   $view->base_table = 'host';
   $view->core = 0;
   $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $view->disabled = false; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
     'userid' => array(
@@ -1575,7 +1575,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -1848,7 +1848,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -2467,7 +2467,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -2502,7 +2502,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -2601,7 +2601,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -2636,7 +2636,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -2671,7 +2671,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -3167,7 +3167,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -3284,7 +3284,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -3455,7 +3455,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -3963,7 +3963,7 @@ 
   $view->base_table = 'host';
   $view->core = 6;
   $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $view->disabled = false; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('relationships', array(
     'app_version_id' => array(
@@ -4155,7 +4155,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -4196,7 +4196,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -4237,7 +4237,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -4278,7 +4278,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -4320,7 +4320,7 @@ 
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
       'exclude' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => ',',
@@ -4645,7 +4645,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -4686,7 +4686,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -4727,7 +4727,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -4768,7 +4768,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -4810,7 +4810,7 @@ 
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
       'exclude' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => ',',
@@ -4893,7 +4893,7 @@ 
   $view->base_table = 'host';
   $view->core = 0;
   $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $view->disabled = false; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('relationships', array(
     'userid' => array(
@@ -4929,7 +4929,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -5520,9 +5520,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'show_hosts',
@@ -5643,9 +5643,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'rpc_time',
@@ -5661,9 +5661,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'show_hosts',
@@ -5731,7 +5731,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => ',',
@@ -5810,7 +5810,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => ',',
@@ -5854,7 +5854,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -6386,9 +6386,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'total_credit',
@@ -6546,7 +6546,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -6625,7 +6625,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -6701,7 +6701,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -7258,9 +7258,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'show_hosts',
@@ -7276,9 +7276,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'total_credit',
@@ -7405,15 +7405,15 @@ 
     'weight' => 0,
   ));
   $handler->override_option('allow', array(
-    'use_pager' => FALSE,
-    'items_per_page' => FALSE,
-    'offset' => FALSE,
-    'link_to_view' => FALSE,
-    'more_link' => FALSE,
-    'path_override' => FALSE,
-    'title_override' => FALSE,
-    'exposed_form' => FALSE,
-    'fields_override' => FALSE,
+    'use_pager' => false,
+    'items_per_page' => false,
+    'offset' => false,
+    'link_to_view' => false,
+    'more_link' => false,
+    'path_override' => false,
+    'title_override' => false,
+    'exposed_form' => false,
+    'fields_override' => false,
   ));
   $handler->override_option('argument_input', array());
   $handler->override_option('link_to_view', 0);
@@ -7429,7 +7429,7 @@ 
   $view->base_table = 'result';
   $view->core = 0;
   $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $view->disabled = false; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
     'name' => array(
@@ -7490,7 +7490,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -7528,7 +7528,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -7728,7 +7728,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -7763,7 +7763,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -7798,7 +7798,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -7833,7 +7833,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -7868,7 +7868,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -8071,7 +8071,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -8109,7 +8109,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -8348,9 +8348,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'server_state',
@@ -8369,9 +8369,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome',
@@ -8390,9 +8390,9 @@ 
         'max' => '7',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome_1',
@@ -8411,9 +8411,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome_2',
@@ -8450,9 +8450,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'server_state',
@@ -8489,9 +8489,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'server_state',
@@ -8515,9 +8515,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome',
@@ -8541,9 +8541,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome_1',
@@ -8567,9 +8567,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state',
@@ -8593,9 +8593,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state_1',
@@ -8619,9 +8619,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state_2',
@@ -8668,9 +8668,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'server_state',
@@ -8689,9 +8689,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome',
@@ -8710,9 +8710,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state',
@@ -8731,9 +8731,9 @@ 
         'max' => '4',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state_1',
@@ -8752,9 +8752,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state_2',
@@ -8791,9 +8791,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'server_state',
@@ -8812,9 +8812,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome',
@@ -8833,9 +8833,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state',
@@ -8873,7 +8873,7 @@ 
   $view->base_table = 'result';
   $view->core = 0;
   $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $view->disabled = false; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
     'name' => array(
@@ -8928,7 +8928,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -9245,7 +9245,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -9324,7 +9324,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -9403,7 +9403,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -9482,7 +9482,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -9556,7 +9556,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -9664,7 +9664,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => ',',
@@ -9705,7 +9705,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => ',',
@@ -9746,7 +9746,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => ',',
@@ -9787,7 +9787,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -9907,7 +9907,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => ',',
@@ -9948,7 +9948,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -10129,7 +10129,7 @@ 
   $view->base_table = 'user';
   $view->core = 6;
   $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $view->disabled = false; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
     'rownumber' => array(
@@ -10190,7 +10190,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -10438,9 +10438,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'total_credit',
@@ -10584,7 +10584,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -10891,15 +10891,15 @@ 
     'weight' => 0,
   ));
   $handler->override_option('allow', array(
-    'use_pager' => FALSE,
-    'items_per_page' => FALSE,
-    'offset' => FALSE,
-    'link_to_view' => FALSE,
-    'more_link' => FALSE,
-    'path_override' => FALSE,
-    'title_override' => FALSE,
-    'exposed_form' => FALSE,
-    'fields_override' => FALSE,
+    'use_pager' => false,
+    'items_per_page' => false,
+    'offset' => false,
+    'link_to_view' => false,
+    'more_link' => false,
+    'path_override' => false,
+    'title_override' => false,
+    'exposed_form' => false,
+    'fields_override' => false,
   ));
   $handler->override_option('argument_input', array());
   $handler->override_option('link_to_view', 0);
@@ -10915,7 +10915,7 @@ 
   $view->base_table = 'workunit';
   $view->core = 0;
   $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $view->disabled = false; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('relationships', array(
     'appid' => array(
@@ -11115,7 +11115,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -11253,7 +11253,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -11288,7 +11288,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -11323,7 +11323,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -11358,7 +11358,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -11393,7 +11393,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -11428,7 +11428,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -11463,7 +11463,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -11650,7 +11650,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => ',',
@@ -11784,7 +11784,7 @@ 
   $view->base_table = 'result';
   $view->core = 6;
   $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $view->disabled = false; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
     'name' => array(
@@ -11845,7 +11845,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -11886,7 +11886,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -12089,7 +12089,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -12124,7 +12124,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -12159,7 +12159,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -12194,7 +12194,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -12229,7 +12229,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -12432,7 +12432,7 @@ 
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -12470,7 +12470,7 @@ 
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'set_precision' => FALSE,
+      'set_precision' => false,
       'precision' => 0,
       'decimal' => '.',
       'separator' => '',
@@ -12737,9 +12737,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'server_state',
@@ -12758,9 +12758,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome',
@@ -12779,9 +12779,9 @@ 
         'max' => '7',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome_1',
@@ -12800,9 +12800,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome_2',
@@ -12839,9 +12839,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'server_state',
@@ -12878,9 +12878,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'server_state',
@@ -12904,9 +12904,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome',
@@ -12930,9 +12930,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome_1',
@@ -12956,9 +12956,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state',
@@ -12982,9 +12982,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state_1',
@@ -13008,9 +13008,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state_2',
@@ -13057,9 +13057,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'server_state',
@@ -13078,9 +13078,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome',
@@ -13099,9 +13099,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state',
@@ -13120,9 +13120,9 @@ 
         'max' => '4',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state_1',
@@ -13141,9 +13141,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state_2',
@@ -13180,9 +13180,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'server_state',
@@ -13201,9 +13201,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'outcome',
@@ -13222,9 +13222,9 @@ 
         'max' => '',
       ),
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'validate_state',

Indentation +6324 added lines, -6324 removed lines

@@ -4,22 +4,22 @@ 
  * Implementation of hook_views_default_views().
  */
 function work_and_host_stats_views_default_views() {
-  $views = array();
+    $views = array();
 
-  // Exported view: boinc_account_tasks_all
-  $view = new view;
-  $view->name = 'boinc_account_tasks_all';
-  $view->description = 'A list of all tasks for a user';
-  $view->tag = '';
-  $view->base_table = 'result';
-  $view->core = 6;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('fields', array(
+    // Exported view: boinc_account_tasks_all
+    $view = new view;
+    $view->name = 'boinc_account_tasks_all';
+    $view->description = 'A list of all tasks for a user';
+    $view->tag = '';
+    $view->base_table = 'result';
+    $view->core = 6;
+    $view->api_version = '2';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('fields', array(
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -38,20 +38,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'name',
-      'table' => 'result',
-      'field' => 'name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'name',
+        'table' => 'result',
+        'field' => 'name',
+        'relationship' => 'none',
     ),
     'id' => array(
-      'label' => 'Task ID',
-      'alter' => array(
+        'label' => 'Task ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -70,29 +70,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'id',
-      'table' => 'result',
-      'field' => 'id',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'id',
+        'table' => 'result',
+        'field' => 'id',
+        'relationship' => 'none',
     ),
     'workunitid' => array(
-      'label' => 'Workunit ID',
-      'alter' => array(
+        'label' => 'Workunit ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 1,
@@ -111,29 +111,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'workunitid',
-      'table' => 'result',
-      'field' => 'workunitid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'workunitid',
+        'table' => 'result',
+        'field' => 'workunitid',
+        'relationship' => 'none',
     ),
     'hostid' => array(
-      'label' => 'Computer',
-      'alter' => array(
+        'label' => 'Computer',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 1,
@@ -152,29 +152,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'hostid',
-      'table' => 'result',
-      'field' => 'hostid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'hostid',
+        'table' => 'result',
+        'field' => 'hostid',
+        'relationship' => 'none',
     ),
     'sent_time' => array(
-      'label' => 'Sent',
-      'alter' => array(
+        'label' => 'Sent',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -191,21 +191,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s T',
-      'exclude' => 1,
-      'id' => 'sent_time',
-      'table' => 'result',
-      'field' => 'sent_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s T',
+        'exclude' => 1,
+        'id' => 'sent_time',
+        'table' => 'result',
+        'field' => 'sent_time',
+        'relationship' => 'none',
     ),
     'received_time' => array(
-      'label' => 'Received time',
-      'alter' => array(
+        'label' => 'Received time',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -222,21 +222,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'date_format' => 'small',
-      'custom_date_format' => '',
-      'exclude' => 1,
-      'id' => 'received_time',
-      'table' => 'result',
-      'field' => 'received_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'date_format' => 'small',
+        'custom_date_format' => '',
+        'exclude' => 1,
+        'id' => 'received_time',
+        'table' => 'result',
+        'field' => 'received_time',
+        'relationship' => 'none',
     ),
     'report_deadline' => array(
-      'label' => 'Report deadline',
-      'alter' => array(
+        'label' => 'Report deadline',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -253,21 +253,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'date_format' => 'small',
-      'custom_date_format' => '',
-      'exclude' => 1,
-      'id' => 'report_deadline',
-      'table' => 'result',
-      'field' => 'report_deadline',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'date_format' => 'small',
+        'custom_date_format' => '',
+        'exclude' => 1,
+        'id' => 'report_deadline',
+        'table' => 'result',
+        'field' => 'report_deadline',
+        'relationship' => 'none',
     ),
     'phpcode_3' => array(
-      'label' => 'Sent',
-      'alter' => array(
+        'label' => 'Sent',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -286,24 +286,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(\'util\');
   echo date(\'j M Y G:i:s T\', $data->result_sent_time);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_3',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_3',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => 'Time reported or deadline',
-      'alter' => array(
+        'label' => 'Time reported or deadline',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -322,24 +322,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php return boincwork_task_time_reported($data->result_received_time, $data->result_report_deadline); ?>',
-      'exclude' => 0,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php return boincwork_task_time_reported($data->result_received_time, $data->result_report_deadline); ?>',
+        'exclude' => 0,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Override',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'server_state' => array(
-      'label' => 'Server state',
-      'alter' => array(
+        'label' => 'Server state',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -356,25 +356,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'relationship' => 'none',
     ),
     'outcome' => array(
-      'label' => 'Outcome',
-      'alter' => array(
+        'label' => 'Outcome',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -391,25 +391,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'relationship' => 'none',
     ),
     'client_state' => array(
-      'label' => 'Client state',
-      'alter' => array(
+        'label' => 'Client state',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -426,25 +426,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'client_state',
-      'table' => 'result',
-      'field' => 'client_state',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'client_state',
+        'table' => 'result',
+        'field' => 'client_state',
+        'relationship' => 'none',
     ),
     'validate_state' => array(
-      'label' => 'Validation state',
-      'alter' => array(
+        'label' => 'Validation state',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -461,25 +461,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'validate_state',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'validate_state',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'relationship' => 'none',
     ),
     'exit_status' => array(
-      'label' => 'Exit status',
-      'alter' => array(
+        'label' => 'Exit status',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -496,25 +496,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'exit_status',
-      'table' => 'result',
-      'field' => 'exit_status',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'exit_status',
+        'table' => 'result',
+        'field' => 'exit_status',
+        'relationship' => 'none',
     ),
     'phpcode_1' => array(
-      'label' => 'Status',
-      'alter' => array(
+        'label' => 'Status',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -531,11 +531,11 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'value' => '<?php
   require_boinc(\'result\');
   $result = new stdClass();
   $result->server_state = $data->result_server_state;
@@ -545,18 +545,18 @@ 
   $result->exit_status = $data->result_exit_status;
   return state_string($result);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_1',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode_1',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Override',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'elapsed_time' => array(
-      'label' => 'Run time',
-      'alter' => array(
+        'label' => 'Run time',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -575,29 +575,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'elapsed_time',
-      'table' => 'result',
-      'field' => 'elapsed_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'elapsed_time',
+        'table' => 'result',
+        'field' => 'elapsed_time',
+        'relationship' => 'none',
     ),
     'cpu_time' => array(
-      'label' => 'CPU time',
-      'alter' => array(
+        'label' => 'CPU time',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -616,29 +616,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'cpu_time',
-      'table' => 'result',
-      'field' => 'cpu_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'cpu_time',
+        'table' => 'result',
+        'field' => 'cpu_time',
+        'relationship' => 'none',
     ),
     'granted_credit' => array(
-      'label' => 'Granted credit',
-      'alter' => array(
+        'label' => 'Granted credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -655,25 +655,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'granted_credit',
-      'table' => 'result',
-      'field' => 'granted_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'granted_credit',
+        'table' => 'result',
+        'field' => 'granted_credit',
+        'relationship' => 'none',
     ),
     'appid' => array(
-      'label' => 'Application ID',
-      'alter' => array(
+        'label' => 'Application ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -692,29 +692,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'appid',
-      'table' => 'result',
-      'field' => 'appid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'appid',
+        'table' => 'result',
+        'field' => 'appid',
+        'relationship' => 'none',
     ),
     'app_version_id' => array(
-      'label' => 'Application version',
-      'alter' => array(
+        'label' => 'Application version',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -731,25 +731,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'app_version_id',
-      'table' => 'result',
-      'field' => 'app_version_id',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'app_version_id',
+        'table' => 'result',
+        'field' => 'app_version_id',
+        'relationship' => 'none',
     ),
     'phpcode_2' => array(
-      'label' => 'Application',
-      'alter' => array(
+        'label' => 'Application',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -768,48 +768,48 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(\'result\');
   $result = new stdClass();
   $result->appid = $data->result_appid;
   $result->app_version_id = $data->result_app_version_id;
   return app_version_string($result);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_2',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode_2',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Override',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('arguments', array(
+    ));
+    $handler->override_option('arguments', array(
     'userid' => array(
-      'default_action' => 'default',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '',
-      'breadcrumb' => '',
-      'default_argument_type' => 'current_user',
-      'default_argument' => '',
-      'validate_type' => 'php',
-      'validate_fail' => 'empty',
-      'break_phrase' => 0,
-      'not' => 0,
-      'id' => 'userid',
-      'table' => 'result',
-      'field' => 'userid',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'default',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => '',
+        'breadcrumb' => '',
+        'default_argument_type' => 'current_user',
+        'default_argument' => '',
+        'validate_type' => 'php',
+        'validate_fail' => 'empty',
+        'break_phrase' => 0,
+        'not' => 0,
+        'id' => 'userid',
+        'table' => 'result',
+        'field' => 'userid',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -818,10 +818,10 @@ 
         268174006 => 0,
         1271379760 => 0,
         933038561 => 0,
-      ),
-      'me_redirect' => 0,
-      'me_validate_user_argument_type' => 'uid',
-      'me_validate_user_roles' => array(
+        ),
+        'me_redirect' => 0,
+        'me_validate_user_argument_type' => 'uid',
+        'me_validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -830,20 +830,20 @@ 
         268174006 => 0,
         1271379760 => 0,
         933038561 => 0,
-      ),
-      'relationship' => 'none',
-      'default_options_div_prefix' => '',
-      'default_taxonomy_tid_term_page' => 0,
-      'default_taxonomy_tid_node' => 0,
-      'default_taxonomy_tid_limit' => 0,
-      'default_taxonomy_tid_vids' => array(
+        ),
+        'relationship' => 'none',
+        'default_options_div_prefix' => '',
+        'default_taxonomy_tid_term_page' => 0,
+        'default_taxonomy_tid_node' => 0,
+        'default_taxonomy_tid_limit' => 0,
+        'default_taxonomy_tid_vids' => array(
         1 => 0,
         2 => 0,
-      ),
-      'default_argument_user' => 0,
-      'default_argument_fixed' => '',
-      'default_argument_php' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'default_argument_user' => 0,
+        'default_argument_fixed' => '',
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'page' => 0,
         'news' => 0,
         'team' => 0,
@@ -852,709 +852,709 @@ 
         'forum' => 0,
         'panel' => 0,
         'story' => 0,
-      ),
-      'validate_argument_node_access' => 0,
-      'validate_argument_nid_type' => 'nid',
-      'validate_argument_vocabulary' => array(
+        ),
+        'validate_argument_node_access' => 0,
+        'validate_argument_nid_type' => 'nid',
+        'validate_argument_vocabulary' => array(
         1 => 0,
         2 => 0,
-      ),
-      'validate_argument_type' => 'tid',
-      'validate_argument_transform' => 0,
-      'validate_user_restrict_roles' => 0,
-      'validate_argument_node_flag_name' => '*relationship*',
-      'validate_argument_node_flag_test' => 'flaggable',
-      'validate_argument_node_flag_id_type' => 'id',
-      'validate_argument_user_flag_name' => '*relationship*',
-      'validate_argument_user_flag_test' => 'flaggable',
-      'validate_argument_user_flag_id_type' => 'id',
-      'validate_argument_php' => 'return is_current_boinc_user($argument);',
-      'me_validate_user_restrict_roles' => 0,
-      'override' => array(
+        ),
+        'validate_argument_type' => 'tid',
+        'validate_argument_transform' => 0,
+        'validate_user_restrict_roles' => 0,
+        'validate_argument_node_flag_name' => '*relationship*',
+        'validate_argument_node_flag_test' => 'flaggable',
+        'validate_argument_node_flag_id_type' => 'id',
+        'validate_argument_user_flag_name' => '*relationship*',
+        'validate_argument_user_flag_test' => 'flaggable',
+        'validate_argument_user_flag_id_type' => 'id',
+        'validate_argument_php' => 'return is_current_boinc_user($argument);',
+        'me_validate_user_restrict_roles' => 0,
+        'override' => array(
         'button' => 'Override',
-      ),
+        ),
     ),
-  ));
-  $handler->override_option('access', array(
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('empty', '<?php
+    ));
+    $handler->override_option('empty', '<?php
   if (!user_is_logged_in()) {
     drupal_goto(\'user/login\', drupal_get_destination());
   }
 ?>');
-  $handler->override_option('empty_format', '3');
-  $handler->override_option('items_per_page', 20);
-  $handler->override_option('use_pager', '1');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', array(
+    $handler->override_option('empty_format', '3');
+    $handler->override_option('items_per_page', 20);
+    $handler->override_option('use_pager', '1');
+    $handler->override_option('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 1,
     'order' => 'desc',
     'summary' => '',
     'columns' => array(
-      'id' => 'id',
-      'workunitid' => 'workunitid',
-      'hostid' => 'hostid',
-      'sent_time' => 'sent_time',
-      'received_time' => 'received_time',
-      'report_deadline' => 'report_deadline',
-      'phpcode_3' => 'phpcode_3',
-      'phpcode' => 'phpcode',
-      'server_state' => 'server_state',
-      'outcome' => 'outcome',
-      'client_state' => 'client_state',
-      'validate_state' => 'validate_state',
-      'exit_status' => 'exit_status',
-      'phpcode_1' => 'phpcode_1',
-      'elapsed_time' => 'elapsed_time',
-      'cpu_time' => 'cpu_time',
-      'claimed_credit_1' => 'claimed_credit_1',
-      'granted_credit' => 'granted_credit',
-      'app_version_id' => 'app_version_id',
-      'phpcode_2' => 'phpcode_2',
+        'id' => 'id',
+        'workunitid' => 'workunitid',
+        'hostid' => 'hostid',
+        'sent_time' => 'sent_time',
+        'received_time' => 'received_time',
+        'report_deadline' => 'report_deadline',
+        'phpcode_3' => 'phpcode_3',
+        'phpcode' => 'phpcode',
+        'server_state' => 'server_state',
+        'outcome' => 'outcome',
+        'client_state' => 'client_state',
+        'validate_state' => 'validate_state',
+        'exit_status' => 'exit_status',
+        'phpcode_1' => 'phpcode_1',
+        'elapsed_time' => 'elapsed_time',
+        'cpu_time' => 'cpu_time',
+        'claimed_credit_1' => 'claimed_credit_1',
+        'granted_credit' => 'granted_credit',
+        'app_version_id' => 'app_version_id',
+        'phpcode_2' => 'phpcode_2',
     ),
     'info' => array(
-      'id' => array(
+        'id' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'workunitid' => array(
+        ),
+        'workunitid' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'hostid' => array(
+        ),
+        'hostid' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'sent_time' => array(
+        ),
+        'sent_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'received_time' => array(
+        ),
+        'received_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'report_deadline' => array(
+        ),
+        'report_deadline' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'phpcode_3' => array(
+        ),
+        'phpcode_3' => array(
         'separator' => '',
-      ),
-      'phpcode' => array(
+        ),
+        'phpcode' => array(
         'separator' => '',
-      ),
-      'server_state' => array(
+        ),
+        'server_state' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'outcome' => array(
+        ),
+        'outcome' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'client_state' => array(
+        ),
+        'client_state' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'validate_state' => array(
+        ),
+        'validate_state' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'exit_status' => array(
+        ),
+        'exit_status' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'phpcode_1' => array(
+        ),
+        'phpcode_1' => array(
         'separator' => '',
-      ),
-      'elapsed_time' => array(
+        ),
+        'elapsed_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'cpu_time' => array(
+        ),
+        'cpu_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'claimed_credit_1' => array(
+        ),
+        'claimed_credit_1' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'granted_credit' => array(
+        ),
+        'granted_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'app_version_id' => array(
+        ),
+        'app_version_id' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'phpcode_2' => array(
+        ),
+        'phpcode_2' => array(
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'id',
-  ));
-  $handler = $view->new_display('page', 'All tasks', 'page_1');
-  $handler->override_option('path', 'account/tasks/all');
-  $handler->override_option('menu', array(
+    ));
+    $handler = $view->new_display('page', 'All tasks', 'page_1');
+    $handler->override_option('path', 'account/tasks/all');
+    $handler->override_option('menu', array(
     'type' => 'default tab',
     'title' => 'All tasks',
     'description' => 'Show all tasks associated with the account',
     'weight' => '0',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'normal',
     'title' => 'Tasks',
     'description' => 'Show all tasks',
     'weight' => '0',
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('page', 'Error', 'page_2');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'Error', 'page_2');
+    $handler->override_option('filters', array(
     'server_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '5',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'override' => array(
+        ),
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'outcome' => array(
-      'operator' => '>=',
-      'value' => array(
+        'operator' => '>=',
+        'value' => array(
         'value' => '3',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'outcome_1' => array(
-      'operator' => 'not between',
-      'value' => array(
+        'operator' => 'not between',
+        'value' => array(
         'value' => '',
         'min' => '4',
         'max' => '7',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome_1',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome_1',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'outcome_2' => array(
-      'operator' => '<=',
-      'value' => array(
+        'operator' => '<=',
+        'value' => array(
         'value' => '7',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome_2',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome_2',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('path', 'account/tasks/error');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'account/tasks/error');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'Error',
     'description' => 'Show tasks with errors associated with the account',
     'weight' => '5',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('page', 'In progress', 'page_3');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'In progress', 'page_3');
+    $handler->override_option('filters', array(
     'server_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '4',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'override' => array(
+        ),
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('path', 'account/tasks/active');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'account/tasks/active');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'In progress',
     'description' => 'Show tasks in progress associated with the account',
     'weight' => '1',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('page', 'Invalidated', 'page_4');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'Invalidated', 'page_4');
+    $handler->override_option('filters', array(
     'server_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '5',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'override' => array(
+        ),
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_begin_2' => array(
-      'id' => 'views_or_begin_2',
-      'table' => 'views_or',
-      'field' => 'views_or_begin',
+        'id' => 'views_or_begin_2',
+        'table' => 'views_or',
+        'field' => 'views_or_begin',
     ),
     'outcome' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '6',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_next_5' => array(
-      'id' => 'views_or_next_5',
-      'table' => 'views_or',
-      'field' => 'views_or_next',
+        'id' => 'views_or_next_5',
+        'table' => 'views_or',
+        'field' => 'views_or_next',
     ),
     'outcome_1' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome_1',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome_1',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_begin_3' => array(
-      'id' => 'views_or_begin_3',
-      'table' => 'views_or',
-      'field' => 'views_or_begin',
+        'id' => 'views_or_begin_3',
+        'table' => 'views_or',
+        'field' => 'views_or_begin',
     ),
     'validate_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '2',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_next_3' => array(
-      'id' => 'views_or_next_3',
-      'table' => 'views_or',
-      'field' => 'views_or_next',
+        'id' => 'views_or_next_3',
+        'table' => 'views_or',
+        'field' => 'views_or_next',
     ),
     'validate_state_1' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '3',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state_1',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state_1',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_next_4' => array(
-      'id' => 'views_or_next_4',
-      'table' => 'views_or',
-      'field' => 'views_or_next',
+        'id' => 'views_or_next_4',
+        'table' => 'views_or',
+        'field' => 'views_or_next',
     ),
     'validate_state_2' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '5',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state_2',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state_2',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_end_3' => array(
-      'id' => 'views_or_end_3',
-      'table' => 'views_or',
-      'field' => 'views_or_end',
+        'id' => 'views_or_end_3',
+        'table' => 'views_or',
+        'field' => 'views_or_end',
     ),
     'views_or_end_2' => array(
-      'id' => 'views_or_end_2',
-      'table' => 'views_or',
-      'field' => 'views_or_end',
+        'id' => 'views_or_end_2',
+        'table' => 'views_or',
+        'field' => 'views_or_end',
     ),
-  ));
-  $handler->override_option('path', 'account/tasks/invalid');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'account/tasks/invalid');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'Invalid',
     'description' => 'Show invalidated tasks associated with the account',
     'weight' => '4',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('page', 'Pending', 'page_5');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'Pending', 'page_5');
+    $handler->override_option('filters', array(
     'server_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '5',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'override' => array(
+        ),
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'outcome' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'validate_state' => array(
-      'operator' => '>=',
-      'value' => array(
+        'operator' => '>=',
+        'value' => array(
         'value' => '0',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'validate_state_1' => array(
-      'operator' => 'not between',
-      'value' => array(
+        'operator' => 'not between',
+        'value' => array(
         'value' => '',
         'min' => '0',
         'max' => '4',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state_1',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state_1',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'validate_state_2' => array(
-      'operator' => '<=',
-      'value' => array(
+        'operator' => '<=',
+        'value' => array(
         'value' => '4',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state_2',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state_2',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('path', 'account/tasks/pending');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'account/tasks/pending');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'Pending',
     'description' => 'Show tasks associated with the account with results pending',
     'weight' => '2',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('page', 'Validated', 'page_6');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'Validated', 'page_6');
+    $handler->override_option('filters', array(
     'server_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '5',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'override' => array(
+        ),
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'outcome' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'validate_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('path', 'account/tasks/valid');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'account/tasks/valid');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'Valid',
     'description' => 'Show validated tasks associated with the account',
     'weight' => '3',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
+    ));
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  // Exported view: boinc_host
-  $view = new view;
-  $view->name = 'boinc_host';
-  $view->description = 'Details for a specific host';
-  $view->tag = '';
-  $view->base_table = 'host';
-  $view->core = 0;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('fields', array(
+    // Exported view: boinc_host
+    $view = new view;
+    $view->name = 'boinc_host';
+    $view->description = 'Details for a specific host';
+    $view->tag = '';
+    $view->base_table = 'host';
+    $view->core = 0;
+    $view->api_version = '2';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('fields', array(
     'userid' => array(
-      'label' => 'User ID',
-      'alter' => array(
+        'label' => 'User ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1571,25 +1571,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'userid',
-      'table' => 'host',
-      'field' => 'userid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'userid',
+        'table' => 'host',
+        'field' => 'userid',
+        'relationship' => 'none',
     ),
     'last_ip_addr' => array(
-      'label' => 'Last IP address',
-      'alter' => array(
+        'label' => 'Last IP address',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1606,19 +1606,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 1,
-      'id' => 'last_ip_addr',
-      'table' => 'host',
-      'field' => 'last_ip_addr',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 1,
+        'id' => 'last_ip_addr',
+        'table' => 'host',
+        'field' => 'last_ip_addr',
+        'relationship' => 'none',
     ),
     'nsame_ip_addr' => array(
-      'label' => 'Same IP address count',
-      'alter' => array(
+        'label' => 'Same IP address count',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1635,19 +1635,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 1,
-      'id' => 'nsame_ip_addr',
-      'table' => 'host',
-      'field' => 'nsame_ip_addr',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 1,
+        'id' => 'nsame_ip_addr',
+        'table' => 'host',
+        'field' => 'nsame_ip_addr',
+        'relationship' => 'none',
     ),
     'external_ip_addr' => array(
-      'label' => 'External IP address',
-      'alter' => array(
+        'label' => 'External IP address',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1664,19 +1664,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 1,
-      'id' => 'external_ip_addr',
-      'table' => 'host',
-      'field' => 'external_ip_addr',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 1,
+        'id' => 'external_ip_addr',
+        'table' => 'host',
+        'field' => 'external_ip_addr',
+        'relationship' => 'none',
     ),
     'phpcode_26' => array(
-      'label' => 'IP address',
-      'alter' => array(
+        'label' => 'IP address',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1695,12 +1695,12 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   if (is_current_boinc_user($data->host_userid)) {
     $showIP = arg(2);
     if ($showIP) {
@@ -1719,15 +1719,15 @@ 
     }
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_26',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_26',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_28' => array(
-      'label' => 'External IP address',
-      'alter' => array(
+        'label' => 'External IP address',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1744,11 +1744,11 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'value' => '<?php
   if (is_current_boinc_user($data->host_userid)) {
     $showIP = arg(2);
     if ($showIP) {
@@ -1756,15 +1756,15 @@ 
     }
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_28',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_28',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'domain_name' => array(
-      'label' => 'Domain name',
-      'alter' => array(
+        'label' => 'Domain name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1781,19 +1781,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 1,
-      'id' => 'domain_name',
-      'table' => 'host',
-      'field' => 'domain_name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 1,
+        'id' => 'domain_name',
+        'table' => 'host',
+        'field' => 'domain_name',
+        'relationship' => 'none',
     ),
     'phpcode_3' => array(
-      'label' => 'Domain name',
-      'alter' => array(
+        'label' => 'Domain name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1810,24 +1810,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'value' => '<?php
   if (is_current_boinc_user($data->host_userid)) {
     echo $data->host_domain_name;
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_3',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_3',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'timezone' => array(
-      'label' => 'Timezone',
-      'alter' => array(
+        'label' => 'Timezone',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1844,25 +1844,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'timezone',
-      'table' => 'host',
-      'field' => 'timezone',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'timezone',
+        'table' => 'host',
+        'field' => 'timezone',
+        'relationship' => 'none',
     ),
     'phpcode_4' => array(
-      'label' => 'Local standard time',
-      'alter' => array(
+        'label' => 'Local standard time',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1881,25 +1881,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   if (is_current_boinc_user($data->host_userid)) {
     echo \'UTC \' . ($data->host_timezone > 0 ? \'+\' : \'\') . $data->host_timezone / 3600 . \' \' . bts(\'hours\', array(), NULL, \'boinc:unit-of-time\');
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_4',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_4',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_5' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1916,24 +1916,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'value' => '<?php
   if (is_current_boinc_user($data->host_userid)) {
     echo $data->host_domain_name;
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_5',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_5',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_29' => array(
-      'label' => 'Owner',
-      'alter' => array(
+        'label' => 'Owner',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1952,12 +1952,12 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   if (!is_current_boinc_user($data->host_userid)) {
     require_boinc(\'boinc_db\');
     $owner = BoincUser::lookup_id($data->host_userid);
@@ -1966,15 +1966,15 @@ 
     echo ($owner->show_hosts) ? $profile_link : bts(\'Anonymous\', array(), NULL, \'boinc:anonymous-user\');
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_29',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_29',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'create_time' => array(
-      'label' => 'Created',
-      'alter' => array(
+        'label' => 'Created',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -1993,22 +1993,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s T',
-      'exclude' => 1,
-      'id' => 'create_time',
-      'table' => 'host',
-      'field' => 'create_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s T',
+        'exclude' => 1,
+        'id' => 'create_time',
+        'table' => 'host',
+        'field' => 'create_time',
+        'relationship' => 'none',
     ),
     'phpcode_6' => array(
-      'label' => 'Created',
-      'alter' => array(
+        'label' => 'Created',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2027,23 +2027,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   echo date(\'j M Y G:i:s T\', $data->host_create_time);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_6',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_6',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'total_credit' => array(
-      'label' => 'Total credit',
-      'alter' => array(
+        'label' => 'Total credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2062,29 +2062,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '0',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'total_credit',
-      'table' => 'host',
-      'field' => 'total_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '0',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'total_credit',
+        'table' => 'host',
+        'field' => 'total_credit',
+        'relationship' => 'none',
     ),
     'expavg_credit' => array(
-      'label' => 'Average credit',
-      'alter' => array(
+        'label' => 'Average credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2101,25 +2101,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'expavg_credit',
-      'table' => 'host',
-      'field' => 'expavg_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'expavg_credit',
+        'table' => 'host',
+        'field' => 'expavg_credit',
+        'relationship' => 'none',
     ),
     'host_cpid' => array(
-      'label' => 'Cross project ID',
-      'alter' => array(
+        'label' => 'Cross project ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2138,20 +2138,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'host_cpid',
-      'table' => 'host',
-      'field' => 'host_cpid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'host_cpid',
+        'table' => 'host',
+        'field' => 'host_cpid',
+        'relationship' => 'none',
     ),
     'phpcode_7' => array(
-      'label' => 'Cross project credit',
-      'alter' => array(
+        'label' => 'Cross project credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2168,11 +2168,11 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'value' => '<?php
   require_boinc(\'util\');
   $owner = BoincUser::lookup_id($data->host_userid);
   if ($owner->show_hosts) {
@@ -2189,15 +2189,15 @@ 
     echo $x;
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_7',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_7',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'serialnum' => array(
-      'label' => 'Serial Number',
-      'alter' => array(
+        'label' => 'Serial Number',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2214,19 +2214,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 1,
-      'id' => 'serialnum',
-      'table' => 'host',
-      'field' => 'serialnum',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 1,
+        'id' => 'serialnum',
+        'table' => 'host',
+        'field' => 'serialnum',
+        'relationship' => 'none',
     ),
     'p_vendor' => array(
-      'label' => 'CPU',
-      'alter' => array(
+        'label' => 'CPU',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2243,19 +2243,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 1,
-      'id' => 'p_vendor',
-      'table' => 'host',
-      'field' => 'p_vendor',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 1,
+        'id' => 'p_vendor',
+        'table' => 'host',
+        'field' => 'p_vendor',
+        'relationship' => 'none',
     ),
     'p_model' => array(
-      'label' => 'CPU type',
-      'alter' => array(
+        'label' => 'CPU type',
+        'alter' => array(
         'alter_text' => 1,
         'text' => '[p_vendor] [p_model]',
         'make_link' => 0,
@@ -2274,20 +2274,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'p_model',
-      'table' => 'host',
-      'field' => 'p_model',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'p_model',
+        'table' => 'host',
+        'field' => 'p_model',
+        'relationship' => 'none',
     ),
     'p_ncpus' => array(
-      'label' => 'Number of processors',
-      'alter' => array(
+        'label' => 'Number of processors',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2304,19 +2304,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'p_ncpus',
-      'table' => 'host',
-      'field' => 'p_ncpus',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'p_ncpus',
+        'table' => 'host',
+        'field' => 'p_ncpus',
+        'relationship' => 'none',
     ),
     'phpcode_1' => array(
-      'label' => 'Coprocessors',
-      'alter' => array(
+        'label' => 'Coprocessors',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2333,25 +2333,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'value' => '<?php
   if ($data->host_serialnum) {
     require_boinc(\'host\');
     echo gpu_desc(parse_serialnum($data->host_serialnum));
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_1',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_1',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'os_name' => array(
-      'label' => 'Operating system',
-      'alter' => array(
+        'label' => 'Operating system',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2368,19 +2368,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 1,
-      'id' => 'os_name',
-      'table' => 'host',
-      'field' => 'os_name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 1,
+        'id' => 'os_name',
+        'table' => 'host',
+        'field' => 'os_name',
+        'relationship' => 'none',
     ),
     'os_version' => array(
-      'label' => 'Operating system',
-      'alter' => array(
+        'label' => 'Operating system',
+        'alter' => array(
         'alter_text' => 1,
         'text' => '[os_name] [os_version]',
         'make_link' => 0,
@@ -2399,20 +2399,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'os_version',
-      'table' => 'host',
-      'field' => 'os_version',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'os_version',
+        'table' => 'host',
+        'field' => 'os_version',
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => 'BOINC client version',
-      'alter' => array(
+        'label' => 'BOINC client version',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2429,24 +2429,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'value' => '<?php
   require_boinc(\'host\');
   $version = boinc_version(parse_serialnum($data->host_serialnum));
   if ($version) echo $version;
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'm_nbytes' => array(
-      'label' => 'Memory',
-      'alter' => array(
+        'label' => 'Memory',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2463,25 +2463,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'm_nbytes',
-      'table' => 'host',
-      'field' => 'm_nbytes',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'm_nbytes',
+        'table' => 'host',
+        'field' => 'm_nbytes',
+        'relationship' => 'none',
     ),
     'm_cache' => array(
-      'label' => 'Cache',
-      'alter' => array(
+        'label' => 'Cache',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2498,25 +2498,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'm_cache',
-      'table' => 'host',
-      'field' => 'm_cache',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'm_cache',
+        'table' => 'host',
+        'field' => 'm_cache',
+        'relationship' => 'none',
     ),
     'phpcode_8' => array(
-      'label' => 'Memory',
-      'alter' => array(
+        'label' => 'Memory',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2533,22 +2533,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'value' => '<?php
   echo round($data->host_m_nbytes/(1024*1024), 2) . \' MiB\';
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_8',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_8',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_9' => array(
-      'label' => 'Cache',
-      'alter' => array(
+        'label' => 'Cache',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2565,22 +2565,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'value' => '<?php
   echo round($data->host_m_cache/(1024), 2) . \' KiB\';
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_9',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_9',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'm_swap' => array(
-      'label' => 'Swap space',
-      'alter' => array(
+        'label' => 'Swap space',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2597,25 +2597,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'm_swap',
-      'table' => 'host',
-      'field' => 'm_swap',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'm_swap',
+        'table' => 'host',
+        'field' => 'm_swap',
+        'relationship' => 'none',
     ),
     'd_total' => array(
-      'label' => 'Total disk space',
-      'alter' => array(
+        'label' => 'Total disk space',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2632,25 +2632,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'd_total',
-      'table' => 'host',
-      'field' => 'd_total',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'd_total',
+        'table' => 'host',
+        'field' => 'd_total',
+        'relationship' => 'none',
     ),
     'd_free' => array(
-      'label' => 'Free disk space',
-      'alter' => array(
+        'label' => 'Free disk space',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2667,25 +2667,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'd_free',
-      'table' => 'host',
-      'field' => 'd_free',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'd_free',
+        'table' => 'host',
+        'field' => 'd_free',
+        'relationship' => 'none',
     ),
     'phpcode_10' => array(
-      'label' => 'Swap space',
-      'alter' => array(
+        'label' => 'Swap space',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2702,24 +2702,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'value' => '<?php
   if (is_current_boinc_user($data->host_userid)) {
     echo round($data->host_m_swap/(1024*1024), 2) . \' MiB\';
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_10',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_10',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_11' => array(
-      'label' => 'Total disk space',
-      'alter' => array(
+        'label' => 'Total disk space',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2736,24 +2736,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'value' => '<?php
   if (is_current_boinc_user($data->host_userid)) {
     echo round($data->host_d_total/(1024*1024*1024), 2) . \' GiB\';
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_11',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_11',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_12' => array(
-      'label' => 'Free disk space',
-      'alter' => array(
+        'label' => 'Free disk space',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2770,24 +2770,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'value' => '<?php
   if (is_current_boinc_user($data->host_userid)) {
     echo round($data->host_d_free/(1024*1024*1024), 2) . \' GiB\';
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_12',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_12',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'n_bwdown' => array(
-      'label' => 'Average download rate',
-      'alter' => array(
+        'label' => 'Average download rate',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2804,25 +2804,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 0,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'n_bwdown',
-      'table' => 'host',
-      'field' => 'n_bwdown',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 0,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'n_bwdown',
+        'table' => 'host',
+        'field' => 'n_bwdown',
+        'relationship' => 'none',
     ),
     'avg_turnaround' => array(
-      'label' => 'Average turnaround time',
-      'alter' => array(
+        'label' => 'Average turnaround time',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2839,25 +2839,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 0,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'avg_turnaround',
-      'table' => 'host',
-      'field' => 'avg_turnaround',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 0,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'avg_turnaround',
+        'table' => 'host',
+        'field' => 'avg_turnaround',
+        'relationship' => 'none',
     ),
     'n_bwup' => array(
-      'label' => 'Average upload rate',
-      'alter' => array(
+        'label' => 'Average upload rate',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2874,25 +2874,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 0,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'n_bwup',
-      'table' => 'host',
-      'field' => 'n_bwup',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 0,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'n_bwup',
+        'table' => 'host',
+        'field' => 'n_bwup',
+        'relationship' => 'none',
     ),
     'p_fpops' => array(
-      'label' => 'Measured floating point speed',
-      'alter' => array(
+        'label' => 'Measured floating point speed',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2909,25 +2909,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 0,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'p_fpops',
-      'table' => 'host',
-      'field' => 'p_fpops',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 0,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'p_fpops',
+        'table' => 'host',
+        'field' => 'p_fpops',
+        'relationship' => 'none',
     ),
     'p_iops' => array(
-      'label' => 'Measured integer speed',
-      'alter' => array(
+        'label' => 'Measured integer speed',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2944,25 +2944,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 0,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'p_iops',
-      'table' => 'host',
-      'field' => 'p_iops',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 0,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'p_iops',
+        'table' => 'host',
+        'field' => 'p_iops',
+        'relationship' => 'none',
     ),
     'phpcode_13' => array(
-      'label' => 'Measured floating point speed',
-      'alter' => array(
+        'label' => 'Measured floating point speed',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -2981,25 +2981,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   echo bts(\'@count million ops/sec\',
     array(\'@count\' => round($data->host_p_fpops/(1000*1000), 2)),
     NULL, \'boinc:host-details\');
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_13',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_13',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_14' => array(
-      'label' => 'Measured integer speed',
-      'alter' => array(
+        'label' => 'Measured integer speed',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3018,25 +3018,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   echo bts(\'@count million ops/sec\',
     array(\'@count\' => round($data->host_p_iops/(1000*1000), 2)),
     NULL, \'boinc:host-details\');
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_14',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_14',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_15' => array(
-      'label' => 'Average upload rate',
-      'alter' => array(
+        'label' => 'Average upload rate',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3055,24 +3055,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   $rate = round($data->host_n_bwup/(1024), 2);
   echo ($rate > 0) ? bts(\'@rate KiB/sec\', array(\'@rate\' => $rate), NULL, \'boinc:host-details\') : bts(\'Unknown\', array(), NULL, \'boinc:host-details\');
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_15',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_15',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_16' => array(
-      'label' => 'Average download rate',
-      'alter' => array(
+        'label' => 'Average download rate',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3091,24 +3091,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   $rate = round($data->host_n_bwdown/(1024), 2);
   echo ($rate > 0) ? bts(\'@rate KiB/sec\', array(\'@rate\' => $rate), NULL, \'boinc:host-details\') : bts(\'Unknown\', array(), NULL, \'boinc:host-details\');
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_16',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_16',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_17' => array(
-      'label' => 'Average turnaround time',
-      'alter' => array(
+        'label' => 'Average turnaround time',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3127,23 +3127,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   echo bts(\'@count days\', array(\'@count\' => round($data->host_avg_turnaround/(60*60*24), 2)), NULL, \'boinc:host-details\');
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_17',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_17',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'max_results_day' => array(
-      'label' => 'Maximum daily WU quota per CPU',
-      'alter' => array(
+        'label' => 'Maximum daily WU quota per CPU',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3162,29 +3162,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '/day',
-      'exclude' => 1,
-      'id' => 'max_results_day',
-      'table' => 'host',
-      'field' => 'max_results_day',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '/day',
+        'exclude' => 1,
+        'id' => 'max_results_day',
+        'table' => 'host',
+        'field' => 'max_results_day',
+        'relationship' => 'none',
     ),
     'nothing' => array(
-      'label' => 'Application details',
-      'alter' => array(
+        'label' => 'Application details',
+        'alter' => array(
         'text' => 'Show',
         'make_link' => 1,
         'path' => 'host/!1/apps',
@@ -3202,23 +3202,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'nothing',
-      'table' => 'views',
-      'field' => 'nothing',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'nothing',
+        'table' => 'views',
+        'field' => 'nothing',
+        'override' => array(
         'button' => 'Override',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'phpcode_18' => array(
-      'label' => 'Tasks',
-      'alter' => array(
+        'label' => 'Tasks',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3237,12 +3237,12 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '0',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '0',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'value' => '<?php
   //require_boint(\'util\');
   //$config = get_config();
   //if (parse_bool($config, "show_results")) {
@@ -3255,15 +3255,15 @@ 
     }
   //}
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_18',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_18',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'rpc_seqno' => array(
-      'label' => 'Number of times client has contacted server',
-      'alter' => array(
+        'label' => 'Number of times client has contacted server',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3280,25 +3280,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'rpc_seqno',
-      'table' => 'host',
-      'field' => 'rpc_seqno',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'rpc_seqno',
+        'table' => 'host',
+        'field' => 'rpc_seqno',
+        'relationship' => 'none',
     ),
     'phpcode_2' => array(
-      'label' => 'Number of times client has contacted server',
-      'alter' => array(
+        'label' => 'Number of times client has contacted server',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3317,23 +3317,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '0',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '0',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'value' => '<?php
   echo $data->host_rpc_seqno;
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_2',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_2',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'on_frac' => array(
-      'label' => '% of time BOINC client is running',
-      'alter' => array(
+        'label' => '% of time BOINC client is running',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3350,25 +3350,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 0,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'on_frac',
-      'table' => 'host',
-      'field' => 'on_frac',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 0,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'on_frac',
+        'table' => 'host',
+        'field' => 'on_frac',
+        'relationship' => 'none',
     ),
     'rpc_time_1' => array(
-      'label' => 'Last contact',
-      'alter' => array(
+        'label' => 'Last contact',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3385,21 +3385,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'date_format' => 'small',
-      'custom_date_format' => '',
-      'exclude' => 1,
-      'id' => 'rpc_time_1',
-      'table' => 'host',
-      'field' => 'rpc_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'date_format' => 'small',
+        'custom_date_format' => '',
+        'exclude' => 1,
+        'id' => 'rpc_time_1',
+        'table' => 'host',
+        'field' => 'rpc_time',
+        'relationship' => 'none',
     ),
     'cpu_efficiency' => array(
-      'label' => 'Average CPU efficiency',
-      'alter' => array(
+        'label' => 'Average CPU efficiency',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3416,25 +3416,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 0,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'cpu_efficiency',
-      'table' => 'host',
-      'field' => 'cpu_efficiency',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 0,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'cpu_efficiency',
+        'table' => 'host',
+        'field' => 'cpu_efficiency',
+        'relationship' => 'none',
     ),
     'duration_correction_factor' => array(
-      'label' => 'Task duration correction factor',
-      'alter' => array(
+        'label' => 'Task duration correction factor',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3451,25 +3451,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'duration_correction_factor',
-      'table' => 'host',
-      'field' => 'duration_correction_factor',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'duration_correction_factor',
+        'table' => 'host',
+        'field' => 'duration_correction_factor',
+        'relationship' => 'none',
     ),
     'connected_frac' => array(
-      'label' => 'While BOINC running, % of time host has an Internet connection',
-      'alter' => array(
+        'label' => 'While BOINC running, % of time host has an Internet connection',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3486,25 +3486,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 0,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'connected_frac',
-      'table' => 'host',
-      'field' => 'connected_frac',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 0,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'connected_frac',
+        'table' => 'host',
+        'field' => 'connected_frac',
+        'relationship' => 'none',
     ),
     'active_frac' => array(
-      'label' => 'While BOINC running, % of time work is allowed',
-      'alter' => array(
+        'label' => 'While BOINC running, % of time work is allowed',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3521,25 +3521,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 0,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'active_frac',
-      'table' => 'host',
-      'field' => 'active_frac',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 0,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'active_frac',
+        'table' => 'host',
+        'field' => 'active_frac',
+        'relationship' => 'none',
     ),
     'phpcode_19' => array(
-      'label' => 'Last time contacted server',
-      'alter' => array(
+        'label' => 'Last time contacted server',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3558,23 +3558,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   echo boincwork_host_last_contact($data->host_rpc_time, $data->id);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_19',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_19',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_20' => array(
-      'label' => '% of time BOINC client is running',
-      'alter' => array(
+        'label' => '% of time BOINC client is running',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3591,24 +3591,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'value' => '<?php
   if (is_current_boinc_user($data->host_userid)) {
     echo ($data->host_on_frac * 100) . \' %\';
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_20',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_20',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_21' => array(
-      'label' => 'While BOINC running, % of time host has an Internet connection',
-      'alter' => array(
+        'label' => 'While BOINC running, % of time host has an Internet connection',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3625,26 +3625,26 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'value' => '<?php
   if (is_current_boinc_user($data->host_userid)) {
     if ($data->host_connected_frac > 0) {
       echo ($data->host_connected_frac * 100) . \' %\';
     }
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_21',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_21',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_22' => array(
-      'label' => 'While BOINC running, % of time work is allowed',
-      'alter' => array(
+        'label' => 'While BOINC running, % of time work is allowed',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3663,25 +3663,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   if (is_current_boinc_user($data->host_userid)) {
     echo ($data->host_active_frac * 100) . \' %\';
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_22',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_22',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_27' => array(
-      'label' => 'Average CPU efficiency',
-      'alter' => array(
+        'label' => 'Average CPU efficiency',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3698,26 +3698,26 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'value' => '<?php
   if (is_current_boinc_user($data->host_userid)) {
     if ($data->host_cpu_efficiency) {
       echo $data->host_cpu_efficiency;
     }
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_27',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_27',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_23' => array(
-      'label' => 'Task duration correction factor',
-      'alter' => array(
+        'label' => 'Task duration correction factor',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3734,26 +3734,26 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'value' => '<?php
   if (is_current_boinc_user($data->host_userid)) {
     if ($data->host_duration_correction_factor) {
       echo $data->host_duration_correction_factor;
     }
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_23',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_23',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_24' => array(
-      'label' => 'Location',
-      'alter' => array(
+        'label' => 'Location',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3772,25 +3772,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   if (is_current_boinc_user($data->host_userid)) {
     echo boincwork_host_venue_selector($data->id);
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_24',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_24',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_25' => array(
-      'label' => 'Actions ',
-      'alter' => array(
+        'label' => 'Actions ',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -3809,48 +3809,48 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   echo boincwork_host_action_links($data->id);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_25',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('arguments', array(
+        'exclude' => 0,
+        'id' => 'phpcode_25',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
+    ),
+    ));
+    $handler->override_option('arguments', array(
     'id' => array(
-      'default_action' => 'not found',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => 'Computer %1',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'numeric',
-      'validate_fail' => 'not found',
-      'id' => 'id',
-      'table' => 'host',
-      'field' => 'id',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'not found',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => 'Computer %1',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'numeric',
+        'validate_fail' => 'not found',
+        'id' => 'id',
+        'table' => 'host',
+        'field' => 'id',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3 => 0,
-      ),
-      'relationship' => 'none',
-      'default_options_div_prefix' => '',
-      'default_argument_fixed' => '',
-      'default_argument_user' => 0,
-      'default_argument_php' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'relationship' => 'none',
+        'default_options_div_prefix' => '',
+        'default_argument_fixed' => '',
+        'default_argument_user' => 0,
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'forum' => 0,
         'job_post' => 0,
         'news' => 0,
@@ -3858,44 +3858,44 @@ 
         'profile' => 0,
         'story' => 0,
         'team' => 0,
-      ),
-      'validate_argument_node_access' => 0,
-      'validate_argument_nid_type' => 'nid',
-      'validate_argument_vocabulary' => array(
+        ),
+        'validate_argument_node_access' => 0,
+        'validate_argument_nid_type' => 'nid',
+        'validate_argument_vocabulary' => array(
         1 => 0,
-      ),
-      'validate_argument_type' => 'tid',
-      'validate_argument_transform' => 0,
-      'validate_user_restrict_roles' => 0,
-      'validate_argument_php' => '',
+        ),
+        'validate_argument_type' => 'tid',
+        'validate_argument_transform' => 0,
+        'validate_user_restrict_roles' => 0,
+        'validate_argument_php' => '',
     ),
     'null' => array(
-      'default_action' => 'default',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'none',
-      'validate_fail' => 'not found',
-      'must_not_be' => 0,
-      'id' => 'null',
-      'table' => 'views',
-      'field' => 'null',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'default',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => '',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'none',
+        'validate_fail' => 'not found',
+        'must_not_be' => 0,
+        'id' => 'null',
+        'table' => 'views',
+        'field' => 'null',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3 => 0,
-      ),
-      'relationship' => 'none',
-      'default_options_div_prefix' => '',
-      'default_argument_fixed' => '0',
-      'default_argument_user' => 0,
-      'default_argument_php' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'relationship' => 'none',
+        'default_options_div_prefix' => '',
+        'default_argument_fixed' => '0',
+        'default_argument_user' => 0,
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'forum' => 0,
         'job_post' => 0,
         'news' => 0,
@@ -3903,98 +3903,98 @@ 
         'profile' => 0,
         'story' => 0,
         'team' => 0,
-      ),
-      'validate_argument_node_access' => 0,
-      'validate_argument_nid_type' => 'nid',
-      'validate_argument_vocabulary' => array(
+        ),
+        'validate_argument_node_access' => 0,
+        'validate_argument_nid_type' => 'nid',
+        'validate_argument_vocabulary' => array(
         1 => 0,
-      ),
-      'validate_argument_type' => 'tid',
-      'validate_argument_transform' => 0,
-      'validate_user_restrict_roles' => 0,
-      'validate_argument_php' => '',
-    ),
-  ));
-  $handler->override_option('access', array(
+        ),
+        'validate_argument_type' => 'tid',
+        'validate_argument_transform' => 0,
+        'validate_user_restrict_roles' => 0,
+        'validate_argument_php' => '',
+    ),
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('items_per_page', 0);
-  $handler->override_option('distinct', 0);
-  $handler->override_option('style_plugin', 'grid');
-  $handler->override_option('style_options', array(
+    ));
+    $handler->override_option('items_per_page', 0);
+    $handler->override_option('distinct', 0);
+    $handler->override_option('style_plugin', 'grid');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'columns' => '2',
     'alignment' => 'vertical',
     'fill_single_line' => 1,
-  ));
-  $handler->override_option('row_options', array(
+    ));
+    $handler->override_option('row_options', array(
     'inline' => array(),
     'separator' => '',
     'hide_empty' => 0,
-  ));
-  $handler = $view->new_display('page', 'Page', 'page_1');
-  $handler->override_option('row_options', array());
-  $handler->override_option('path', 'host');
-  $handler->override_option('menu', array(
+    ));
+    $handler = $view->new_display('page', 'Page', 'page_1');
+    $handler->override_option('row_options', array());
+    $handler->override_option('path', 'host');
+    $handler->override_option('menu', array(
     'type' => 'none',
     'title' => 'All computers',
     'description' => 'Show all computers associated with the account',
     'weight' => '1',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
+    ));
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  // Exported view: boinc_host_apps
-  $view = new view;
-  $view->name = 'boinc_host_apps';
-  $view->description = '';
-  $view->tag = '';
-  $view->base_table = 'host';
-  $view->core = 6;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('relationships', array(
+    // Exported view: boinc_host_apps
+    $view = new view;
+    $view->name = 'boinc_host_apps';
+    $view->description = '';
+    $view->tag = '';
+    $view->base_table = 'host';
+    $view->core = 6;
+    $view->api_version = '2';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('relationships', array(
     'app_version_id' => array(
-      'label' => 'App version',
-      'required' => 1,
-      'id' => 'app_version_id',
-      'table' => 'host_app_version',
-      'field' => 'app_version_id',
-      'relationship' => 'none',
+        'label' => 'App version',
+        'required' => 1,
+        'id' => 'app_version_id',
+        'table' => 'host_app_version',
+        'field' => 'app_version_id',
+        'relationship' => 'none',
     ),
     'appid' => array(
-      'label' => 'App ID',
-      'required' => 1,
-      'id' => 'appid',
-      'table' => 'app_version',
-      'field' => 'appid',
-      'relationship' => 'app_version_id',
+        'label' => 'App ID',
+        'required' => 1,
+        'id' => 'appid',
+        'table' => 'app_version',
+        'field' => 'appid',
+        'relationship' => 'app_version_id',
     ),
     'platformid' => array(
-      'label' => 'Platform ID',
-      'required' => 1,
-      'id' => 'platformid',
-      'table' => 'app_version',
-      'field' => 'platformid',
-      'relationship' => 'app_version_id',
-    ),
-  ));
-  $handler->override_option('fields', array(
+        'label' => 'Platform ID',
+        'required' => 1,
+        'id' => 'platformid',
+        'table' => 'app_version',
+        'field' => 'platformid',
+        'relationship' => 'app_version_id',
+    ),
+    ));
+    $handler->override_option('fields', array(
     'user_friendly_name' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4013,20 +4013,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'user_friendly_name',
-      'table' => 'app',
-      'field' => 'user_friendly_name',
-      'relationship' => 'appid',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'user_friendly_name',
+        'table' => 'app',
+        'field' => 'user_friendly_name',
+        'relationship' => 'appid',
     ),
     'version_num' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4045,29 +4045,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'set_precision' => 0,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'id' => 'version_num',
-      'table' => 'app_version',
-      'field' => 'version_num',
-      'relationship' => 'app_version_id',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'set_precision' => 0,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'id' => 'version_num',
+        'table' => 'app_version',
+        'field' => 'version_num',
+        'relationship' => 'app_version_id',
     ),
     'name' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4086,20 +4086,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'platform',
-      'field' => 'name',
-      'relationship' => 'platformid',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'name',
+        'table' => 'platform',
+        'field' => 'name',
+        'relationship' => 'platformid',
     ),
     'plan_class' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 1,
         'text' => '([plan_class])',
         'make_link' => 0,
@@ -4118,20 +4118,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'plan_class',
-      'table' => 'app_version',
-      'field' => 'plan_class',
-      'relationship' => 'app_version_id',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'plan_class',
+        'table' => 'app_version',
+        'field' => 'plan_class',
+        'relationship' => 'app_version_id',
     ),
     'et_n' => array(
-      'label' => 'Number of tasks completed',
-      'alter' => array(
+        'label' => 'Number of tasks completed',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4150,29 +4150,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'et_n',
-      'table' => 'host_app_version',
-      'field' => 'et_n',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'et_n',
+        'table' => 'host_app_version',
+        'field' => 'et_n',
+        'relationship' => 'none',
     ),
     'max_jobs_per_day' => array(
-      'label' => 'Max tasks per day',
-      'alter' => array(
+        'label' => 'Max tasks per day',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4191,29 +4191,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'max_jobs_per_day',
-      'table' => 'host_app_version',
-      'field' => 'max_jobs_per_day',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'max_jobs_per_day',
+        'table' => 'host_app_version',
+        'field' => 'max_jobs_per_day',
+        'relationship' => 'none',
     ),
     'n_jobs_today' => array(
-      'label' => 'Number of tasks today',
-      'alter' => array(
+        'label' => 'Number of tasks today',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4232,29 +4232,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'n_jobs_today',
-      'table' => 'host_app_version',
-      'field' => 'n_jobs_today',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'n_jobs_today',
+        'table' => 'host_app_version',
+        'field' => 'n_jobs_today',
+        'relationship' => 'none',
     ),
     'consecutive_valid' => array(
-      'label' => 'Consecutive valid tasks',
-      'alter' => array(
+        'label' => 'Consecutive valid tasks',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4273,29 +4273,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'consecutive_valid',
-      'table' => 'host_app_version',
-      'field' => 'consecutive_valid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'consecutive_valid',
+        'table' => 'host_app_version',
+        'field' => 'consecutive_valid',
+        'relationship' => 'none',
     ),
     'et_avg' => array(
-      'label' => 'Average processing rate',
-      'alter' => array(
+        'label' => 'Average processing rate',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4314,29 +4314,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'id' => 'et_avg',
-      'table' => 'host_app_version',
-      'field' => 'et_avg',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'id' => 'et_avg',
+        'table' => 'host_app_version',
+        'field' => 'et_avg',
+        'relationship' => 'none',
     ),
     'turnaround_avg' => array(
-      'label' => 'Average turnaround time',
-      'alter' => array(
+        'label' => 'Average turnaround time',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4355,45 +4355,45 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'set_precision' => 0,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'id' => 'turnaround_avg',
-      'table' => 'host_app_version',
-      'field' => 'turnaround_avg',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'set_precision' => 0,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'id' => 'turnaround_avg',
+        'table' => 'host_app_version',
+        'field' => 'turnaround_avg',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('arguments', array(
+    ));
+    $handler->override_option('arguments', array(
     'host_id' => array(
-      'default_action' => 'not found',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'numeric',
-      'validate_fail' => 'not found',
-      'id' => 'host_id',
-      'table' => 'host_app_version',
-      'field' => 'host_id',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'not found',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => '',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'numeric',
+        'validate_fail' => 'not found',
+        'id' => 'host_id',
+        'table' => 'host_app_version',
+        'field' => 'host_id',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -4401,10 +4401,10 @@ 
         1257454314 => 0,
         1271379760 => 0,
         933038561 => 0,
-      ),
-      'me_redirect' => 0,
-      'me_validate_user_argument_type' => 'uid',
-      'me_validate_user_roles' => array(
+        ),
+        'me_redirect' => 0,
+        'me_validate_user_argument_type' => 'uid',
+        'me_validate_user_roles' => array(
         2 => 0,
         3519698132 => 0,
         1110965548 => 0,
@@ -4412,20 +4412,20 @@ 
         1257454314 => 0,
         1271379760 => 0,
         933038561 => 0,
-      ),
-      'relationship' => 'none',
-      'default_options_div_prefix' => '',
-      'default_taxonomy_tid_term_page' => 0,
-      'default_taxonomy_tid_node' => 0,
-      'default_taxonomy_tid_limit' => 0,
-      'default_taxonomy_tid_vids' => array(
+        ),
+        'relationship' => 'none',
+        'default_options_div_prefix' => '',
+        'default_taxonomy_tid_term_page' => 0,
+        'default_taxonomy_tid_node' => 0,
+        'default_taxonomy_tid_limit' => 0,
+        'default_taxonomy_tid_vids' => array(
         1 => 0,
         2 => 0,
-      ),
-      'default_argument_user' => 0,
-      'default_argument_fixed' => '',
-      'default_argument_php' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'default_argument_user' => 0,
+        'default_argument_fixed' => '',
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'page' => 0,
         'news' => 0,
         'team' => 0,
@@ -4434,51 +4434,51 @@ 
         'forum' => 0,
         'panel' => 0,
         'story' => 0,
-      ),
-      'validate_argument_node_access' => 0,
-      'validate_argument_nid_type' => 'nid',
-      'validate_argument_vocabulary' => array(
+        ),
+        'validate_argument_node_access' => 0,
+        'validate_argument_nid_type' => 'nid',
+        'validate_argument_vocabulary' => array(
         1 => 0,
         2 => 0,
-      ),
-      'validate_argument_type' => 'tid',
-      'validate_argument_transform' => 0,
-      'validate_user_restrict_roles' => 0,
-      'validate_argument_node_flag_name' => '*relationship*',
-      'validate_argument_node_flag_test' => 'flaggable',
-      'validate_argument_node_flag_id_type' => 'id',
-      'validate_argument_user_flag_name' => '*relationship*',
-      'validate_argument_user_flag_test' => 'flaggable',
-      'validate_argument_user_flag_id_type' => 'id',
-      'validate_argument_php' => '',
-      'me_validate_user_restrict_roles' => 0,
-    ),
-  ));
-  $handler->override_option('access', array(
+        ),
+        'validate_argument_type' => 'tid',
+        'validate_argument_transform' => 0,
+        'validate_user_restrict_roles' => 0,
+        'validate_argument_node_flag_name' => '*relationship*',
+        'validate_argument_node_flag_test' => 'flaggable',
+        'validate_argument_node_flag_id_type' => 'id',
+        'validate_argument_user_flag_name' => '*relationship*',
+        'validate_argument_user_flag_test' => 'flaggable',
+        'validate_argument_user_flag_id_type' => 'id',
+        'validate_argument_php' => '',
+        'me_validate_user_restrict_roles' => 0,
+    ),
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('use_pager', '1');
-  $handler->override_option('style_options', array(
+    ));
+    $handler->override_option('use_pager', '1');
+    $handler->override_option('style_options', array(
     'grouping' => '',
-  ));
-  $handler->override_option('row_options', array(
+    ));
+    $handler->override_option('row_options', array(
     'inline' => array(
-      'user_friendly_name' => 'user_friendly_name',
-      'version_num' => 'version_num',
-      'name' => 'name',
-      'plan_class' => 'plan_class',
+        'user_friendly_name' => 'user_friendly_name',
+        'version_num' => 'version_num',
+        'name' => 'name',
+        'plan_class' => 'plan_class',
     ),
     'separator' => ' ',
     'hide_empty' => 0,
-  ));
-  $handler = $view->new_display('page', 'Page', 'page_1');
-  $handler->override_option('fields', array(
+    ));
+    $handler = $view->new_display('page', 'Page', 'page_1');
+    $handler->override_option('fields', array(
     'user_friendly_name' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 1,
         'text' => '<b>[user_friendly_name]',
         'make_link' => 0,
@@ -4497,23 +4497,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'user_friendly_name',
-      'table' => 'app',
-      'field' => 'user_friendly_name',
-      'relationship' => 'appid',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'user_friendly_name',
+        'table' => 'app',
+        'field' => 'user_friendly_name',
+        'relationship' => 'appid',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'version_num' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4532,29 +4532,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'set_precision' => 0,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'id' => 'version_num',
-      'table' => 'app_version',
-      'field' => 'version_num',
-      'relationship' => 'app_version_id',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'set_precision' => 0,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'id' => 'version_num',
+        'table' => 'app_version',
+        'field' => 'version_num',
+        'relationship' => 'app_version_id',
     ),
     'name' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4573,20 +4573,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'platform',
-      'field' => 'name',
-      'relationship' => 'platformid',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'name',
+        'table' => 'platform',
+        'field' => 'name',
+        'relationship' => 'platformid',
     ),
     'plan_class' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 1,
         'text' => '([plan_class])</b>',
         'make_link' => 0,
@@ -4605,23 +4605,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'exclude' => 0,
-      'id' => 'plan_class',
-      'table' => 'app_version',
-      'field' => 'plan_class',
-      'relationship' => 'app_version_id',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'exclude' => 0,
+        'id' => 'plan_class',
+        'table' => 'app_version',
+        'field' => 'plan_class',
+        'relationship' => 'app_version_id',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'et_n' => array(
-      'label' => 'Number of tasks completed',
-      'alter' => array(
+        'label' => 'Number of tasks completed',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4640,29 +4640,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'et_n',
-      'table' => 'host_app_version',
-      'field' => 'et_n',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'et_n',
+        'table' => 'host_app_version',
+        'field' => 'et_n',
+        'relationship' => 'none',
     ),
     'max_jobs_per_day' => array(
-      'label' => 'Max tasks per day',
-      'alter' => array(
+        'label' => 'Max tasks per day',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4681,29 +4681,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'max_jobs_per_day',
-      'table' => 'host_app_version',
-      'field' => 'max_jobs_per_day',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'max_jobs_per_day',
+        'table' => 'host_app_version',
+        'field' => 'max_jobs_per_day',
+        'relationship' => 'none',
     ),
     'n_jobs_today' => array(
-      'label' => 'Number of tasks today',
-      'alter' => array(
+        'label' => 'Number of tasks today',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4722,29 +4722,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'n_jobs_today',
-      'table' => 'host_app_version',
-      'field' => 'n_jobs_today',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'n_jobs_today',
+        'table' => 'host_app_version',
+        'field' => 'n_jobs_today',
+        'relationship' => 'none',
     ),
     'consecutive_valid' => array(
-      'label' => 'Consecutive valid tasks',
-      'alter' => array(
+        'label' => 'Consecutive valid tasks',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4763,29 +4763,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'consecutive_valid',
-      'table' => 'host_app_version',
-      'field' => 'consecutive_valid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'consecutive_valid',
+        'table' => 'host_app_version',
+        'field' => 'consecutive_valid',
+        'relationship' => 'none',
     ),
     'et_avg' => array(
-      'label' => 'Average processing rate',
-      'alter' => array(
+        'label' => 'Average processing rate',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4804,29 +4804,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'id' => 'et_avg',
-      'table' => 'host_app_version',
-      'field' => 'et_avg',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'id' => 'et_avg',
+        'table' => 'host_app_version',
+        'field' => 'et_avg',
+        'relationship' => 'none',
     ),
     'turnaround_avg' => array(
-      'label' => 'Average turnaround time',
-      'alter' => array(
+        'label' => 'Average turnaround time',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4845,67 +4845,67 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'set_precision' => 0,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'id' => 'turnaround_avg',
-      'table' => 'host_app_version',
-      'field' => 'turnaround_avg',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'set_precision' => 0,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'id' => 'turnaround_avg',
+        'table' => 'host_app_version',
+        'field' => 'turnaround_avg',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('title', 'Application details');
-  $handler->override_option('path', 'host/%/apps');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('title', 'Application details');
+    $handler->override_option('path', 'host/%/apps');
+    $handler->override_option('menu', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'primary-links',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
+    ));
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  // Exported view: boinc_host_list
-  $view = new view;
-  $view->name = 'boinc_host_list';
-  $view->description = 'A list of computers associated with a given user';
-  $view->tag = '';
-  $view->base_table = 'host';
-  $view->core = 0;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('relationships', array(
+    // Exported view: boinc_host_list
+    $view = new view;
+    $view->name = 'boinc_host_list';
+    $view->description = 'A list of computers associated with a given user';
+    $view->tag = '';
+    $view->base_table = 'host';
+    $view->core = 0;
+    $view->api_version = '2';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('relationships', array(
     'userid' => array(
-      'id' => 'userid',
-      'table' => 'host',
-      'field' => 'userid',
+        'id' => 'userid',
+        'table' => 'host',
+        'field' => 'userid',
     ),
-  ));
-  $handler->override_option('fields', array(
+    ));
+    $handler->override_option('fields', array(
     'id' => array(
-      'label' => 'Computer ID',
-      'alter' => array(
+        'label' => 'Computer ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => 'ID: [id]
 <a href="">Details</a> | <a href="">Tasks</a>
@@ -4925,25 +4925,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => 'ID: ',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'id',
-      'table' => 'host',
-      'field' => 'id',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => 'ID: ',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'id',
+        'table' => 'host',
+        'field' => 'id',
+        'relationship' => 'none',
     ),
     'phpcode_3' => array(
-      'label' => 'Computer links',
-      'alter' => array(
+        'label' => 'Computer links',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4962,23 +4962,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   echo l(bts(\'Details\', array(), NULL, \'boinc:host-details\'), "host/{$data->id}") . \'&nbsp;|&nbsp;\' . l(bts(\'Tasks\', array(), NULL, \'boinc:host-tasks-link\'), "host/{$data->id}/tasks/0/0");
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_3',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_3',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'host_cpid' => array(
-      'label' => 'Cross project ID',
-      'alter' => array(
+        'label' => 'Cross project ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -4995,19 +4995,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 1,
-      'id' => 'host_cpid',
-      'table' => 'host',
-      'field' => 'host_cpid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 1,
+        'id' => 'host_cpid',
+        'table' => 'host',
+        'field' => 'host_cpid',
+        'relationship' => 'none',
     ),
     'phpcode_4' => array(
-      'label' => 'Cross-project statistics',
-      'alter' => array(
+        'label' => 'Cross-project statistics',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5024,11 +5024,11 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'value' => '<?php
   require_boinc(\'stats_sites\');
   global $host_sites;
   $x = "";
@@ -5041,15 +5041,15 @@ 
   }
   echo "Cross-project stats: {$x}";
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_4',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_4',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'rownumber' => array(
-      'label' => 'Rank',
-      'alter' => array(
+        'label' => 'Rank',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5066,19 +5066,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'rownumber',
-      'table' => 'customfield',
-      'field' => 'rownumber',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'rownumber',
+        'table' => 'customfield',
+        'field' => 'rownumber',
+        'relationship' => 'none',
     ),
     'expavg_credit' => array(
-      'label' => 'Avg. credit',
-      'alter' => array(
+        'label' => 'Avg. credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5095,25 +5095,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'expavg_credit',
-      'table' => 'host',
-      'field' => 'expavg_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'expavg_credit',
+        'table' => 'host',
+        'field' => 'expavg_credit',
+        'relationship' => 'none',
     ),
     'total_credit' => array(
-      'label' => 'Total credit',
-      'alter' => array(
+        'label' => 'Total credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5132,29 +5132,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'total_credit',
-      'table' => 'host',
-      'field' => 'total_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'total_credit',
+        'table' => 'host',
+        'field' => 'total_credit',
+        'relationship' => 'none',
     ),
     'serialnum' => array(
-      'label' => 'Serial Number',
-      'alter' => array(
+        'label' => 'Serial Number',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5171,19 +5171,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 1,
-      'id' => 'serialnum',
-      'table' => 'host',
-      'field' => 'serialnum',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 1,
+        'id' => 'serialnum',
+        'table' => 'host',
+        'field' => 'serialnum',
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => 'BOINC version',
-      'alter' => array(
+        'label' => 'BOINC version',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5200,23 +5200,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'value' => '<?php
   require_boinc(\'host\');
   echo boinc_version(parse_serialnum($data->host_serialnum));
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'p_vendor' => array(
-      'label' => 'CPU',
-      'alter' => array(
+        'label' => 'CPU',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5233,22 +5233,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'p_vendor',
-      'table' => 'host',
-      'field' => 'p_vendor',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'p_vendor',
+        'table' => 'host',
+        'field' => 'p_vendor',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Override',
-      ),
+        ),
     ),
     'p_model' => array(
-      'label' => 'CPU model',
-      'alter' => array(
+        'label' => 'CPU model',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5265,19 +5265,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'p_model',
-      'table' => 'host',
-      'field' => 'p_model',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'p_model',
+        'table' => 'host',
+        'field' => 'p_model',
+        'relationship' => 'none',
     ),
     'p_ncpus' => array(
-      'label' => 'Number of CPUs',
-      'alter' => array(
+        'label' => 'Number of CPUs',
+        'alter' => array(
         'alter_text' => 1,
         'text' => '([p_ncpus] processors)',
         'make_link' => 0,
@@ -5294,19 +5294,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'p_ncpus',
-      'table' => 'host',
-      'field' => 'p_ncpus',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'p_ncpus',
+        'table' => 'host',
+        'field' => 'p_ncpus',
+        'relationship' => 'none',
     ),
     'phpcode_1' => array(
-      'label' => 'GPU',
-      'alter' => array(
+        'label' => 'GPU',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5323,23 +5323,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'value' => '<?php
   require_boinc(\'host\');
   echo gpu_desc(parse_serialnum($data->host_serialnum));
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_1',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_1',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'os_name' => array(
-      'label' => 'Operating system',
-      'alter' => array(
+        'label' => 'Operating system',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5356,19 +5356,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'os_name',
-      'table' => 'host',
-      'field' => 'os_name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'os_name',
+        'table' => 'host',
+        'field' => 'os_name',
+        'relationship' => 'none',
     ),
     'os_version' => array(
-      'label' => 'Operating system version',
-      'alter' => array(
+        'label' => 'Operating system version',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5385,19 +5385,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'os_version',
-      'table' => 'host',
-      'field' => 'os_version',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'os_version',
+        'table' => 'host',
+        'field' => 'os_version',
+        'relationship' => 'none',
     ),
     'rpc_time' => array(
-      'label' => 'Last contact',
-      'alter' => array(
+        'label' => 'Last contact',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5416,22 +5416,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s T',
-      'exclude' => 1,
-      'id' => 'rpc_time',
-      'table' => 'host',
-      'field' => 'rpc_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s T',
+        'exclude' => 1,
+        'id' => 'rpc_time',
+        'table' => 'host',
+        'field' => 'rpc_time',
+        'relationship' => 'none',
     ),
     'phpcode_2' => array(
-      'label' => 'Last contact',
-      'alter' => array(
+        'label' => 'Last contact',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5450,48 +5450,48 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   echo boincwork_host_last_contact($data->host_rpc_time, $data->id);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_2',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('arguments', array(
+        'exclude' => 0,
+        'id' => 'phpcode_2',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
+    ),
+    ));
+    $handler->override_option('arguments', array(
     'userid' => array(
-      'default_action' => 'not found',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'numeric',
-      'validate_fail' => 'not found',
-      'id' => 'userid',
-      'table' => 'host',
-      'field' => 'userid',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'not found',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => '',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'numeric',
+        'validate_fail' => 'not found',
+        'id' => 'userid',
+        'table' => 'host',
+        'field' => 'userid',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3 => 0,
-      ),
-      'relationship' => 'none',
-      'default_options_div_prefix' => '',
-      'default_argument_fixed' => '',
-      'default_argument_user' => 0,
-      'default_argument_php' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'relationship' => 'none',
+        'default_options_div_prefix' => '',
+        'default_argument_fixed' => '',
+        'default_argument_user' => 0,
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'forum' => 0,
         'job_post' => 0,
         'news' => 0,
@@ -5499,215 +5499,215 @@ 
         'profile' => 0,
         'story' => 0,
         'team' => 0,
-      ),
-      'validate_argument_node_access' => 0,
-      'validate_argument_nid_type' => 'nid',
-      'validate_argument_vocabulary' => array(
+        ),
+        'validate_argument_node_access' => 0,
+        'validate_argument_nid_type' => 'nid',
+        'validate_argument_vocabulary' => array(
         1 => 0,
-      ),
-      'validate_argument_type' => 'tid',
-      'validate_argument_transform' => 0,
-      'validate_user_restrict_roles' => 0,
-      'validate_argument_php' => '',
-    ),
-  ));
-  $handler->override_option('filters', array(
+        ),
+        'validate_argument_type' => 'tid',
+        'validate_argument_transform' => 0,
+        'validate_user_restrict_roles' => 0,
+        'validate_argument_php' => '',
+    ),
+    ));
+    $handler->override_option('filters', array(
     'show_hosts' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'show_hosts',
-      'table' => 'user',
-      'field' => 'show_hosts',
-      'relationship' => 'userid',
-    ),
-  ));
-  $handler->override_option('access', array(
+        ),
+        'id' => 'show_hosts',
+        'table' => 'user',
+        'field' => 'show_hosts',
+        'relationship' => 'userid',
+    ),
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('empty_format', '1');
-  $handler->override_option('items_per_page', 20);
-  $handler->override_option('use_pager', '1');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', array(
+    ));
+    $handler->override_option('empty_format', '1');
+    $handler->override_option('items_per_page', 20);
+    $handler->override_option('use_pager', '1');
+    $handler->override_option('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 1,
     'order' => 'desc',
     'summary' => '',
     'columns' => array(
-      'id' => 'id',
-      'phpcode_3' => 'id',
-      'host_cpid' => 'host_cpid',
-      'phpcode_4' => 'id',
-      'rownumber' => 'rownumber',
-      'expavg_credit' => 'expavg_credit',
-      'total_credit' => 'total_credit',
-      'serialnum' => 'serialnum',
-      'phpcode' => 'phpcode',
-      'p_vendor' => 'p_vendor',
-      'p_model' => 'p_vendor',
-      'p_ncpus' => 'p_vendor',
-      'phpcode_1' => 'phpcode_1',
-      'os_name' => 'os_name',
-      'os_version' => 'os_name',
-      'rpc_time' => 'rpc_time',
-      'phpcode_2' => 'phpcode_2',
+        'id' => 'id',
+        'phpcode_3' => 'id',
+        'host_cpid' => 'host_cpid',
+        'phpcode_4' => 'id',
+        'rownumber' => 'rownumber',
+        'expavg_credit' => 'expavg_credit',
+        'total_credit' => 'total_credit',
+        'serialnum' => 'serialnum',
+        'phpcode' => 'phpcode',
+        'p_vendor' => 'p_vendor',
+        'p_model' => 'p_vendor',
+        'p_ncpus' => 'p_vendor',
+        'phpcode_1' => 'phpcode_1',
+        'os_name' => 'os_name',
+        'os_version' => 'os_name',
+        'rpc_time' => 'rpc_time',
+        'phpcode_2' => 'phpcode_2',
     ),
     'info' => array(
-      'id' => array(
+        'id' => array(
         'sortable' => 1,
         'separator' => '<br/>',
-      ),
-      'phpcode_3' => array(
+        ),
+        'phpcode_3' => array(
         'separator' => '',
-      ),
-      'host_cpid' => array(
+        ),
+        'host_cpid' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'phpcode_4' => array(
+        ),
+        'phpcode_4' => array(
         'separator' => '',
-      ),
-      'rownumber' => array(
+        ),
+        'rownumber' => array(
         'separator' => '',
-      ),
-      'expavg_credit' => array(
+        ),
+        'expavg_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'total_credit' => array(
+        ),
+        'total_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'serialnum' => array(
+        ),
+        'serialnum' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'phpcode' => array(
+        ),
+        'phpcode' => array(
         'separator' => '',
-      ),
-      'p_vendor' => array(
+        ),
+        'p_vendor' => array(
         'sortable' => 1,
         'separator' => '<br/>',
-      ),
-      'p_model' => array(
+        ),
+        'p_model' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'p_ncpus' => array(
+        ),
+        'p_ncpus' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'phpcode_1' => array(
+        ),
+        'phpcode_1' => array(
         'separator' => '',
-      ),
-      'os_name' => array(
+        ),
+        'os_name' => array(
         'sortable' => 1,
         'separator' => '<br/>',
-      ),
-      'os_version' => array(
+        ),
+        'os_version' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'rpc_time' => array(
+        ),
+        'rpc_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'phpcode_2' => array(
+        ),
+        'phpcode_2' => array(
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'rpc_time',
-  ));
-  $handler = $view->new_display('page', 'User active hosts', 'page_1');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'User active hosts', 'page_1');
+    $handler->override_option('filters', array(
     'rpc_time' => array(
-      'operator' => '>',
-      'value' => array(
+        'operator' => '>',
+        'value' => array(
         'type' => 'offset',
         'value' => '-30 days',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'rpc_time',
-      'table' => 'host',
-      'field' => 'rpc_time',
-      'relationship' => 'none',
+        ),
+        'id' => 'rpc_time',
+        'table' => 'host',
+        'field' => 'rpc_time',
+        'relationship' => 'none',
     ),
     'show_hosts' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'show_hosts',
-      'table' => 'user',
-      'field' => 'show_hosts',
-      'relationship' => 'userid',
-    ),
-  ));
-  $handler->override_option('path', 'account/%/computers/active');
-  $handler->override_option('menu', array(
+        ),
+        'id' => 'show_hosts',
+        'table' => 'user',
+        'field' => 'show_hosts',
+        'relationship' => 'userid',
+    ),
+    ));
+    $handler->override_option('path', 'account/%/computers/active');
+    $handler->override_option('menu', array(
     'type' => 'default tab',
     'title' => 'Active in past 30 days',
     'description' => 'Show only computers that have been active in the past month',
     'weight' => '0',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'tab',
     'title' => 'Computers',
     'description' => 'Show the computers associated with this user',
     'weight' => '0',
     'name' => 'secondary-links',
-  ));
-  $handler = $view->new_display('page', 'User all hosts', 'page_2');
-  $handler->override_option('path', 'account/%/computers/all');
-  $handler->override_option('menu', array(
+    ));
+    $handler = $view->new_display('page', 'User all hosts', 'page_2');
+    $handler->override_option('path', 'account/%/computers/all');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'All computers',
     'description' => 'Show all computers associated with the account',
     'weight' => '1',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('page', 'Top hosts', 'page_3');
-  $handler->override_option('fields', array(
+    ));
+    $handler = $view->new_display('page', 'Top hosts', 'page_3');
+    $handler->override_option('fields', array(
     'id_1' => array(
-      'label' => 'Id',
-      'alter' => array(
+        'label' => 'Id',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5726,32 +5726,32 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'id_1',
-      'table' => 'user',
-      'field' => 'id',
-      'relationship' => 'userid',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'id_1',
+        'table' => 'user',
+        'field' => 'id',
+        'relationship' => 'userid',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5770,23 +5770,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'name',
-      'table' => 'user',
-      'field' => 'name',
-      'relationship' => 'userid',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'name',
+        'table' => 'user',
+        'field' => 'name',
+        'relationship' => 'userid',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'show_hosts' => array(
-      'label' => 'Show Hosts',
-      'alter' => array(
+        'label' => 'Show Hosts',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5805,32 +5805,32 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'show_hosts',
-      'table' => 'user',
-      'field' => 'show_hosts',
-      'relationship' => 'userid',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'show_hosts',
+        'table' => 'user',
+        'field' => 'show_hosts',
+        'relationship' => 'userid',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'id' => array(
-      'label' => 'Computer ID',
-      'alter' => array(
+        'label' => 'Computer ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => 'ID: [id]
 <a href="">Details</a> | <a href="">Tasks</a>
@@ -5850,25 +5850,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => 'ID: ',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'id',
-      'table' => 'host',
-      'field' => 'id',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => 'ID: ',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'id',
+        'table' => 'host',
+        'field' => 'id',
+        'relationship' => 'none',
     ),
     'phpcode_3' => array(
-      'label' => 'Computer links',
-      'alter' => array(
+        'label' => 'Computer links',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5887,26 +5887,26 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   echo l(bts(\'Details\', array(), NULL, \'boinc:host-details\'), "host/{$data->id}") . \'&nbsp;|&nbsp;\' . l(bts(\'Tasks\', array(), NULL, \'boinc:host-tasks-link\'), "host/{$data->id}/tasks/0/0");
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_3',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode_3',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'host_cpid' => array(
-      'label' => 'Cross project ID',
-      'alter' => array(
+        'label' => 'Cross project ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5923,19 +5923,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 1,
-      'id' => 'host_cpid',
-      'table' => 'host',
-      'field' => 'host_cpid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 1,
+        'id' => 'host_cpid',
+        'table' => 'host',
+        'field' => 'host_cpid',
+        'relationship' => 'none',
     ),
     'phpcode_4' => array(
-      'label' => 'Cross-project statistics',
-      'alter' => array(
+        'label' => 'Cross-project statistics',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -5954,12 +5954,12 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(\'stats_sites\');
   global $host_sites;
   $x = "";
@@ -5972,18 +5972,18 @@ 
   }
   echo "Cross-project stats: {$x}";
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_4',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode_4',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'rownumber' => array(
-      'label' => 'Rank',
-      'alter' => array(
+        'label' => 'Rank',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6000,19 +6000,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'rownumber',
-      'table' => 'customfield',
-      'field' => 'rownumber',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'rownumber',
+        'table' => 'customfield',
+        'field' => 'rownumber',
+        'relationship' => 'none',
     ),
     'phpcode_5' => array(
-      'label' => 'Owner',
-      'alter' => array(
+        'label' => 'Owner',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6031,12 +6031,12 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
 $uid = get_drupal_id($data->user_host_id);
 if ($data->user_host_show_hosts) {
   echo l($data->user_host_name, "account/{$uid}");
@@ -6044,18 +6044,18 @@ 
 else {
   echo bts(\'Anonymous\', array(), NULL, \'boinc:anonymous-user\');
 }',
-      'exclude' => 0,
-      'id' => 'phpcode_5',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode_5',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'expavg_credit' => array(
-      'label' => 'Avg. credit',
-      'alter' => array(
+        'label' => 'Avg. credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6072,25 +6072,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'expavg_credit',
-      'table' => 'host',
-      'field' => 'expavg_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'expavg_credit',
+        'table' => 'host',
+        'field' => 'expavg_credit',
+        'relationship' => 'none',
     ),
     'total_credit' => array(
-      'label' => 'Total credit',
-      'alter' => array(
+        'label' => 'Total credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6109,32 +6109,32 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'total_credit',
-      'table' => 'host',
-      'field' => 'total_credit',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'total_credit',
+        'table' => 'host',
+        'field' => 'total_credit',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'serialnum' => array(
-      'label' => 'Serial Number',
-      'alter' => array(
+        'label' => 'Serial Number',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6151,19 +6151,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 1,
-      'id' => 'serialnum',
-      'table' => 'host',
-      'field' => 'serialnum',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 1,
+        'id' => 'serialnum',
+        'table' => 'host',
+        'field' => 'serialnum',
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => 'BOINC version',
-      'alter' => array(
+        'label' => 'BOINC version',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6180,23 +6180,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'value' => '<?php
   require_boinc(\'host\');
   echo boinc_version(parse_serialnum($data->host_serialnum));
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'p_vendor' => array(
-      'label' => 'CPU',
-      'alter' => array(
+        'label' => 'CPU',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6213,22 +6213,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'p_vendor',
-      'table' => 'host',
-      'field' => 'p_vendor',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'p_vendor',
+        'table' => 'host',
+        'field' => 'p_vendor',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Override',
-      ),
+        ),
     ),
     'p_model' => array(
-      'label' => 'CPU model',
-      'alter' => array(
+        'label' => 'CPU model',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6245,19 +6245,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'p_model',
-      'table' => 'host',
-      'field' => 'p_model',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'p_model',
+        'table' => 'host',
+        'field' => 'p_model',
+        'relationship' => 'none',
     ),
     'p_ncpus' => array(
-      'label' => 'Number of CPUs',
-      'alter' => array(
+        'label' => 'Number of CPUs',
+        'alter' => array(
         'alter_text' => 1,
         'text' => '([p_ncpus] processors)',
         'make_link' => 0,
@@ -6274,19 +6274,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'p_ncpus',
-      'table' => 'host',
-      'field' => 'p_ncpus',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'p_ncpus',
+        'table' => 'host',
+        'field' => 'p_ncpus',
+        'relationship' => 'none',
     ),
     'phpcode_1' => array(
-      'label' => 'GPU',
-      'alter' => array(
+        'label' => 'GPU',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6303,23 +6303,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'value' => '<?php
   require_boinc(\'host\');
   echo gpu_desc(parse_serialnum($data->host_serialnum));
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_1',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_1',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'os_name' => array(
-      'label' => 'Operating system',
-      'alter' => array(
+        'label' => 'Operating system',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6336,19 +6336,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'os_name',
-      'table' => 'host',
-      'field' => 'os_name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'os_name',
+        'table' => 'host',
+        'field' => 'os_name',
+        'relationship' => 'none',
     ),
     'os_version' => array(
-      'label' => 'Operating system version',
-      'alter' => array(
+        'label' => 'Operating system version',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6365,164 +6365,164 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'os_version',
-      'table' => 'host',
-      'field' => 'os_version',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'os_version',
+        'table' => 'host',
+        'field' => 'os_version',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('arguments', array());
-  $handler->override_option('filters', array(
+    ));
+    $handler->override_option('arguments', array());
+    $handler->override_option('filters', array(
     'total_credit' => array(
-      'operator' => '>=',
-      'value' => array(
+        'operator' => '>=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'total_credit',
-      'table' => 'host',
-      'field' => 'total_credit',
-      'override' => array(
+        ),
+        'id' => 'total_credit',
+        'table' => 'host',
+        'field' => 'total_credit',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('items_per_page', 50);
-  $handler->override_option('use_pager', '0');
-  $handler->override_option('style_options', array(
+    ));
+    $handler->override_option('items_per_page', 50);
+    $handler->override_option('use_pager', '0');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 1,
     'order' => 'desc',
     'summary' => '',
     'columns' => array(
-      'id_1' => 'id_1',
-      'name' => 'name',
-      'show_hosts' => 'show_hosts',
-      'id' => 'id',
-      'phpcode_3' => 'id',
-      'host_cpid' => 'host_cpid',
-      'phpcode_4' => 'id',
-      'rownumber' => 'rownumber',
-      'phpcode_5' => 'phpcode_5',
-      'expavg_credit' => 'expavg_credit',
-      'total_credit' => 'total_credit',
-      'serialnum' => 'serialnum',
-      'phpcode' => 'phpcode',
-      'p_vendor' => 'p_vendor',
-      'p_model' => 'p_vendor',
-      'p_ncpus' => 'p_vendor',
-      'phpcode_1' => 'phpcode_1',
-      'os_name' => 'os_name',
-      'os_version' => 'os_name',
+        'id_1' => 'id_1',
+        'name' => 'name',
+        'show_hosts' => 'show_hosts',
+        'id' => 'id',
+        'phpcode_3' => 'id',
+        'host_cpid' => 'host_cpid',
+        'phpcode_4' => 'id',
+        'rownumber' => 'rownumber',
+        'phpcode_5' => 'phpcode_5',
+        'expavg_credit' => 'expavg_credit',
+        'total_credit' => 'total_credit',
+        'serialnum' => 'serialnum',
+        'phpcode' => 'phpcode',
+        'p_vendor' => 'p_vendor',
+        'p_model' => 'p_vendor',
+        'p_ncpus' => 'p_vendor',
+        'phpcode_1' => 'phpcode_1',
+        'os_name' => 'os_name',
+        'os_version' => 'os_name',
     ),
     'info' => array(
-      'id_1' => array(
+        'id_1' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'name' => array(
+        ),
+        'name' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'show_hosts' => array(
+        ),
+        'show_hosts' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'id' => array(
+        ),
+        'id' => array(
         'sortable' => 0,
         'separator' => '<br/>',
-      ),
-      'phpcode_3' => array(
+        ),
+        'phpcode_3' => array(
         'separator' => '',
-      ),
-      'host_cpid' => array(
+        ),
+        'host_cpid' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'phpcode_4' => array(
+        ),
+        'phpcode_4' => array(
         'separator' => '',
-      ),
-      'rownumber' => array(
+        ),
+        'rownumber' => array(
         'separator' => '',
-      ),
-      'phpcode_5' => array(
+        ),
+        'phpcode_5' => array(
         'separator' => '',
-      ),
-      'expavg_credit' => array(
+        ),
+        'expavg_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'total_credit' => array(
+        ),
+        'total_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'serialnum' => array(
+        ),
+        'serialnum' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'phpcode' => array(
+        ),
+        'phpcode' => array(
         'separator' => '',
-      ),
-      'p_vendor' => array(
+        ),
+        'p_vendor' => array(
         'sortable' => 0,
         'separator' => '<br/>',
-      ),
-      'p_model' => array(
+        ),
+        'p_model' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'p_ncpus' => array(
+        ),
+        'p_ncpus' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'phpcode_1' => array(
+        ),
+        'phpcode_1' => array(
         'separator' => '',
-      ),
-      'os_name' => array(
+        ),
+        'os_name' => array(
         'sortable' => 0,
         'separator' => '<br/>',
-      ),
-      'os_version' => array(
+        ),
+        'os_version' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'expavg_credit',
-  ));
-  $handler->override_option('path', 'community/stats/hosts');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'community/stats/hosts');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'Top Computers',
     'description' => '',
     'weight' => '10',
     'name' => 'primary-links',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('panel_pane', 'Top hosts pane', 'panel_pane_1');
-  $handler->override_option('fields', array(
+    ));
+    $handler = $view->new_display('panel_pane', 'Top hosts pane', 'panel_pane_1');
+    $handler->override_option('fields', array(
     'id_1' => array(
-      'label' => 'Id',
-      'alter' => array(
+        'label' => 'Id',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6541,32 +6541,32 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'id_1',
-      'table' => 'user',
-      'field' => 'id',
-      'relationship' => 'userid',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'id_1',
+        'table' => 'user',
+        'field' => 'id',
+        'relationship' => 'userid',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6585,23 +6585,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'name',
-      'table' => 'user',
-      'field' => 'name',
-      'relationship' => 'userid',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'name',
+        'table' => 'user',
+        'field' => 'name',
+        'relationship' => 'userid',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'show_hosts' => array(
-      'label' => 'Show Hosts',
-      'alter' => array(
+        'label' => 'Show Hosts',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6620,32 +6620,32 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'show_hosts',
-      'table' => 'user',
-      'field' => 'show_hosts',
-      'relationship' => 'userid',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'show_hosts',
+        'table' => 'user',
+        'field' => 'show_hosts',
+        'relationship' => 'userid',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'rownumber' => array(
-      'label' => 'Rank',
-      'alter' => array(
+        'label' => 'Rank',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6662,19 +6662,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'rownumber',
-      'table' => 'customfield',
-      'field' => 'rownumber',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'rownumber',
+        'table' => 'customfield',
+        'field' => 'rownumber',
+        'relationship' => 'none',
     ),
     'id' => array(
-      'label' => 'Computer ID',
-      'alter' => array(
+        'label' => 'Computer ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => 'ID: [id]
 <a href="">Details</a> | <a href="">Tasks</a>
@@ -6696,32 +6696,32 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'id',
-      'table' => 'host',
-      'field' => 'id',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'id',
+        'table' => 'host',
+        'field' => 'id',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'phpcode_3' => array(
-      'label' => 'Computer links',
-      'alter' => array(
+        'label' => 'Computer links',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6740,26 +6740,26 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   echo l(bts(\'Details\', array(), NULL, \'boinc:host-details\'), "host/{$data->id}") . \'&nbsp;|&nbsp;\' . l(bts(\'Tasks\', array(), NULL, \'boinc:host-tasks-link\'), "host/{$data->id}/tasks/0/0");
 ?>',
-      'exclude' => 1,
-      'id' => 'phpcode_3',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
-      'override' => array(
+        'exclude' => 1,
+        'id' => 'phpcode_3',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'host_cpid' => array(
-      'label' => 'Cross project ID',
-      'alter' => array(
+        'label' => 'Cross project ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6776,19 +6776,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 1,
-      'id' => 'host_cpid',
-      'table' => 'host',
-      'field' => 'host_cpid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 1,
+        'id' => 'host_cpid',
+        'table' => 'host',
+        'field' => 'host_cpid',
+        'relationship' => 'none',
     ),
     'phpcode_4' => array(
-      'label' => 'Cross-project statistics',
-      'alter' => array(
+        'label' => 'Cross-project statistics',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6807,12 +6807,12 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(\'stats_sites\');
   global $host_sites;
   $x = "";
@@ -6825,18 +6825,18 @@ 
   }
   echo "Cross-project stats: {$x}";
 ?>',
-      'exclude' => 1,
-      'id' => 'phpcode_4',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
-      'override' => array(
+        'exclude' => 1,
+        'id' => 'phpcode_4',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'phpcode_5' => array(
-      'label' => 'Owner',
-      'alter' => array(
+        'label' => 'Owner',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6855,12 +6855,12 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
 $uid = get_drupal_id($data->user_host_id);
 if ($data->user_host_show_hosts) {
   echo l($data->user_host_name, "account/{$uid}");
@@ -6868,18 +6868,18 @@ 
 else {
   echo bts(\'Anonymous\', array(), NULL, \'boinc:anonymous-user\');
 }',
-      'exclude' => 0,
-      'id' => 'phpcode_5',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode_5',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'expavg_credit' => array(
-      'label' => 'Recent average credit',
-      'alter' => array(
+        'label' => 'Recent average credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6898,32 +6898,32 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'expavg_credit',
-      'table' => 'host',
-      'field' => 'expavg_credit',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'expavg_credit',
+        'table' => 'host',
+        'field' => 'expavg_credit',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'total_credit' => array(
-      'label' => 'Total credit',
-      'alter' => array(
+        'label' => 'Total credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6942,32 +6942,32 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'total_credit',
-      'table' => 'host',
-      'field' => 'total_credit',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'total_credit',
+        'table' => 'host',
+        'field' => 'total_credit',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'serialnum' => array(
-      'label' => 'Serial Number',
-      'alter' => array(
+        'label' => 'Serial Number',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -6984,19 +6984,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 1,
-      'id' => 'serialnum',
-      'table' => 'host',
-      'field' => 'serialnum',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 1,
+        'id' => 'serialnum',
+        'table' => 'host',
+        'field' => 'serialnum',
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => 'BOINC version',
-      'alter' => array(
+        'label' => 'BOINC version',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7015,27 +7015,27 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(\'host\');
   echo boinc_version(parse_serialnum($data->host_serialnum));
 ?>',
-      'exclude' => 1,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
-      'override' => array(
+        'exclude' => 1,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'p_vendor' => array(
-      'label' => 'CPU',
-      'alter' => array(
+        'label' => 'CPU',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7054,23 +7054,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'p_vendor',
-      'table' => 'host',
-      'field' => 'p_vendor',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'p_vendor',
+        'table' => 'host',
+        'field' => 'p_vendor',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'p_model' => array(
-      'label' => 'CPU model',
-      'alter' => array(
+        'label' => 'CPU model',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7089,23 +7089,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'p_model',
-      'table' => 'host',
-      'field' => 'p_model',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'p_model',
+        'table' => 'host',
+        'field' => 'p_model',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'p_ncpus' => array(
-      'label' => 'Number of CPUs',
-      'alter' => array(
+        'label' => 'Number of CPUs',
+        'alter' => array(
         'alter_text' => 1,
         'text' => '([p_ncpus] processors)',
         'make_link' => 0,
@@ -7124,23 +7124,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'p_ncpus',
-      'table' => 'host',
-      'field' => 'p_ncpus',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'p_ncpus',
+        'table' => 'host',
+        'field' => 'p_ncpus',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'phpcode_1' => array(
-      'label' => 'GPU',
-      'alter' => array(
+        'label' => 'GPU',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7159,27 +7159,27 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(\'host\');
   echo gpu_desc(parse_serialnum($data->host_serialnum));
 ?>',
-      'exclude' => 1,
-      'id' => 'phpcode_1',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
-      'override' => array(
+        'exclude' => 1,
+        'id' => 'phpcode_1',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'os_name' => array(
-      'label' => 'Operating system',
-      'alter' => array(
+        'label' => 'Operating system',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7198,23 +7198,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'os_name',
-      'table' => 'host',
-      'field' => 'os_name',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'os_name',
+        'table' => 'host',
+        'field' => 'os_name',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'os_version' => array(
-      'label' => 'Operating system version',
-      'alter' => array(
+        'label' => 'Operating system version',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7233,178 +7233,178 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'os_version',
-      'table' => 'host',
-      'field' => 'os_version',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'os_version',
+        'table' => 'host',
+        'field' => 'os_version',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
-  ));
-  $handler->override_option('arguments', array());
-  $handler->override_option('filters', array(
+    ));
+    $handler->override_option('arguments', array());
+    $handler->override_option('filters', array(
     'show_hosts' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'show_hosts',
-      'table' => 'user',
-      'field' => 'show_hosts',
-      'relationship' => 'userid',
+        ),
+        'id' => 'show_hosts',
+        'table' => 'user',
+        'field' => 'show_hosts',
+        'relationship' => 'userid',
     ),
     'total_credit' => array(
-      'operator' => '>=',
-      'value' => array(
+        'operator' => '>=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'total_credit',
-      'table' => 'host',
-      'field' => 'total_credit',
-      'override' => array(
+        ),
+        'id' => 'total_credit',
+        'table' => 'host',
+        'field' => 'total_credit',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('title', 'Top computers');
-  $handler->override_option('items_per_page', 10);
-  $handler->override_option('use_pager', '0');
-  $handler->override_option('use_more', 1);
-  $handler->override_option('use_more_always', 0);
-  $handler->override_option('use_more_text', 'view more');
-  $handler->override_option('link_display', 'page_3');
-  $handler->override_option('style_options', array(
+        ),
+        'relationship' => 'none',
+    ),
+    ));
+    $handler->override_option('title', 'Top computers');
+    $handler->override_option('items_per_page', 10);
+    $handler->override_option('use_pager', '0');
+    $handler->override_option('use_more', 1);
+    $handler->override_option('use_more_always', 0);
+    $handler->override_option('use_more_text', 'view more');
+    $handler->override_option('link_display', 'page_3');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 0,
     'order' => 'desc',
     'summary' => '',
     'columns' => array(
-      'id_1' => 'id_1',
-      'name' => 'name',
-      'show_hosts' => 'show_hosts',
-      'rownumber' => 'rownumber',
-      'id' => 'id',
-      'phpcode_3' => 'id',
-      'host_cpid' => 'host_cpid',
-      'phpcode_4' => 'id',
-      'phpcode_5' => 'phpcode_5',
-      'expavg_credit' => 'expavg_credit',
-      'total_credit' => 'total_credit',
-      'serialnum' => 'serialnum',
-      'phpcode' => 'phpcode',
-      'p_vendor' => 'p_vendor',
-      'p_model' => 'p_vendor',
-      'p_ncpus' => 'p_vendor',
-      'phpcode_1' => 'phpcode_1',
-      'os_name' => 'os_name',
-      'os_version' => 'os_name',
+        'id_1' => 'id_1',
+        'name' => 'name',
+        'show_hosts' => 'show_hosts',
+        'rownumber' => 'rownumber',
+        'id' => 'id',
+        'phpcode_3' => 'id',
+        'host_cpid' => 'host_cpid',
+        'phpcode_4' => 'id',
+        'phpcode_5' => 'phpcode_5',
+        'expavg_credit' => 'expavg_credit',
+        'total_credit' => 'total_credit',
+        'serialnum' => 'serialnum',
+        'phpcode' => 'phpcode',
+        'p_vendor' => 'p_vendor',
+        'p_model' => 'p_vendor',
+        'p_ncpus' => 'p_vendor',
+        'phpcode_1' => 'phpcode_1',
+        'os_name' => 'os_name',
+        'os_version' => 'os_name',
     ),
     'info' => array(
-      'id_1' => array(
+        'id_1' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'name' => array(
+        ),
+        'name' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'show_hosts' => array(
+        ),
+        'show_hosts' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'rownumber' => array(
+        ),
+        'rownumber' => array(
         'separator' => '',
-      ),
-      'id' => array(
+        ),
+        'id' => array(
         'sortable' => 0,
         'separator' => ' | ',
-      ),
-      'phpcode_3' => array(
+        ),
+        'phpcode_3' => array(
         'separator' => '',
-      ),
-      'host_cpid' => array(
+        ),
+        'host_cpid' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'phpcode_4' => array(
+        ),
+        'phpcode_4' => array(
         'separator' => '',
-      ),
-      'phpcode_5' => array(
+        ),
+        'phpcode_5' => array(
         'separator' => '',
-      ),
-      'expavg_credit' => array(
+        ),
+        'expavg_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'total_credit' => array(
+        ),
+        'total_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'serialnum' => array(
+        ),
+        'serialnum' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'phpcode' => array(
+        ),
+        'phpcode' => array(
         'separator' => '',
-      ),
-      'p_vendor' => array(
+        ),
+        'p_vendor' => array(
         'sortable' => 1,
         'separator' => '<br/>',
-      ),
-      'p_model' => array(
+        ),
+        'p_model' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'p_ncpus' => array(
+        ),
+        'p_ncpus' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'phpcode_1' => array(
+        ),
+        'phpcode_1' => array(
         'separator' => '',
-      ),
-      'os_name' => array(
+        ),
+        'os_name' => array(
         'sortable' => 1,
         'separator' => '<br/>',
-      ),
-      'os_version' => array(
+        ),
+        'os_version' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'expavg_credit',
-  ));
-  $handler->override_option('pane_title', '');
-  $handler->override_option('pane_description', '');
-  $handler->override_option('pane_category', array(
+    ));
+    $handler->override_option('pane_title', '');
+    $handler->override_option('pane_description', '');
+    $handler->override_option('pane_category', array(
     'name' => 'View panes',
     'weight' => 0,
-  ));
-  $handler->override_option('allow', array(
+    ));
+    $handler->override_option('allow', array(
     'use_pager' => FALSE,
     'items_per_page' => FALSE,
     'offset' => FALSE,
@@ -7414,27 +7414,27 @@ 
     'title_override' => FALSE,
     'exposed_form' => FALSE,
     'fields_override' => FALSE,
-  ));
-  $handler->override_option('argument_input', array());
-  $handler->override_option('link_to_view', 0);
-  $handler->override_option('inherit_panels_path', 0);
+    ));
+    $handler->override_option('argument_input', array());
+    $handler->override_option('link_to_view', 0);
+    $handler->override_option('inherit_panels_path', 0);
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  // Exported view: boinc_host_tasks_all
-  $view = new view;
-  $view->name = 'boinc_host_tasks_all';
-  $view->description = 'A list of all tasks for the given host';
-  $view->tag = '';
-  $view->base_table = 'result';
-  $view->core = 0;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('fields', array(
+    // Exported view: boinc_host_tasks_all
+    $view = new view;
+    $view->name = 'boinc_host_tasks_all';
+    $view->description = 'A list of all tasks for the given host';
+    $view->tag = '';
+    $view->base_table = 'result';
+    $view->core = 0;
+    $view->api_version = '2';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('fields', array(
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7453,20 +7453,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'name',
-      'table' => 'result',
-      'field' => 'name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'name',
+        'table' => 'result',
+        'field' => 'name',
+        'relationship' => 'none',
     ),
     'id' => array(
-      'label' => 'Task ID',
-      'alter' => array(
+        'label' => 'Task ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7485,29 +7485,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'id',
-      'table' => 'result',
-      'field' => 'id',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'id',
+        'table' => 'result',
+        'field' => 'id',
+        'relationship' => 'none',
     ),
     'workunitid' => array(
-      'label' => 'Workunit ID',
-      'alter' => array(
+        'label' => 'Workunit ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 1,
@@ -7524,25 +7524,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'workunitid',
-      'table' => 'result',
-      'field' => 'workunitid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'workunitid',
+        'table' => 'result',
+        'field' => 'workunitid',
+        'relationship' => 'none',
     ),
     'sent_time' => array(
-      'label' => 'Sent',
-      'alter' => array(
+        'label' => 'Sent',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7559,21 +7559,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s e',
-      'exclude' => 1,
-      'id' => 'sent_time',
-      'table' => 'result',
-      'field' => 'sent_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s e',
+        'exclude' => 1,
+        'id' => 'sent_time',
+        'table' => 'result',
+        'field' => 'sent_time',
+        'relationship' => 'none',
     ),
     'received_time' => array(
-      'label' => 'Received time',
-      'alter' => array(
+        'label' => 'Received time',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7590,21 +7590,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'date_format' => 'small',
-      'custom_date_format' => '',
-      'exclude' => 1,
-      'id' => 'received_time',
-      'table' => 'result',
-      'field' => 'received_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'date_format' => 'small',
+        'custom_date_format' => '',
+        'exclude' => 1,
+        'id' => 'received_time',
+        'table' => 'result',
+        'field' => 'received_time',
+        'relationship' => 'none',
     ),
     'report_deadline' => array(
-      'label' => 'Report deadline',
-      'alter' => array(
+        'label' => 'Report deadline',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7621,21 +7621,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'date_format' => 'small',
-      'custom_date_format' => '',
-      'exclude' => 1,
-      'id' => 'report_deadline',
-      'table' => 'result',
-      'field' => 'report_deadline',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'date_format' => 'small',
+        'custom_date_format' => '',
+        'exclude' => 1,
+        'id' => 'report_deadline',
+        'table' => 'result',
+        'field' => 'report_deadline',
+        'relationship' => 'none',
     ),
     'phpcode_3' => array(
-      'label' => 'Sent',
-      'alter' => array(
+        'label' => 'Sent',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7654,24 +7654,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(\'util\');
   echo date(\'j M Y G:i:s T\', $data->result_sent_time);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_3',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_3',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => 'Time reported or deadline',
-      'alter' => array(
+        'label' => 'Time reported or deadline',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7690,24 +7690,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php return boincwork_task_time_reported($data->result_received_time, $data->result_report_deadline); ?>',
-      'exclude' => 0,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php return boincwork_task_time_reported($data->result_received_time, $data->result_report_deadline); ?>',
+        'exclude' => 0,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Override',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'server_state' => array(
-      'label' => 'Server state',
-      'alter' => array(
+        'label' => 'Server state',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7724,25 +7724,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'relationship' => 'none',
     ),
     'outcome' => array(
-      'label' => 'Outcome',
-      'alter' => array(
+        'label' => 'Outcome',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7759,25 +7759,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'relationship' => 'none',
     ),
     'client_state' => array(
-      'label' => 'Client state',
-      'alter' => array(
+        'label' => 'Client state',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7794,25 +7794,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'client_state',
-      'table' => 'result',
-      'field' => 'client_state',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'client_state',
+        'table' => 'result',
+        'field' => 'client_state',
+        'relationship' => 'none',
     ),
     'validate_state' => array(
-      'label' => 'Validation state',
-      'alter' => array(
+        'label' => 'Validation state',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7829,25 +7829,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'validate_state',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'validate_state',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'relationship' => 'none',
     ),
     'exit_status' => array(
-      'label' => 'Exit status',
-      'alter' => array(
+        'label' => 'Exit status',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7864,25 +7864,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'exit_status',
-      'table' => 'result',
-      'field' => 'exit_status',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'exit_status',
+        'table' => 'result',
+        'field' => 'exit_status',
+        'relationship' => 'none',
     ),
     'phpcode_1' => array(
-      'label' => 'Status',
-      'alter' => array(
+        'label' => 'Status',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7899,11 +7899,11 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'value' => '<?php
   require_boinc(\'result\');
   $result = new stdClass();
   $result->server_state = $data->result_server_state;
@@ -7913,18 +7913,18 @@ 
   $result->exit_status = $data->result_exit_status;
   return state_string($result);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_1',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode_1',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Override',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'elapsed_time' => array(
-      'label' => 'Run time',
-      'alter' => array(
+        'label' => 'Run time',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7943,29 +7943,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'elapsed_time',
-      'table' => 'result',
-      'field' => 'elapsed_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'elapsed_time',
+        'table' => 'result',
+        'field' => 'elapsed_time',
+        'relationship' => 'none',
     ),
     'cpu_time' => array(
-      'label' => 'CPU time',
-      'alter' => array(
+        'label' => 'CPU time',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -7984,29 +7984,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'cpu_time',
-      'table' => 'result',
-      'field' => 'cpu_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'cpu_time',
+        'table' => 'result',
+        'field' => 'cpu_time',
+        'relationship' => 'none',
     ),
     'granted_credit' => array(
-      'label' => 'Granted credit',
-      'alter' => array(
+        'label' => 'Granted credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -8025,29 +8025,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'granted_credit',
-      'table' => 'result',
-      'field' => 'granted_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'granted_credit',
+        'table' => 'result',
+        'field' => 'granted_credit',
+        'relationship' => 'none',
     ),
     'appid' => array(
-      'label' => 'Application ID',
-      'alter' => array(
+        'label' => 'Application ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -8066,29 +8066,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'appid',
-      'table' => 'result',
-      'field' => 'appid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'appid',
+        'table' => 'result',
+        'field' => 'appid',
+        'relationship' => 'none',
     ),
     'app_version_id' => array(
-      'label' => 'Application version',
-      'alter' => array(
+        'label' => 'Application version',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -8105,25 +8105,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'app_version_id',
-      'table' => 'result',
-      'field' => 'app_version_id',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'app_version_id',
+        'table' => 'result',
+        'field' => 'app_version_id',
+        'relationship' => 'none',
     ),
     'phpcode_2' => array(
-      'label' => 'Application',
-      'alter' => array(
+        'label' => 'Application',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -8142,55 +8142,55 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(\'result\');
   $result = new stdClass();
   $result->appid = $data->result_appid;
   $result->app_version_id = $data->result_app_version_id;
   return app_version_string($result);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_2',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode_2',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Override',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('arguments', array(
+    ));
+    $handler->override_option('arguments', array(
     'hostid' => array(
-      'default_action' => 'not found',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => 'Tasks for computer %1',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'numeric',
-      'validate_fail' => 'not found',
-      'id' => 'hostid',
-      'table' => 'result',
-      'field' => 'hostid',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'not found',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => 'Tasks for computer %1',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'numeric',
+        'validate_fail' => 'not found',
+        'id' => 'hostid',
+        'table' => 'result',
+        'field' => 'hostid',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3 => 0,
-      ),
-      'relationship' => 'none',
-      'default_options_div_prefix' => '',
-      'default_argument_fixed' => '',
-      'default_argument_user' => 0,
-      'default_argument_php' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'relationship' => 'none',
+        'default_options_div_prefix' => '',
+        'default_argument_fixed' => '',
+        'default_argument_user' => 0,
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'forum' => 0,
         'job_post' => 0,
         'news' => 0,
@@ -8198,687 +8198,687 @@ 
         'profile' => 0,
         'story' => 0,
         'team' => 0,
-      ),
-      'validate_argument_node_access' => 0,
-      'validate_argument_nid_type' => 'nid',
-      'validate_argument_vocabulary' => array(
+        ),
+        'validate_argument_node_access' => 0,
+        'validate_argument_nid_type' => 'nid',
+        'validate_argument_vocabulary' => array(
         1 => 0,
-      ),
-      'validate_argument_type' => 'tid',
-      'validate_argument_transform' => 0,
-      'validate_user_restrict_roles' => 0,
-      'validate_argument_php' => '',
-    ),
-  ));
-  $handler->override_option('access', array(
+        ),
+        'validate_argument_type' => 'tid',
+        'validate_argument_transform' => 0,
+        'validate_user_restrict_roles' => 0,
+        'validate_argument_php' => '',
+    ),
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('items_per_page', 20);
-  $handler->override_option('use_pager', '1');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', array(
+    ));
+    $handler->override_option('items_per_page', 20);
+    $handler->override_option('use_pager', '1');
+    $handler->override_option('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 1,
     'order' => 'desc',
     'summary' => '',
     'columns' => array(
-      'id' => 'id',
-      'workunitid' => 'workunitid',
-      'sent_time' => 'sent_time',
-      'received_time' => 'received_time',
-      'report_deadline' => 'report_deadline',
-      'phpcode_3' => 'phpcode_3',
-      'phpcode' => 'phpcode',
-      'server_state' => 'server_state',
-      'outcome' => 'outcome',
-      'client_state' => 'client_state',
-      'validate_state' => 'validate_state',
-      'exit_status' => 'exit_status',
-      'phpcode_1' => 'phpcode_1',
-      'elapsed_time' => 'elapsed_time',
-      'cpu_time' => 'cpu_time',
-      'claimed_credit_1' => 'claimed_credit_1',
-      'granted_credit' => 'granted_credit',
-      'app_version_id' => 'app_version_id',
-      'phpcode_2' => 'phpcode_2',
+        'id' => 'id',
+        'workunitid' => 'workunitid',
+        'sent_time' => 'sent_time',
+        'received_time' => 'received_time',
+        'report_deadline' => 'report_deadline',
+        'phpcode_3' => 'phpcode_3',
+        'phpcode' => 'phpcode',
+        'server_state' => 'server_state',
+        'outcome' => 'outcome',
+        'client_state' => 'client_state',
+        'validate_state' => 'validate_state',
+        'exit_status' => 'exit_status',
+        'phpcode_1' => 'phpcode_1',
+        'elapsed_time' => 'elapsed_time',
+        'cpu_time' => 'cpu_time',
+        'claimed_credit_1' => 'claimed_credit_1',
+        'granted_credit' => 'granted_credit',
+        'app_version_id' => 'app_version_id',
+        'phpcode_2' => 'phpcode_2',
     ),
     'info' => array(
-      'id' => array(
+        'id' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'workunitid' => array(
+        ),
+        'workunitid' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'sent_time' => array(
+        ),
+        'sent_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'received_time' => array(
+        ),
+        'received_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'report_deadline' => array(
+        ),
+        'report_deadline' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'phpcode_3' => array(
+        ),
+        'phpcode_3' => array(
         'separator' => '',
-      ),
-      'phpcode' => array(
+        ),
+        'phpcode' => array(
         'separator' => '',
-      ),
-      'server_state' => array(
+        ),
+        'server_state' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'outcome' => array(
+        ),
+        'outcome' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'client_state' => array(
+        ),
+        'client_state' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'validate_state' => array(
+        ),
+        'validate_state' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'exit_status' => array(
+        ),
+        'exit_status' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'phpcode_1' => array(
+        ),
+        'phpcode_1' => array(
         'separator' => '',
-      ),
-      'elapsed_time' => array(
+        ),
+        'elapsed_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'cpu_time' => array(
+        ),
+        'cpu_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'claimed_credit_1' => array(
+        ),
+        'claimed_credit_1' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'granted_credit' => array(
+        ),
+        'granted_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'app_version_id' => array(
+        ),
+        'app_version_id' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'phpcode_2' => array(
+        ),
+        'phpcode_2' => array(
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'id',
-  ));
-  $handler = $view->new_display('page', 'All tasks', 'page_1');
-  $handler->override_option('path', 'host/%/tasks/all');
-  $handler->override_option('menu', array(
+    ));
+    $handler = $view->new_display('page', 'All tasks', 'page_1');
+    $handler->override_option('path', 'host/%/tasks/all');
+    $handler->override_option('menu', array(
     'type' => 'default tab',
     'title' => 'All tasks',
     'description' => 'Show all tasks associated with the host',
     'weight' => '0',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'tab',
     'title' => 'Tasks',
     'description' => 'Show all tasks',
     'weight' => '0',
     'name' => 'secondary-links',
-  ));
-  $handler = $view->new_display('page', 'Error', 'page_2');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'Error', 'page_2');
+    $handler->override_option('filters', array(
     'server_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '5',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'override' => array(
+        ),
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'outcome' => array(
-      'operator' => '>=',
-      'value' => array(
+        'operator' => '>=',
+        'value' => array(
         'value' => '3',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'outcome_1' => array(
-      'operator' => 'not between',
-      'value' => array(
+        'operator' => 'not between',
+        'value' => array(
         'value' => '',
         'min' => '4',
         'max' => '7',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome_1',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome_1',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'outcome_2' => array(
-      'operator' => '<=',
-      'value' => array(
+        'operator' => '<=',
+        'value' => array(
         'value' => '7',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome_2',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome_2',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('path', 'host/%/tasks/error');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'host/%/tasks/error');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'Error',
     'description' => 'Show tasks with errors associated with the host',
     'weight' => '5',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('page', 'In progress', 'page_3');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'In progress', 'page_3');
+    $handler->override_option('filters', array(
     'server_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '4',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'override' => array(
+        ),
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('path', 'host/%/tasks/active');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'host/%/tasks/active');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'In progress',
     'description' => 'Show tasks in progress associated with the host',
     'weight' => '1',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('page', 'Invalidated', 'page_4');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'Invalidated', 'page_4');
+    $handler->override_option('filters', array(
     'server_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '5',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'override' => array(
+        ),
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_begin_2' => array(
-      'id' => 'views_or_begin_2',
-      'table' => 'views_or',
-      'field' => 'views_or_begin',
+        'id' => 'views_or_begin_2',
+        'table' => 'views_or',
+        'field' => 'views_or_begin',
     ),
     'outcome' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '6',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_next_3' => array(
-      'id' => 'views_or_next_3',
-      'table' => 'views_or',
-      'field' => 'views_or_next',
+        'id' => 'views_or_next_3',
+        'table' => 'views_or',
+        'field' => 'views_or_next',
     ),
     'outcome_1' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome_1',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome_1',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_begin' => array(
-      'id' => 'views_or_begin',
-      'table' => 'views_or',
-      'field' => 'views_or_begin',
+        'id' => 'views_or_begin',
+        'table' => 'views_or',
+        'field' => 'views_or_begin',
     ),
     'validate_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '2',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_next_4' => array(
-      'id' => 'views_or_next_4',
-      'table' => 'views_or',
-      'field' => 'views_or_next',
+        'id' => 'views_or_next_4',
+        'table' => 'views_or',
+        'field' => 'views_or_next',
     ),
     'validate_state_1' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '3',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state_1',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state_1',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_next' => array(
-      'id' => 'views_or_next',
-      'table' => 'views_or',
-      'field' => 'views_or_next',
+        'id' => 'views_or_next',
+        'table' => 'views_or',
+        'field' => 'views_or_next',
     ),
     'validate_state_2' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '5',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state_2',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state_2',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_end_3' => array(
-      'id' => 'views_or_end_3',
-      'table' => 'views_or',
-      'field' => 'views_or_end',
+        'id' => 'views_or_end_3',
+        'table' => 'views_or',
+        'field' => 'views_or_end',
     ),
     'views_or_end_2' => array(
-      'id' => 'views_or_end_2',
-      'table' => 'views_or',
-      'field' => 'views_or_end',
+        'id' => 'views_or_end_2',
+        'table' => 'views_or',
+        'field' => 'views_or_end',
     ),
-  ));
-  $handler->override_option('path', 'host/%/tasks/invalid');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'host/%/tasks/invalid');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'Invalid',
     'description' => 'Show invalidated tasks associated with the host',
     'weight' => '4',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('page', 'Pending', 'page_5');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'Pending', 'page_5');
+    $handler->override_option('filters', array(
     'server_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '5',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'override' => array(
+        ),
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'outcome' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'validate_state' => array(
-      'operator' => '>=',
-      'value' => array(
+        'operator' => '>=',
+        'value' => array(
         'value' => '0',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'validate_state_1' => array(
-      'operator' => 'not between',
-      'value' => array(
+        'operator' => 'not between',
+        'value' => array(
         'value' => '',
         'min' => '0',
         'max' => '4',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state_1',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state_1',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'validate_state_2' => array(
-      'operator' => '<=',
-      'value' => array(
+        'operator' => '<=',
+        'value' => array(
         'value' => '4',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state_2',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state_2',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('path', 'host/%/tasks/pending');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'host/%/tasks/pending');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'Pending',
     'description' => 'Show tasks associated with the host with results pending',
     'weight' => '2',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('page', 'Validated', 'page_6');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'Validated', 'page_6');
+    $handler->override_option('filters', array(
     'server_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '5',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'override' => array(
+        ),
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'outcome' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'validate_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('path', 'host/%/tasks/valid');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'host/%/tasks/valid');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'Valid',
     'description' => 'Show validated tasks associated with the host',
     'weight' => '3',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
+    ));
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  // Exported view: boinc_task
-  $view = new view;
-  $view->name = 'boinc_task';
-  $view->description = 'Details for a specific task';
-  $view->tag = '';
-  $view->base_table = 'result';
-  $view->core = 0;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('fields', array(
+    // Exported view: boinc_task
+    $view = new view;
+    $view->name = 'boinc_task';
+    $view->description = 'Details for a specific task';
+    $view->tag = '';
+    $view->base_table = 'result';
+    $view->core = 0;
+    $view->api_version = '2';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('fields', array(
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -8895,19 +8895,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'result',
-      'field' => 'name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'name',
+        'table' => 'result',
+        'field' => 'name',
+        'relationship' => 'none',
     ),
     'workunitid' => array(
-      'label' => 'Workunit ID',
-      'alter' => array(
+        'label' => 'Workunit ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 1,
@@ -8924,25 +8924,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'workunitid',
-      'table' => 'result',
-      'field' => 'workunitid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'workunitid',
+        'table' => 'result',
+        'field' => 'workunitid',
+        'relationship' => 'none',
     ),
     'create_time' => array(
-      'label' => 'Created',
-      'alter' => array(
+        'label' => 'Created',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -8961,22 +8961,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s T',
-      'exclude' => 1,
-      'id' => 'create_time',
-      'table' => 'result',
-      'field' => 'create_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s T',
+        'exclude' => 1,
+        'id' => 'create_time',
+        'table' => 'result',
+        'field' => 'create_time',
+        'relationship' => 'none',
     ),
     'sent_time' => array(
-      'label' => 'Sent',
-      'alter' => array(
+        'label' => 'Sent',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -8995,22 +8995,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s T',
-      'exclude' => 1,
-      'id' => 'sent_time',
-      'table' => 'result',
-      'field' => 'sent_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s T',
+        'exclude' => 1,
+        'id' => 'sent_time',
+        'table' => 'result',
+        'field' => 'sent_time',
+        'relationship' => 'none',
     ),
     'report_deadline' => array(
-      'label' => 'Report deadline',
-      'alter' => array(
+        'label' => 'Report deadline',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9029,22 +9029,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s T',
-      'exclude' => 1,
-      'id' => 'report_deadline',
-      'table' => 'result',
-      'field' => 'report_deadline',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s T',
+        'exclude' => 1,
+        'id' => 'report_deadline',
+        'table' => 'result',
+        'field' => 'report_deadline',
+        'relationship' => 'none',
     ),
     'received_time' => array(
-      'label' => 'Received',
-      'alter' => array(
+        'label' => 'Received',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9063,22 +9063,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s T',
-      'exclude' => 1,
-      'id' => 'received_time',
-      'table' => 'result',
-      'field' => 'received_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s T',
+        'exclude' => 1,
+        'id' => 'received_time',
+        'table' => 'result',
+        'field' => 'received_time',
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => 'Created',
-      'alter' => array(
+        'label' => 'Created',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9097,23 +9097,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
 echo date(\'j M Y G:i:s T\', $data->result_create_time);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_1' => array(
-      'label' => 'Sent',
-      'alter' => array(
+        'label' => 'Sent',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9132,24 +9132,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
 echo date(\'j M Y G:i:s T\', $data->result_sent_time);
 ?>
 ',
-      'exclude' => 0,
-      'id' => 'phpcode_1',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_1',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_8' => array(
-      'label' => 'Report deadline',
-      'alter' => array(
+        'label' => 'Report deadline',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9168,24 +9168,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
 echo date(\'j M Y G:i:s T\', $data->result_report_deadline);
 ?>
 ',
-      'exclude' => 0,
-      'id' => 'phpcode_8',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_8',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_9' => array(
-      'label' => 'Received',
-      'alter' => array(
+        'label' => 'Received',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9204,24 +9204,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
 echo date(\'j M Y G:i:s T\', $data->result_received_time);
 ?>
 ',
-      'exclude' => 0,
-      'id' => 'phpcode_9',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_9',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'server_state' => array(
-      'label' => 'Server state',
-      'alter' => array(
+        'label' => 'Server state',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9240,29 +9240,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'relationship' => 'none',
     ),
     'phpcode_3' => array(
-      'label' => 'Server state',
-      'alter' => array(
+        'label' => 'Server state',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9281,26 +9281,26 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(array(\'result\', \'util\'));
   $result = new stdClass();
   $result->server_state = $data->result_server_state;
   return result_server_state_string($result);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_3',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_3',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'outcome' => array(
-      'label' => 'Outcome',
-      'alter' => array(
+        'label' => 'Outcome',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9319,29 +9319,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'relationship' => 'none',
     ),
     'phpcode_4' => array(
-      'label' => 'Outcome',
-      'alter' => array(
+        'label' => 'Outcome',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9360,26 +9360,26 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(array(\'result\', \'util\'));
   $result = new stdClass();
   $result->outcome = $data->result_outcome;
   return result_outcome_string($result);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_4',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_4',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'client_state' => array(
-      'label' => 'Client state',
-      'alter' => array(
+        'label' => 'Client state',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9398,29 +9398,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'client_state',
-      'table' => 'result',
-      'field' => 'client_state',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'client_state',
+        'table' => 'result',
+        'field' => 'client_state',
+        'relationship' => 'none',
     ),
     'phpcode_5' => array(
-      'label' => 'Client state',
-      'alter' => array(
+        'label' => 'Client state',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9439,26 +9439,26 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(array(\'result\', \'util\'));
   $result = new stdClass();
   $result->client_state = $data->result_client_state;
   return result_client_state_string($result);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_5',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_5',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'exit_status' => array(
-      'label' => 'Exit status',
-      'alter' => array(
+        'label' => 'Exit status',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9477,29 +9477,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'exit_status',
-      'table' => 'result',
-      'field' => 'exit_status',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'exit_status',
+        'table' => 'result',
+        'field' => 'exit_status',
+        'relationship' => 'none',
     ),
     'phpcode_6' => array(
-      'label' => 'Exit status',
-      'alter' => array(
+        'label' => 'Exit status',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9518,24 +9518,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(array(\'result\', \'util\'));
   return exit_status_string($data->result_exit_status);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_6',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_6',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'hostid' => array(
-      'label' => 'Computer',
-      'alter' => array(
+        'label' => 'Computer',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 1,
@@ -9552,25 +9552,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'hostid',
-      'table' => 'result',
-      'field' => 'hostid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'hostid',
+        'table' => 'result',
+        'field' => 'hostid',
+        'relationship' => 'none',
     ),
     'elapsed_time' => array(
-      'label' => 'Run time (sec)',
-      'alter' => array(
+        'label' => 'Run time (sec)',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9587,25 +9587,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'elapsed_time',
-      'table' => 'result',
-      'field' => 'elapsed_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'elapsed_time',
+        'table' => 'result',
+        'field' => 'elapsed_time',
+        'relationship' => 'none',
     ),
     'cpu_time' => array(
-      'label' => 'CPU time (sec)',
-      'alter' => array(
+        'label' => 'CPU time (sec)',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9622,25 +9622,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'cpu_time',
-      'table' => 'result',
-      'field' => 'cpu_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'cpu_time',
+        'table' => 'result',
+        'field' => 'cpu_time',
+        'relationship' => 'none',
     ),
     'peak_working_set_size' => array(
-      'label' => 'Peak working set size (MB)',
-      'alter' => array(
+        'label' => 'Peak working set size (MB)',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9659,29 +9659,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'peak_working_set_size',
-      'table' => 'result',
-      'field' => 'peak_working_set_size',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'peak_working_set_size',
+        'table' => 'result',
+        'field' => 'peak_working_set_size',
+        'relationship' => 'none',
     ),
     'peak_swap_size' => array(
-      'label' => 'Peak swap size (MB)',
-      'alter' => array(
+        'label' => 'Peak swap size (MB)',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9700,29 +9700,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'peak_swap_size',
-      'table' => 'result',
-      'field' => 'peak_swap_size',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'peak_swap_size',
+        'table' => 'result',
+        'field' => 'peak_swap_size',
+        'relationship' => 'none',
     ),
     'peak_disk_usage' => array(
-      'label' => 'Peak disk usage (MB)',
-      'alter' => array(
+        'label' => 'Peak disk usage (MB)',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9741,29 +9741,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'peak_disk_usage',
-      'table' => 'result',
-      'field' => 'peak_disk_usage',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'peak_disk_usage',
+        'table' => 'result',
+        'field' => 'peak_disk_usage',
+        'relationship' => 'none',
     ),
     'validate_state' => array(
-      'label' => 'Validation state',
-      'alter' => array(
+        'label' => 'Validation state',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9782,29 +9782,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'validate_state',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'validate_state',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'relationship' => 'none',
     ),
     'phpcode_7' => array(
-      'label' => 'Validation state',
-      'alter' => array(
+        'label' => 'Validation state',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9823,26 +9823,26 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(array(\'result\', \'util\'));
   $result = new stdClass();
   $result->validate_state = $data->result_validate_state;
   return validate_state_str($result);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_7',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_7',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'granted_credit' => array(
-      'label' => 'Granted credit',
-      'alter' => array(
+        'label' => 'Granted credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9861,29 +9861,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'granted_credit',
-      'table' => 'result',
-      'field' => 'granted_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'granted_credit',
+        'table' => 'result',
+        'field' => 'granted_credit',
+        'relationship' => 'none',
     ),
     'appid' => array(
-      'label' => 'Application ID',
-      'alter' => array(
+        'label' => 'Application ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9902,29 +9902,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'appid',
-      'table' => 'result',
-      'field' => 'appid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'appid',
+        'table' => 'result',
+        'field' => 'appid',
+        'relationship' => 'none',
     ),
     'app_version_id' => array(
-      'label' => 'Application version',
-      'alter' => array(
+        'label' => 'Application version',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9943,29 +9943,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'app_version_id',
-      'table' => 'result',
-      'field' => 'app_version_id',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'app_version_id',
+        'table' => 'result',
+        'field' => 'app_version_id',
+        'relationship' => 'none',
     ),
     'phpcode_2' => array(
-      'label' => 'Application',
-      'alter' => array(
+        'label' => 'Application',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -9984,30 +9984,30 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(array(\'result\', \'util\'));
   $result = new stdClass();
   $result->appid = $data->result_appid;
   $result->app_version_id = $data->result_app_version_id;
   return app_version_string($result);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_2',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode_2',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Override',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'stderr_out' => array(
-      'label' => 'Stderr output',
-      'alter' => array(
+        'label' => 'Stderr output',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '<pre>[stderr_out]</pre>',
         'make_link' => 0,
@@ -10024,47 +10024,47 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 1,
-      'id' => 'stderr_out',
-      'table' => 'result',
-      'field' => 'stderr_out',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 1,
+        'id' => 'stderr_out',
+        'table' => 'result',
+        'field' => 'stderr_out',
+        'override' => array(
         'button' => 'Override',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('arguments', array(
+    ));
+    $handler->override_option('arguments', array(
     'id' => array(
-      'default_action' => 'not found',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => 'Task %1',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'numeric',
-      'validate_fail' => 'not found',
-      'id' => 'id',
-      'table' => 'result',
-      'field' => 'id',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'not found',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => 'Task %1',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'numeric',
+        'validate_fail' => 'not found',
+        'id' => 'id',
+        'table' => 'result',
+        'field' => 'id',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3 => 0,
-      ),
-      'relationship' => 'none',
-      'default_options_div_prefix' => '',
-      'default_argument_fixed' => '',
-      'default_argument_user' => 0,
-      'default_argument_php' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'relationship' => 'none',
+        'default_options_div_prefix' => '',
+        'default_argument_fixed' => '',
+        'default_argument_user' => 0,
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'forum' => 0,
         'job_post' => 0,
         'news' => 0,
@@ -10072,69 +10072,69 @@ 
         'profile' => 0,
         'story' => 0,
         'team' => 0,
-      ),
-      'validate_argument_node_access' => 0,
-      'validate_argument_nid_type' => 'nid',
-      'validate_argument_vocabulary' => array(
+        ),
+        'validate_argument_node_access' => 0,
+        'validate_argument_nid_type' => 'nid',
+        'validate_argument_vocabulary' => array(
         1 => 0,
-      ),
-      'validate_argument_type' => 'tid',
-      'validate_argument_transform' => 0,
-      'validate_user_restrict_roles' => 0,
-      'validate_argument_php' => '',
-    ),
-  ));
-  $handler->override_option('access', array(
+        ),
+        'validate_argument_type' => 'tid',
+        'validate_argument_transform' => 0,
+        'validate_user_restrict_roles' => 0,
+        'validate_argument_php' => '',
+    ),
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('footer_format', '1');
-  $handler->override_option('footer_empty', 0);
-  $handler->override_option('items_per_page', 0);
-  $handler = $view->new_display('page', 'Page', 'page_1');
-  $handler->override_option('items_per_page', 20);
-  $handler->override_option('use_pager', '1');
-  $handler->override_option('style_plugin', 'grid');
-  $handler->override_option('style_options', array(
+    ));
+    $handler->override_option('footer_format', '1');
+    $handler->override_option('footer_empty', 0);
+    $handler->override_option('items_per_page', 0);
+    $handler = $view->new_display('page', 'Page', 'page_1');
+    $handler->override_option('items_per_page', 20);
+    $handler->override_option('use_pager', '1');
+    $handler->override_option('style_plugin', 'grid');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'columns' => '2',
     'alignment' => 'vertical',
     'fill_single_line' => 1,
-  ));
-  $handler->override_option('path', 'task');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'task');
+    $handler->override_option('menu', array(
     'type' => 'none',
     'title' => 'All tasks',
     'description' => 'Show all tasks associated with the account',
     'weight' => '0',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'normal',
     'title' => 'Tasks',
     'description' => 'Show all tasks',
     'weight' => '0',
     'name' => 'secondary-links',
-  ));
+    ));
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  // Exported view: boinc_users
-  $view = new view;
-  $view->name = 'boinc_users';
-  $view->description = 'User lists and statistics';
-  $view->tag = '';
-  $view->base_table = 'user';
-  $view->core = 6;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('fields', array(
+    // Exported view: boinc_users
+    $view = new view;
+    $view->name = 'boinc_users';
+    $view->description = 'User lists and statistics';
+    $view->tag = '';
+    $view->base_table = 'user';
+    $view->core = 6;
+    $view->api_version = '2';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('fields', array(
     'rownumber' => array(
-      'label' => 'Rank',
-      'alter' => array(
+        'label' => 'Rank',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10153,20 +10153,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'rownumber',
-      'table' => 'customfield',
-      'field' => 'rownumber',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'rownumber',
+        'table' => 'customfield',
+        'field' => 'rownumber',
+        'relationship' => 'none',
     ),
     'id' => array(
-      'label' => 'Id',
-      'alter' => array(
+        'label' => 'Id',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10185,29 +10185,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'id',
-      'table' => 'user',
-      'field' => 'id',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'id',
+        'table' => 'user',
+        'field' => 'id',
+        'relationship' => 'none',
     ),
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10226,20 +10226,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'name',
-      'table' => 'user',
-      'field' => 'name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'name',
+        'table' => 'user',
+        'field' => 'name',
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10258,12 +10258,12 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   $uid = boincuser_lookup_uid($data->id);
   if ($uid) {
     $account = user_load($uid);
@@ -10274,15 +10274,15 @@ 
     print $data->user_name;
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'expavg_credit' => array(
-      'label' => 'Recent average credit',
-      'alter' => array(
+        'label' => 'Recent average credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10301,29 +10301,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '0',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'expavg_credit',
-      'table' => 'user',
-      'field' => 'expavg_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '0',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'expavg_credit',
+        'table' => 'user',
+        'field' => 'expavg_credit',
+        'relationship' => 'none',
     ),
     'total_credit' => array(
-      'label' => 'Total Credit',
-      'alter' => array(
+        'label' => 'Total Credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10342,29 +10342,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '0',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'total_credit',
-      'table' => 'user',
-      'field' => 'total_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '0',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'total_credit',
+        'table' => 'user',
+        'field' => 'total_credit',
+        'relationship' => 'none',
     ),
     'country' => array(
-      'label' => 'Country',
-      'alter' => array(
+        'label' => 'Country',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10383,20 +10383,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'country',
-      'table' => 'user',
-      'field' => 'country',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'country',
+        'table' => 'user',
+        'field' => 'country',
+        'relationship' => 'none',
     ),
     'create_time' => array(
-      'label' => 'Joined',
-      'alter' => array(
+        'label' => 'Joined',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10415,120 +10415,120 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'time ago',
-      'custom_date_format' => '',
-      'exclude' => 0,
-      'id' => 'create_time',
-      'table' => 'user',
-      'field' => 'create_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'time ago',
+        'custom_date_format' => '',
+        'exclude' => 0,
+        'id' => 'create_time',
+        'table' => 'user',
+        'field' => 'create_time',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('filters', array(
+    ));
+    $handler->override_option('filters', array(
     'total_credit' => array(
-      'operator' => '>=',
-      'value' => array(
+        'operator' => '>=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'total_credit',
-      'table' => 'user',
-      'field' => 'total_credit',
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('access', array(
+        ),
+        'id' => 'total_credit',
+        'table' => 'user',
+        'field' => 'total_credit',
+        'relationship' => 'none',
+    ),
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('items_per_page', 100);
-  $handler->override_option('use_pager', '0');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', array(
+    ));
+    $handler->override_option('items_per_page', 100);
+    $handler->override_option('use_pager', '0');
+    $handler->override_option('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 1,
     'order' => 'desc',
     'summary' => '',
     'columns' => array(
-      'rownumber' => 'rownumber',
-      'id' => 'id',
-      'name' => 'name',
-      'phpcode' => 'phpcode',
-      'expavg_credit' => 'expavg_credit',
-      'total_credit' => 'total_credit',
-      'country' => 'country',
-      'create_time' => 'create_time',
+        'rownumber' => 'rownumber',
+        'id' => 'id',
+        'name' => 'name',
+        'phpcode' => 'phpcode',
+        'expavg_credit' => 'expavg_credit',
+        'total_credit' => 'total_credit',
+        'country' => 'country',
+        'create_time' => 'create_time',
     ),
     'info' => array(
-      'rownumber' => array(
+        'rownumber' => array(
         'separator' => '',
-      ),
-      'id' => array(
+        ),
+        'id' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'name' => array(
+        ),
+        'name' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'phpcode' => array(
+        ),
+        'phpcode' => array(
         'separator' => '',
-      ),
-      'expavg_credit' => array(
+        ),
+        'expavg_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'total_credit' => array(
+        ),
+        'total_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'country' => array(
+        ),
+        'country' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'create_time' => array(
+        ),
+        'create_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'expavg_credit',
-  ));
-  $handler = $view->new_display('page', 'Top users', 'page_1');
-  $handler->override_option('path', 'community/stats/users');
-  $handler->override_option('menu', array(
+    ));
+    $handler = $view->new_display('page', 'Top users', 'page_1');
+    $handler->override_option('path', 'community/stats/users');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'Top Users',
     'description' => '',
     'weight' => '0',
     'name' => 'primary-links',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('panel_pane', 'Top users pane', 'panel_pane_1');
-  $handler->override_option('fields', array(
+    ));
+    $handler = $view->new_display('panel_pane', 'Top users pane', 'panel_pane_1');
+    $handler->override_option('fields', array(
     'rownumber' => array(
-      'label' => 'Rank',
-      'alter' => array(
+        'label' => 'Rank',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10547,20 +10547,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'rownumber',
-      'table' => 'customfield',
-      'field' => 'rownumber',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'rownumber',
+        'table' => 'customfield',
+        'field' => 'rownumber',
+        'relationship' => 'none',
     ),
     'id' => array(
-      'label' => 'Id',
-      'alter' => array(
+        'label' => 'Id',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10579,29 +10579,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'id',
-      'table' => 'user',
-      'field' => 'id',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'id',
+        'table' => 'user',
+        'field' => 'id',
+        'relationship' => 'none',
     ),
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10620,20 +10620,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'name',
-      'table' => 'user',
-      'field' => 'name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'name',
+        'table' => 'user',
+        'field' => 'name',
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10652,12 +10652,12 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   $uid = boincuser_lookup_uid($data->id);
   if ($uid) {
     $account = user_load($uid);
@@ -10668,15 +10668,15 @@ 
     print $data->user_name;
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'country' => array(
-      'label' => 'Country',
-      'alter' => array(
+        'label' => 'Country',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10695,20 +10695,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'country',
-      'table' => 'user',
-      'field' => 'country',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 0,
+        'id' => 'country',
+        'table' => 'user',
+        'field' => 'country',
+        'relationship' => 'none',
     ),
     'expavg_credit' => array(
-      'label' => 'Recent average credit',
-      'alter' => array(
+        'label' => 'Recent average credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10727,32 +10727,32 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '0',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'expavg_credit',
-      'table' => 'user',
-      'field' => 'expavg_credit',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '0',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'expavg_credit',
+        'table' => 'user',
+        'field' => 'expavg_credit',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
+        ),
     ),
     'total_credit' => array(
-      'label' => 'Total Credit',
-      'alter' => array(
+        'label' => 'Total Credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10771,29 +10771,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '0',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'total_credit',
-      'table' => 'user',
-      'field' => 'total_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '0',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'total_credit',
+        'table' => 'user',
+        'field' => 'total_credit',
+        'relationship' => 'none',
     ),
     'create_time' => array(
-      'label' => 'Joined',
-      'alter' => array(
+        'label' => 'Joined',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10812,85 +10812,85 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'time ago',
-      'custom_date_format' => '',
-      'exclude' => 1,
-      'id' => 'create_time',
-      'table' => 'user',
-      'field' => 'create_time',
-      'relationship' => 'none',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'time ago',
+        'custom_date_format' => '',
+        'exclude' => 1,
+        'id' => 'create_time',
+        'table' => 'user',
+        'field' => 'create_time',
+        'relationship' => 'none',
+        'override' => array(
         'button' => 'Use default',
-      ),
-    ),
-  ));
-  $handler->override_option('title', 'Top participants');
-  $handler->override_option('items_per_page', 10);
-  $handler->override_option('use_more', 1);
-  $handler->override_option('use_more_always', 0);
-  $handler->override_option('use_more_text', 'view more');
-  $handler->override_option('style_options', array(
+        ),
+    ),
+    ));
+    $handler->override_option('title', 'Top participants');
+    $handler->override_option('items_per_page', 10);
+    $handler->override_option('use_more', 1);
+    $handler->override_option('use_more_always', 0);
+    $handler->override_option('use_more_text', 'view more');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 0,
     'order' => 'desc',
     'summary' => '',
     'columns' => array(
-      'rownumber' => 'rownumber',
-      'id' => 'id',
-      'name' => 'name',
-      'phpcode' => 'phpcode',
-      'country' => 'country',
-      'expavg_credit' => 'expavg_credit',
-      'total_credit' => 'total_credit',
-      'create_time' => 'create_time',
+        'rownumber' => 'rownumber',
+        'id' => 'id',
+        'name' => 'name',
+        'phpcode' => 'phpcode',
+        'country' => 'country',
+        'expavg_credit' => 'expavg_credit',
+        'total_credit' => 'total_credit',
+        'create_time' => 'create_time',
     ),
     'info' => array(
-      'rownumber' => array(
+        'rownumber' => array(
         'separator' => '',
-      ),
-      'id' => array(
+        ),
+        'id' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'name' => array(
+        ),
+        'name' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'phpcode' => array(
+        ),
+        'phpcode' => array(
         'separator' => '',
-      ),
-      'country' => array(
+        ),
+        'country' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'expavg_credit' => array(
+        ),
+        'expavg_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'total_credit' => array(
+        ),
+        'total_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'create_time' => array(
+        ),
+        'create_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'expavg_credit',
-  ));
-  $handler->override_option('pane_title', '');
-  $handler->override_option('pane_description', '');
-  $handler->override_option('pane_category', array(
+    ));
+    $handler->override_option('pane_title', '');
+    $handler->override_option('pane_description', '');
+    $handler->override_option('pane_category', array(
     'name' => 'View panes',
     'weight' => 0,
-  ));
-  $handler->override_option('allow', array(
+    ));
+    $handler->override_option('allow', array(
     'use_pager' => FALSE,
     'items_per_page' => FALSE,
     'offset' => FALSE,
@@ -10900,37 +10900,37 @@ 
     'title_override' => FALSE,
     'exposed_form' => FALSE,
     'fields_override' => FALSE,
-  ));
-  $handler->override_option('argument_input', array());
-  $handler->override_option('link_to_view', 0);
-  $handler->override_option('inherit_panels_path', 0);
+    ));
+    $handler->override_option('argument_input', array());
+    $handler->override_option('link_to_view', 0);
+    $handler->override_option('inherit_panels_path', 0);
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  // Exported view: boinc_workunit
-  $view = new view;
-  $view->name = 'boinc_workunit';
-  $view->description = 'Details for a specific workunit';
-  $view->tag = '';
-  $view->base_table = 'workunit';
-  $view->core = 0;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('relationships', array(
+    // Exported view: boinc_workunit
+    $view = new view;
+    $view->name = 'boinc_workunit';
+    $view->description = 'Details for a specific workunit';
+    $view->tag = '';
+    $view->base_table = 'workunit';
+    $view->core = 0;
+    $view->api_version = '2';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('relationships', array(
     'appid' => array(
-      'label' => 'Application',
-      'required' => 1,
-      'id' => 'appid',
-      'table' => 'workunit',
-      'field' => 'appid',
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('fields', array(
+        'label' => 'Application',
+        'required' => 1,
+        'id' => 'appid',
+        'table' => 'workunit',
+        'field' => 'appid',
+        'relationship' => 'none',
+    ),
+    ));
+    $handler->override_option('fields', array(
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10947,19 +10947,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'workunit',
-      'field' => 'name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'name',
+        'table' => 'workunit',
+        'field' => 'name',
+        'relationship' => 'none',
     ),
     'phpcode_8' => array(
-      'label' => 'dont_suppress_pending',
-      'alter' => array(
+        'label' => 'dont_suppress_pending',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -10978,25 +10978,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(\'util\');
   $dont_suppress_pending = parse_bool(get_config(), "dont_suppress_pending");
   $data->dontsuppresspending = $dont_suppress_pending;
 ?>',
-      'exclude' => 1,
-      'id' => 'phpcode_8',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 1,
+        'id' => 'phpcode_8',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'user_friendly_name' => array(
-      'label' => 'Application',
-      'alter' => array(
+        'label' => 'Application',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11013,19 +11013,19 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'user_friendly_name',
-      'table' => 'app',
-      'field' => 'user_friendly_name',
-      'relationship' => 'appid',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'exclude' => 0,
+        'id' => 'user_friendly_name',
+        'table' => 'app',
+        'field' => 'user_friendly_name',
+        'relationship' => 'appid',
     ),
     'create_time' => array(
-      'label' => 'Created',
-      'alter' => array(
+        'label' => 'Created',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11044,22 +11044,22 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s T',
-      'exclude' => 1,
-      'id' => 'create_time',
-      'table' => 'workunit',
-      'field' => 'create_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s T',
+        'exclude' => 1,
+        'id' => 'create_time',
+        'table' => 'workunit',
+        'field' => 'create_time',
+        'relationship' => 'none',
     ),
     'phpcode_2' => array(
-      'label' => 'Created',
-      'alter' => array(
+        'label' => 'Created',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11078,23 +11078,23 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
 echo date(\'j M Y G:i:s T\', $data->workunit_create_time);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_2',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_2',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'canonical_resultid' => array(
-      'label' => 'Canonical result',
-      'alter' => array(
+        'label' => 'Canonical result',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11111,25 +11111,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'canonical_resultid',
-      'table' => 'workunit',
-      'field' => 'canonical_resultid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'canonical_resultid',
+        'table' => 'workunit',
+        'field' => 'canonical_resultid',
+        'relationship' => 'none',
     ),
     'canonical_credit' => array(
-      'label' => 'Canonical credit',
-      'alter' => array(
+        'label' => 'Canonical credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11146,25 +11146,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => 0,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'canonical_credit',
-      'table' => 'workunit',
-      'field' => 'canonical_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => 0,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'canonical_credit',
+        'table' => 'workunit',
+        'field' => 'canonical_credit',
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => 'Canonical result',
-      'alter' => array(
+        'label' => 'Canonical result',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11181,24 +11181,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'value' => '<?php
   if ($data->workunit_canonical_resultid) {
     echo l($data->workunit_canonical_resultid, "task/{$data->workunit_canonical_resultid}");
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_1' => array(
-      'label' => 'Granted credit',
-      'alter' => array(
+        'label' => 'Granted credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11215,24 +11215,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'value' => '<?php
   if ($data->workunit_canonical_resultid) {
     echo $data->workunit_canonical_credit;
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_1',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_1',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'error_mask' => array(
-      'label' => 'Error mask',
-      'alter' => array(
+        'label' => 'Error mask',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11249,25 +11249,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'error_mask',
-      'table' => 'workunit',
-      'field' => 'error_mask',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'error_mask',
+        'table' => 'workunit',
+        'field' => 'error_mask',
+        'relationship' => 'none',
     ),
     'target_nresults' => array(
-      'label' => 'Initial replication',
-      'alter' => array(
+        'label' => 'Initial replication',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11284,25 +11284,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'target_nresults',
-      'table' => 'workunit',
-      'field' => 'target_nresults',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'target_nresults',
+        'table' => 'workunit',
+        'field' => 'target_nresults',
+        'relationship' => 'none',
     ),
     'max_error_results' => array(
-      'label' => 'Max error tasks',
-      'alter' => array(
+        'label' => 'Max error tasks',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11319,25 +11319,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'max_error_results',
-      'table' => 'workunit',
-      'field' => 'max_error_results',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'max_error_results',
+        'table' => 'workunit',
+        'field' => 'max_error_results',
+        'relationship' => 'none',
     ),
     'max_success_results' => array(
-      'label' => 'Max success tasks',
-      'alter' => array(
+        'label' => 'Max success tasks',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11354,25 +11354,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'max_success_results',
-      'table' => 'workunit',
-      'field' => 'max_success_results',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'max_success_results',
+        'table' => 'workunit',
+        'field' => 'max_success_results',
+        'relationship' => 'none',
     ),
     'max_total_results' => array(
-      'label' => 'Max total tasks',
-      'alter' => array(
+        'label' => 'Max total tasks',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11389,25 +11389,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'max_total_results',
-      'table' => 'workunit',
-      'field' => 'max_total_results',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'max_total_results',
+        'table' => 'workunit',
+        'field' => 'max_total_results',
+        'relationship' => 'none',
     ),
     'min_quorum' => array(
-      'label' => 'Minimum quorum',
-      'alter' => array(
+        'label' => 'Minimum quorum',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11424,25 +11424,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'min_quorum',
-      'table' => 'workunit',
-      'field' => 'min_quorum',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'min_quorum',
+        'table' => 'workunit',
+        'field' => 'min_quorum',
+        'relationship' => 'none',
     ),
     'target_nresults_1' => array(
-      'label' => 'Target number of results',
-      'alter' => array(
+        'label' => 'Target number of results',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11459,25 +11459,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'target_nresults_1',
-      'table' => 'app',
-      'field' => 'target_nresults',
-      'relationship' => 'appid',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'target_nresults_1',
+        'table' => 'app',
+        'field' => 'target_nresults',
+        'relationship' => 'appid',
     ),
     'phpcode_3' => array(
-      'label' => 'Minimum quorum',
-      'alter' => array(
+        'label' => 'Minimum quorum',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11496,25 +11496,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   if (!($data->app_workunit_target_nresults>0 AND !$data->workunit_canonical_resultid AND !$data->workunit_error_mask AND !$data->dontsuppresspending)) {
     echo $data->workunit_min_quorum;
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_3',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_3',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_4' => array(
-      'label' => 'Initial replication',
-      'alter' => array(
+        'label' => 'Initial replication',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11533,26 +11533,26 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   if (!($data->app_workunit_target_nresults>0 AND !$data->workunit_canonical_resultid AND !$data->workunit_error_mask AND !$data->dontsuppresspending)) {
 
     echo $data->workunit_target_nresults;
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_4',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_4',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_5' => array(
-      'label' => 'Max # of error/total/success tasks',
-      'alter' => array(
+        'label' => 'Max # of error/total/success tasks',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11571,25 +11571,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   if (!($data->app_workunit_target_nresults>0 AND !$data->workunit_canonical_resultid AND !$data->workunit_error_mask AND !$data->dontsuppresspending)) {
     echo "{$data->workunit_max_error_results}, {$data->workunit_max_total_results}, {$data->workunit_max_success_results}";
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_5',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_5',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode_6' => array(
-      'label' => 'Errors',
-      'alter' => array(
+        'label' => 'Errors',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11608,12 +11608,12 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   if (!($data->app_workunit_target_nresults>0 AND !$data->workunit_canonical_resultid AND !$data->workunit_error_mask AND !$data->dontsuppresspending)) {
     if ($data->workunit_error_mask) {
       require_boinc(\'result\');
@@ -11621,15 +11621,15 @@ 
     }
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_6',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_6',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'need_validate' => array(
-      'label' => 'Needs validation',
-      'alter' => array(
+        'label' => 'Needs validation',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11646,25 +11646,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => ',',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'need_validate',
-      'table' => 'workunit',
-      'field' => 'need_validate',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => ',',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'need_validate',
+        'table' => 'workunit',
+        'field' => 'need_validate',
+        'relationship' => 'none',
     ),
     'phpcode_7' => array(
-      'label' => 'Validation',
-      'alter' => array(
+        'label' => 'Validation',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11683,12 +11683,12 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 1,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 1,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   if (!($data->app_workunit_target_nresults>0 AND !$data->workunit_canonical_resultid AND !$data->workunit_error_mask AND !$data->dontsuppresspending)) {
 
     if ($data->workunit_need_validate) {
@@ -11696,40 +11696,40 @@ 
     }
   }
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_7',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('arguments', array(
+        'exclude' => 0,
+        'id' => 'phpcode_7',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
+    ),
+    ));
+    $handler->override_option('arguments', array(
     'id' => array(
-      'default_action' => 'not found',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => 'Workunit %1',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'numeric',
-      'validate_fail' => 'not found',
-      'id' => 'id',
-      'table' => 'workunit',
-      'field' => 'id',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'not found',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => 'Workunit %1',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'numeric',
+        'validate_fail' => 'not found',
+        'id' => 'id',
+        'table' => 'workunit',
+        'field' => 'id',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         3 => 0,
-      ),
-      'relationship' => 'none',
-      'default_options_div_prefix' => '',
-      'default_argument_fixed' => '',
-      'default_argument_user' => 0,
-      'default_argument_php' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'relationship' => 'none',
+        'default_options_div_prefix' => '',
+        'default_argument_fixed' => '',
+        'default_argument_user' => 0,
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'forum' => 0,
         'job_post' => 0,
         'news' => 0,
@@ -11737,59 +11737,59 @@ 
         'profile' => 0,
         'story' => 0,
         'team' => 0,
-      ),
-      'validate_argument_node_access' => 0,
-      'validate_argument_nid_type' => 'nid',
-      'validate_argument_vocabulary' => array(
+        ),
+        'validate_argument_node_access' => 0,
+        'validate_argument_nid_type' => 'nid',
+        'validate_argument_vocabulary' => array(
         1 => 0,
-      ),
-      'validate_argument_type' => 'tid',
-      'validate_argument_transform' => 0,
-      'validate_user_restrict_roles' => 0,
-      'validate_argument_php' => '',
-    ),
-  ));
-  $handler->override_option('access', array(
+        ),
+        'validate_argument_type' => 'tid',
+        'validate_argument_transform' => 0,
+        'validate_user_restrict_roles' => 0,
+        'validate_argument_php' => '',
+    ),
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('footer_format', '1');
-  $handler->override_option('footer_empty', 0);
-  $handler = $view->new_display('page', 'Page', 'page_1');
-  $handler->override_option('path', 'workunit');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('footer_format', '1');
+    $handler->override_option('footer_empty', 0);
+    $handler = $view->new_display('page', 'Page', 'page_1');
+    $handler->override_option('path', 'workunit');
+    $handler->override_option('menu', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'primary-links',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
+    ));
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  // Exported view: boinc_workunit_tasks_all
-  $view = new view;
-  $view->name = 'boinc_workunit_tasks_all';
-  $view->description = 'A list of all tasks in a given workunit';
-  $view->tag = '';
-  $view->base_table = 'result';
-  $view->core = 6;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('fields', array(
+    // Exported view: boinc_workunit_tasks_all
+    $view = new view;
+    $view->name = 'boinc_workunit_tasks_all';
+    $view->description = 'A list of all tasks in a given workunit';
+    $view->tag = '';
+    $view->base_table = 'result';
+    $view->core = 6;
+    $view->api_version = '2';
+    $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('fields', array(
     'name' => array(
-      'label' => 'Name',
-      'alter' => array(
+        'label' => 'Name',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11808,20 +11808,20 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 1,
-      'id' => 'name',
-      'table' => 'result',
-      'field' => 'name',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'exclude' => 1,
+        'id' => 'name',
+        'table' => 'result',
+        'field' => 'name',
+        'relationship' => 'none',
     ),
     'id' => array(
-      'label' => 'Task ID',
-      'alter' => array(
+        'label' => 'Task ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11840,29 +11840,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'id',
-      'table' => 'result',
-      'field' => 'id',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'id',
+        'table' => 'result',
+        'field' => 'id',
+        'relationship' => 'none',
     ),
     'hostid' => array(
-      'label' => 'Computer',
-      'alter' => array(
+        'label' => 'Computer',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 1,
@@ -11881,29 +11881,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'hostid',
-      'table' => 'result',
-      'field' => 'hostid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'hostid',
+        'table' => 'result',
+        'field' => 'hostid',
+        'relationship' => 'none',
     ),
     'sent_time' => array(
-      'label' => 'Sent',
-      'alter' => array(
+        'label' => 'Sent',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11920,21 +11920,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'date_format' => 'custom',
-      'custom_date_format' => 'j M Y G:i:s e',
-      'exclude' => 1,
-      'id' => 'sent_time',
-      'table' => 'result',
-      'field' => 'sent_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'date_format' => 'custom',
+        'custom_date_format' => 'j M Y G:i:s e',
+        'exclude' => 1,
+        'id' => 'sent_time',
+        'table' => 'result',
+        'field' => 'sent_time',
+        'relationship' => 'none',
     ),
     'received_time' => array(
-      'label' => 'Received time',
-      'alter' => array(
+        'label' => 'Received time',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11951,21 +11951,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'date_format' => 'small',
-      'custom_date_format' => '',
-      'exclude' => 1,
-      'id' => 'received_time',
-      'table' => 'result',
-      'field' => 'received_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'date_format' => 'small',
+        'custom_date_format' => '',
+        'exclude' => 1,
+        'id' => 'received_time',
+        'table' => 'result',
+        'field' => 'received_time',
+        'relationship' => 'none',
     ),
     'report_deadline' => array(
-      'label' => 'Report deadline',
-      'alter' => array(
+        'label' => 'Report deadline',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -11982,21 +11982,21 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'date_format' => 'small',
-      'custom_date_format' => '',
-      'exclude' => 1,
-      'id' => 'report_deadline',
-      'table' => 'result',
-      'field' => 'report_deadline',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'date_format' => 'small',
+        'custom_date_format' => '',
+        'exclude' => 1,
+        'id' => 'report_deadline',
+        'table' => 'result',
+        'field' => 'report_deadline',
+        'relationship' => 'none',
     ),
     'phpcode_3' => array(
-      'label' => 'Sent',
-      'alter' => array(
+        'label' => 'Sent',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -12015,24 +12015,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(\'util\');
   echo date(\'j M Y G:i:s T\', $data->result_sent_time);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_3',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'relationship' => 'none',
+        'exclude' => 0,
+        'id' => 'phpcode_3',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'relationship' => 'none',
     ),
     'phpcode' => array(
-      'label' => 'Time reported or deadline',
-      'alter' => array(
+        'label' => 'Time reported or deadline',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -12051,24 +12051,24 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php return boincwork_task_time_reported($data->result_received_time, $data->result_report_deadline); ?>',
-      'exclude' => 0,
-      'id' => 'phpcode',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php return boincwork_task_time_reported($data->result_received_time, $data->result_report_deadline); ?>',
+        'exclude' => 0,
+        'id' => 'phpcode',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Override',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'server_state' => array(
-      'label' => 'Server state',
-      'alter' => array(
+        'label' => 'Server state',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -12085,25 +12085,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'relationship' => 'none',
     ),
     'outcome' => array(
-      'label' => 'Outcome',
-      'alter' => array(
+        'label' => 'Outcome',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -12120,25 +12120,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'relationship' => 'none',
     ),
     'client_state' => array(
-      'label' => 'Client state',
-      'alter' => array(
+        'label' => 'Client state',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -12155,25 +12155,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'client_state',
-      'table' => 'result',
-      'field' => 'client_state',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'client_state',
+        'table' => 'result',
+        'field' => 'client_state',
+        'relationship' => 'none',
     ),
     'validate_state' => array(
-      'label' => 'Validation state',
-      'alter' => array(
+        'label' => 'Validation state',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -12190,25 +12190,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'validate_state',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'validate_state',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'relationship' => 'none',
     ),
     'exit_status' => array(
-      'label' => 'Exit status',
-      'alter' => array(
+        'label' => 'Exit status',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -12225,25 +12225,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'exit_status',
-      'table' => 'result',
-      'field' => 'exit_status',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'exit_status',
+        'table' => 'result',
+        'field' => 'exit_status',
+        'relationship' => 'none',
     ),
     'phpcode_1' => array(
-      'label' => 'Status',
-      'alter' => array(
+        'label' => 'Status',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -12260,11 +12260,11 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'value' => '<?php
   require_boinc(\'result\');
   $result = new stdClass();
   $result->server_state = $data->result_server_state;
@@ -12274,18 +12274,18 @@ 
   $result->exit_status = $data->result_exit_status;
   return state_string($result);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_1',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode_1',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Override',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'elapsed_time' => array(
-      'label' => 'Run time',
-      'alter' => array(
+        'label' => 'Run time',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -12304,29 +12304,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'elapsed_time',
-      'table' => 'result',
-      'field' => 'elapsed_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'elapsed_time',
+        'table' => 'result',
+        'field' => 'elapsed_time',
+        'relationship' => 'none',
     ),
     'cpu_time' => array(
-      'label' => 'CPU time',
-      'alter' => array(
+        'label' => 'CPU time',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -12345,29 +12345,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => 1,
-      'precision' => '2',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'cpu_time',
-      'table' => 'result',
-      'field' => 'cpu_time',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => 1,
+        'precision' => '2',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'cpu_time',
+        'table' => 'result',
+        'field' => 'cpu_time',
+        'relationship' => 'none',
     ),
     'granted_credit' => array(
-      'label' => 'Granted credit',
-      'alter' => array(
+        'label' => 'Granted credit',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -12386,29 +12386,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 0,
-      'set_precision' => 1,
-      'precision' => '0',
-      'decimal' => '.',
-      'separator' => ',',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 0,
-      'id' => 'granted_credit',
-      'table' => 'result',
-      'field' => 'granted_credit',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 0,
+        'set_precision' => 1,
+        'precision' => '0',
+        'decimal' => '.',
+        'separator' => ',',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 0,
+        'id' => 'granted_credit',
+        'table' => 'result',
+        'field' => 'granted_credit',
+        'relationship' => 'none',
     ),
     'appid' => array(
-      'label' => 'Application ID',
-      'alter' => array(
+        'label' => 'Application ID',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -12427,29 +12427,29 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'format_plural' => 0,
-      'format_plural_singular' => '1',
-      'format_plural_plural' => '@count',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'appid',
-      'table' => 'result',
-      'field' => 'appid',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'format_plural' => 0,
+        'format_plural_singular' => '1',
+        'format_plural_plural' => '@count',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'appid',
+        'table' => 'result',
+        'field' => 'appid',
+        'relationship' => 'none',
     ),
     'app_version_id' => array(
-      'label' => 'Application version',
-      'alter' => array(
+        'label' => 'Application version',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -12466,25 +12466,25 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'set_precision' => FALSE,
-      'precision' => 0,
-      'decimal' => '.',
-      'separator' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'exclude' => 1,
-      'id' => 'app_version_id',
-      'table' => 'result',
-      'field' => 'app_version_id',
-      'relationship' => 'none',
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'set_precision' => FALSE,
+        'precision' => 0,
+        'decimal' => '.',
+        'separator' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'exclude' => 1,
+        'id' => 'app_version_id',
+        'table' => 'result',
+        'field' => 'app_version_id',
+        'relationship' => 'none',
     ),
     'phpcode_2' => array(
-      'label' => 'Application',
-      'alter' => array(
+        'label' => 'Application',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -12503,756 +12503,756 @@ 
         'ellipsis' => 1,
         'html' => 0,
         'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'value' => '<?php
+        ),
+        'empty' => '',
+        'hide_empty' => 0,
+        'empty_zero' => 0,
+        'hide_alter_empty' => 1,
+        'value' => '<?php
   require_boinc(\'result\');
   $result = new stdClass();
   $result->appid = $data->result_appid;
   $result->app_version_id = $data->result_app_version_id;
   return app_version_string($result);
 ?>',
-      'exclude' => 0,
-      'id' => 'phpcode_2',
-      'table' => 'customfield',
-      'field' => 'phpcode',
-      'override' => array(
+        'exclude' => 0,
+        'id' => 'phpcode_2',
+        'table' => 'customfield',
+        'field' => 'phpcode',
+        'override' => array(
         'button' => 'Override',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('arguments', array(
+    ));
+    $handler->override_option('arguments', array(
     'workunitid' => array(
-      'default_action' => 'not found',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => 'Tasks for workunit %1',
-      'breadcrumb' => '',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'numeric',
-      'validate_fail' => 'not found',
-      'id' => 'workunitid',
-      'table' => 'result',
-      'field' => 'workunitid',
-      'validate_user_argument_type' => 'uid',
-      'validate_user_roles' => array(
+        'default_action' => 'not found',
+        'style_plugin' => 'default_summary',
+        'style_options' => array(),
+        'wildcard' => 'all',
+        'wildcard_substitution' => 'All',
+        'title' => 'Tasks for workunit %1',
+        'breadcrumb' => '',
+        'default_argument_type' => 'fixed',
+        'default_argument' => '',
+        'validate_type' => 'numeric',
+        'validate_fail' => 'not found',
+        'id' => 'workunitid',
+        'table' => 'result',
+        'field' => 'workunitid',
+        'validate_user_argument_type' => 'uid',
+        'validate_user_roles' => array(
         2 => 0,
         4 => 0,
         7 => 0,
         5 => 0,
         3 => 0,
         6 => 0,
-      ),
-      'me_redirect' => 0,
-      'me_validate_user_argument_type' => 'uid',
-      'me_validate_user_roles' => array(
+        ),
+        'me_redirect' => 0,
+        'me_validate_user_argument_type' => 'uid',
+        'me_validate_user_roles' => array(
         2 => 0,
         4 => 0,
         7 => 0,
         5 => 0,
         3 => 0,
         6 => 0,
-      ),
-      'relationship' => 'none',
-      'default_options_div_prefix' => '',
-      'default_taxonomy_tid_term_page' => 0,
-      'default_taxonomy_tid_node' => 0,
-      'default_taxonomy_tid_limit' => 0,
-      'default_taxonomy_tid_vids' => array(
+        ),
+        'relationship' => 'none',
+        'default_options_div_prefix' => '',
+        'default_taxonomy_tid_term_page' => 0,
+        'default_taxonomy_tid_node' => 0,
+        'default_taxonomy_tid_limit' => 0,
+        'default_taxonomy_tid_vids' => array(
         1 => 0,
         2 => 0,
-      ),
-      'default_argument_user' => 0,
-      'default_argument_fixed' => '',
-      'default_argument_php' => '',
-      'validate_argument_node_type' => array(
+        ),
+        'default_argument_user' => 0,
+        'default_argument_fixed' => '',
+        'default_argument_php' => '',
+        'validate_argument_node_type' => array(
         'page' => 0,
         'news' => 0,
         'profile' => 0,
         'forum' => 0,
         'panel' => 0,
         'story' => 0,
-      ),
-      'validate_argument_node_access' => 0,
-      'validate_argument_nid_type' => 'nid',
-      'validate_argument_vocabulary' => array(
+        ),
+        'validate_argument_node_access' => 0,
+        'validate_argument_nid_type' => 'nid',
+        'validate_argument_vocabulary' => array(
         1 => 0,
         2 => 0,
-      ),
-      'validate_argument_type' => 'tid',
-      'validate_argument_transform' => 0,
-      'validate_user_restrict_roles' => 0,
-      'validate_argument_node_flag_name' => '*relationship*',
-      'validate_argument_node_flag_test' => 'flaggable',
-      'validate_argument_node_flag_id_type' => 'id',
-      'validate_argument_user_flag_name' => '*relationship*',
-      'validate_argument_user_flag_test' => 'flaggable',
-      'validate_argument_user_flag_id_type' => 'id',
-      'validate_argument_php' => '',
-      'me_validate_user_restrict_roles' => 0,
-    ),
-  ));
-  $handler->override_option('access', array(
+        ),
+        'validate_argument_type' => 'tid',
+        'validate_argument_transform' => 0,
+        'validate_user_restrict_roles' => 0,
+        'validate_argument_node_flag_name' => '*relationship*',
+        'validate_argument_node_flag_test' => 'flaggable',
+        'validate_argument_node_flag_id_type' => 'id',
+        'validate_argument_user_flag_name' => '*relationship*',
+        'validate_argument_user_flag_test' => 'flaggable',
+        'validate_argument_user_flag_id_type' => 'id',
+        'validate_argument_php' => '',
+        'me_validate_user_restrict_roles' => 0,
+    ),
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('items_per_page', 20);
-  $handler->override_option('use_pager', '1');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', array(
+    ));
+    $handler->override_option('items_per_page', 20);
+    $handler->override_option('use_pager', '1');
+    $handler->override_option('style_plugin', 'table');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'override' => 1,
     'sticky' => 1,
     'order' => 'asc',
     'summary' => '',
     'columns' => array(
-      'id' => 'id',
-      'hostid' => 'hostid',
-      'sent_time' => 'sent_time',
-      'received_time' => 'received_time',
-      'report_deadline' => 'report_deadline',
-      'phpcode_3' => 'phpcode_3',
-      'phpcode' => 'phpcode',
-      'server_state' => 'server_state',
-      'outcome' => 'outcome',
-      'client_state' => 'client_state',
-      'validate_state' => 'validate_state',
-      'exit_status' => 'exit_status',
-      'phpcode_1' => 'phpcode_1',
-      'elapsed_time' => 'elapsed_time',
-      'cpu_time' => 'cpu_time',
-      'claimed_credit_1' => 'claimed_credit_1',
-      'granted_credit' => 'granted_credit',
-      'app_version_id' => 'app_version_id',
-      'phpcode_2' => 'phpcode_2',
+        'id' => 'id',
+        'hostid' => 'hostid',
+        'sent_time' => 'sent_time',
+        'received_time' => 'received_time',
+        'report_deadline' => 'report_deadline',
+        'phpcode_3' => 'phpcode_3',
+        'phpcode' => 'phpcode',
+        'server_state' => 'server_state',
+        'outcome' => 'outcome',
+        'client_state' => 'client_state',
+        'validate_state' => 'validate_state',
+        'exit_status' => 'exit_status',
+        'phpcode_1' => 'phpcode_1',
+        'elapsed_time' => 'elapsed_time',
+        'cpu_time' => 'cpu_time',
+        'claimed_credit_1' => 'claimed_credit_1',
+        'granted_credit' => 'granted_credit',
+        'app_version_id' => 'app_version_id',
+        'phpcode_2' => 'phpcode_2',
     ),
     'info' => array(
-      'id' => array(
+        'id' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'hostid' => array(
+        ),
+        'hostid' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'sent_time' => array(
+        ),
+        'sent_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'received_time' => array(
+        ),
+        'received_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'report_deadline' => array(
+        ),
+        'report_deadline' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'phpcode_3' => array(
+        ),
+        'phpcode_3' => array(
         'separator' => '',
-      ),
-      'phpcode' => array(
+        ),
+        'phpcode' => array(
         'separator' => '',
-      ),
-      'server_state' => array(
+        ),
+        'server_state' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'outcome' => array(
+        ),
+        'outcome' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'client_state' => array(
+        ),
+        'client_state' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'validate_state' => array(
+        ),
+        'validate_state' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'exit_status' => array(
+        ),
+        'exit_status' => array(
         'sortable' => 0,
         'separator' => '',
-      ),
-      'phpcode_1' => array(
+        ),
+        'phpcode_1' => array(
         'separator' => '',
-      ),
-      'elapsed_time' => array(
+        ),
+        'elapsed_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'cpu_time' => array(
+        ),
+        'cpu_time' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'claimed_credit_1' => array(
+        ),
+        'claimed_credit_1' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'granted_credit' => array(
+        ),
+        'granted_credit' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'app_version_id' => array(
+        ),
+        'app_version_id' => array(
         'sortable' => 1,
         'separator' => '',
-      ),
-      'phpcode_2' => array(
+        ),
+        'phpcode_2' => array(
         'separator' => '',
-      ),
+        ),
     ),
     'default' => 'id',
-  ));
-  $handler = $view->new_display('page', 'All tasks', 'page_1');
-  $handler->override_option('path', 'workunit/%/tasks/all');
-  $handler->override_option('menu', array(
+    ));
+    $handler = $view->new_display('page', 'All tasks', 'page_1');
+    $handler->override_option('path', 'workunit/%/tasks/all');
+    $handler->override_option('menu', array(
     'type' => 'default tab',
     'title' => 'All tasks',
     'description' => 'Show all tasks associated with the workunit',
     'weight' => '0',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'tab',
     'title' => 'Tasks',
     'description' => 'Show all tasks',
     'weight' => '0',
     'name' => 'secondary-links',
-  ));
-  $handler = $view->new_display('page', 'Error', 'page_2');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'Error', 'page_2');
+    $handler->override_option('filters', array(
     'server_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '5',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'override' => array(
+        ),
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'outcome' => array(
-      'operator' => '>=',
-      'value' => array(
+        'operator' => '>=',
+        'value' => array(
         'value' => '3',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'outcome_1' => array(
-      'operator' => 'not between',
-      'value' => array(
+        'operator' => 'not between',
+        'value' => array(
         'value' => '',
         'min' => '4',
         'max' => '7',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome_1',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome_1',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'outcome_2' => array(
-      'operator' => '<=',
-      'value' => array(
+        'operator' => '<=',
+        'value' => array(
         'value' => '7',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome_2',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome_2',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('path', 'workunit/%/tasks/error');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'workunit/%/tasks/error');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'Error',
     'description' => 'Show tasks with errors associated with the workunit',
     'weight' => '5',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('page', 'In progress', 'page_3');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'In progress', 'page_3');
+    $handler->override_option('filters', array(
     'server_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '4',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'override' => array(
+        ),
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('path', 'workunit/%/tasks/active');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'workunit/%/tasks/active');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'In progress',
     'description' => 'Show tasks in progress associated with the workunit',
     'weight' => '1',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('page', 'Invalidated', 'page_4');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'Invalidated', 'page_4');
+    $handler->override_option('filters', array(
     'server_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '5',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'override' => array(
+        ),
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_begin_2' => array(
-      'id' => 'views_or_begin_2',
-      'table' => 'views_or',
-      'field' => 'views_or_begin',
+        'id' => 'views_or_begin_2',
+        'table' => 'views_or',
+        'field' => 'views_or_begin',
     ),
     'outcome' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '6',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_next_3' => array(
-      'id' => 'views_or_next_3',
-      'table' => 'views_or',
-      'field' => 'views_or_next',
+        'id' => 'views_or_next_3',
+        'table' => 'views_or',
+        'field' => 'views_or_next',
     ),
     'outcome_1' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome_1',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome_1',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_begin' => array(
-      'id' => 'views_or_begin',
-      'table' => 'views_or',
-      'field' => 'views_or_begin',
+        'id' => 'views_or_begin',
+        'table' => 'views_or',
+        'field' => 'views_or_begin',
     ),
     'validate_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '2',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_next_4' => array(
-      'id' => 'views_or_next_4',
-      'table' => 'views_or',
-      'field' => 'views_or_next',
+        'id' => 'views_or_next_4',
+        'table' => 'views_or',
+        'field' => 'views_or_next',
     ),
     'validate_state_1' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '3',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state_1',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state_1',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_next' => array(
-      'id' => 'views_or_next',
-      'table' => 'views_or',
-      'field' => 'views_or_next',
+        'id' => 'views_or_next',
+        'table' => 'views_or',
+        'field' => 'views_or_next',
     ),
     'validate_state_2' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '5',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state_2',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state_2',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'views_or_end_3' => array(
-      'id' => 'views_or_end_3',
-      'table' => 'views_or',
-      'field' => 'views_or_end',
+        'id' => 'views_or_end_3',
+        'table' => 'views_or',
+        'field' => 'views_or_end',
     ),
     'views_or_end_2' => array(
-      'id' => 'views_or_end_2',
-      'table' => 'views_or',
-      'field' => 'views_or_end',
+        'id' => 'views_or_end_2',
+        'table' => 'views_or',
+        'field' => 'views_or_end',
     ),
-  ));
-  $handler->override_option('path', 'workunit/%/tasks/invalid');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'workunit/%/tasks/invalid');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'Invalid',
     'description' => 'Show invalidated tasks associated with the workunit',
     'weight' => '4',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('page', 'Pending', 'page_5');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'Pending', 'page_5');
+    $handler->override_option('filters', array(
     'server_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '5',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'override' => array(
+        ),
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'outcome' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'validate_state' => array(
-      'operator' => '>=',
-      'value' => array(
+        'operator' => '>=',
+        'value' => array(
         'value' => '0',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'validate_state_1' => array(
-      'operator' => 'not between',
-      'value' => array(
+        'operator' => 'not between',
+        'value' => array(
         'value' => '',
         'min' => '0',
         'max' => '4',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state_1',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state_1',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'validate_state_2' => array(
-      'operator' => '<=',
-      'value' => array(
+        'operator' => '<=',
+        'value' => array(
         'value' => '4',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state_2',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state_2',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('path', 'workunit/%/tasks/pending');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'workunit/%/tasks/pending');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'Pending',
     'description' => 'Show tasks associated with the workunit with results pending',
     'weight' => '2',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
-  $handler = $view->new_display('page', 'Validated', 'page_6');
-  $handler->override_option('filters', array(
+    ));
+    $handler = $view->new_display('page', 'Validated', 'page_6');
+    $handler->override_option('filters', array(
     'server_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '5',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'server_state',
-      'table' => 'result',
-      'field' => 'server_state',
-      'override' => array(
+        ),
+        'id' => 'server_state',
+        'table' => 'result',
+        'field' => 'server_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'outcome' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'outcome',
-      'table' => 'result',
-      'field' => 'outcome',
-      'override' => array(
+        ),
+        'id' => 'outcome',
+        'table' => 'result',
+        'field' => 'outcome',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
     'validate_state' => array(
-      'operator' => '=',
-      'value' => array(
+        'operator' => '=',
+        'value' => array(
         'value' => '1',
         'min' => '',
         'max' => '',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'validate_state',
-      'table' => 'result',
-      'field' => 'validate_state',
-      'override' => array(
+        ),
+        'id' => 'validate_state',
+        'table' => 'result',
+        'field' => 'validate_state',
+        'override' => array(
         'button' => 'Use default',
-      ),
-      'relationship' => 'none',
+        ),
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('path', 'workunit/%/tasks/valid');
-  $handler->override_option('menu', array(
+    ));
+    $handler->override_option('path', 'workunit/%/tasks/valid');
+    $handler->override_option('menu', array(
     'type' => 'tab',
     'title' => 'Valid',
     'description' => 'Show validated tasks associated with the workunit',
     'weight' => '3',
     'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
+    ));
+    $handler->override_option('tab_options', array(
     'type' => 'none',
     'title' => '',
     'description' => '',
     'weight' => 0,
     'name' => 'navigation',
-  ));
+    ));
 
-  $views[$view->name] = $view;
+    $views[$view->name] = $view;
 
-  return $views;
+    return $views;
 }

drupal/sites/default/boinc/modules/boincteam/includes/boincteam.rules.inc

Indentation +18 added lines, -18 removed lines

@@ -16,39 +16,39 @@
  */
 
 function boincteam_rules_event_info() {
-  return array(
+    return array(
     'boincteam_create_team_error' => array(
-      'label' => bts('Error creating a new BOINC team - general error.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincteam',
-      'arguments' => rules_events_hook_boincteam_arguments(),
+        'label' => bts('Error creating a new BOINC team - general error.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincteam',
+        'arguments' => rules_events_hook_boincteam_arguments(),
     ),
     'boincteam_create_team_nopathauto_error' => array(
-      'label' => bts('Error creating a new BOINC team - no pathauto module.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'Boincteam',
-      'arguments' => rules_events_hook_boincteam_arguments(),
+        'label' => bts('Error creating a new BOINC team - no pathauto module.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'Boincteam',
+        'arguments' => rules_events_hook_boincteam_arguments(),
     ),
-  );
+    );
 }
 
 /**
  * Arguments suitable for boincteam
  **/
 function rules_events_hook_boincteam_arguments() {
-  return array(
+    return array(
     'team_name' => array(
-      'type' => 'string',
-      'label' => 'team name',
-      'required' => TRUE,
+        'type' => 'string',
+        'label' => 'team name',
+        'required' => TRUE,
     ),
-  ) + rules_events_hook_boincteam_adminnotify_argument();
+    ) + rules_events_hook_boincteam_adminnotify_argument();
 }
 
 function rules_events_hook_boincteam_adminnotify_argument() {
-  return array(
+    return array(
     'subject_tag' => array(
-      'type' => 'string',
-      'label' => 'Subject tag for email filtering',
-      'required' => TRUE,
+        'type' => 'string',
+        'label' => 'Subject tag for email filtering',
+        'required' => TRUE,
     ),
-  ) + rules_events_global_user_argument();
+    ) + rules_events_global_user_argument();
 }
\ No newline at end of file

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

@@ -18,12 +18,12 @@ 
 function boincteam_rules_event_info() {
   return array(
     'boincteam_create_team_error' => array(
-      'label' => bts('Error creating a new BOINC team - general error.', array(), NULL, 'boinc:rule-event'),
+      'label' => bts('Error creating a new BOINC team - general error.', array(), null, 'boinc:rule-event'),
       'module' => 'Boincteam',
       'arguments' => rules_events_hook_boincteam_arguments(),
     ),
     'boincteam_create_team_nopathauto_error' => array(
-      'label' => bts('Error creating a new BOINC team - no pathauto module.', array(), NULL, 'boinc:rule-event'),
+      'label' => bts('Error creating a new BOINC team - no pathauto module.', array(), null, 'boinc:rule-event'),
       'module' => 'Boincteam',
       'arguments' => rules_events_hook_boincteam_arguments(),
     ),
@@ -38,7 +38,7 @@ 
     'team_name' => array(
       'type' => 'string',
       'label' => 'team name',
-      'required' => TRUE,
+      'required' => true,
     ),
   ) + rules_events_hook_boincteam_adminnotify_argument();
 }
@@ -48,7 +48,7 @@ 
     'subject_tag' => array(
       'type' => 'string',
       'label' => 'Subject tag for email filtering',
-      'required' => TRUE,
+      'required' => true,
     ),
   ) + rules_events_global_user_argument();
 }
\ No newline at end of file