BOINC / boinc

drupal/sites/default/boinc/modules/contrib/filefield/filefield.theme.inc

Switch Indentation +121 added lines, -121 removed lines

@@ -123,126 +123,126 @@
 function _filefield_generic_icon_map($file) {
   switch ($file['filemime']) {
     // Word document types.
-    case 'application/msword':
-    case 'application/vnd.ms-word.document.macroEnabled.12':
-    case 'application/vnd.oasis.opendocument.text':
-    case 'application/vnd.oasis.opendocument.text-template':
-    case 'application/vnd.oasis.opendocument.text-master':
-    case 'application/vnd.oasis.opendocument.text-web':
-    case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
-    case 'application/vnd.stardivision.writer':
-    case 'application/vnd.sun.xml.writer':
-    case 'application/vnd.sun.xml.writer.template':
-    case 'application/vnd.sun.xml.writer.global':
-    case 'application/vnd.wordperfect':
-    case 'application/x-abiword':
-    case 'application/x-applix-word':
-    case 'application/x-kword':
-    case 'application/x-kword-crypt':
-      return 'x-office-document';
-
-    // Spreadsheet document types.
-    case 'application/vnd.ms-excel':
-    case 'application/vnd.ms-excel.sheet.macroEnabled.12':
-    case 'application/vnd.oasis.opendocument.spreadsheet':
-    case 'application/vnd.oasis.opendocument.spreadsheet-template':
-    case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
-    case 'application/vnd.stardivision.calc':
-    case 'application/vnd.sun.xml.calc':
-    case 'application/vnd.sun.xml.calc.template':
-    case 'application/vnd.lotus-1-2-3':
-    case 'application/x-applix-spreadsheet':
-    case 'application/x-gnumeric':
-    case 'application/x-kspread':
-    case 'application/x-kspread-crypt':
-      return 'x-office-spreadsheet';
-
-    // Presentation document types.
-    case 'application/vnd.ms-powerpoint':
-    case 'application/vnd.ms-powerpoint.presentation.macroEnabled.12':
-    case 'application/vnd.oasis.opendocument.presentation':
-    case 'application/vnd.oasis.opendocument.presentation-template':
-    case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
-    case 'application/vnd.openxmlformats-officedocument.presentationml.slideshow':
-    case 'application/vnd.stardivision.impress':
-    case 'application/vnd.sun.xml.impress':
-    case 'application/vnd.sun.xml.impress.template':
-    case 'application/x-kpresenter':
-      return 'x-office-presentation';
-
-    // Compressed archive types.
-    case 'application/zip':
-    case 'application/x-zip':
-    case 'application/stuffit':
-    case 'application/x-stuffit':
-    case 'application/x-7z-compressed':
-    case 'application/x-ace':
-    case 'application/x-arj':
-    case 'application/x-bzip':
-    case 'application/x-bzip-compressed-tar':
-    case 'application/x-compress':
-    case 'application/x-compressed-tar':
-    case 'application/x-cpio-compressed':
-    case 'application/x-deb':
-    case 'application/x-gzip':
-    case 'application/x-java-archive':
-    case 'application/x-lha':
-    case 'application/x-lhz':
-    case 'application/x-lzop':
-    case 'application/x-rar':
-    case 'application/x-rpm':
-    case 'application/x-tzo':
-    case 'application/x-tar':
-    case 'application/x-tarz':
-    case 'application/x-tgz':
-      return 'package-x-generic';
-
-    // Script file types.
-    case 'application/ecmascript':
-    case 'application/javascript':
-    case 'application/mathematica':
-    case 'application/vnd.mozilla.xul+xml':
-    case 'application/x-asp':
-    case 'application/x-awk':
-    case 'application/x-cgi':
-    case 'application/x-csh':
-    case 'application/x-m4':
-    case 'application/x-perl':
-    case 'application/x-php':
-    case 'application/x-ruby':
-    case 'application/x-shellscript':
-    case 'text/vnd.wap.wmlscript':
-    case 'text/x-emacs-lisp':
-    case 'text/x-haskell':
-    case 'text/x-literate-haskell':
-    case 'text/x-lua':
-    case 'text/x-makefile':
-    case 'text/x-matlab':
-    case 'text/x-python':
-    case 'text/x-sql':
-    case 'text/x-tcl':
-      return 'text-x-script';
-
-    // HTML aliases.
-    case 'application/xhtml+xml':
-      return 'text-html';
-
-    // RTF files.
-    case 'application/rtf':
-      return 'text-rtf';
-
-    // Google earth files.
-    case 'application/vnd.google-earth.kml+xml':
-    case 'application/vnd.google-earth.kmz':
-      return 'application-google-earth';
-
-    // Executable types.
-    case 'application/x-macbinary':
-    case 'application/x-ms-dos-executable':
-    case 'application/x-pef-executable':
-      return 'application-x-executable';
-
-    default:
-      return FALSE;
+  case 'application/msword':
+  case 'application/vnd.ms-word.document.macroEnabled.12':
+  case 'application/vnd.oasis.opendocument.text':
+  case 'application/vnd.oasis.opendocument.text-template':
+  case 'application/vnd.oasis.opendocument.text-master':
+  case 'application/vnd.oasis.opendocument.text-web':
+  case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
+  case 'application/vnd.stardivision.writer':
+  case 'application/vnd.sun.xml.writer':
+  case 'application/vnd.sun.xml.writer.template':
+  case 'application/vnd.sun.xml.writer.global':
+  case 'application/vnd.wordperfect':
+  case 'application/x-abiword':
+  case 'application/x-applix-word':
+  case 'application/x-kword':
+  case 'application/x-kword-crypt':
+    return 'x-office-document';
+
+  // Spreadsheet document types.
+  case 'application/vnd.ms-excel':
+  case 'application/vnd.ms-excel.sheet.macroEnabled.12':
+  case 'application/vnd.oasis.opendocument.spreadsheet':
+  case 'application/vnd.oasis.opendocument.spreadsheet-template':
+  case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
+  case 'application/vnd.stardivision.calc':
+  case 'application/vnd.sun.xml.calc':
+  case 'application/vnd.sun.xml.calc.template':
+  case 'application/vnd.lotus-1-2-3':
+  case 'application/x-applix-spreadsheet':
+  case 'application/x-gnumeric':
+  case 'application/x-kspread':
+  case 'application/x-kspread-crypt':
+    return 'x-office-spreadsheet';
+
+  // Presentation document types.
+  case 'application/vnd.ms-powerpoint':
+  case 'application/vnd.ms-powerpoint.presentation.macroEnabled.12':
+  case 'application/vnd.oasis.opendocument.presentation':
+  case 'application/vnd.oasis.opendocument.presentation-template':
+  case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
+  case 'application/vnd.openxmlformats-officedocument.presentationml.slideshow':
+  case 'application/vnd.stardivision.impress':
+  case 'application/vnd.sun.xml.impress':
+  case 'application/vnd.sun.xml.impress.template':
+  case 'application/x-kpresenter':
+    return 'x-office-presentation';
+
+  // Compressed archive types.
+  case 'application/zip':
+  case 'application/x-zip':
+  case 'application/stuffit':
+  case 'application/x-stuffit':
+  case 'application/x-7z-compressed':
+  case 'application/x-ace':
+  case 'application/x-arj':
+  case 'application/x-bzip':
+  case 'application/x-bzip-compressed-tar':
+  case 'application/x-compress':
+  case 'application/x-compressed-tar':
+  case 'application/x-cpio-compressed':
+  case 'application/x-deb':
+  case 'application/x-gzip':
+  case 'application/x-java-archive':
+  case 'application/x-lha':
+  case 'application/x-lhz':
+  case 'application/x-lzop':
+  case 'application/x-rar':
+  case 'application/x-rpm':
+  case 'application/x-tzo':
+  case 'application/x-tar':
+  case 'application/x-tarz':
+  case 'application/x-tgz':
+    return 'package-x-generic';
+
+  // Script file types.
+  case 'application/ecmascript':
+  case 'application/javascript':
+  case 'application/mathematica':
+  case 'application/vnd.mozilla.xul+xml':
+  case 'application/x-asp':
+  case 'application/x-awk':
+  case 'application/x-cgi':
+  case 'application/x-csh':
+  case 'application/x-m4':
+  case 'application/x-perl':
+  case 'application/x-php':
+  case 'application/x-ruby':
+  case 'application/x-shellscript':
+  case 'text/vnd.wap.wmlscript':
+  case 'text/x-emacs-lisp':
+  case 'text/x-haskell':
+  case 'text/x-literate-haskell':
+  case 'text/x-lua':
+  case 'text/x-makefile':
+  case 'text/x-matlab':
+  case 'text/x-python':
+  case 'text/x-sql':
+  case 'text/x-tcl':
+    return 'text-x-script';
+
+  // HTML aliases.
+  case 'application/xhtml+xml':
+    return 'text-html';
+
+  // RTF files.
+  case 'application/rtf':
+    return 'text-rtf';
+
+  // Google earth files.
+  case 'application/vnd.google-earth.kml+xml':
+  case 'application/vnd.google-earth.kmz':
+    return 'application-google-earth';
+
+  // Executable types.
+  case 'application/x-macbinary':
+  case 'application/x-ms-dos-executable':
+  case 'application/x-pef-executable':
+    return 'application-x-executable';
+
+  default:
+    return FALSE;
   }
 }

drupal/sites/default/boinc/modules/contrib/filefield/filefield.module

Switch Indentation +4 added lines, -4 removed lines

@@ -313,10 +313,10 @@
  */
 function filefield_widget_settings($op, $widget) {
   switch ($op) {
-    case 'form':
-      return filefield_widget_settings_form($widget);
-    case 'save':
-      return filefield_widget_settings_save($widget);
+  case 'form':
+    return filefield_widget_settings_form($widget);
+  case 'save':
+    return filefield_widget_settings_save($widget);
   }
 }
 

drupal/sites/default/boinc/modules/contrib/forum_access/forum_access.node.inc

Switch Indentation +34 added lines, -34 removed lines

@@ -79,27 +79,27 @@ 
     $allowed_options = variable_get('forum_access_allowed_node_edit_options', array('status', 'sticky', 'subscriptions_notify'));
     foreach (element_children($form) as $key) {
       switch ($key) {
-        case 'options':
-          foreach (element_children($form[$key]) as $key2) {
-            if (array_search($key2, $allowed_options) === FALSE) {
-              $form[$key][$key2]['#access'] = FALSE;
-            }
-          }
-          break;
-        case 'buttons':
-          $tid = $form['taxonomy'][$vid]['#default_value'][0];
-          if (!forum_access_access($tid, 'update')) {
-            $form['buttons']['submit']['#access'] = FALSE;
-            $form['buttons']['preview']['#access'] = FALSE;
-          }
-          if (!forum_access_access($tid, 'delete')) {
-            $form['buttons']['delete']['#access'] = FALSE;
-          }
-          break;
-        default:
-          if (array_search($key, $allowed_elements) === FALSE) {
-            $form[$key]['#access'] = FALSE;
+      case 'options':
+        foreach (element_children($form[$key]) as $key2) {
+          if (array_search($key2, $allowed_options) === FALSE) {
+            $form[$key][$key2]['#access'] = FALSE;
           }
+        }
+        break;
+      case 'buttons':
+        $tid = $form['taxonomy'][$vid]['#default_value'][0];
+        if (!forum_access_access($tid, 'update')) {
+          $form['buttons']['submit']['#access'] = FALSE;
+          $form['buttons']['preview']['#access'] = FALSE;
+        }
+        if (!forum_access_access($tid, 'delete')) {
+          $form['buttons']['delete']['#access'] = FALSE;
+        }
+        break;
+      default:
+        if (array_search($key, $allowed_elements) === FALSE) {
+          $form[$key]['#access'] = FALSE;
+        }
       }
     }
   }
@@ -120,20 +120,20 @@ 
     if ($tid = _forum_access_get_tid($node)) {
       if (!forum_access_access($tid, 'comment_create') and !(forum_access_access($tid, 'create') and ($node->uid==$user->uid)) ) {
         switch (arg(0)) {
-          case 'node':
-              // Remove the in-line comment form, replace with text message to user.
-              $form = NULL;
-              $form['from'] = array(
-                  '#type'  => 'item',
-                  '#value' => 'You do not have permission to post comments in this forum.',);
-            break;
-            case 'comment':
-                if (arg(1)=='reply') {
-                    drupal_set_message(t("ERROR: You do not have permission to post comments in this forum."), 'error');
-                    drupal_goto("node/$node->nid");
-                    exit;
-                }
-            break;
+        case 'node':
+            // Remove the in-line comment form, replace with text message to user.
+            $form = NULL;
+            $form['from'] = array(
+                '#type'  => 'item',
+                '#value' => 'You do not have permission to post comments in this forum.',);
+          break;
+        case 'comment':
+            if (arg(1)=='reply') {
+                drupal_set_message(t("ERROR: You do not have permission to post comments in this forum."), 'error');
+                drupal_goto("node/$node->nid");
+                exit;
+            }
+        break;
         }//switch arg(0)
       }
       else {

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

Switch Indentation +31 added lines, -31 removed lines

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

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

Switch Indentation +277 added lines, -277 removed lines

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

drupal/sites/default/boinc/modules/boincwork/boincwork.views.inc

Switch Indentation +1607 added lines, -1607 removed lines

@@ -13,1660 +13,1660 @@ 
  */
 function boincwork_views_data() {
   
-  // -----------------------------------------------------------------------------------------------
-  // Definition for host table
-  // -----------------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------------------------
+// Definition for host table
+// -----------------------------------------------------------------------------------------------
   
-  $data['host']['table']['group'] = t('BOINC');
+$data['host']['table']['group'] = t('BOINC');
   
-  $data['host']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC host'),
-      'help' => t('Computers attached to BOINC'),
-      'database' => 'boinc_ro'
-  );
+$data['host']['table']['base'] = array(
+  'field' => 'id',
+  'title' => t('BOINC host'),
+  'help' => t('Computers attached to BOINC'),
+  'database' => 'boinc_ro'
+);
   
-  // This table references the {user} table.
-  // This join creates an 'implicit' relationship to the user table, so that when
-  // "User" is the base table, the fields are automatically available.
+// This table references the {user} table.
+// This join creates an 'implicit' relationship to the user table, so that when
+// "User" is the base table, the fields are automatically available.
   
-  // Index this array by the table name to which this table refers.
-  // 'left_field' is the primary key in the referenced table.
-  // 'field' is the foreign key in this table.
+// Index this array by the table name to which this table refers.
+// 'left_field' is the primary key in the referenced table.
+// 'field' is the foreign key in this table.
   
-  $data['host']['table']['join'] = array(
-    'user' => array(
-      'left_field' => 'id',
-      'field' => 'userid',
-    )
-  );
+$data['host']['table']['join'] = array(
+'user' => array(
+  'left_field' => 'id',
+  'field' => 'userid',
+)
+);
 
-  // Describe each of the individual fields in this table to Views. For
-  // each field, you may define what field, sort, argument, and/or filter
-  // handlers it supports. This will determine where in the Views interface you
-  // may use the field.
+// Describe each of the individual fields in this table to Views. For
+// each field, you may define what field, sort, argument, and/or filter
+// handlers it supports. This will determine where in the Views interface you
+// may use the field.
   
-  // Primary keys allowed as arguments
+// Primary keys allowed as arguments
   
-  $data['host']['id'] = array(
-    'title' => bts('Computer ID', array(), NULL, 'boinc:host-list'),
-    'help' => t('The ID number of this host.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['venue'] = array(
-    'title' => bts('Location', array(), NULL, 'boinc:host-list'),
-    'help' => t('The name of the preference set assigned to this host.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title'
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
+$data['host']['id'] = array(
+'title' => bts('Computer ID', array(), NULL, 'boinc:host-list'),
+'help' => t('The ID number of this host.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'argument' => array(
+  'handler' => 'views_handler_argument',
+  'name field' => 'title',
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['venue'] = array(
+'title' => bts('Location', array(), NULL, 'boinc:host-list'),
+'help' => t('The name of the preference set assigned to this host.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'argument' => array(
+  'handler' => 'views_handler_argument',
+  'name field' => 'title'
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
   
-  // Foreign key fields
+// Foreign key fields
   
-  $data['host']['userid'] = array(
-    'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
-    'help' => t('The owner of this host.'),
-    // Because this is a foreign key to the {user} table. This allows us to
-    // have, when the view is configured with this relationship, all the fields
-    // for the related node available.
-    'argument' => array(
-      'handler' => 'views_handler_argument_boincuser_id',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'relationship' => array(
-      'base' => 'user',
-      'field' => 'userid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('User')
-    ),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['host']['userid'] = array(
+'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
+'help' => t('The owner of this host.'),
+// Because this is a foreign key to the {user} table. This allows us to
+// have, when the view is configured with this relationship, all the fields
+// for the related node available.
+'argument' => array(
+  'handler' => 'views_handler_argument_boincuser_id',
+  'name field' => 'title',
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'relationship' => array(
+  'base' => 'user',
+  'field' => 'userid',
+  'handler' => 'views_handler_relationship',
+  'label' => t('User')
+),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // Descriptions of general host fields (alphabetized)
+// Descriptions of general host fields (alphabetized)
   
-  $data['host']['active_frac'] = array(
-    'title' => bts('While BOINC running, % of time work is allowed', array(), NULL, 'boinc:host-details'),
-    'help' => t('The percentage of time that work is allowed.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['avg_turnaround'] = array(
-    'title' => bts('Average turnaround time', array(), NULL, 'boinc:host-details'),
-    'help' => t('The average time required for work to be completed.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['create_time'] = array(
-    'title' => bts('Created', array(), NULL, 'boinc:host-details'),
-    'help' => t('The time the host record was created.'),
-    'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_date'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_date'
-    )
-  );
-  $data['host']['connected_frac'] = array(
-    'title' => bts('While BOINC running, % of time host has an Internet connection', array(), NULL, 'boinc:host-details'),
-    'help' => t('The percentage of time that the host has an Internet connection.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['cpu_efficiency'] = array(
-    'title' => bts('Average CPU efficiency', array(), NULL, 'boinc:host-details'),
-    'help' => t('The average efficiency of the host CPU.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['d_free'] = array(
-    'title' => bts('Free disk space', array(), NULL, 'boinc:host-details'),
-    'help' => t('The amount of disk space that is not in use.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['d_total'] = array(
-    'title' => bts('Total disk space', array(), NULL, 'boinc:host-details'),
-    'help' => t('The size of the disk on which BOINC is installed.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['domain_name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
-    'help' => t('The name of the host.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['host']['duration_correction_factor'] = array(
-    'title' => bts('Task duration correction factor', array(), NULL, 'boinc:host-details'),
-    'help' => t('Task duration correction factor.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['expavg_credit'] = array(
-    'title' => bts('Avg. credit', array(), NULL, 'boinc:host-details'),
-    'help' => t('A decaying average of credit per day.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['external_ip_addr'] = array(
-    'title' => bts('External IP address', array(), NULL, 'boinc:host-details'),
-    'help' => t('The IP address from which the host last communicated.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['host']['host_cpid'] = array(
-    'title' => bts('Cross project ID', array(), NULL, 'boinc:host-details'),
-    'help' => t('The consistent identifier of the host across projects.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['host']['last_ip_addr'] = array(
-    'title' => bts('Last IP address', array(), NULL, 'boinc:host-details'),
-    'help' => t('The IP address of the host at last communication.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['host']['m_cache'] = array(
-    'title' => bts('Cache', array(), NULL, 'boinc:host-details'),
-    'help' => t('The amount of cache on the processor(s).'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['m_nbytes'] = array(
-    'title' => bts('Memory', array(), NULL, 'boinc:host-details'),
-    'help' => t('The amount of memory installed.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['m_swap'] = array(
-    'title' => bts('Swap space', array(), NULL, 'boinc:host-details'),
-    'help' => t('The amount of swap space configured.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['max_results_day'] = array(
-    'title' => bts('Maximum daily WU quota per CPU', array(), NULL, 'boinc:host-details'),
-    'help' => t('The maximum number of workunits to be allocated per CPU.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['n_bwdown'] = array(
-    'title' => bts('Average download rate', array(), NULL, 'boinc:host-details'),
-    'help' => t('The average rate at which new work is downloaded.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['n_bwup'] = array(
-    'title' => bts('Average upload rate', array(), NULL, 'boinc:host-details'),
-    'help' => t('The average rate at which completed work is uploaded.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['nsame_ip_addr'] = array(
-    'title' => bts('Same IP address count', array(), NULL, 'boinc:host-details'),
-    'help' => t('The number of times the last IP address.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['host']['on_frac'] = array(
-    'title' => bts('% of time BOINC client is running', array(), NULL, 'boinc:host-details'),
-    'help' => t('The percentage of time that the BOINC client is running.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['os_name'] = array(
-    'title' => bts('Operating system', array(), NULL, 'boinc:host-details'),
-    'help' => t('The name of the host operating system.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );  
-  $data['host']['os_version'] = array(
-    'title' => bts('Operating system version', array(), NULL, 'boinc:host-details'),
-    'help' => t('The version of the host operating system.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['host']['p_fpops'] = array(
-    'title' => bts('Measured floating point speed', array(), NULL, 'boinc:host-details'),
-    'help' => t('The capability of the host in floating point operations per second.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['p_iops'] = array(
-    'title' => bts('Measured integer speed', array(), NULL, 'boinc:host-details'),
-    'help' => t('The capability of the host in integer operations per second.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['p_model'] = array(
-    'title' => bts('CPU model', array(), NULL, 'boinc:host-details'),
-    'help' => t('The model of the CPU in the host.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['host']['p_ncpus'] = array(
-    'title' => bts('Number of processors', array(), NULL, 'boinc:host-details'),
-    'help' => t('The count of CPU cores in the system.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['host']['p_vendor'] = array(
-    'title' => bts('CPU', array(), NULL, 'boinc:host-details'),
-    'help' => t('The manufacturer of the CPU in the host.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['host']['rpc_seqno'] = array(
-    'title' => bts('Number of times client has contacted server', array(), NULL, 'boinc:host-details'),
-    'help' => t('The number of times the client has contacted the server.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['rpc_time'] = array(
-    'title' => bts('Last contact', array(), NULL, 'boinc:host-details'),
-    'help' => t('The time of the last RPC contact with the host.'),
-    'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_date'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_date'
-    )
-  );
-  $data['host']['serialnum'] = array(
-    'title' => bts('Serial number', array(), NULL, 'boinc:host-details'),
-    'help' => t('Contains the release number of the BOINC application in use and the GPU of the host.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['host']['timezone'] = array(
-    'title' => bts('Timezone', array(), NULL, 'boinc:host-details'),
-    'help' => t('The UTC offset of the local time.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host']['total_credit'] = array(
-    'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
-    'help' => t('The total accumulated BOINC credit for a host.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['host']['active_frac'] = array(
+'title' => bts('While BOINC running, % of time work is allowed', array(), NULL, 'boinc:host-details'),
+'help' => t('The percentage of time that work is allowed.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['avg_turnaround'] = array(
+'title' => bts('Average turnaround time', array(), NULL, 'boinc:host-details'),
+'help' => t('The average time required for work to be completed.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['create_time'] = array(
+'title' => bts('Created', array(), NULL, 'boinc:host-details'),
+'help' => t('The time the host record was created.'),
+'field' => array(
+  'handler' => 'views_handler_field_date',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_date'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_date'
+)
+);
+$data['host']['connected_frac'] = array(
+'title' => bts('While BOINC running, % of time host has an Internet connection', array(), NULL, 'boinc:host-details'),
+'help' => t('The percentage of time that the host has an Internet connection.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['cpu_efficiency'] = array(
+'title' => bts('Average CPU efficiency', array(), NULL, 'boinc:host-details'),
+'help' => t('The average efficiency of the host CPU.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['d_free'] = array(
+'title' => bts('Free disk space', array(), NULL, 'boinc:host-details'),
+'help' => t('The amount of disk space that is not in use.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['d_total'] = array(
+'title' => bts('Total disk space', array(), NULL, 'boinc:host-details'),
+'help' => t('The size of the disk on which BOINC is installed.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['domain_name'] = array(
+'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
+'help' => t('The name of the host.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['host']['duration_correction_factor'] = array(
+'title' => bts('Task duration correction factor', array(), NULL, 'boinc:host-details'),
+'help' => t('Task duration correction factor.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['expavg_credit'] = array(
+'title' => bts('Avg. credit', array(), NULL, 'boinc:host-details'),
+'help' => t('A decaying average of credit per day.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['external_ip_addr'] = array(
+'title' => bts('External IP address', array(), NULL, 'boinc:host-details'),
+'help' => t('The IP address from which the host last communicated.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['host']['host_cpid'] = array(
+'title' => bts('Cross project ID', array(), NULL, 'boinc:host-details'),
+'help' => t('The consistent identifier of the host across projects.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['host']['last_ip_addr'] = array(
+'title' => bts('Last IP address', array(), NULL, 'boinc:host-details'),
+'help' => t('The IP address of the host at last communication.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['host']['m_cache'] = array(
+'title' => bts('Cache', array(), NULL, 'boinc:host-details'),
+'help' => t('The amount of cache on the processor(s).'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['m_nbytes'] = array(
+'title' => bts('Memory', array(), NULL, 'boinc:host-details'),
+'help' => t('The amount of memory installed.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['m_swap'] = array(
+'title' => bts('Swap space', array(), NULL, 'boinc:host-details'),
+'help' => t('The amount of swap space configured.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['max_results_day'] = array(
+'title' => bts('Maximum daily WU quota per CPU', array(), NULL, 'boinc:host-details'),
+'help' => t('The maximum number of workunits to be allocated per CPU.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['n_bwdown'] = array(
+'title' => bts('Average download rate', array(), NULL, 'boinc:host-details'),
+'help' => t('The average rate at which new work is downloaded.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['n_bwup'] = array(
+'title' => bts('Average upload rate', array(), NULL, 'boinc:host-details'),
+'help' => t('The average rate at which completed work is uploaded.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['nsame_ip_addr'] = array(
+'title' => bts('Same IP address count', array(), NULL, 'boinc:host-details'),
+'help' => t('The number of times the last IP address.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['host']['on_frac'] = array(
+'title' => bts('% of time BOINC client is running', array(), NULL, 'boinc:host-details'),
+'help' => t('The percentage of time that the BOINC client is running.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['os_name'] = array(
+'title' => bts('Operating system', array(), NULL, 'boinc:host-details'),
+'help' => t('The name of the host operating system.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);  
+$data['host']['os_version'] = array(
+'title' => bts('Operating system version', array(), NULL, 'boinc:host-details'),
+'help' => t('The version of the host operating system.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['host']['p_fpops'] = array(
+'title' => bts('Measured floating point speed', array(), NULL, 'boinc:host-details'),
+'help' => t('The capability of the host in floating point operations per second.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['p_iops'] = array(
+'title' => bts('Measured integer speed', array(), NULL, 'boinc:host-details'),
+'help' => t('The capability of the host in integer operations per second.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['p_model'] = array(
+'title' => bts('CPU model', array(), NULL, 'boinc:host-details'),
+'help' => t('The model of the CPU in the host.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['host']['p_ncpus'] = array(
+'title' => bts('Number of processors', array(), NULL, 'boinc:host-details'),
+'help' => t('The count of CPU cores in the system.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['host']['p_vendor'] = array(
+'title' => bts('CPU', array(), NULL, 'boinc:host-details'),
+'help' => t('The manufacturer of the CPU in the host.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['host']['rpc_seqno'] = array(
+'title' => bts('Number of times client has contacted server', array(), NULL, 'boinc:host-details'),
+'help' => t('The number of times the client has contacted the server.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['rpc_time'] = array(
+'title' => bts('Last contact', array(), NULL, 'boinc:host-details'),
+'help' => t('The time of the last RPC contact with the host.'),
+'field' => array(
+  'handler' => 'views_handler_field_date',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_date'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_date'
+)
+);
+$data['host']['serialnum'] = array(
+'title' => bts('Serial number', array(), NULL, 'boinc:host-details'),
+'help' => t('Contains the release number of the BOINC application in use and the GPU of the host.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['host']['timezone'] = array(
+'title' => bts('Timezone', array(), NULL, 'boinc:host-details'),
+'help' => t('The UTC offset of the local time.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host']['total_credit'] = array(
+'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
+'help' => t('The total accumulated BOINC credit for a host.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for platform table
-  // ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+// Definition for platform table
+// ------------------------------------------------------------------------------------------------
   
-  $data['platform']['table']['group'] = t('BOINC');
-  $data['platform']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC platform'),
-      'help' => t('Operating system platforms'),
-      'database' => 'boinc_ro'
-  );
+$data['platform']['table']['group'] = t('BOINC');
+$data['platform']['table']['base'] = array(
+  'field' => 'id',
+  'title' => t('BOINC platform'),
+  'help' => t('Operating system platforms'),
+  'database' => 'boinc_ro'
+);
   
-  // Primary keys allowed as arguments
+// Primary keys allowed as arguments
 
-  $data['platform']['id'] = array(
-    'title' => bts('Platform ID', array(), NULL, 'boinc:platform-details'),
-    'help' => t('The ID number of the platform.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['platform']['id'] = array(
+'title' => bts('Platform ID', array(), NULL, 'boinc:platform-details'),
+'help' => t('The ID number of the platform.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'argument' => array(
+  'handler' => 'views_handler_argument',
+  'name field' => 'title',
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // Descriptions of app fields (alphabetized)
+// Descriptions of app fields (alphabetized)
   
-  $data['platform']['name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
-    'help' => t('The name of the platform.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
+$data['platform']['name'] = array(
+'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
+'help' => t('The name of the platform.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for result (task) table
-  // ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+// Definition for result (task) table
+// ------------------------------------------------------------------------------------------------
   
-  $data['result']['table']['group'] = t('BOINC');
-  $data['result']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC result'),
-      'help' => t('Results produced by BOINC'),
-      'database' => 'boinc_ro'
-  );
+$data['result']['table']['group'] = t('BOINC');
+$data['result']['table']['base'] = array(
+  'field' => 'id',
+  'title' => t('BOINC result'),
+  'help' => t('Results produced by BOINC'),
+  'database' => 'boinc_ro'
+);
   
-  // Create implicit relationships to the user, workunit, and host tables
+// Create implicit relationships to the user, workunit, and host tables
   
-  $data['result']['table']['join'] = array(
-    'user' => array(
-      'left_field' => 'id',
-      'field' => 'userid'
-    ),
-    'workunit' => array(
-      'left_field' => 'id',
-      'field' => 'workunitid'
-    ),
-    'host' => array(
-      'left_field' => 'id',
-      'field' => 'hostid'
-    )
-  );
+$data['result']['table']['join'] = array(
+'user' => array(
+  'left_field' => 'id',
+  'field' => 'userid'
+),
+'workunit' => array(
+  'left_field' => 'id',
+  'field' => 'workunitid'
+),
+'host' => array(
+  'left_field' => 'id',
+  'field' => 'hostid'
+)
+);
   
-  // Primary keys allowed as arguments
+// Primary keys allowed as arguments
 
-  $data['result']['id'] = array(
-    'title' => bts('Task ID', array(), NULL, 'boinc:task-details'),
-    'help' => t('The ID number of this result.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['result']['id'] = array(
+'title' => bts('Task ID', array(), NULL, 'boinc:task-details'),
+'help' => t('The ID number of this result.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'argument' => array(
+  'handler' => 'views_handler_argument',
+  'name field' => 'title',
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // Foreign key fields
+// Foreign key fields
   
-  $data['result']['userid'] = array(
-    'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
-    'help' => t('The owner of this result.'),
-    // Foreign key to the {user} table
-    'argument' => array(
-      'handler' => 'views_handler_argument_boincuser_id',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'relationship' => array(
-      'base' => 'user',
-      'field' => 'userid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('User')
-    )
-  );
-  $data['result']['workunitid'] = array(
-    'title' => bts('Workunit ID', array(), NULL, 'boinc:workunit-details'),
-    'help' => t('The workunit associated with this result.'),
-    // Foreign key to the {workunit} table
-    'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'relationship' => array(
-      'base' => 'workunit',
-      'field' => 'workunitid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Workunit')
-    ),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['result']['hostid'] = array(
-    'title' => bts('Host ID', array(), NULL, 'boinc:task-details'),
-    'help' => t('The host associated with this result.'),
-    // Foreign key to the {host} table
-    'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'relationship' => array(
-      'base' => 'host',
-      'field' => 'hostid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Host')
-    ),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['result']['userid'] = array(
+'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
+'help' => t('The owner of this result.'),
+// Foreign key to the {user} table
+'argument' => array(
+  'handler' => 'views_handler_argument_boincuser_id',
+  'name field' => 'title',
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'relationship' => array(
+  'base' => 'user',
+  'field' => 'userid',
+  'handler' => 'views_handler_relationship',
+  'label' => t('User')
+)
+);
+$data['result']['workunitid'] = array(
+'title' => bts('Workunit ID', array(), NULL, 'boinc:workunit-details'),
+'help' => t('The workunit associated with this result.'),
+// Foreign key to the {workunit} table
+'argument' => array(
+  'handler' => 'views_handler_argument',
+  'name field' => 'title',
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'relationship' => array(
+  'base' => 'workunit',
+  'field' => 'workunitid',
+  'handler' => 'views_handler_relationship',
+  'label' => t('Workunit')
+),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['result']['hostid'] = array(
+'title' => bts('Host ID', array(), NULL, 'boinc:task-details'),
+'help' => t('The host associated with this result.'),
+// Foreign key to the {host} table
+'argument' => array(
+  'handler' => 'views_handler_argument',
+  'name field' => 'title',
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'relationship' => array(
+  'base' => 'host',
+  'field' => 'hostid',
+  'handler' => 'views_handler_relationship',
+  'label' => t('Host')
+),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // Descriptions of result fields (alphabetized)
+// Descriptions of result fields (alphabetized)
   
-  $data['result']['appid'] = array(
-    'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
-    'help' => t('The ID number of the application.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['result']['app_version_id'] = array(
-    'title' => bts('Application version', array(), NULL, 'boinc:task-details'),
-    'help' => t('The version number of the application.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['result']['claimed_credit'] = array(
-    'title' => bts('Claimed credit', array(), NULL, 'boinc:task-details'),
-    'help' => t('The credit claimed for this result.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['result']['client_state'] = array(
-    'title' => bts('Client state', array(), NULL, 'boinc:task-details'),
-    'help' => t('The state of the task on the client side.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['result']['cpu_time'] = array(
-    'title' => bts('CPU time', array(), NULL, 'boinc:task-details'),
-    'help' => t('The CPU time spent on the task.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['result']['create_time'] = array(
-    'title' => bts('Created', array(), NULL, 'boinc:task-details:-1:ignoreoverwrite'),
-    'help' => t('The time that the task was created.'),
-    'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_date'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_date'
-    )
-  );
-  $data['result']['elapsed_time'] = array(
-    'title' => bts('Run time', array(), NULL, 'boinc:task-details'),
-    'help' => t('The run time of the task.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['result']['exit_status'] = array(
-    'title' => bts('Exit status', array(), NULL, 'boinc:task-details'),
-    'help' => t('The exit code of the task.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['result']['granted_credit'] = array(
-    'title' => bts('Granted credit', array(), NULL, 'boinc:task-details'),
-    'help' => t('The credit granted for this result.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['result']['name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
-    'help' => t('The name of the task.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['result']['outcome'] = array(
-    'title' => bts('Outcome', array(), NULL, 'boinc:task-details'),
-    'help' => t('The outcome of the task.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['result']['received_time'] = array(
-    'title' => bts('Received time', array(), NULL, 'boinc:task-details'),
-    'help' => t('The time that the result was received.'),
-    'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_date'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_date'
-    )
-  );
-  $data['result']['report_deadline'] = array(
-    'title' => bts('Report deadline', array(), NULL, 'boinc:task-details'),
-    'help' => t('The deadline for the task.'),
-    'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_date'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_date'
-    )
-  );
-  $data['result']['sent_time'] = array(
-    'title' => bts('Sent', array(), NULL, 'boinc:task-details'),
-    'help' => t('The time that the task was sent.'),
-    'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_date'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_date'
-    )
-  );
-  $data['result']['server_state'] = array(
-    'title' => bts('Server state', array(), NULL, 'boinc:task-details'),
-    'help' => t('The state of task on the server side.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['result']['stderr_out'] = array(
-    'title' => bts('Stderr out', array(), NULL, 'boinc:task-details'),
-    'help' => t('The output to standard error.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['result']['validate_state'] = array(
-    'title' => bts('Validation state', array(), NULL, 'boinc:task-details'),
-    'help' => t('The state of validation of this result.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['result']['peak_working_set_size'] = array(
-    'title' => bts('Peak working set size', array(), NULL, 'boinc:task-details'),
-    'help' => t('Peak working set size.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['result']['peak_swap_size'] = array(
-    'title' => bts('Peak swap size', array(), NULL, 'boinc:task-details'),
-    'help' => t('Peak swap size.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-    $data['result']['peak_disk_usage'] = array(
-    'title' => bts('Peak disk usage', array(), NULL, 'boinc:task-details'),
-    'help' => t('Peak disk usage.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['result']['appid'] = array(
+'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
+'help' => t('The ID number of the application.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['result']['app_version_id'] = array(
+'title' => bts('Application version', array(), NULL, 'boinc:task-details'),
+'help' => t('The version number of the application.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['result']['claimed_credit'] = array(
+'title' => bts('Claimed credit', array(), NULL, 'boinc:task-details'),
+'help' => t('The credit claimed for this result.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['result']['client_state'] = array(
+'title' => bts('Client state', array(), NULL, 'boinc:task-details'),
+'help' => t('The state of the task on the client side.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['result']['cpu_time'] = array(
+'title' => bts('CPU time', array(), NULL, 'boinc:task-details'),
+'help' => t('The CPU time spent on the task.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['result']['create_time'] = array(
+'title' => bts('Created', array(), NULL, 'boinc:task-details:-1:ignoreoverwrite'),
+'help' => t('The time that the task was created.'),
+'field' => array(
+  'handler' => 'views_handler_field_date',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_date'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_date'
+)
+);
+$data['result']['elapsed_time'] = array(
+'title' => bts('Run time', array(), NULL, 'boinc:task-details'),
+'help' => t('The run time of the task.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['result']['exit_status'] = array(
+'title' => bts('Exit status', array(), NULL, 'boinc:task-details'),
+'help' => t('The exit code of the task.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['result']['granted_credit'] = array(
+'title' => bts('Granted credit', array(), NULL, 'boinc:task-details'),
+'help' => t('The credit granted for this result.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['result']['name'] = array(
+'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
+'help' => t('The name of the task.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['result']['outcome'] = array(
+'title' => bts('Outcome', array(), NULL, 'boinc:task-details'),
+'help' => t('The outcome of the task.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['result']['received_time'] = array(
+'title' => bts('Received time', array(), NULL, 'boinc:task-details'),
+'help' => t('The time that the result was received.'),
+'field' => array(
+  'handler' => 'views_handler_field_date',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_date'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_date'
+)
+);
+$data['result']['report_deadline'] = array(
+'title' => bts('Report deadline', array(), NULL, 'boinc:task-details'),
+'help' => t('The deadline for the task.'),
+'field' => array(
+  'handler' => 'views_handler_field_date',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_date'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_date'
+)
+);
+$data['result']['sent_time'] = array(
+'title' => bts('Sent', array(), NULL, 'boinc:task-details'),
+'help' => t('The time that the task was sent.'),
+'field' => array(
+  'handler' => 'views_handler_field_date',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_date'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_date'
+)
+);
+$data['result']['server_state'] = array(
+'title' => bts('Server state', array(), NULL, 'boinc:task-details'),
+'help' => t('The state of task on the server side.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['result']['stderr_out'] = array(
+'title' => bts('Stderr out', array(), NULL, 'boinc:task-details'),
+'help' => t('The output to standard error.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['result']['validate_state'] = array(
+'title' => bts('Validation state', array(), NULL, 'boinc:task-details'),
+'help' => t('The state of validation of this result.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['result']['peak_working_set_size'] = array(
+'title' => bts('Peak working set size', array(), NULL, 'boinc:task-details'),
+'help' => t('Peak working set size.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['result']['peak_swap_size'] = array(
+'title' => bts('Peak swap size', array(), NULL, 'boinc:task-details'),
+'help' => t('Peak swap size.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['result']['peak_disk_usage'] = array(
+'title' => bts('Peak disk usage', array(), NULL, 'boinc:task-details'),
+'help' => t('Peak disk usage.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
 
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for workunit table
-  // ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+// Definition for workunit table
+// ------------------------------------------------------------------------------------------------
   
-  $data['workunit']['table']['group'] = t('BOINC');
-  $data['workunit']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC workunit'),
-      'help' => t('Workunits produced by BOINC'),
-      'database' => 'boinc_ro'
-  );
+$data['workunit']['table']['group'] = t('BOINC');
+$data['workunit']['table']['base'] = array(
+  'field' => 'id',
+  'title' => t('BOINC workunit'),
+  'help' => t('Workunits produced by BOINC'),
+  'database' => 'boinc_ro'
+);
   
-  // Create implicit relationship to the app table
+// Create implicit relationship to the app table
   
-  $data['workunit']['table']['join'] = array(
-    'app' => array(
-      'left_field' => 'id',
-      'field' => 'appid'
-    )
-  );
+$data['workunit']['table']['join'] = array(
+'app' => array(
+  'left_field' => 'id',
+  'field' => 'appid'
+)
+);
   
-  // Primary keys allowed as arguments
+// Primary keys allowed as arguments
   
-  $data['workunit']['id'] = array(
-    'title' => bts('Workunit ID', array(), NULL, 'boinc:workunit-details'),
-    'help' => t('The ID number of this workunit.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['workunit']['id'] = array(
+'title' => bts('Workunit ID', array(), NULL, 'boinc:workunit-details'),
+'help' => t('The ID number of this workunit.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'argument' => array(
+  'handler' => 'views_handler_argument',
+  'name field' => 'title',
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // Foreign key fields
+// Foreign key fields
   
-  $data['workunit']['appid'] = array(
-    'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
-    'help' => t('The application associated with this workunit.'), 
-    'argument' => array( // foreign key to the {app} table
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'relationship' => array(
-      'base' => 'app',
-      'field' => 'appid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Application')
-    ),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['workunit']['appid'] = array(
+'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
+'help' => t('The application associated with this workunit.'), 
+'argument' => array( // foreign key to the {app} table
+  'handler' => 'views_handler_argument',
+  'name field' => 'title',
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'relationship' => array(
+  'base' => 'app',
+  'field' => 'appid',
+  'handler' => 'views_handler_relationship',
+  'label' => t('Application')
+),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // Descriptions of workunit fields (alphabetized)
+// Descriptions of workunit fields (alphabetized)
   
-  $data['workunit']['canonical_credit'] = array(
-    'title' => bts('Canonical credit', array(), NULL, 'boinc:workunit-details'),
-    'help' => t('The canonical credit of the workunit.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['workunit']['canonical_resultid'] = array(
-    'title' => bts('Canonical result ID', array(), NULL, 'boinc:workunit-details'),
-    'help' => t('The ID of the canonical result associated with the workunit.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['workunit']['create_time'] = array(
-    'title' => bts('Created time', array(), NULL, 'boinc:workunit-details'),
-    'help' => t('The time that the workunit was created.'),
-    'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_date'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_date'
-    )
-  );
-  $data['workunit']['error_mask'] = array(
-    'title' => bts('Error mask', array(), NULL, 'boinc:workunit-details'),
-    'help' => t('Error mask of the workunit.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['workunit']['min_quorum'] = array(
-    'title' => bts('Minimum quorum', array(), NULL, 'boinc:workunit-details'),
-    'help' => t('Minimum quorum of the workunit.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['workunit']['name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreovewrite'),
-    'help' => t('The name of the workunit.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['workunit']['max_error_results'] = array(
-    'title' => bts('Max error tasks', array(), NULL, 'boinc:workunit-details'),
-    'help' => t('The maximum number of error tasks in the workunit.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['workunit']['max_success_results'] = array(
-    'title' => bts('Max success tasks', array(), NULL, 'boinc:workunit-details'),
-    'help' => t('The maximum number of successful tasks in the workunit.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['workunit']['max_total_results'] = array(
-    'title' => bts('Max total tasks', array(), NULL, 'boinc:workunit-details'),
-    'help' => t('The maximum number of total tasks in the workunit.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['workunit']['need_validate'] = array(
-    'title' => bts('Needs validation', array(), NULL, 'boinc:workunit-details'),
-    'help' => t('Whether or not a workunit needs validation.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['workunit']['target_nresults'] = array(
-    'title' => bts('Initial replication', array(), NULL, 'boinc:workunit-details'),
-    'help' => t('The target number of results for the workunit.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['workunit']['canonical_credit'] = array(
+'title' => bts('Canonical credit', array(), NULL, 'boinc:workunit-details'),
+'help' => t('The canonical credit of the workunit.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE,
+  'float' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['workunit']['canonical_resultid'] = array(
+'title' => bts('Canonical result ID', array(), NULL, 'boinc:workunit-details'),
+'help' => t('The ID of the canonical result associated with the workunit.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['workunit']['create_time'] = array(
+'title' => bts('Created time', array(), NULL, 'boinc:workunit-details'),
+'help' => t('The time that the workunit was created.'),
+'field' => array(
+  'handler' => 'views_handler_field_date',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_date'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_date'
+)
+);
+$data['workunit']['error_mask'] = array(
+'title' => bts('Error mask', array(), NULL, 'boinc:workunit-details'),
+'help' => t('Error mask of the workunit.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['workunit']['min_quorum'] = array(
+'title' => bts('Minimum quorum', array(), NULL, 'boinc:workunit-details'),
+'help' => t('Minimum quorum of the workunit.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['workunit']['name'] = array(
+'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreovewrite'),
+'help' => t('The name of the workunit.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['workunit']['max_error_results'] = array(
+'title' => bts('Max error tasks', array(), NULL, 'boinc:workunit-details'),
+'help' => t('The maximum number of error tasks in the workunit.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['workunit']['max_success_results'] = array(
+'title' => bts('Max success tasks', array(), NULL, 'boinc:workunit-details'),
+'help' => t('The maximum number of successful tasks in the workunit.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['workunit']['max_total_results'] = array(
+'title' => bts('Max total tasks', array(), NULL, 'boinc:workunit-details'),
+'help' => t('The maximum number of total tasks in the workunit.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['workunit']['need_validate'] = array(
+'title' => bts('Needs validation', array(), NULL, 'boinc:workunit-details'),
+'help' => t('Whether or not a workunit needs validation.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['workunit']['target_nresults'] = array(
+'title' => bts('Initial replication', array(), NULL, 'boinc:workunit-details'),
+'help' => t('The target number of results for the workunit.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for app table
-  // ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+// Definition for app table
+// ------------------------------------------------------------------------------------------------
   
-  $data['app']['table']['group'] = t('BOINC');
-  $data['app']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC app'),
-      'help' => t('Research applications run by BOINC'),
-      'database' => 'boinc_ro'
-  );
+$data['app']['table']['group'] = t('BOINC');
+$data['app']['table']['base'] = array(
+  'field' => 'id',
+  'title' => t('BOINC app'),
+  'help' => t('Research applications run by BOINC'),
+  'database' => 'boinc_ro'
+);
   
-  // Primary keys allowed as arguments
+// Primary keys allowed as arguments
 
-  $data['app']['id'] = array(
-    'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
-    'help' => t('The ID number of this application.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['app']['id'] = array(
+'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
+'help' => t('The ID number of this application.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'argument' => array(
+  'handler' => 'views_handler_argument',
+  'name field' => 'title',
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // Descriptions of app fields (alphabetized)
+// Descriptions of app fields (alphabetized)
   
-  $data['app']['target_nresults'] = array(
-    'title' => bts('Target number of results', array(), NULL, 'boinc:application-details'),
-    'help' => t('The number of times to replicate tasks in this application.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['app']['user_friendly_name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
-    'help' => t('The user friendly name of the application.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
+$data['app']['target_nresults'] = array(
+'title' => bts('Target number of results', array(), NULL, 'boinc:application-details'),
+'help' => t('The number of times to replicate tasks in this application.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['app']['user_friendly_name'] = array(
+'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
+'help' => t('The user friendly name of the application.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for app_version table
-  // ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+// Definition for app_version table
+// ------------------------------------------------------------------------------------------------
   
-  $data['app_version']['table']['group'] = t('BOINC');
-  $data['app_version']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC app version'),
-      'help' => t('Versions of research applications run by BOINC'),
-      'database' => 'boinc_ro'
-  );
+$data['app_version']['table']['group'] = t('BOINC');
+$data['app_version']['table']['base'] = array(
+  'field' => 'id',
+  'title' => t('BOINC app version'),
+  'help' => t('Versions of research applications run by BOINC'),
+  'database' => 'boinc_ro'
+);
   
-  // Primary keys allowed as arguments
+// Primary keys allowed as arguments
 
-  $data['app_version']['id'] = array(
-    'title' => bts('Application version ID', array(), NULL, 'boinc:application-details'),
-    'help' => t('The ID number of this application version.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['app_version']['id'] = array(
+'title' => bts('Application version ID', array(), NULL, 'boinc:application-details'),
+'help' => t('The ID number of this application version.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'argument' => array(
+  'handler' => 'views_handler_argument',
+  'name field' => 'title',
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // Foreign key fields
+// Foreign key fields
   
-  $data['app_version']['appid'] = array(
-    'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
-    'help' => t('The application ID associated with this app version.'),
-    // Because this is a foreign key to the {app} table. This allows us to
-    // have, when the view is configured with this relationship, all the fields
-    // for the related node available.
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'relationship' => array(
-      'base' => 'app',
-      'field' => 'id',
-      'handler' => 'views_handler_relationship',
-      'label' => t('App ID')
-    ),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['app_version']['appid'] = array(
+'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
+'help' => t('The application ID associated with this app version.'),
+// Because this is a foreign key to the {app} table. This allows us to
+// have, when the view is configured with this relationship, all the fields
+// for the related node available.
+'argument' => array(
+  'handler' => 'views_handler_argument_numeric',
+  'name field' => 'title',
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'relationship' => array(
+  'base' => 'app',
+  'field' => 'id',
+  'handler' => 'views_handler_relationship',
+  'label' => t('App ID')
+),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  $data['app_version']['platformid'] = array(
-    'title' => bts('Platform ID', array(), NULL, 'boinc:platform-details'),
-    'help' => t('The platform ID associated with this app version.'),
-    // Because this is a foreign key to the {platform} table. This allows us to
-    // have, when the view is configured with this relationship, all the fields
-    // for the related node available.
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'relationship' => array(
-      'base' => 'platform',
-      'field' => 'id',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Platform ID')
-    ),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['app_version']['platformid'] = array(
+'title' => bts('Platform ID', array(), NULL, 'boinc:platform-details'),
+'help' => t('The platform ID associated with this app version.'),
+// Because this is a foreign key to the {platform} table. This allows us to
+// have, when the view is configured with this relationship, all the fields
+// for the related node available.
+'argument' => array(
+  'handler' => 'views_handler_argument_numeric',
+  'name field' => 'title',
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'relationship' => array(
+  'base' => 'platform',
+  'field' => 'id',
+  'handler' => 'views_handler_relationship',
+  'label' => t('Platform ID')
+),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // Descriptions of app fields (alphabetized)
+// Descriptions of app fields (alphabetized)
   
-  $data['app_version']['plan_class'] = array(
-    'title' => bts('Plan class', array(), NULL, 'boinc:application-details'),
-    'help' => t('App version plan class.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
-  $data['app_version']['version_num'] = array(
-    'title' => bts('Version number', array(), NULL, 'boinc:application-details'),
-    'help' => t('The application version number.'),
-    'field' => array(
-      'handler' => 'views_handler_field_boincwork_app_version_number',
-      'click sortable' => TRUE,
-      'float' => TRUE,
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['app_version']['plan_class'] = array(
+'title' => bts('Plan class', array(), NULL, 'boinc:application-details'),
+'help' => t('App version plan class.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
+$data['app_version']['version_num'] = array(
+'title' => bts('Version number', array(), NULL, 'boinc:application-details'),
+'help' => t('The application version number.'),
+'field' => array(
+  'handler' => 'views_handler_field_boincwork_app_version_number',
+  'click sortable' => TRUE,
+  'float' => TRUE,
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for host_app_version table
-  // ------------------------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------------------------
+// Definition for host_app_version table
+// ------------------------------------------------------------------------------------------------
   
-  $data['host_app_version']['table']['group'] = t('BOINC');
+$data['host_app_version']['table']['group'] = t('BOINC');
   
-  // This table references the {host} table.
-  // This join creates an 'implicit' relationship to the host table, so that when
-  // "Host" is the base table, the fields are automatically available.
+// This table references the {host} table.
+// This join creates an 'implicit' relationship to the host table, so that when
+// "Host" is the base table, the fields are automatically available.
   
-  // Index this array by the table name to which this table refers.
-  // 'left_field' is the primary key in the referenced table.
-  // 'field' is the foreign key in this table.
+// Index this array by the table name to which this table refers.
+// 'left_field' is the primary key in the referenced table.
+// 'field' is the foreign key in this table.
   
-  $data['host_app_version']['table']['join'] = array(
-    'host' => array(
-      'left_field' => 'id',
-      'field' => 'host_id',
-    )
-  );
+$data['host_app_version']['table']['join'] = array(
+'host' => array(
+  'left_field' => 'id',
+  'field' => 'host_id',
+)
+);
   
-  // Primary keys allowed as arguments
+// Primary keys allowed as arguments
 
-  $data['host_app_version']['host_id'] = array(
-    'title' => bts('Computer', array(), NULL, 'boinc:host-details'),
-    'help' => t('The host ID connected to this app version data.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['host_app_version']['host_id'] = array(
+'title' => bts('Computer', array(), NULL, 'boinc:host-details'),
+'help' => t('The host ID connected to this app version data.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'argument' => array(
+  'handler' => 'views_handler_argument',
+  'name field' => 'title',
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // Foreign key fields
+// Foreign key fields
   
-  $data['host_app_version']['app_version_id'] = array(
-    'title' => bts('App version ID', array(), NULL, 'boinc:application-details'),
-    'help' => t('The app version ID connected to this host data.'),
-    // Because this is a foreign key to the {host} table. This allows us to
-    // have, when the view is configured with this relationship, all the fields
-    // for the related node available.
-    'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
-    ),
-    'relationship' => array(
-      'base' => 'app_version',
-      'field' => 'id',
-      'handler' => 'views_handler_relationship',
-      'label' => t('App version')
-    ),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
+$data['host_app_version']['app_version_id'] = array(
+'title' => bts('App version ID', array(), NULL, 'boinc:application-details'),
+'help' => t('The app version ID connected to this host data.'),
+// Because this is a foreign key to the {host} table. This allows us to
+// have, when the view is configured with this relationship, all the fields
+// for the related node available.
+'argument' => array(
+  'handler' => 'views_handler_argument_numeric',
+  'name field' => 'title',
+  'numeric' => TRUE,
+  'validate type' => 'id'
+),
+'relationship' => array(
+  'base' => 'app_version',
+  'field' => 'id',
+  'handler' => 'views_handler_relationship',
+  'label' => t('App version')
+),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
   
-  // Descriptions of host_app_version fields (alphabetized)
+// Descriptions of host_app_version fields (alphabetized)
   
-  $data['host_app_version']['consecutive_valid'] = array(
-    'title' => bts('Consecutive valid tasks', array(), NULL, 'boinc:application-details'),
-    'help' => t('The number of consecutive valid tasks for this app and by this host.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host_app_version']['et_avg'] = array(
-    'title' => t('Average processing rate'),
-    'help' => t('The "et_avg" for this app and by this host.'),
-    'field' => array(
-      'handler' => 'views_handler_field_boincwork_host_app_et_avg',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host_app_version']['et_n'] = array(
-    'title' => bts('Number of tasks completed', array(), NULL, 'boinc:application-details'),
-    'help' => t('The tasks completed for this app and by this host.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host_app_version']['max_jobs_per_day'] = array(
-    'title' => bts('Max tasks per day', array(), NULL, 'boinc:application-details'),
-    'help' => t('The maximum tasks per day for this app and by this host.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host_app_version']['n_jobs_today'] = array(
-    'title' => bts('Number of tasks today', array(), NULL, 'boinc:application-details'),
-    'help' => t('The number of tasks today for this app and by this host.'),
-    'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host_app_version']['turnaround_avg'] = array(
-    'title' => bts('Average turnaround time', array(), NULL, 'boinc:application-details:-1:ignoreoverwrite'),
-    'help' => t('The average turnaround time per task for this app and by this host.'),
-    'field' => array(
-      'handler' => 'views_handler_field_boincwork_host_app_turnaround_avg',
-      'click sortable' => TRUE,
-      'float' => TRUE,
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
-    )
-  );
-  $data['host_app_version']['user_friendly_name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
-    'help' => t('The user friendly name of the application.'),
-    'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
-    ),
-    'filter' => array(
-      'handler' => 'views_handler_filter_string'
-    ),
-    'sort' => array(
-      'handler' => 'views_handler_sort_string'
-    )
-  );
+$data['host_app_version']['consecutive_valid'] = array(
+'title' => bts('Consecutive valid tasks', array(), NULL, 'boinc:application-details'),
+'help' => t('The number of consecutive valid tasks for this app and by this host.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host_app_version']['et_avg'] = array(
+'title' => t('Average processing rate'),
+'help' => t('The "et_avg" for this app and by this host.'),
+'field' => array(
+  'handler' => 'views_handler_field_boincwork_host_app_et_avg',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host_app_version']['et_n'] = array(
+'title' => bts('Number of tasks completed', array(), NULL, 'boinc:application-details'),
+'help' => t('The tasks completed for this app and by this host.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host_app_version']['max_jobs_per_day'] = array(
+'title' => bts('Max tasks per day', array(), NULL, 'boinc:application-details'),
+'help' => t('The maximum tasks per day for this app and by this host.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host_app_version']['n_jobs_today'] = array(
+'title' => bts('Number of tasks today', array(), NULL, 'boinc:application-details'),
+'help' => t('The number of tasks today for this app and by this host.'),
+'field' => array(
+  'handler' => 'views_handler_field_numeric',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host_app_version']['turnaround_avg'] = array(
+'title' => bts('Average turnaround time', array(), NULL, 'boinc:application-details:-1:ignoreoverwrite'),
+'help' => t('The average turnaround time per task for this app and by this host.'),
+'field' => array(
+  'handler' => 'views_handler_field_boincwork_host_app_turnaround_avg',
+  'click sortable' => TRUE,
+  'float' => TRUE,
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_numeric'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_numeric'
+)
+);
+$data['host_app_version']['user_friendly_name'] = array(
+'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
+'help' => t('The user friendly name of the application.'),
+'field' => array(
+  'handler' => 'views_handler_field',
+  'click sortable' => TRUE
+),
+'filter' => array(
+  'handler' => 'views_handler_filter_string'
+),
+'sort' => array(
+  'handler' => 'views_handler_sort_string'
+)
+);
   
-  return $data;
+return $data;
 }
 
 /*
@@ -1678,23 +1678,23 @@ 
 
 function boincwork_views_handlers() {
   
-  return array(
-    'info' => array(
-      'path' => drupal_get_path('module', 'boincwork') . '/views',
-    ),
-    'handlers' => array(
-      'views_handler_argument_boincuser_id' => array(
-        'parent' => 'views_handler_argument_numeric'
-      ),
-      'views_handler_field_boincwork_app_version_number' => array(
-        'parent' => 'views_handler_field_numeric'
-      ),
-      'views_handler_field_boincwork_host_app_et_avg' => array(
-        'parent' => 'views_handler_field_numeric'
-      ),
-      'views_handler_field_boincwork_host_app_turnaround_avg' => array(
-        'parent' => 'views_handler_field_numeric'
-      ),
-    )
-  );
+return array(
+'info' => array(
+  'path' => drupal_get_path('module', 'boincwork') . '/views',
+),
+'handlers' => array(
+  'views_handler_argument_boincuser_id' => array(
+    'parent' => 'views_handler_argument_numeric'
+  ),
+  'views_handler_field_boincwork_app_version_number' => array(
+    'parent' => 'views_handler_field_numeric'
+  ),
+  'views_handler_field_boincwork_host_app_et_avg' => array(
+    'parent' => 'views_handler_field_numeric'
+  ),
+  'views_handler_field_boincwork_host_app_turnaround_avg' => array(
+    'parent' => 'views_handler_field_numeric'
+  ),
+)
+);
 }

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

Switch Indentation +127 added lines, -127 removed lines

@@ -11,25 +11,25 @@ 
  * that was selected
  */
 function boincwork_ahah_helper_venue_submit($form, &$form_state) {
-  $form_state['storage']['prefs']['preset'] = null;
-  ahah_helper_generic_submit($form, $form_state);
+$form_state['storage']['prefs']['preset'] = null;
+ahah_helper_generic_submit($form, $form_state);
 }
 
 /**
  * Get a predetermined set of preferences
  */
 function boincwork_get_preset_prefs($preset = null) {
-  $saved_state = variable_get('boincwork_preset_prefs', null);
+$saved_state = variable_get('boincwork_preset_prefs', null);
   
-  // If not configured yet, use these values as for inital
-  // computing/general preferences.
-  if (!$saved_state) {
-    // Get BOINC project disk space configurations from config.xml to
-    // fill in initial preference values.
-    require_boinc(array('db', 'prefs'));
-    $disk_space_config = get_disk_space_config();
-
-    $saved_state = '
+// If not configured yet, use these values as for inital
+// computing/general preferences.
+if (!$saved_state) {
+// Get BOINC project disk space configurations from config.xml to
+// fill in initial preference values.
+require_boinc(array('db', 'prefs'));
+$disk_space_config = get_disk_space_config();
+
+$saved_state = '
       <general_preferences>
         <preset name="standard">
           <run_on_batteries>0</run_on_batteries>
@@ -160,89 +160,89 @@ 
           <dont_verify_images>0</dont_verify_images>
         </preset>
       </general_preferences>';
-  }
+}
   
-  // Convert XML data to array format
-  $preset_prefs = load_configuration($saved_state);
+// Convert XML data to array format
+$preset_prefs = load_configuration($saved_state);
   
-  if ($preset) {
-    // Load preset from configuration
-    $preset_prefs = (array) $preset_prefs['general_preferences'];
-    if (isset($preset_prefs['preset'])) {
-      if (!is_numeric(key($preset_prefs['preset']))) {
-        $preset_prefs['preset'] = array($preset_prefs['preset']);
-      }
-      foreach ($preset_prefs['preset'] as $key => $prefs) {
-        if (isset($prefs['@attributes']['name']) AND $prefs['@attributes']['name'] == $preset) {
-          return $preset_prefs['preset'][$key];
-        }
-      }
+if ($preset) {
+// Load preset from configuration
+$preset_prefs = (array) $preset_prefs['general_preferences'];
+if (isset($preset_prefs['preset'])) {
+  if (!is_numeric(key($preset_prefs['preset']))) {
+    $preset_prefs['preset'] = array($preset_prefs['preset']);
+  }
+  foreach ($preset_prefs['preset'] as $key => $prefs) {
+    if (isset($prefs['@attributes']['name']) AND $prefs['@attributes']['name'] == $preset) {
+      return $preset_prefs['preset'][$key];
     }
   }
-  return $preset_prefs;
+}
+}
+return $preset_prefs;
 }
 
 /**
  * Load (and validate) the project specific configuration XML
  */
 function boincwork_get_project_specific_config() {
-  $raw_config_data = variable_get('boinc_project_specific_prefs_config', '');
+$raw_config_data = variable_get('boinc_project_specific_prefs_config', '');
   
-  $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
-  libxml_use_internal_errors(true);
+$xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
+libxml_use_internal_errors(true);
   
-  $xml = new DomDocument();
-  $xml->loadXML($raw_config_data, LIBXML_NOBLANKS);
-  if (!$xml->schemaValidate($xsd)) {
-    $errors = libxml_get_errors();
-    $lines = explode("\r", $raw_config_data);
-    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
-      ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
-    return NULL;
-  }
+$xml = new DomDocument();
+$xml->loadXML($raw_config_data, LIBXML_NOBLANKS);
+if (!$xml->schemaValidate($xsd)) {
+$errors = libxml_get_errors();
+$lines = explode("\r", $raw_config_data);
+drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
+  ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
+return NULL;
+}
   
-  // Convert XML to array for validation
-  $xml = load_configuration($raw_config_data);
-  return $xml;
+// Convert XML to array for validation
+$xml = load_configuration($raw_config_data);
+return $xml;
 }
 
 /**
  * Get rules by which to validate project specific data
  */
 function boincwork_get_project_specific_config_validation_rules($xml = array()) {
-  $rules = array();
-  if (!$xml) {
-    // Read the config XML
-    $xml = boincwork_get_project_specific_config();
-    $xml = $xml['project_specific_preferences'];
-  }
-  foreach ($xml as $type => $elements) {
-    if (is_array($elements) AND !is_numeric(key($elements))) {
-      $elements = array($elements);
-    }
-    switch ($type) {
-    case 'compound':
-      foreach ($elements as $element) {
-        $name = $element['@attributes']['name'];
-        $rules[$name] = boincwork_get_project_specific_config_validation_rules($element['attributes']);
-      }
-      break;
+$rules = array();
+if (!$xml) {
+// Read the config XML
+$xml = boincwork_get_project_specific_config();
+$xml = $xml['project_specific_preferences'];
+}
+foreach ($xml as $type => $elements) {
+if (is_array($elements) AND !is_numeric(key($elements))) {
+  $elements = array($elements);
+}
+switch ($type) {
+case 'compound':
+foreach ($elements as $element) {
+$name = $element['@attributes']['name'];
+$rules[$name] = boincwork_get_project_specific_config_validation_rules($element['attributes']);
+}
+break;
       
-    case 'text':
-      foreach ($elements as $element) {
-        $name = $element['@attributes']['name'];
-        $rules[$name] = array(
-          'datatype' => $element['@attributes']['datatype']
-        );
-        if (isset($element['@attributes']['min'])) {
-          $rules[$name]['min'] = $element['@attributes']['min'];
-        }
-        if (isset($element['@attributes']['max'])) {
-          $rules[$name]['max'] = $element['@attributes']['max'];
-        }
-      }
-      break;
-    /*
+case 'text':
+foreach ($elements as $element) {
+$name = $element['@attributes']['name'];
+$rules[$name] = array(
+'datatype' => $element['@attributes']['datatype']
+);
+if (isset($element['@attributes']['min'])) {
+$rules[$name]['min'] = $element['@attributes']['min'];
+}
+if (isset($element['@attributes']['max'])) {
+$rules[$name]['max'] = $element['@attributes']['max'];
+}
+}
+break;
+/*
     case 'radio':
     case 'dropdown':
       foreach ($elements as $element) {
@@ -260,36 +260,36 @@ 
       }
       break;
     */
-    case 'apps':
-      // At least one app needs to be selected
-      $rules['apps'] = array(
-        'minimum selected' => 1,
-        'list' => array()
-      );
-      foreach ($elements as $element) {
-        foreach ($element['app'] as $app) {
-          $name = "app_{$app['@attributes']['id']}";
-          $rules['apps']['list'][] = $name;
-          //$rules[$name] = array(
-          //  'options' => $options
-          //);
-        }
-      }
-      break;
+case 'apps':
+// At least one app needs to be selected
+$rules['apps'] = array(
+'minimum selected' => 1,
+'list' => array()
+);
+foreach ($elements as $element) {
+foreach ($element['app'] as $app) {
+$name = "app_{$app['@attributes']['id']}";
+$rules['apps']['list'][] = $name;
+//$rules[$name] = array(
+//  'options' => $options
+//);
+}
+}
+break;
       
-    case 'group':
-      foreach ($elements as $element) {
-        $name = $element['@attributes']['name'];
-        $rules += boincwork_get_project_specific_config_validation_rules($element);
-      }
-      break;
-    /*
+case 'group':
+foreach ($elements as $element) {
+$name = $element['@attributes']['name'];
+$rules += boincwork_get_project_specific_config_validation_rules($element);
+}
+break;
+/*
     case 'boolean':
       // Shouldn't need to validate boolean...
       break;
       */
-    default:
-    }
+default:
+}
   }
   return $rules;
 }
@@ -643,9 +643,9 @@ 
     }
     break;
     
-    default:
-      // Don't generate form elements for things that aren't explicitly form
-      // elements (i.e. 'title', '@attributes' keys, and the like)
+  default:
+    // Don't generate form elements for things that aren't explicitly form
+    // elements (i.e. 'title', '@attributes' keys, and the like)
   }
 }
 
@@ -1965,29 +1965,29 @@ 
  */
 function pretty_application_version($appverid, $vernum, $plan_class, $plfm) {
   switch ($appverid) {
-    case ANON_PLATFORM_UNKNOWN:
-      return "Anonymous platform";
-    case ANON_PLATFORM_CPU:
-      return "Anonymous platform CPU";
-    case ANON_PLATFORM_NVIDIA:
-      return "Anonymous platform NVIDIA GPU";
-    case ANON_PLATFORM_ATI:
-      return "Anonymous platform ATI GPU";
-    case ANON_PLATFORM_INTEL:
-      return "Anonymous platform Intel GPU";
-    case 0:
-      return "---";
-    default:
-      // Handle the case where the appversid is still negative. This
-      // may be cause BOINC has introduced a new anonymous platform
-      // that is not handled by the above case statements.
-      if ($appverid < 0) {
-        return "Unknown Anonymous platform";
-      }
-      else {
-        $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
-        $prettyc = ($plan_class) ? "($av->plan_class)" : '';
-        return "v$prettyv $prettyc $plfm";
-      }
+  case ANON_PLATFORM_UNKNOWN:
+    return "Anonymous platform";
+  case ANON_PLATFORM_CPU:
+    return "Anonymous platform CPU";
+  case ANON_PLATFORM_NVIDIA:
+    return "Anonymous platform NVIDIA GPU";
+  case ANON_PLATFORM_ATI:
+    return "Anonymous platform ATI GPU";
+  case ANON_PLATFORM_INTEL:
+    return "Anonymous platform Intel GPU";
+  case 0:
+    return "---";
+  default:
+    // Handle the case where the appversid is still negative. This
+    // may be cause BOINC has introduced a new anonymous platform
+    // that is not handled by the above case statements.
+    if ($appverid < 0) {
+      return "Unknown Anonymous platform";
+    }
+    else {
+      $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
+      $prettyc = ($plan_class) ? "($av->plan_class)" : '';
+      return "v$prettyv $prettyc $plfm";
+    }
   }
 }