BOINC / boinc

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

Switch Indentation +3 added lines, -3 removed lines

@@ -643,9 +643,9 @@
     }
     break;
     
-    default:
-      // Don't generate form elements for things that aren't explicitly form
-      // elements (i.e. 'title', '@attributes' keys, and the like)
+  default:
+    // Don't generate form elements for things that aren't explicitly form
+    // elements (i.e. 'title', '@attributes' keys, and the like)
   }
 }
 

Doc Comments +6 added lines

@@ -977,6 +977,7 @@ 
 
 /**
  * Format a number to be displayed using a maximum number of digits
+ * @param double $number
  */ 
 function boincwork_format_stats($number, $max_digits = 4) {
   $suffix = array(
@@ -1187,6 +1188,9 @@ 
   //  xml_to_array(): Convert an XML DOM object to array format
   //------------------------------------------------------------------------------------------------
   
+  /**
+   * @param DOMDocument $xml
+   */
   function xml_to_array($xml) {
       $node = $xml->firstChild; //$xml->first_child();
       $result = '';
@@ -1269,6 +1273,7 @@ 
 
 /**
   * Determine output for host list views when no hosts are found.
+  * @param string $context
   */
 function boincwork_views_host_list_empty_text($context = NULL) {
   
@@ -1818,6 +1823,7 @@ 
 
 /**
  * Function to delete a column from an array.
+ * @param integer $offset
  */
 function delete_col(&$array, $offset) {
   return array_walk($array, function (&$v) use ($offset) {

Braces +39 added lines, -68 removed lines

@@ -332,8 +332,7 @@ 
         $name = $element['@attributes']['name'];
         if (isset($element['@attributes']['entitytype']) AND $element['@attributes']['entitytype'] == 'attribute') {
           $defaults['@attributes'][$name] = $values[$name];
-        }
-        else {
+        } else {
           $defaults[$name] = $values[$name];
         }
       }
@@ -384,8 +383,7 @@ 
       if (isset($user_pref[$name])) {
         if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
           $value = $user_pref[$name]['@value'];
-        }
-        else {
+        } else {
           $value = $user_pref[$name];
         }
       }
@@ -447,8 +445,7 @@ 
       if (isset($user_pref[$name])) {
         if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
           $value = $user_pref[$name]['@value'];
-        }
-        else {
+        } else {
           $value = $user_pref[$name];
         }
       }
@@ -492,8 +489,7 @@ 
               isset($item['@attributes']['selected'])) {
             $default = ($item['@attributes']['selected'] == 'true') ? $item['@value'] : null;
           }
-        }
-        else {
+        } else {
           $value = $item;
         }
         $options[$value] = $value;
@@ -696,8 +692,7 @@ 
       );
       if ($top_level) {
         $uncategorized[$key] = $prefs_element;
-      }
-      else {
+      } else {
         $prefs_table[$key] = $prefs_element;
       }
       break;
@@ -711,8 +706,7 @@ 
       'name' => bts('Other settings', array(), NULL, 'boinc:account-preferences'),
       'elements' => $uncategorized,
     );
-  }
-  elseif ($uncategorized) {
+  } elseif ($uncategorized) {
     // If nothing is categorized, output all prefs under a general "settings"
     $prefs_table['settings'] = array(
       'name' => bts('Settings', array(), NULL, 'boinc:account-preferences'),
@@ -745,8 +739,7 @@ 
       $main_prefs = load_configuration($boincuser->project_prefs);
       $main_prefs = (array) $main_prefs['project_preferences'];
     }
-  }
-  else {
+  } else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
       $main_prefs = (array) $main_prefs['global_preferences'];
@@ -762,8 +755,7 @@ 
     if (count($main_prefs) < 3)
         $main_prefs['@attributes'] = array('cleared' => 1);
     return $main_prefs;
-  }
-  else {
+  } else {
     if (isset($main_prefs['venue'])) {
       if (!is_numeric(key($main_prefs['venue']))) {
         $main_prefs['venue'] = array($main_prefs['venue']);
@@ -803,8 +795,7 @@ 
       $main_prefs = load_configuration($boincuser->project_prefs);
       $main_prefs = (array) $main_prefs['project_preferences'];
     }
-  }
-  else {
+  } else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
       $main_prefs = (array) $main_prefs['global_preferences'];
@@ -817,8 +808,7 @@ 
   if (!$venue OR $venue == 'generic') {
     //$main_prefs = $prefs;
     $main_prefs = $prefs + $main_prefs;
-  }
-  else {
+  } else {
     if (isset($main_prefs['venue'])) {
       if (!is_numeric(key($main_prefs['venue']))) {
         $main_prefs['venue'] = array($main_prefs['venue']);
@@ -827,8 +817,7 @@ 
         if (isset($prefs_venue['@attributes']['name']) AND $prefs_venue['@attributes']['name'] == $venue) {
           if ($prefs) {
             $main_prefs['venue'][$key] = $prefs;
-          }
-          else {
+          } else {
             // If prefs is null, clear out this preference set
             unset($main_prefs['venue'][$key]);
             if (count($main_prefs['venue']) == 0) {
@@ -870,8 +859,7 @@ 
     db_set_active('boinc');
     $result = db_query("UPDATE user SET project_prefs = '{$boincuser->project_prefs}' WHERE id = '{$boincuser->id}'");
     db_set_active('default');
-  }
-  else {
+  } else {
     $main_prefs = array('global_preferences' => $main_prefs);
     $boincuser->global_prefs = save_configuration($main_prefs);
     db_set_active('boinc');
@@ -919,15 +907,13 @@ 
       // Process nested form elements
       $parents[] = $field;
       boincwork_validate_form($rules, $values[$field], $parents);
-    }
-    else {
+    } else {
       if ($parents) {
         // form_set_error() identifies nested form elements with '][' as a
         // delimiter between each parent and child element
         $parents[] = $field;
         $form_field = implode('][', $parents);
-      }
-      else {
+      } else {
         $form_field = $field;
       }
       if (isset($rules['datatype']) AND !boincwork_validate_datatype($values[$field], $rules['datatype'])) {
@@ -1010,8 +996,7 @@ 
   //  load_configuration(): Convert structured text/xml to array
   //------------------------------------------------------------------------------------------------
   
-  function load_configuration($text)
-  {
+  function load_configuration($text) {
       if (preg_match('/^\<\?xml .*\?\>$/i', $text)) return null;
       if ($xml = text_to_xml($text)) return xml_to_array($xml);
       return false;
@@ -1021,8 +1006,7 @@ 
   //  save_configuration(): Convert array to structured text/xml
   //------------------------------------------------------------------------------------------------
   
-  function save_configuration($array)
-  {
+  function save_configuration($array) {
       if ($xml = array_to_xml($array)) return xml_to_text($xml, false, true);
       return false;
   }
@@ -1054,26 +1038,22 @@ 
               $ordered_array[$item['@position']] = array(
                 $name => $item
               );
-            }
-            else {
+            } else {
               $unordered_array[] = array(
                 $name => $item
               );
             }
           }
-        }
-        elseif (isset($value['@position'])) {
+        } elseif (isset($value['@position'])) {
           $ordered_array[$value['@position']] = array(
             $name => $value
           );
-        }
-        else {
+        } else {
           $unordered_array[] = array(
             $name => $value
           );
         }
-      }
-      else {
+      } else {
         $unordered_array[] = array(
           $name => $value
         );
@@ -1159,8 +1139,7 @@ 
   //  xml_to_text(): Convert an XML DOM object to string format
   //------------------------------------------------------------------------------------------------
   
-  function xml_to_text($xml, $include_xml_declaration = true, $add_carriage_returns = false)
-  {
+  function xml_to_text($xml, $include_xml_declaration = true, $add_carriage_returns = false) {
       $xml->formatOutput = true;
       $text = $xml->saveXML();
       if (!$include_xml_declaration) {
@@ -1203,10 +1182,14 @@ 
               $sibling = $node->nextSibling;
               
               // Determine if this node forms a set with siblings (share a node name)
-              while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->nextSibling;
+              while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) {
+                  $sibling = $sibling->nextSibling;
+              }
               if (!$sibling) {
                   $sibling = $node->previousSibling;
-                  while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->previousSibling;
+                  while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) {
+                      $sibling = $sibling->previousSibling;
+                  }
               }
               
               if ($sibling) {
@@ -1301,8 +1284,7 @@ 
       . ' computers. Computers will be displayed when they have earned their'
       . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
     }
-  }
-  else {
+  } else {
     $output .=  '<h2>' . bts('Computers hidden', array(), NULL, 'boinc:host-list') . '</h2>';
     $output .=  '<p>' . bts('This user has chosen not to show information'
     . ' about their computers.', array(), NULL, 'boinc:host-list') . '</p>';
@@ -1462,8 +1444,7 @@ 
     if (!$received_time) {
       if (time() < $deadline) {
         $output = '<span class="on-time">' . $output . '</span>';
-      }
-      else {
+      } else {
         $output = '<span class="past-due">' . $output . '</span>';
       }
     }
@@ -1554,11 +1535,9 @@ 
   // Use userid, hostid, or workunitid
   if ($category==0) {
     $sqlall .= "AND r.userid='%s' ";
-  }
-  elseif ($category==1) {
+  } elseif ($category==1) {
     $sqlall .= "AND r.workunitid='%s' ";
-  }
-  elseif ($category==2) {
+  } elseif ($category==2) {
     $sqlall .= "AND r.hostid='%s' ";
   }
   $sqlall .= "ORDER BY user_friendly_name";
@@ -1598,8 +1577,7 @@ 
       }// if mystate
 
     }// while
-  }
-  else {
+  } else {
   }
   
   // Entry for all applications.
@@ -1687,11 +1665,9 @@ 
   // Use userid, hostid, or workunitid
   if ($category==0) {
     $sqlsub .= "AND r.userid = '%s' ";
-  }
-  elseif ($category==1) {
+  } elseif ($category==1) {
     $sqlsub .= "AND r.workunitid = '%s' ";
-  }
-  elseif ($category==2) {
+  } elseif ($category==2) {
     $sqlsub .= "AND r.hostid = '%s' ";
   }
 
@@ -1717,8 +1693,7 @@ 
   if (is_numeric($app_id) AND $app_id>0 ) {
     $sqlsub .= " AND r.appid = '%s'";
     $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), 20, 0, NULL, $queryid, $app_id);
-  }
-  else {
+  } else {
     $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), 20, 0, NULL, $queryid);
   }
   db_set_active('default');
@@ -1750,19 +1725,16 @@ 
         $resultdata[] = array_values($prettyresult);
       }
     }// while
-  }
-  else {
+  } else {
   }
   // Begin result navigation
 
   // Set pathprefix based on type
   if ($category==0) {
     $pathprefix = 'account/tasks';
-  }
-  elseif ($category==1) {
+  } elseif ($category==1) {
     $pathprefix = 'workunit/' . $queryid . '/tasks';
-  }
-  elseif ($category==2) {
+  } elseif ($category==2) {
     $pathprefix = 'host/' . $queryid . '/tasks';
   }
   // Need an "All" tab as well, maps to app_id of zero.
@@ -1772,8 +1744,7 @@ 
     $mypath = $pathprefix . '/' . $state . '/' . $app_id;
     if ($state==STATE_ALL) {
       $ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
-    }
-    else {
+    } else {
       $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
     }
     $myitem = array(

Spacing +86 added lines, -86 removed lines

@@ -167,7 +167,7 @@ 
   
   if ($preset) {
     // Load preset from configuration
-    $preset_prefs = (array) $preset_prefs['general_preferences'];
+    $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']);
@@ -188,7 +188,7 @@ 
 function boincwork_get_project_specific_config() {
   $raw_config_data = variable_get('boinc_project_specific_prefs_config', '');
   
-  $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
+  $xsd = './'.drupal_get_path('module', 'boincwork').'/includes/projectprefs.xsd';
   libxml_use_internal_errors(true);
   
   $xml = new DomDocument();
@@ -196,8 +196,8 @@ 
   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');
+    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}".
+      ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), 'error');
     return NULL;
   }
   
@@ -392,13 +392,13 @@ 
       
       // Use appropriate datatype
       if (isset($element['@attributes']['datatype'])) {
-        switch($element['@attributes']['datatype']) {
+        switch ($element['@attributes']['datatype']) {
         case 'integer':
-          $value = (int) $value;
+          $value = (int)$value;
           break;
           
         case 'float':
-          $value = number_format((float) $value, 2);
+          $value = number_format((float)$value, 2);
           break;
         
         default:
@@ -420,7 +420,7 @@ 
         '#type' => 'textfield',
         '#default_value' => $value,
         '#size' => 5,
-        '#description' => $description . bts(' Default value: @default', array('@default' => $default), NULL, 'boinc:account-preferences-project')
+        '#description' => $description.bts(' Default value: @default', array('@default' => $default), NULL, 'boinc:account-preferences-project')
       );
     }
     break;
@@ -484,7 +484,7 @@ 
       $name = $element['@attributes']['name'];
       $default = null;
       $options = array();
-      foreach($element['items']['item'] as $item) {
+      foreach ($element['items']['item'] as $item) {
         if (is_array($item)) {
           $value = $item['@value'];
           if ($default === NULL AND
@@ -526,7 +526,7 @@ 
         '#options' => $options,
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $value,
-        '#description' => $description . bts(' Default value: @default', array('@default' =>$default), NULL, 'boinc:account-preferences-project')
+        '#description' => $description.bts(' Default value: @default', array('@default' =>$default), NULL, 'boinc:account-preferences-project')
       );
     }
     break;
@@ -591,7 +591,7 @@ 
     }
     foreach ($elements as $key => $element) {
       $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $name = str_replace(' ','_',strtolower($title));
+      $name = str_replace(' ', '_', strtolower($title));
       $name = "group_{$name}";
       
       // Translate elements as appropriate
@@ -743,13 +743,13 @@ 
   if ($type == 'project') {
     if ($boincuser->project_prefs) {
       $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+      $main_prefs = (array)$main_prefs['project_preferences'];
     }
   }
   else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+      $main_prefs = (array)$main_prefs['global_preferences'];
     }
   }
   
@@ -801,13 +801,13 @@ 
   if ($type == 'project') {
     if ($boincuser->project_prefs) {
       $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+      $main_prefs = (array)$main_prefs['project_preferences'];
     }
   }
   else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+      $main_prefs = (array)$main_prefs['global_preferences'];
     }
   }
   
@@ -996,11 +996,11 @@ 
   $magnitude = 0;
   $precision = 0;
   if ($digits > $max_digits) {
-    $magnitude = floor(($digits - ($max_digits - 3)) / 3);
-    $precision = $max_digits - ($digits - ($magnitude * 3) + 1);
-    $number = round($number / pow(1000, $magnitude), $precision);
+    $magnitude = floor(($digits - ($max_digits - 3))/3);
+    $precision = $max_digits - ($digits - ($magnitude*3) + 1);
+    $number = round($number/pow(1000, $magnitude), $precision);
   }
-  $number = number_format($number, $precision) . (($magnitude) ? "{$suffix[$magnitude]}" : '');
+  $number = number_format($number, $precision).(($magnitude) ? "{$suffix[$magnitude]}" : '');
   
   return $number;
 }
@@ -1178,7 +1178,7 @@ 
   
   function text_to_xml($text) {
     $xml = new DomDocument();
-    if ( !($xml->loadXML($text)) ) return false;
+    if (!($xml->loadXML($text))) return false;
     return $xml;
   }
   
@@ -1195,7 +1195,7 @@ 
       while (!is_null($node)) {
           switch ($node->nodeType) {
           case XML_TEXT_NODE:
-              if (trim($node->nodeValue)  != '') $result = $node->nodeValue;
+              if (trim($node->nodeValue) != '') $result = $node->nodeValue;
               break;
           case XML_ELEMENT_NODE:
               $node_name = $node->nodeName;
@@ -1212,7 +1212,7 @@ 
               if ($sibling) {
                   $result[$node_name][$index] = '';
                   if ($node->childNodes) {
-                      $result[$node_name][$index] = xml_to_array($node) ;
+                      $result[$node_name][$index] = xml_to_array($node);
                   }
                   if ($node->hasAttributes()) {
                       $attributes = $node->attributes;
@@ -1235,14 +1235,14 @@ 
               } else {
                   $result[$node_name] = '';
                   if ($node->childNodes) {
-                      $result[$node_name] = xml_to_array($node) ;
+                      $result[$node_name] = xml_to_array($node);
                   }
                   if ($node->hasAttributes()) {
                       $attributes = $node->attributes;
                       if ($result[$node_name] !== '' AND !is_array($result[$node_name])) {
                           $result[$node_name] = array('@value' => $result[$node_name]);
                       }
-                      foreach($attributes as $key => $attribute) {
+                      foreach ($attributes as $key => $attribute) {
                           $result[$node_name]['@attributes'][$attribute->name] = $attribute->value;
                       }
                   }
@@ -1282,30 +1282,30 @@ 
   // Determine if hosts are associated at all or just hidden
   $output = '';
   if ($boincuser->show_hosts) {
-    switch($context) {
+    switch ($context) {
     case 'active':
-      $output .=  '<h2>' . bts('No active computers', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user has no computers that have been'
-      . ' active in the last 30 days.', array(), NULL, 'boinc:host-list') . '</p>';
+      $output .= '<h2>'.bts('No active computers', array(), NULL, 'boinc:host-list').'</h2>';
+      $output .= '<p>'.bts('This user has no computers that have been'
+      . ' active in the last 30 days.', array(), NULL, 'boinc:host-list').'</p>';
       break;
       
     case 'preferences':
-      $output .=  '<h2>' . bts('No computers', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('There are no computers assigned to this'
-      . ' preference set.', array(), NULL, 'boinc:host-list') . '</p>';
+      $output .= '<h2>'.bts('No computers', array(), NULL, 'boinc:host-list').'</h2>';
+      $output .= '<p>'.bts('There are no computers assigned to this'
+      . ' preference set.', array(), NULL, 'boinc:host-list').'</p>';
       break;
     
     default:
-      $output .=  '<h2>' . bts('Computers pending', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user does not yet have any associated'
+      $output .= '<h2>'.bts('Computers pending', array(), NULL, 'boinc:host-list').'</h2>';
+      $output .= '<p>'.bts('This user does not yet have any associated'
       . ' computers. Computers will be displayed when they have earned their'
-      . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
+      . ' first credits.', array(), NULL, 'boinc:host-list').'</p>';
     }
   }
   else {
-    $output .=  '<h2>' . bts('Computers hidden', array(), NULL, 'boinc:host-list') . '</h2>';
-    $output .=  '<p>' . bts('This user has chosen not to show information'
-    . ' about their computers.', array(), NULL, 'boinc:host-list') . '</p>';
+    $output .= '<h2>'.bts('Computers hidden', array(), NULL, 'boinc:host-list').'</h2>';
+    $output .= '<p>'.bts('This user has chosen not to show information'
+    . ' about their computers.', array(), NULL, 'boinc:host-list').'</p>';
   }
   return $output;
 }
@@ -1317,11 +1317,11 @@ 
   
   // 
   $output = '';
-  switch($context) {
+  switch ($context) {
   default:
-    $output .=  '<h2>' . bts('No @type tasks', array('@type' => $context), NULL, 'boinc:task-list')
+    $output .= '<h2>'.bts('No @type tasks', array('@type' => $context), NULL, 'boinc:task-list')
     . '</h2>';
-    $output .=  '<p>' . bts('There are no tasks of this type on record', array(), NULL, 'boinc:task-list')
+    $output .= '<p>'.bts('There are no tasks of this type on record', array(), NULL, 'boinc:task-list')
     . '</p>';
   }
   return $output;
@@ -1343,10 +1343,10 @@ 
       $output .= l(bts('Delete', array(), NULL, 'boinc:form-delete'), "host/{$host_id}/delete",
         array(
           'attributes' => array(
-            'onclick' => 'return confirm(\'' . bts('This will delete host @id'
+            'onclick' => 'return confirm(\''.bts('This will delete host @id'
               . ' from your account forever. Are you sure this is OK?',
               array('@id' => $host_id),
-              NULL, 'boinc:account-host-delete') . '\')'
+              NULL, 'boinc:account-host-delete').'\')'
           )
         )
       );
@@ -1436,8 +1436,8 @@ 
       "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location')
     );
     variable_set('jump_use_js_venues-Array', 1);
-    drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-    drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
+    drupal_add_js(drupal_get_path('module', 'jump').'/jump.js');
+    drupal_add_js(drupal_get_path('theme', 'boinc').'/js/prefs.js', 'theme');
     // Get current venue
     db_set_active('boinc');
     $venue = db_result(db_query(
@@ -1461,10 +1461,10 @@ 
     // Add a wrapper to deadline text
     if (!$received_time) {
       if (time() < $deadline) {
-        $output = '<span class="on-time">' . $output . '</span>';
+        $output = '<span class="on-time">'.$output.'</span>';
       }
       else {
-        $output = '<span class="past-due">' . $output . '</span>';
+        $output = '<span class="past-due">'.$output.'</span>';
       }
     }
   }
@@ -1498,15 +1498,15 @@ 
  */
 function boincwork_tasktable($category = 0, $queryid = 1, $tselect = NULL, $app_id = 0) {
   // Check type parameter, if not (0,2) then return an error.
-  if ( ($category!=0) AND ($category!=1) AND ($category!=2) ) {
+  if (($category != 0) AND ($category != 1) AND ($category != 2)) {
     watchdog('boincwork', 'task table called with invalid category = %category', array('%category' => $category), WATCHDOG_WARNING);
     return '';
   }
 
-  require_boinc( array('util', 'result') );
+  require_boinc(array('util', 'result'));
 
   global $language;
-  $locality=$language->language;
+  $locality = $language->language;
   $nf = new NumberFormatter($locality, NumberFormatter::DECIMAL);
   $nf->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, 0);
   $nf->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, 0);
@@ -1554,13 +1554,13 @@ 
       ."ON r.appid=a.id ";
 
   // Use userid, hostid, or workunitid
-  if ($category==0) {
+  if ($category == 0) {
     $sqlall .= "AND r.userid='%s' ";
   }
-  elseif ($category==1) {
+  elseif ($category == 1) {
     $sqlall .= "AND r.workunitid='%s' ";
   }
-  elseif ($category==2) {
+  elseif ($category == 2) {
     $sqlall .= "AND r.hostid='%s' ";
   }
   $sqlall .= "ORDER BY user_friendly_name";
@@ -1571,7 +1571,7 @@ 
   if ($dbres_all) {
     while ($result = db_fetch_object($dbres_all)) {
       $mystate = state_num($result);
-      if ( ($result->appid==$app_id) OR ($app_id==0) OR ($app_id==-1) ) {
+      if (($result->appid == $app_id) OR ($app_id == 0) OR ($app_id == -1)) {
         $taskstates[STATE_ALL]++;
         switch ($mystate) {
         case STATE_IN_PROGRESS:
@@ -1594,7 +1594,7 @@ 
 
       //map holds a map between app ids and user friendly names for all applications.
       $application_map[$result->appid] = $result->user_friendly_name;
-      if ( ($mystate == $tselect) OR ($tselect==STATE_ALL) ) {
+      if (($mystate == $tselect) OR ($tselect == STATE_ALL)) {
         //count of appids in the results.
         $application_select_count[$result->appid]++;
       }// if mystate
@@ -1607,14 +1607,14 @@ 
   // Entry for all applications.
   $allcount = $application_select_count ? array_sum($application_select_count) : 0;
   $applications[-1] = bts('Application', array(), NULL, 'boinc:task-table');
-  $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table') . ' (' . $allcount . ')';
+  $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table').' ('.$allcount.')';
   // Create application filter from application_map and application_select_count.
-  foreach($application_map as $akey => $aname) {
+  foreach ($application_map as $akey => $aname) {
     $acount = 0;
-    if ( $application_select_count and array_key_exists($akey, $application_select_count) ) {
+    if ($application_select_count and array_key_exists($akey, $application_select_count)) {
       $acount = $application_select_count[$akey];
     }
-    $applications[$akey] = $aname . ' ('. $acount . ')';
+    $applications[$akey] = $aname.' ('.$acount.')';
   }
   // Header array for (sub) results table.
   $resultheader = array(
@@ -1687,13 +1687,13 @@ 
       ."ON av.platformid=pl.id ";
 
   // Use userid, hostid, or workunitid
-  if ($category==0) {
+  if ($category == 0) {
     $sqlsub .= "AND r.userid = '%s' ";
   }
-  elseif ($category==1) {
+  elseif ($category == 1) {
     $sqlsub .= "AND r.workunitid = '%s' ";
   }
-  elseif ($category==2) {
+  elseif ($category == 2) {
     $sqlsub .= "AND r.hostid = '%s' ";
   }
 
@@ -1716,12 +1716,12 @@ 
     break;
   }
 
-  if (is_numeric($app_id) AND $app_id>0 ) {
+  if (is_numeric($app_id) AND $app_id > 0) {
     $sqlsub .= " AND r.appid = '%s'";
-    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), 20, 0, NULL, $queryid, $app_id);
+    $dbres_sub = pager_query($sqlsub.tablesort_sql($resultheader), 20, 0, NULL, $queryid, $app_id);
   }
   else {
-    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), 20, 0, NULL, $queryid);
+    $dbres_sub = pager_query($sqlsub.tablesort_sql($resultheader), 20, 0, NULL, $queryid);
   }
   db_set_active('default');
 
@@ -1729,7 +1729,7 @@ 
   if ($dbres_sub) {
     while ($result = db_fetch_object($dbres_sub)) {
       // check if state matches selection
-      if ( (state_num($result) == $tselect) OR ($tselect==STATE_ALL) ) {
+      if ((state_num($result) == $tselect) OR ($tselect == STATE_ALL)) {
         // create pretty result row
         $prettyresult = array(
           array(
@@ -1745,7 +1745,7 @@ 
           $nf->format($result->cpu_time),
           $nf->format($result->granted_credit),
           array(
-            'data' => $result->user_friendly_name . " " . pretty_application_version($result->version_number, $result->plan_class, $result->platform),
+            'data' => $result->user_friendly_name." ".pretty_application_version($result->version_number, $result->plan_class, $result->platform),
             'class' => 'task-app',
           ),
         );
@@ -1758,54 +1758,54 @@ 
   // Begin result navigation
 
   // Set pathprefix based on type
-  if ($category==0) {
+  if ($category == 0) {
     $pathprefix = 'account/tasks';
   }
-  elseif ($category==1) {
-    $pathprefix = 'workunit/' . $queryid . '/tasks';
+  elseif ($category == 1) {
+    $pathprefix = 'workunit/'.$queryid.'/tasks';
   }
-  elseif ($category==2) {
-    $pathprefix = 'host/' . $queryid . '/tasks';
+  elseif ($category == 2) {
+    $pathprefix = 'host/'.$queryid.'/tasks';
   }
   // Need an "All" tab as well, maps to app_id of zero.
   $application_map[0] = bts('All', array(), NULL, 'boinc:task-table');
   $stitems = array();
   foreach ($taskstates as $state => $numstates) {
-    $mypath = $pathprefix . '/' . $state . '/' . $app_id;
-    if ($state==STATE_ALL) {
-      $ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+    $mypath = $pathprefix.'/'.$state.'/'.$app_id;
+    if ($state == STATE_ALL) {
+      $ltext = '<span class="tab task-app-name">'.bts('All', array(), NULL, 'boinc:task-table').' ('.$numstates.')</span>';
     }
     else {
-      $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+      $ltext = '<span class="tab">'.bts($state_hnames[$state], array(), NULL, 'boinc:task-table').' ('.$numstates.')</span>';
     }
     $myitem = array(
-      'data' => l($ltext, $mypath, array('html' => TRUE) ),
+      'data' => l($ltext, $mypath, array('html' => TRUE)),
     );
-    if ($state==$tselect) {
+    if ($state == $tselect) {
       $myitem['class'] = 'active';
     }
     $stitems[] = $myitem;
   }
   // Add reset button
-  $mypath = $pathprefix . '/0/0';
-  $ltext = '<span class="tab">' . bts('Reset', array(), NULL, 'boinc:task-table') . '</span>';
-  $stitems[] = array( 'data' => l($ltext, $mypath, array('html' => TRUE) ) );
+  $mypath = $pathprefix.'/0/0';
+  $ltext = '<span class="tab">'.bts('Reset', array(), NULL, 'boinc:task-table').'</span>';
+  $stitems[] = array('data' => l($ltext, $mypath, array('html' => TRUE)));
 
-  $output .= theme_item_list($stitems, $title = NULL, $type='ul'. $attributes=' class="tabs secondary clearfix"');
+  $output .= theme_item_list($stitems, $title = NULL, $type = 'ul'.$attributes = ' class="tabs secondary clearfix"');
 
   // Application select-drop down form
   // Hack to place Application form into header
   // App ID of zero maps to "-1" for drop-down box.
-  if ($app_id==0) {
-    $app_id=-1;
+  if ($app_id == 0) {
+    $app_id = -1;
   }
   $resultheader[] = drupal_get_form('boincwork_selectapp_form', $applications, $app_id);
 
   // Begin table of results
-  if ( is_array($resultheader) AND is_array($resultdata) ) {
+  if (is_array($resultheader) AND is_array($resultdata)) {
 
     // Take advantage of the fact that $category is the same as the row/column we want to remove.
-    if ( ($category==1) OR ($category==2) ) {
+    if (($category == 1) OR ($category == 2)) {
       unset($resultheader[$category]);
       delete_col($resultdata, $category);
     }
@@ -1822,7 +1822,7 @@ 
  * Function to delete a column from an array.
  */
 function delete_col(&$array, $offset) {
-  return array_walk($array, function (&$v) use ($offset) {
+  return array_walk($array, function(&$v) use ($offset) {
      array_splice($v, $offset, 1);
   });
 }

Indentation +804 added lines, -804 removed lines

@@ -11,19 +11,19 @@ 
  * 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) {
+    // 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'));
@@ -160,88 +160,88 @@ 
           <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) {
+    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']))) {
+        if (!is_numeric(key($preset_prefs['preset']))) {
         $preset_prefs['preset'] = array($preset_prefs['preset']);
-      }
-      foreach ($preset_prefs['preset'] as $key => $prefs) {
+        }
+        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['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)) {
+    $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');
+        ': <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) {
+    $rules = array();
+    if (!$xml) {
     // Read the config XML
     $xml = boincwork_get_project_specific_config();
     $xml = $xml['project_specific_preferences'];
-  }
-  foreach ($xml as $type => $elements) {
+    }
+    foreach ($xml as $type => $elements) {
     if (is_array($elements) AND !is_numeric(key($elements))) {
-      $elements = array($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;
+        }
+        break;
       
     case 'text':
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
         $rules[$name] = array(
-          'datatype' => $element['@attributes']['datatype']
+            'datatype' => $element['@attributes']['datatype']
         );
         if (isset($element['@attributes']['min'])) {
-          $rules[$name]['min'] = $element['@attributes']['min'];
+            $rules[$name]['min'] = $element['@attributes']['min'];
         }
         if (isset($element['@attributes']['max'])) {
-          $rules[$name]['max'] = $element['@attributes']['max'];
+            $rules[$name]['max'] = $element['@attributes']['max'];
         }
-      }
-      break;
+        }
+        break;
     /*
     case 'radio':
     case 'dropdown':
@@ -265,24 +265,24 @@ 
       $rules['apps'] = array(
         'minimum selected' => 1,
         'list' => array()
-      );
-      foreach ($elements as $element) {
+        );
+        foreach ($elements as $element) {
         foreach ($element['app'] as $app) {
-          $name = "app_{$app['@attributes']['id']}";
-          $rules['apps']['list'][] = $name;
-          //$rules[$name] = array(
-          //  'options' => $options
-          //);
+            $name = "app_{$app['@attributes']['id']}";
+            $rules['apps']['list'][] = $name;
+            //$rules[$name] = array(
+            //  'options' => $options
+            //);
         }
-      }
-      break;
+        }
+        break;
       
     case 'group':
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
         $rules += boincwork_get_project_specific_config_validation_rules($element);
-      }
-      break;
+        }
+        break;
     /*
     case 'boolean':
       // Shouldn't need to validate boolean...
@@ -290,39 +290,39 @@ 
       */
     default:
     }
-  }
-  return $rules;
+    }
+    return $rules;
 }
 
 /**
  * Define how project specific settings should be saved
  */
 function boincwork_format_project_specific_prefs_data($values, $xml = array()) {
-  $defaults = array();
-  if (!$xml) {
+    $defaults = array();
+    if (!$xml) {
     // Read the config XML
     $xml = boincwork_get_project_specific_config();
     $xml = $xml['project_specific_preferences'];
-  }
-  foreach ($xml as $type => $elements) {
+    }
+    foreach ($xml as $type => $elements) {
     $structure_data = array();
     if (is_array($elements) AND !is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     switch ($type) {
     case 'compound':
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
         $default[$name]['@attributes'] = boincwork_format_project_specific_prefs_data($values[$name], $element['attributes']);
-      }
-      $defaults += $default;
-      break;
+        }
+        $defaults += $default;
+        break;
       
     case 'group':
       foreach ($elements as $element) {
         $defaults += boincwork_format_project_specific_prefs_data($values, $element);
-      }
-      break;
+        }
+        break;
       
     case 'text':
     case 'radio':
@@ -331,315 +331,315 @@ 
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
         if (isset($element['@attributes']['entitytype']) AND $element['@attributes']['entitytype'] == 'attribute') {
-          $defaults['@attributes'][$name] = $values[$name];
+            $defaults['@attributes'][$name] = $values[$name];
         }
         else {
-          $defaults[$name] = $values[$name];
+            $defaults[$name] = $values[$name];
         }
-      }
-      break;
+        }
+        break;
     
     case 'apps':
       foreach ($elements as $element) {
         $defaults['app_id'] = array();
         foreach ($element['app'] as $app) {
-          $app_id = $app['@attributes']['id'];
-          if ($values['applications']["app_{$app_id}"]) {
+            $app_id = $app['@attributes']['id'];
+            if ($values['applications']["app_{$app_id}"]) {
             $defaults['app_id'][] = $app_id;
-          }
+            }
         }
-      }
-      break;
+        }
+        break;
       
     default:
     }
-  }
-  return $defaults;
+    }
+    return $defaults;
 }
 
 /**
  * Add an element to the form based on its definition
  */
 function boincwork_generate_prefs_element(&$form, $type, $elements, $user_prefs = null) {
-  switch ($type) {
-  case 'text':
+    switch ($type) {
+    case 'text':
     if (!is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     foreach ($elements as $element) {
-      $name = $element['@attributes']['name'];
-      $default = $element['@attributes']['default'];
-      $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $description = '';
-      if (isset($element['description'])) {
+        $name = $element['@attributes']['name'];
+        $default = $element['@attributes']['default'];
+        $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
+        $description = '';
+        if (isset($element['description'])) {
         $description = is_array($element['description']) ? $element['description']['@value'] : $element['description'];
-      }
+        }
       
-      $value = $default;
-      $user_pref = $user_prefs;
-      $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
-      if ($entitytype == 'attribute') {
+        $value = $default;
+        $user_pref = $user_prefs;
+        $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
+        if ($entitytype == 'attribute') {
         $user_pref = $user_prefs['@attributes'];
-      }
-      if (isset($user_pref[$name])) {
+        }
+        if (isset($user_pref[$name])) {
         if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
-          $value = $user_pref[$name]['@value'];
+            $value = $user_pref[$name]['@value'];
         }
         else {
-          $value = $user_pref[$name];
+            $value = $user_pref[$name];
+        }
         }
-      }
       
-      // Use appropriate datatype
-      if (isset($element['@attributes']['datatype'])) {
+        // Use appropriate datatype
+        if (isset($element['@attributes']['datatype'])) {
         switch($element['@attributes']['datatype']) {
         case 'integer':
           $value = (int) $value;
-          break;
+            break;
           
         case 'float':
           $value = number_format((float) $value, 2);
-          break;
+            break;
         
         default:
         }
-      }
+        }
       
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', $title);
         $title = i18nstrings('project:prefs_xml', $title);
-      }
-      if ($description) {
+        }
+        if ($description) {
         i18nstrings_update('project:prefs_xml', $description);
         $description = i18nstrings('project:prefs_xml', $description);
-      }
+        }
       
-      $form[$name] = array(
+        $form[$name] = array(
         '#title' => $title,
         '#type' => 'textfield',
         '#default_value' => $value,
         '#size' => 5,
         '#description' => $description . bts(' Default value: @default', array('@default' => $default), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     break;
     
-  case 'boolean':
+    case 'boolean':
     if (!is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     foreach ($elements as $element) {
-      $name = $element['@attributes']['name'];
-      $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $default = (isset($element['@attributes']['selected']) AND $element['@attributes']['selected'] == 'true') ? 1 : 0;
-      $description = '';
-      if (isset($element['description'])) {
+        $name = $element['@attributes']['name'];
+        $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
+        $default = (isset($element['@attributes']['selected']) AND $element['@attributes']['selected'] == 'true') ? 1 : 0;
+        $description = '';
+        if (isset($element['description'])) {
         $description = is_array($element['description']) ? $element['description']['@value'] : $element['description'];
-      }
+        }
       
-      $value = $default;
-      $user_pref = $user_prefs;
-      $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
-      if ($entitytype == 'attribute') {
+        $value = $default;
+        $user_pref = $user_prefs;
+        $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
+        if ($entitytype == 'attribute') {
         $user_pref = $user_prefs['@attributes'];
-      }
-      if (isset($user_pref[$name])) {
+        }
+        if (isset($user_pref[$name])) {
         if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
-          $value = $user_pref[$name]['@value'];
+            $value = $user_pref[$name]['@value'];
         }
         else {
-          $value = $user_pref[$name];
+            $value = $user_pref[$name];
+        }
         }
-      }
       
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', $title);
         $title = i18nstrings('project:prefs_xml', $title);
-      }
-      if ($description) {
+        }
+        if ($description) {
         i18nstrings_update('project:prefs_xml', $description);
         $description = i18nstrings('project:prefs_xml', $description);
-      }
+        }
       
-      $form[$name] = array(
+        $form[$name] = array(
         '#title' => $title,
         '#type' => 'radios',
         '#options' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $value,
         '#description' => $description
-      );
+        );
     }
     break;
     
-  case 'radio':
+    case 'radio':
   case 'dropdown':
     
     if (!is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     foreach ($elements as $element) {
-      $name = $element['@attributes']['name'];
-      $default = null;
-      $options = array();
-      foreach($element['items']['item'] as $item) {
+        $name = $element['@attributes']['name'];
+        $default = null;
+        $options = array();
+        foreach($element['items']['item'] as $item) {
         if (is_array($item)) {
-          $value = $item['@value'];
-          if ($default === NULL AND
+            $value = $item['@value'];
+            if ($default === NULL AND
               isset($item['@attributes']) AND
               isset($item['@attributes']['selected'])) {
             $default = ($item['@attributes']['selected'] == 'true') ? $item['@value'] : null;
-          }
+            }
         }
         else {
-          $value = $item;
+            $value = $item;
         }
         $options[$value] = $value;
-      }
-      $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $description = '';
-      if (isset($element['description'])) {
+        }
+        $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
+        $description = '';
+        if (isset($element['description'])) {
         $description = is_array($element['description']) ? $element['description']['@value'] : $element['description'];
-      }
-      $user_pref = $user_prefs;
-      $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
-      if ($entitytype == 'attribute') {
+        }
+        $user_pref = $user_prefs;
+        $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
+        if ($entitytype == 'attribute') {
         $user_pref = $user_prefs['@attributes'];
-      }
-      $value = isset($user_pref[$name]) ? $user_pref[$name] : $default;
+        }
+        $value = isset($user_pref[$name]) ? $user_pref[$name] : $default;
       
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', $title);
         $title = i18nstrings('project:prefs_xml', $title);
-      }
-      if ($description) {
+        }
+        if ($description) {
         i18nstrings_update('project:prefs_xml', $description);
         $description = i18nstrings('project:prefs_xml', $description);
-      }
+        }
       
-      $form[$name] = array(
+        $form[$name] = array(
         '#title' => $title,
         '#type' => ($type == 'radio') ? 'radios' : 'select',
         '#options' => $options,
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $value,
         '#description' => $description . bts(' Default value: @default', array('@default' =>$default), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     break;
     
-  case 'apps':
+    case 'apps':
     $title = is_array($elements['title']) ? $elements['title']['@value'] : $elements['title'];
     
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', $title);
         $title = i18nstrings('project:prefs_xml', $title);
-      }
+        }
     
     $form['applications'] = array(
-      '#title' => bts('Applications', array(), NULL, 'boinc:account-preferences'),
-      '#type' => 'fieldset',
-      '#description' => $title,
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE
+        '#title' => bts('Applications', array(), NULL, 'boinc:account-preferences'),
+        '#type' => 'fieldset',
+        '#description' => $title,
+        '#collapsible' => TRUE,
+        '#collapsed' => FALSE
     );
     $applications = array();
     if (!is_array($user_prefs['app_id'])) {
-      $user_prefs['app_id'] = array($user_prefs['app_id']);
+        $user_prefs['app_id'] = array($user_prefs['app_id']);
     }
     foreach ($user_prefs['app_id'] as $app) {
-      if (!$app) continue;
-      if (is_array($app) AND isset($app['@value'])) {
+        if (!$app) continue;
+        if (is_array($app) AND isset($app['@value'])) {
         $app = $app['@value'];
-      }
-      $applications[] = $app;
+        }
+        $applications[] = $app;
     }
     foreach ($elements['app'] as $app) {
-      $app_id = $app['@attributes']['id'];
-      $app_name = $app['@value'];
-      $app_enabled = TRUE;
-      if (isset($app['@attributes']['enabled']) AND
+        $app_id = $app['@attributes']['id'];
+        $app_name = $app['@value'];
+        $app_enabled = TRUE;
+        if (isset($app['@attributes']['enabled']) AND
           $app['@attributes']['enabled'] == 'false') {
         $app_enabled = FALSE;
-      }
-      if ($applications) {
+        }
+        if ($applications) {
         $checked = in_array($app_id, $applications);
-      } else {
+        } else {
         $checked = TRUE;
         if (isset($app['@attributes']['selected']) AND
             $app['@attributes']['selected'] == 'false') {
-          $checked = FALSE;
+            $checked = FALSE;
         }
-      }
-      $form['applications']["app_{$app_id}"] = array(
+        }
+        $form['applications']["app_{$app_id}"] = array(
         '#title' => $app_name,
         '#type' => 'checkbox',
         '#default_value' => ($checked) ? 'x' : false,
         '#disabled' => !$app_enabled
-      );
+        );
     }
     
     break;
     
-  case 'group':
+    case 'group':
     if (!is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     foreach ($elements as $key => $element) {
-      $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $name = str_replace(' ','_',strtolower($title));
-      $name = "group_{$name}";
+        $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
+        $name = str_replace(' ','_',strtolower($title));
+        $name = "group_{$name}";
       
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', $title);
         $title = i18nstrings('project:prefs_xml', $title);
-      }
+        }
       
-      $form[$name] = array(
-          '#title' => $title,
-          '#type' => 'fieldset',
-          '#tree' => FALSE,
-          //'#description' => t('Notes about this group of fields'),
-          '#collapsible' => TRUE,
-          '#collapsed' => FALSE
-      );
-      // Recursively populate the compound element
-      foreach ($element as $child_type => $child) {
+        $form[$name] = array(
+            '#title' => $title,
+            '#type' => 'fieldset',
+            '#tree' => FALSE,
+            //'#description' => t('Notes about this group of fields'),
+            '#collapsible' => TRUE,
+            '#collapsed' => FALSE
+        );
+        // Recursively populate the compound element
+        foreach ($element as $child_type => $child) {
         boincwork_generate_prefs_element($form[$name], $child_type, $child, $user_prefs);
-      }
+        }
     }
     break;
     
-  case 'compound':
+    case 'compound':
     if (!is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     foreach ($elements as $element) {
-      $name = $element['@attributes']['name'];
-      $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
+        $name = $element['@attributes']['name'];
+        $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
       
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', $title);
         $title = i18nstrings('project:prefs_xml', $title);
-      }
+        }
       
-      $form[$name] = array(
-          '#title' => $title,
-          '#type' => 'fieldset',
-          //'#description' => t('Notes about this group of fields'),
-          '#collapsible' => TRUE,
-          '#collapsed' => FALSE
-      );
-      // Recursively populate the compound element
-      foreach ($element['attributes'] as $child_type => $child) {
+        $form[$name] = array(
+            '#title' => $title,
+            '#type' => 'fieldset',
+            //'#description' => t('Notes about this group of fields'),
+            '#collapsible' => TRUE,
+            '#collapsed' => FALSE
+        );
+        // Recursively populate the compound element
+        foreach ($element['attributes'] as $child_type => $child) {
         boincwork_generate_prefs_element($form[$name], $child_type, $child, $user_prefs[$name]['@attributes']);
-      }
+        }
     }
     break;
     
@@ -655,24 +655,24 @@ 
  */
 function boincwork_make_prefs_table($prefs, $top_level = TRUE) {
 
-  $prefs_table = array();
-  $uncategorized = array();
+    $prefs_table = array();
+    $uncategorized = array();
   
-  // Parse the project preferences form
-  foreach ($prefs as $key => $element) {
+    // Parse the project preferences form
+    foreach ($prefs as $key => $element) {
     
     // Determine which type of element this is and act accordingly
     $element_type = NULL;
     if (is_array($element) AND isset($element['#type'])) {
-      $element_type = $element['#type'];
+        $element_type = $element['#type'];
     }
     switch ($element_type) {
     case 'fieldset':
       $prefs_table[$key] = array(
         'name' => $element['#title'],
         'elements' => boincwork_make_prefs_table($element, FALSE),
-      );
-      break;
+        );
+        break;
     case 'textfield':
     case 'radios':
     case 'checkbox':
@@ -682,45 +682,45 @@ 
         switch ($key) {
         case 'start_hour':
           $element['#title'] = bts('Compute only between:', array(), NULL, 'boinc:account-preferences-computing');
-          break;
+            break;
         case 'net_start_hour':
           $element['#title'] = bts('Transfer files only between:', array(), NULL, 'boinc:account-preferences-comuting');
-          break;
+            break;
         default:
         }
-      }
-      $prefs_element = array(
+        }
+        $prefs_element = array(
         'name' => (isset($element['#title'])) ? $element['#title'] : '',
         'description' => (isset($element['#description'])) ? $element['#description'] : '',
         'default_value' => (isset($element['#default_value'])) ? $element['#default_value'] : NULL,
-      );
-      if ($top_level) {
+        );
+        if ($top_level) {
         $uncategorized[$key] = $prefs_element;
-      }
-      else {
+        }
+        else {
         $prefs_table[$key] = $prefs_element;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
+    }
   
-  if ($prefs_table AND $uncategorized) {
+    if ($prefs_table AND $uncategorized) {
     // Throw any settings that don't fit elsewhere into "other"
     $prefs_table['other'] = array(
-      'name' => bts('Other settings', array(), NULL, 'boinc:account-preferences'),
-      'elements' => $uncategorized,
+        'name' => bts('Other settings', array(), NULL, 'boinc:account-preferences'),
+        'elements' => $uncategorized,
     );
-  }
-  elseif ($uncategorized) {
+    }
+    elseif ($uncategorized) {
     // If nothing is categorized, output all prefs under a general "settings"
     $prefs_table['settings'] = array(
-      'name' => bts('Settings', array(), NULL, 'boinc:account-preferences'),
-      'elements' => $uncategorized,
+        'name' => bts('Settings', array(), NULL, 'boinc:account-preferences'),
+        'elements' => $uncategorized,
     );
-  }
+    }
   
-  return $prefs_table;
+    return $prefs_table;
 }
  
 /**
@@ -728,33 +728,33 @@ 
  */
 function boincwork_load_prefs($type = 'general', $venue = null, $account = null) {
   
-  require_boinc(array('user'));
+    require_boinc(array('user'));
   
-  // Load the BOINC user object
-  if (!$account) {
+    // Load the BOINC user object
+    if (!$account) {
     global $user;
     $account = $user;
-  }
-  $account = user_load($account->uid);
-  $boincuser = BoincUser::lookup_id($account->boincuser_id);
+    }
+    $account = user_load($account->uid);
+    $boincuser = BoincUser::lookup_id($account->boincuser_id);
   
-  // Load the desired preferences for the user
-  $main_prefs = array();
-  if ($type == 'project') {
+    // Load the desired preferences for the user
+    $main_prefs = array();
+    if ($type == 'project') {
     if ($boincuser->project_prefs) {
-      $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+        $main_prefs = load_configuration($boincuser->project_prefs);
+        $main_prefs = (array) $main_prefs['project_preferences'];
     }
-  }
-  else {
+    }
+    else {
     if ($boincuser->global_prefs) {
-      $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+        $main_prefs = load_configuration($boincuser->global_prefs);
+        $main_prefs = (array) $main_prefs['global_preferences'];
+    }
     }
-  }
   
-  // Return general preferences or a subset based on venue
-  if (!$venue OR $venue == 'generic') {
+    // Return general preferences or a subset based on venue
+    if (!$venue OR $venue == 'generic') {
     unset($main_prefs['venue']);
     // Use the length of the $main_prefs array as a condition as to
     // whether the preferences have already been set. This is
@@ -762,23 +762,23 @@ 
     if (count($main_prefs) < 3)
         $main_prefs['@attributes'] = array('cleared' => 1);
     return $main_prefs;
-  }
-  else {
+    }
+    else {
     if (isset($main_prefs['venue'])) {
-      if (!is_numeric(key($main_prefs['venue']))) {
+        if (!is_numeric(key($main_prefs['venue']))) {
         $main_prefs['venue'] = array($main_prefs['venue']);
-      }
-      foreach ($main_prefs['venue'] as $key => $prefs_venue) {
+        }
+        foreach ($main_prefs['venue'] as $key => $prefs_venue) {
         if (isset($prefs_venue['@attributes']['name']) AND $prefs_venue['@attributes']['name'] == $venue) {
-          return $main_prefs['venue'][$key];
+            return $main_prefs['venue'][$key];
+        }
         }
-      }
     }
-  }
+    }
 
-  return array(
+    return array(
     '@attributes' => array('name' => $venue, 'cleared' => 1)
-  );
+    );
 }
 
 /**
@@ -786,99 +786,99 @@ 
  */
 function boincwork_save_prefs($prefs, $type = 'general', $venue = null, $account = null) {
   
-  require_boinc(array('user'));
+    require_boinc(array('user'));
   
-  // Load existing project prefs from the BOINC user object
-  if (!$account) {
+    // Load existing project prefs from the BOINC user object
+    if (!$account) {
     global $user;
     $account = $user;
-  }
-  $account = user_load($account->uid);
-  $boincuser = BoincUser::lookup_id($account->boincuser_id);
+    }
+    $account = user_load($account->uid);
+    $boincuser = BoincUser::lookup_id($account->boincuser_id);
   
-  // Load the specified preferences for the user
-  $main_prefs = array();
-  if ($type == 'project') {
+    // Load the specified preferences for the user
+    $main_prefs = array();
+    if ($type == 'project') {
     if ($boincuser->project_prefs) {
-      $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+        $main_prefs = load_configuration($boincuser->project_prefs);
+        $main_prefs = (array) $main_prefs['project_preferences'];
     }
-  }
-  else {
+    }
+    else {
     if ($boincuser->global_prefs) {
-      $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+        $main_prefs = load_configuration($boincuser->global_prefs);
+        $main_prefs = (array) $main_prefs['global_preferences'];
+    }
     }
-  }
   
-  // Save all preferences or a subset based on venue
-  //drupal_set_message('<pre>' . print_r($main_prefs, true) . '</pre>');
-  $new_venue = true;
-  if (!$venue OR $venue == 'generic') {
+    // Save all preferences or a subset based on venue
+    //drupal_set_message('<pre>' . print_r($main_prefs, true) . '</pre>');
+    $new_venue = true;
+    if (!$venue OR $venue == 'generic') {
     //$main_prefs = $prefs;
     $main_prefs = $prefs + $main_prefs;
-  }
-  else {
+    }
+    else {
     if (isset($main_prefs['venue'])) {
-      if (!is_numeric(key($main_prefs['venue']))) {
+        if (!is_numeric(key($main_prefs['venue']))) {
         $main_prefs['venue'] = array($main_prefs['venue']);
-      }
-      foreach ($main_prefs['venue'] as $key => $prefs_venue) {
+        }
+        foreach ($main_prefs['venue'] as $key => $prefs_venue) {
         if (isset($prefs_venue['@attributes']['name']) AND $prefs_venue['@attributes']['name'] == $venue) {
-          if ($prefs) {
+            if ($prefs) {
             $main_prefs['venue'][$key] = $prefs;
-          }
-          else {
+            }
+            else {
             // If prefs is null, clear out this preference set
             unset($main_prefs['venue'][$key]);
             if (count($main_prefs['venue']) == 0) {
-              // If that was the only preference set configured, unset the
-              // venue tag altogether
-              unset($main_prefs['venue']);
+                // If that was the only preference set configured, unset the
+                // venue tag altogether
+                unset($main_prefs['venue']);
             }
-          }
-          $new_venue = false;
-          break;
+            }
+            $new_venue = false;
+            break;
+        }
         }
-      }
     }
     if ($new_venue) {
-      $main_prefs['venue'][] = $prefs;
+        $main_prefs['venue'][] = $prefs;
+    }
     }
-  }
   
-  // Set modified time
-  if ($type == 'general') {
+    // Set modified time
+    if ($type == 'general') {
     if (!isset($main_prefs['mod_time'])) {
-      $main_prefs = array_merge(array('mod_time' => 0), $main_prefs);
+        $main_prefs = array_merge(array('mod_time' => 0), $main_prefs);
     }
     $main_prefs['mod_time'] = time();
     // unset source information, the Client will fill this in again
     if (isset($main_prefs['source_project'])) {
-      unset($main_prefs['source_project']);
+        unset($main_prefs['source_project']);
     }
     if (isset($main_prefs['source_scheduler'])) {
-      unset($main_prefs['source_scheduler']);
+        unset($main_prefs['source_scheduler']);
+    }
     }
-  }
   
-  // Convert prefs back to XML and save to database
-  $result = null;
-  if ($type == 'project') {
+    // Convert prefs back to XML and save to database
+    $result = null;
+    if ($type == 'project') {
     $main_prefs = array('project_preferences' => $main_prefs);
     $boincuser->project_prefs = save_configuration($main_prefs);
     db_set_active('boinc');
     $result = db_query("UPDATE user SET project_prefs = '{$boincuser->project_prefs}' WHERE id = '{$boincuser->id}'");
     db_set_active('default');
-  }
-  else {
+    }
+    else {
     $main_prefs = array('global_preferences' => $main_prefs);
     $boincuser->global_prefs = save_configuration($main_prefs);
     db_set_active('boinc');
     $result = db_query("UPDATE user SET global_prefs = '{$boincuser->global_prefs}' WHERE id = '{$boincuser->id}'");
     db_set_active('default');
-  }
-  return $result;
+    }
+    return $result;
 }
 
 
@@ -892,94 +892,94 @@ 
  */ 
 function boincwork_set_default_venue($venue = '') {
   
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
   
-  if ($venue == 'generic') {
+    if ($venue == 'generic') {
     $venue = '';
-  }
+    }
   
-  db_set_active('boinc');
-  db_query("
+    db_set_active('boinc');
+    db_query("
     UPDATE user
     SET venue = '%s'
     WHERE id = %d",
     $venue, $account->boincuser_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
 }
 
 /**
  * Recursively validate submitted form values against a set of rules
  */ 
 function boincwork_validate_form($validation_rules, $values, $path = array()) {
-  foreach ($validation_rules as $field => $rules) {
+    foreach ($validation_rules as $field => $rules) {
     $parents = $path;
     if (is_array($values[$field])) {
-      // Process nested form elements
-      $parents[] = $field;
-      boincwork_validate_form($rules, $values[$field], $parents);
+        // Process nested form elements
+        $parents[] = $field;
+        boincwork_validate_form($rules, $values[$field], $parents);
     }
     else {
-      if ($parents) {
+        if ($parents) {
         // form_set_error() identifies nested form elements with '][' as a
         // delimiter between each parent and child element
         $parents[] = $field;
         $form_field = implode('][', $parents);
-      }
-      else {
+        }
+        else {
         $form_field = $field;
-      }
-      if (isset($rules['datatype']) AND !boincwork_validate_datatype($values[$field], $rules['datatype'])) {
+        }
+        if (isset($rules['datatype']) AND !boincwork_validate_datatype($values[$field], $rules['datatype'])) {
         form_set_error($form_field, bts('Invalid data type for @field', array('@field' => $field), NULL, 'boinc:account-preferences'));
-      }
-      if (isset($rules['min']) AND $values[$field] < $rules['min']) {
+        }
+        if (isset($rules['min']) AND $values[$field] < $rules['min']) {
         form_set_error($form_field, bts('Minimum value not met for @field', array('@field' => $field), NULL, 'boinc:account-preferences'));
-      }
-      if (isset($rules['max']) AND $values[$field] > $rules['max']) {
+        }
+        if (isset($rules['max']) AND $values[$field] > $rules['max']) {
         form_set_error($form_field, bts('Maximum value exceeded for @field', array('@field' => $field), NULL, 'boinc:account-preferences'));
-      }
+        }
+    }
     }
-  }
 }
 
 /**
  * Check that numeric data conforms to specifications
  */
 function boincwork_validate_datatype($data, $datatype = NULL) {
-  switch ($datatype) {
-  case 'float':
+    switch ($datatype) {
+    case 'float':
     if (!is_numeric($data)) {
-      return FALSE;
+        return FALSE;
     }
     $data += 0.0;
     if (!is_float($data)) {
-      return FALSE;
+        return FALSE;
     }
     break;
     
-  case 'integer':
+    case 'integer':
     if (!is_numeric($data)) {
-      return FALSE;
+        return FALSE;
     }
     $data += 0;
     if (!is_int($data)) {
-      return FALSE;
+        return FALSE;
     }
     break;
   
-  case 'text':
+    case 'text':
   default:
     
   }
-  return TRUE;
+    return TRUE;
 }
 
 /**
  * Format a number to be displayed using a maximum number of digits
  */ 
 function boincwork_format_stats($number, $max_digits = 4) {
-  $suffix = array(
+    $suffix = array(
     0 => '',
     1 => 'k',
     2 => 'M',
@@ -989,95 +989,95 @@ 
     6 => 'E',
     7 => 'Z',
     8 => 'Y'
-  );
-  if (!is_numeric($number)) $number = 0;
+    );
+    if (!is_numeric($number)) $number = 0;
   
-  $digits = floor(log($number, 10)) + 1;
-  $magnitude = 0;
-  $precision = 0;
-  if ($digits > $max_digits) {
+    $digits = floor(log($number, 10)) + 1;
+    $magnitude = 0;
+    $precision = 0;
+    if ($digits > $max_digits) {
     $magnitude = floor(($digits - ($max_digits - 3)) / 3);
     $precision = $max_digits - ($digits - ($magnitude * 3) + 1);
     $number = round($number / pow(1000, $magnitude), $precision);
-  }
-  $number = number_format($number, $precision) . (($magnitude) ? "{$suffix[$magnitude]}" : '');
+    }
+    $number = number_format($number, $precision) . (($magnitude) ? "{$suffix[$magnitude]}" : '');
   
-  return $number;
+    return $number;
 }
 
 
-  //------------------------------------------------------------------------------------------------
-  //  load_configuration(): Convert structured text/xml to array
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  load_configuration(): Convert structured text/xml to array
+    //------------------------------------------------------------------------------------------------
   
-  function load_configuration($text)
-  {
-      if (preg_match('/^\<\?xml .*\?\>$/i', $text)) return null;
-      if ($xml = text_to_xml($text)) return xml_to_array($xml);
-      return false;
-  }
+    function load_configuration($text)
+    {
+        if (preg_match('/^\<\?xml .*\?\>$/i', $text)) return null;
+        if ($xml = text_to_xml($text)) return xml_to_array($xml);
+        return false;
+    }
   
-  //------------------------------------------------------------------------------------------------
-  //  save_configuration(): Convert array to structured text/xml
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  save_configuration(): Convert array to structured text/xml
+    //------------------------------------------------------------------------------------------------
   
-  function save_configuration($array)
-  {
-      if ($xml = array_to_xml($array)) return xml_to_text($xml, false, true);
-      return false;
-  }
+    function save_configuration($array)
+    {
+        if ($xml = array_to_xml($array)) return xml_to_text($xml, false, true);
+        return false;
+    }
   
-  //------------------------------------------------------------------------------------------------
-  //  array_to_xml(): Take a multidimensional array and convert it to a structured
-  //  DOM XML object
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  array_to_xml(): Take a multidimensional array and convert it to a structured
+    //  DOM XML object
+    //------------------------------------------------------------------------------------------------
   
-  function array_to_xml($array, $dom = false, $parent_node = false) {
+    function array_to_xml($array, $dom = false, $parent_node = false) {
     $is_root = false;
     if (!$dom) $dom = new DomDocument('1.0');
     if (!$parent_node) {
-      $parent_node = $dom;
-      $is_root = true;
+        $parent_node = $dom;
+        $is_root = true;
     }
     // Created an intermediate array to attempt to sort by @position
     $ordered_array = array();
     $unordered_array = array();
     foreach ($array as $name => $value) {
-      if ($is_root) {
+        if ($is_root) {
         $unordered_array[] = $array;
         break;
-      }
-      if (is_array($value)) {
+        }
+        if (is_array($value)) {
         if (is_numeric(key($value))) {
-          foreach ($value as $item) {
+            foreach ($value as $item) {
             if (is_array($item) AND isset($item['@position'])) {
-              $ordered_array[$item['@position']] = array(
+                $ordered_array[$item['@position']] = array(
                 $name => $item
-              );
+                );
             }
             else {
-              $unordered_array[] = array(
+                $unordered_array[] = array(
                 $name => $item
-              );
+                );
+            }
             }
-          }
         }
         elseif (isset($value['@position'])) {
-          $ordered_array[$value['@position']] = array(
+            $ordered_array[$value['@position']] = array(
             $name => $value
-          );
+            );
         }
         else {
-          $unordered_array[] = array(
+            $unordered_array[] = array(
             $name => $value
-          );
+            );
         }
-      }
-      else {
+        }
+        else {
         $unordered_array[] = array(
-          $name => $value
+            $name => $value
         );
-      }
+        }
     }
     
     // Now append items without explicit positions at the end
@@ -1085,39 +1085,39 @@ 
     
     // Convert to XML...
     foreach ($primed_array as $item) {
-      list($name, $value) = each($item);
-      if (strcmp($name, '@attributes') == 0) {
+        list($name, $value) = each($item);
+        if (strcmp($name, '@attributes') == 0) {
         if (!is_array($value)) continue;
         foreach ($value as $attributeName => $attributeValue) {
-          $parent_node->setAttribute($attributeName, $attributeValue);
+            $parent_node->setAttribute($attributeName, $attributeValue);
         }
-      } elseif (strcmp($name, '@value') == 0) {
+        } elseif (strcmp($name, '@value') == 0) {
         if (isset($value)) $parent_node->nodeValue = $value;
-      } elseif (strcmp($name, '@position') == 0) {
+        } elseif (strcmp($name, '@position') == 0) {
         continue;
-      } else {
+        } else {
         if (is_numeric($name)) {
-          $name = $parent_node->tagName;
+            $name = $parent_node->tagName;
         }
         $current_item = $dom->createElement($name);
         if (is_array($value)) {
-          if (is_numeric(key($value))) {
+            if (is_numeric(key($value))) {
             $current_node = $parent_node->appendChild($current_item);
             $current_node = array_to_xml($value, $dom, $current_node);
             $child_count = $current_node->childNodes->length;
             for ($i = 0; $i < $child_count; $i++) {
-              $parent_node->appendChild($current_node->childNodes->item(0));
+                $parent_node->appendChild($current_node->childNodes->item(0));
             }
             $parent_node->removeChild($current_node);
-          } else {
+            } else {
             $current_node = $dom->appendChild($current_item);
             $parent_node->appendChild(array_to_xml($value, $dom, $current_node));
-          }
+            }
         } else {
-          if (isset($value)) $current_item->nodeValue = $value;
-          $parent_node->appendChild($current_item);
+            if (isset($value)) $current_item->nodeValue = $value;
+            $parent_node->appendChild($current_item);
+        }
         }
-      }
     }
     /*
     foreach ($array as $name => $value) {
@@ -1153,114 +1153,114 @@ 
       }
     }*/
     return $parent_node;
-  }
+    }
   
-  //------------------------------------------------------------------------------------------------
-  //  xml_to_text(): Convert an XML DOM object to string format
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  xml_to_text(): Convert an XML DOM object to string format
+    //------------------------------------------------------------------------------------------------
   
-  function xml_to_text($xml, $include_xml_declaration = true, $add_carriage_returns = false)
-  {
-      $xml->formatOutput = true;
-      $text = $xml->saveXML();
-      if (!$include_xml_declaration) {
+    function xml_to_text($xml, $include_xml_declaration = true, $add_carriage_returns = false)
+    {
+        $xml->formatOutput = true;
+        $text = $xml->saveXML();
+        if (!$include_xml_declaration) {
         $text = preg_replace('/<\?xml version=.*\?>\s*/i', '', $text, 1);
-      }
-      if ($add_carriage_returns) {;
+        }
+        if ($add_carriage_returns) {;
         $text = preg_replace('/\n/i', "\r\n", $text);
-      }
-      return trim($text);
-  }
+        }
+        return trim($text);
+    }
   
-  //------------------------------------------------------------------------------------------------
-  //  text_to_xml(): Convert an XML DOM object to string format
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  text_to_xml(): Convert an XML DOM object to string format
+    //------------------------------------------------------------------------------------------------
   
-  function text_to_xml($text) {
+    function text_to_xml($text) {
     $xml = new DomDocument();
     if ( !($xml->loadXML($text)) ) return false;
     return $xml;
-  }
+    }
   
   
-  //------------------------------------------------------------------------------------------------
-  //  xml_to_array(): Convert an XML DOM object to array format
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  xml_to_array(): Convert an XML DOM object to array format
+    //------------------------------------------------------------------------------------------------
   
-  function xml_to_array($xml) {
-      $node = $xml->firstChild; //$xml->first_child();
-      $result = '';
-      $index = 1;
-      $position = 0;
-      while (!is_null($node)) {
-          switch ($node->nodeType) {
-          case XML_TEXT_NODE:
+    function xml_to_array($xml) {
+        $node = $xml->firstChild; //$xml->first_child();
+        $result = '';
+        $index = 1;
+        $position = 0;
+        while (!is_null($node)) {
+            switch ($node->nodeType) {
+            case XML_TEXT_NODE:
               if (trim($node->nodeValue)  != '') $result = $node->nodeValue;
-              break;
-          case XML_ELEMENT_NODE:
+                break;
+            case XML_ELEMENT_NODE:
               $node_name = $node->nodeName;
-              $parent = $node->parentNode;
-              $sibling = $node->nextSibling;
+                $parent = $node->parentNode;
+                $sibling = $node->nextSibling;
               
-              // Determine if this node forms a set with siblings (share a node name)
-              while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->nextSibling;
-              if (!$sibling) {
-                  $sibling = $node->previousSibling;
-                  while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->previousSibling;
-              }
+                // Determine if this node forms a set with siblings (share a node name)
+                while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->nextSibling;
+                if (!$sibling) {
+                    $sibling = $node->previousSibling;
+                    while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->previousSibling;
+                }
               
-              if ($sibling) {
-                  $result[$node_name][$index] = '';
-                  if ($node->childNodes) {
-                      $result[$node_name][$index] = xml_to_array($node) ;
-                  }
-                  if ($node->hasAttributes()) {
-                      $attributes = $node->attributes;
-                      if ($result[$node_name][$index] !== '' AND !is_array($result[$node_name][$index])) {
-                          $result[$node_name][$index] = array('@value' => $result[$node_name][$index]);
-                      }
-                      foreach ($attributes as $key => $attribute) {
-                          $result[$node_name][$index]['@attributes'][$attribute->name] = $attribute->value;
-                      }
-                  }
-                  // Retain the position of the element
-                  if (!is_array($result[$node_name][$index])) {
+                if ($sibling) {
+                    $result[$node_name][$index] = '';
+                    if ($node->childNodes) {
+                        $result[$node_name][$index] = xml_to_array($node) ;
+                    }
+                    if ($node->hasAttributes()) {
+                        $attributes = $node->attributes;
+                        if ($result[$node_name][$index] !== '' AND !is_array($result[$node_name][$index])) {
+                            $result[$node_name][$index] = array('@value' => $result[$node_name][$index]);
+                        }
+                        foreach ($attributes as $key => $attribute) {
+                            $result[$node_name][$index]['@attributes'][$attribute->name] = $attribute->value;
+                        }
+                    }
+                    // Retain the position of the element
+                    if (!is_array($result[$node_name][$index])) {
                     $result[$node_name][$index] = array(
-                      '@value' => $result[$node_name][$index]
+                        '@value' => $result[$node_name][$index]
                     );
-                  }
-                  $result[$node_name][$index]['@position'] = $position;
-                  $position++;
-                  $index++;
-              } else {
-                  $result[$node_name] = '';
-                  if ($node->childNodes) {
-                      $result[$node_name] = xml_to_array($node) ;
-                  }
-                  if ($node->hasAttributes()) {
-                      $attributes = $node->attributes;
-                      if ($result[$node_name] !== '' AND !is_array($result[$node_name])) {
-                          $result[$node_name] = array('@value' => $result[$node_name]);
-                      }
-                      foreach($attributes as $key => $attribute) {
-                          $result[$node_name]['@attributes'][$attribute->name] = $attribute->value;
-                      }
-                  }
-                  // Retain the position of the element
-                  if (!is_array($result[$node_name])) {
+                    }
+                    $result[$node_name][$index]['@position'] = $position;
+                    $position++;
+                    $index++;
+                } else {
+                    $result[$node_name] = '';
+                    if ($node->childNodes) {
+                        $result[$node_name] = xml_to_array($node) ;
+                    }
+                    if ($node->hasAttributes()) {
+                        $attributes = $node->attributes;
+                        if ($result[$node_name] !== '' AND !is_array($result[$node_name])) {
+                            $result[$node_name] = array('@value' => $result[$node_name]);
+                        }
+                        foreach($attributes as $key => $attribute) {
+                            $result[$node_name]['@attributes'][$attribute->name] = $attribute->value;
+                        }
+                    }
+                    // Retain the position of the element
+                    if (!is_array($result[$node_name])) {
                     $result[$node_name] = array(
-                      '@value' => $result[$node_name]
+                        '@value' => $result[$node_name]
                     );
-                  }
-                  $result[$node_name]['@position'] = $position;
-                  $position++;
-              }
-              break;
-          }
-          $node = $node->nextSibling;
-      }
-      return $result;
-  }
+                    }
+                    $result[$node_name]['@position'] = $position;
+                    $position++;
+                }
+                break;
+            }
+            $node = $node->nextSibling;
+        }
+        return $result;
+    }
   
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1268,172 +1268,172 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * Determine output for host list views when no hosts are found.
-  */
+ * Determine output for host list views when no hosts are found.
+ */
 function boincwork_views_host_list_empty_text($context = NULL) {
   
-  // Pull the BOINC user ID from the view arguments to get show_hosts 
-  // preference for that user
-  require_boinc('boinc_db');
-  $view = views_get_current_view();
-  $account = user_load($view->args[0]);
-  $boincuser = BoincUser::lookup_id($account->boincuser_id);
+    // Pull the BOINC user ID from the view arguments to get show_hosts 
+    // preference for that user
+    require_boinc('boinc_db');
+    $view = views_get_current_view();
+    $account = user_load($view->args[0]);
+    $boincuser = BoincUser::lookup_id($account->boincuser_id);
   
-  // Determine if hosts are associated at all or just hidden
-  $output = '';
-  if ($boincuser->show_hosts) {
+    // Determine if hosts are associated at all or just hidden
+    $output = '';
+    if ($boincuser->show_hosts) {
     switch($context) {
     case 'active':
       $output .=  '<h2>' . bts('No active computers', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user has no computers that have been'
-      . ' active in the last 30 days.', array(), NULL, 'boinc:host-list') . '</p>';
-      break;
+        $output .=  '<p>' . bts('This user has no computers that have been'
+        . ' active in the last 30 days.', array(), NULL, 'boinc:host-list') . '</p>';
+        break;
       
     case 'preferences':
       $output .=  '<h2>' . bts('No computers', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('There are no computers assigned to this'
-      . ' preference set.', array(), NULL, 'boinc:host-list') . '</p>';
-      break;
+        $output .=  '<p>' . bts('There are no computers assigned to this'
+        . ' preference set.', array(), NULL, 'boinc:host-list') . '</p>';
+        break;
     
     default:
       $output .=  '<h2>' . bts('Computers pending', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user does not yet have any associated'
-      . ' computers. Computers will be displayed when they have earned their'
-      . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
+        $output .=  '<p>' . bts('This user does not yet have any associated'
+        . ' computers. Computers will be displayed when they have earned their'
+        . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
     }
-  }
-  else {
+    }
+    else {
     $output .=  '<h2>' . bts('Computers hidden', array(), NULL, 'boinc:host-list') . '</h2>';
     $output .=  '<p>' . bts('This user has chosen not to show information'
     . ' about their computers.', array(), NULL, 'boinc:host-list') . '</p>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
-  * Determine output for task list views when no tasks are found.
-  */
+ * Determine output for task list views when no tasks are found.
+ */
 function boincwork_views_task_list_empty_text($context = NULL) {
   
-  // 
-  $output = '';
-  switch($context) {
-  default:
+    // 
+    $output = '';
+    switch($context) {
+    default:
     $output .=  '<h2>' . bts('No @type tasks', array('@type' => $context), NULL, 'boinc:task-list')
     . '</h2>';
     $output .=  '<p>' . bts('There are no tasks of this type on record', array(), NULL, 'boinc:task-list')
     . '</p>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
-  * Output links to perform host actions
-  */
+ * Output links to perform host actions
+ */
 function boincwork_host_action_links($host_id) {
-  $output = '';
-  if (boincwork_host_user_is_owner($host_id)) {
+    $output = '';
+    if (boincwork_host_user_is_owner($host_id)) {
     // Show merge hosts option
     $output = '<ul class="tab-list"><li class="first tab">';
     $output .= l(bts('Merge', array(), NULL, 'boinc:form-merge'), "host/{$host_id}/merge");
     $output .= '</li>';
     // If host has no tasks, allow the host to be deleted
     if (!boincwork_host_get_task_count($host_id)) {
-      $output .= '<li class="tab">';
-      $output .= l(bts('Delete', array(), NULL, 'boinc:form-delete'), "host/{$host_id}/delete",
+        $output .= '<li class="tab">';
+        $output .= l(bts('Delete', array(), NULL, 'boinc:form-delete'), "host/{$host_id}/delete",
         array(
-          'attributes' => array(
+            'attributes' => array(
             'onclick' => 'return confirm(\'' . bts('This will delete host @id'
-              . ' from your account forever. Are you sure this is OK?',
-              array('@id' => $host_id),
-              NULL, 'boinc:account-host-delete') . '\')'
-          )
+                . ' from your account forever. Are you sure this is OK?',
+                array('@id' => $host_id),
+                NULL, 'boinc:account-host-delete') . '\')'
+            )
         )
-      );
-      $output .= '</li>';
+        );
+        $output .= '</li>';
     }
     $output .= '</ul>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Get details for a given host
  */
 function boincwork_host_get_info($host_id) {
-  db_set_active('boinc');
-  $host = db_fetch_object(db_query(
+    db_set_active('boinc');
+    $host = db_fetch_object(db_query(
     "SELECT * FROM {host} WHERE id = '%d'",
     $host_id
-  ));
-  db_set_active('default');
-  return $host;
+    ));
+    db_set_active('default');
+    return $host;
 }
 
 /**
  * Get the number of tasks associated with a given host
  */
 function boincwork_host_get_task_count($host_id) {
-  db_set_active('boinc');
-  $count = db_result(db_query(
+    db_set_active('boinc');
+    $count = db_result(db_query(
     "SELECT COUNT(*) FROM {result} WHERE hostid = '%d'",
     $host_id
-  ));
-  db_set_active('default');
-  return $count;
+    ));
+    db_set_active('default');
+    return $count;
 }
 
 /**
  * Check whether a user is the owner of a host
  */
 function boincwork_host_user_is_owner($host_id, $uid = NULL) {
-  if (!$uid) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  $account = user_load($uid);
-  // Get host owner
-  db_set_active('boinc');
-  $owner = db_result(db_query(
+    }
+    $account = user_load($uid);
+    // Get host owner
+    db_set_active('boinc');
+    $owner = db_result(db_query(
     "SELECT userid FROM {host} WHERE id = '%d'",
     $host_id
-  ));
-  db_set_active('default');
-  return ($account->boincuser_id === $owner);
+    ));
+    db_set_active('default');
+    return ($account->boincuser_id === $owner);
 }
 
 /**
-  * Determine output for host last contact time
-  */
+ * Determine output for host last contact time
+ */
 function boincwork_host_last_contact($timestamp, $host_id = NULL, $context = NULL) {
-  $output = '---';
-  $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
-  $log = '';
-  if ($timestamp) {
+    $output = '---';
+    $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
+    $log = '';
+    if ($timestamp) {
     $output = date('j M Y G:i:s T', $timestamp);
-  }
-  if ($root_log_dir AND $host_id) {
+    }
+    if ($root_log_dir AND $host_id) {
     $subdir = substr($host_id, 0, -3) OR $subdir = 0;
     $log = implode('/', array($root_log_dir, $subdir, $host_id));
-  }
-  if ($log AND file_exists($log)) {
+    }
+    if ($log AND file_exists($log)) {
     $output = l($output, "host/{$host_id}/log");
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * 
  */
 function boincwork_host_venue_selector($host_id) {
-  $output = '';
-  if (function_exists('jump_quickly')) {
+    $output = '';
+    if (function_exists('jump_quickly')) {
     $path = "host/{$host_id}/set-venue";
     $venues = array(
-      "{$path}/generic" => bts('Generic', array(), NULL, 'boinc:account-preferences-location'),
-      "{$path}/home" => bts('Home', array(), NULL, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
-      "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location'),
-      "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location')
+        "{$path}/generic" => bts('Generic', array(), NULL, 'boinc:account-preferences-location'),
+        "{$path}/home" => bts('Home', array(), NULL, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
+        "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location'),
+        "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location')
     );
     variable_set('jump_use_js_venues-Array', 1);
     drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
@@ -1441,34 +1441,34 @@ 
     // Get current venue
     db_set_active('boinc');
     $venue = db_result(db_query(
-      "SELECT venue FROM {host} WHERE id = '%d'",
-      $host_id
+        "SELECT venue FROM {host} WHERE id = '%d'",
+        $host_id
     ));
     db_set_active('default');
     $output .= jump_quickly($venues, 'venues', 1, "{$path}/{$venue}");
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
-  * Determine output for task reported time / deadline
-  */
+ * Determine output for task reported time / deadline
+ */
 function boincwork_task_time_reported($received_time = NULL, $deadline = NULL, $context = NULL) {
-  $output = '---';
-  if ($received_time OR $deadline) {
+    $output = '---';
+    if ($received_time OR $deadline) {
     $timestamp = ($received_time) ? $received_time : $deadline;
     $output = date('j M Y G:i:s T', $timestamp);
     // Add a wrapper to deadline text
     if (!$received_time) {
-      if (time() < $deadline) {
+        if (time() < $deadline) {
         $output = '<span class="on-time">' . $output . '</span>';
-      }
-      else {
+        }
+        else {
         $output = '<span class="past-due">' . $output . '</span>';
-      }
+        }
     }
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1497,341 +1497,341 @@ 
  *   for all applications.
  */
 function boincwork_tasktable($category = 0, $queryid = 1, $tselect = NULL, $app_id = 0) {
-  // Check type parameter, if not (0,2) then return an error.
-  if ( ($category!=0) AND ($category!=1) AND ($category!=2) ) {
+    // Check type parameter, if not (0,2) then return an error.
+    if ( ($category!=0) AND ($category!=1) AND ($category!=2) ) {
     watchdog('boincwork', 'task table called with invalid category = %category', array('%category' => $category), WATCHDOG_WARNING);
     return '';
-  }
+    }
 
-  require_boinc( array('util', 'result') );
+    require_boinc( array('util', 'result') );
 
-  global $language;
-  $locality=$language->language;
-  $nf = new NumberFormatter($locality, NumberFormatter::DECIMAL);
-  $nf->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, 0);
-  $nf->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, 0);
+    global $language;
+    $locality=$language->language;
+    $nf = new NumberFormatter($locality, NumberFormatter::DECIMAL);
+    $nf->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, 0);
+    $nf->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, 0);
 
-  $output = '';
+    $output = '';
 
-  $state_hnames = array(
+    $state_hnames = array(
     STATE_ALL => 'All',
     STATE_IN_PROGRESS => 'In progress',
     STATE_PENDING => 'Pending',
     STATE_VALID => 'Valid',
     STATE_INVALID => 'Invalid',
     STATE_ERROR => 'Error',
-  );
-  // Array (hash) to count total number of results/tasks, and their states.
-  $taskstates = array(
+    );
+    // Array (hash) to count total number of results/tasks, and their states.
+    $taskstates = array(
     STATE_ALL => 0,
     STATE_IN_PROGRESS => 0,
     STATE_PENDING => 0,
     STATE_VALID => 0,
     STATE_INVALID => 0,
     STATE_ERROR => 0,
-  );
-  // Array to hold pretty-print result data to be displayed in a table.
-  $resultdata = array();
-  // Arrays for applications. Form below uses $applications as parameter.
-  $application_map = array();
-  $application_select_count = array();
-  $applications = array();
+    );
+    // Array to hold pretty-print result data to be displayed in a table.
+    $resultdata = array();
+    // Arrays for applications. Form below uses $applications as parameter.
+    $application_map = array();
+    $application_select_count = array();
+    $applications = array();
 
-  // BOINC DB queries for results, application names
-  db_set_active('boinc');
+    // BOINC DB queries for results, application names
+    db_set_active('boinc');
 
-  // Query to retreive all results, in order to calculate status for a
-  // host with application names for each result.
-  $sqlall = "SELECT user_friendly_name,"
-      ."r.appid as appid,"
-      ."r.server_state AS server_state,"
-      ."r.outcome AS outcome,"
-      ."r.client_state AS client_state,"
-      ."r.validate_state AS validate_state,"
-      ."r.exit_status AS exit_status "
-      ."FROM {result} AS r "
-      ."INNER JOIN {app} AS a "
-      ."ON r.appid=a.id ";
+    // Query to retreive all results, in order to calculate status for a
+    // host with application names for each result.
+    $sqlall = "SELECT user_friendly_name,"
+        ."r.appid as appid,"
+        ."r.server_state AS server_state,"
+        ."r.outcome AS outcome,"
+        ."r.client_state AS client_state,"
+        ."r.validate_state AS validate_state,"
+        ."r.exit_status AS exit_status "
+        ."FROM {result} AS r "
+        ."INNER JOIN {app} AS a "
+        ."ON r.appid=a.id ";
 
-  // Use userid, hostid, or workunitid
-  if ($category==0) {
+    // Use userid, hostid, or workunitid
+    if ($category==0) {
     $sqlall .= "AND r.userid='%s' ";
-  }
-  elseif ($category==1) {
+    }
+    elseif ($category==1) {
     $sqlall .= "AND r.workunitid='%s' ";
-  }
-  elseif ($category==2) {
+    }
+    elseif ($category==2) {
     $sqlall .= "AND r.hostid='%s' ";
-  }
-  $sqlall .= "ORDER BY user_friendly_name";
-  $dbres_all = db_query($sqlall, $queryid);
-  db_set_active('default');
+    }
+    $sqlall .= "ORDER BY user_friendly_name";
+    $dbres_all = db_query($sqlall, $queryid);
+    db_set_active('default');
 
-  // Loop 1 of DB results
-  if ($dbres_all) {
+    // Loop 1 of DB results
+    if ($dbres_all) {
     while ($result = db_fetch_object($dbres_all)) {
-      $mystate = state_num($result);
-      if ( ($result->appid==$app_id) OR ($app_id==0) OR ($app_id==-1) ) {
+        $mystate = state_num($result);
+        if ( ($result->appid==$app_id) OR ($app_id==0) OR ($app_id==-1) ) {
         $taskstates[STATE_ALL]++;
         switch ($mystate) {
         case STATE_IN_PROGRESS:
           $taskstates[STATE_IN_PROGRESS]++;
-          break;
+            break;
         case STATE_PENDING:
           $taskstates[STATE_PENDING]++;
-          break;
+            break;
         case STATE_VALID:
           $taskstates[STATE_VALID]++;
-          break;
+            break;
         case STATE_INVALID:
           $taskstates[STATE_INVALID]++;
-          break;
+            break;
         case STATE_ERROR:
           $taskstates[STATE_ERROR]++;
-          break;
+            break;
         }
-      }// if app_id
+        }// if app_id
 
-      //map holds a map between app ids and user friendly names for all applications.
-      $application_map[$result->appid] = $result->user_friendly_name;
-      if ( ($mystate == $tselect) OR ($tselect==STATE_ALL) ) {
+        //map holds a map between app ids and user friendly names for all applications.
+        $application_map[$result->appid] = $result->user_friendly_name;
+        if ( ($mystate == $tselect) OR ($tselect==STATE_ALL) ) {
         //count of appids in the results.
         $application_select_count[$result->appid]++;
-      }// if mystate
+        }// if mystate
 
     }// while
-  }
-  else {
-  }
+    }
+    else {
+    }
   
-  // Entry for all applications.
-  $allcount = $application_select_count ? array_sum($application_select_count) : 0;
-  $applications[-1] = bts('Application', array(), NULL, 'boinc:task-table');
-  $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table') . ' (' . $allcount . ')';
-  // Create application filter from application_map and application_select_count.
-  foreach($application_map as $akey => $aname) {
+    // Entry for all applications.
+    $allcount = $application_select_count ? array_sum($application_select_count) : 0;
+    $applications[-1] = bts('Application', array(), NULL, 'boinc:task-table');
+    $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table') . ' (' . $allcount . ')';
+    // Create application filter from application_map and application_select_count.
+    foreach($application_map as $akey => $aname) {
     $acount = 0;
     if ( $application_select_count and array_key_exists($akey, $application_select_count) ) {
-      $acount = $application_select_count[$akey];
+        $acount = $application_select_count[$akey];
     }
     $applications[$akey] = $aname . ' ('. $acount . ')';
-  }
-  // Header array for (sub) results table.
-  $resultheader = array(
+    }
+    // Header array for (sub) results table.
+    $resultheader = array(
     array(
-      'data' => bts('Task ID', array(), NULL, 'boinc:task-table'),
-      'field' => 'id',
+        'data' => bts('Task ID', array(), NULL, 'boinc:task-table'),
+        'field' => 'id',
     ),
     array(
-      'data' => bts('Workunit ID', array(), NULL, 'boinc:task-table'),
-      'field' => 'workunitid',
+        'data' => bts('Workunit ID', array(), NULL, 'boinc:task-table'),
+        'field' => 'workunitid',
     ),
     array(
-      'data' => bts('Computer', array(), NULL, 'boinc:task-table'),
-      'field' => 'hostid',
+        'data' => bts('Computer', array(), NULL, 'boinc:task-table'),
+        'field' => 'hostid',
     ),
     array(
-      'data' => bts('Sent', array(), NULL, 'boinc:task-table'),
-      'field' => 'sent_time',
+        'data' => bts('Sent', array(), NULL, 'boinc:task-table'),
+        'field' => 'sent_time',
     ),
     array(
-      'data' => bts('Time Reported or Deadline', array(), NULL, 'boinc:task-table')
+        'data' => bts('Time Reported or Deadline', array(), NULL, 'boinc:task-table')
     ),
     array(
-      'data' => bts('Status', array(), NULL, 'boinc:task-table')
+        'data' => bts('Status', array(), NULL, 'boinc:task-table')
     ),
     array(
-      'data' => bts('Run time', array(), NULL, 'boinc:task-table'),
-      'field' => 'elapsed_time',
+        'data' => bts('Run time', array(), NULL, 'boinc:task-table'),
+        'field' => 'elapsed_time',
     ),
     array(
-      'data' => bts('CPU time', array(), NULL, 'boinc:task-table'),
-      'field' => 'cpu_time',
+        'data' => bts('CPU time', array(), NULL, 'boinc:task-table'),
+        'field' => 'cpu_time',
     ),
     array(
-      'data' => bts('Granted Credit', array(), NULL, 'boinc:task-table'),
-      'field' => 'granted_credit',
+        'data' => bts('Granted Credit', array(), NULL, 'boinc:task-table'),
+        'field' => 'granted_credit',
     ),
     // Application is a column, but won't be added until after tablesort_sql().
-  );
+    );
 
-  // Query to retreive a subset of the total results for the results table.
-  db_set_active('boinc');
-  $sqlsub = "SELECT r.id AS id,"
-      ."r.name AS name,"
-      ."r.workunitid AS workunitid,"
-      ."r.hostid as hostid,"
-      ."r.sent_time AS sent_time,"
-      ."r.received_time AS received_time,"
-      ."r.report_deadline AS report_deadline,"
-      ."r.server_state AS server_state,"
-      ."r.outcome AS outcome,"
-      ."r.client_state AS client_state,"
-      ."r.validate_state AS validate_state,"
-      ."r.exit_status AS exit_status,"
-      ."r.elapsed_time AS elapsed_time,"
-      ."r.cpu_time AS cpu_time,"
-      ."r.granted_credit AS granted_credit,"
-      ."r.appid AS appid,"
-      ."r.app_version_id AS app_version_id,"
-      ."a.user_friendly_name,"
-      ."av.version_num AS version_number,"
-      ."av.plan_class AS plan_class,"
-      ."pl.name AS platform "
-      ."FROM {result} AS r "
-      ."INNER JOIN {app} AS a "
-      ."ON r.appid=a.id "
-      ."INNER JOIN {app_version} AS av "
-      ."ON r.app_version_id=av.id "
-      ."INNER JOIN {platform} AS pl "
-      ."ON av.platformid=pl.id ";
+    // Query to retreive a subset of the total results for the results table.
+    db_set_active('boinc');
+    $sqlsub = "SELECT r.id AS id,"
+        ."r.name AS name,"
+        ."r.workunitid AS workunitid,"
+        ."r.hostid as hostid,"
+        ."r.sent_time AS sent_time,"
+        ."r.received_time AS received_time,"
+        ."r.report_deadline AS report_deadline,"
+        ."r.server_state AS server_state,"
+        ."r.outcome AS outcome,"
+        ."r.client_state AS client_state,"
+        ."r.validate_state AS validate_state,"
+        ."r.exit_status AS exit_status,"
+        ."r.elapsed_time AS elapsed_time,"
+        ."r.cpu_time AS cpu_time,"
+        ."r.granted_credit AS granted_credit,"
+        ."r.appid AS appid,"
+        ."r.app_version_id AS app_version_id,"
+        ."a.user_friendly_name,"
+        ."av.version_num AS version_number,"
+        ."av.plan_class AS plan_class,"
+        ."pl.name AS platform "
+        ."FROM {result} AS r "
+        ."INNER JOIN {app} AS a "
+        ."ON r.appid=a.id "
+        ."INNER JOIN {app_version} AS av "
+        ."ON r.app_version_id=av.id "
+        ."INNER JOIN {platform} AS pl "
+        ."ON av.platformid=pl.id ";
 
-  // Use userid, hostid, or workunitid
-  if ($category==0) {
+    // Use userid, hostid, or workunitid
+    if ($category==0) {
     $sqlsub .= "AND r.userid = '%s' ";
-  }
-  elseif ($category==1) {
+    }
+    elseif ($category==1) {
     $sqlsub .= "AND r.workunitid = '%s' ";
-  }
-  elseif ($category==2) {
+    }
+    elseif ($category==2) {
     $sqlsub .= "AND r.hostid = '%s' ";
-  }
+    }
 
-  // Append additional where clauses based on task selection.
-  switch ($tselect) {
-  case STATE_IN_PROGRESS:
+    // Append additional where clauses based on task selection.
+    switch ($tselect) {
+    case STATE_IN_PROGRESS:
     $sqlsub .= "AND r.server_state = 4 ";
     break;
-  case STATE_PENDING:
+    case STATE_PENDING:
     $sqlsub .= "AND (r.server_state = 5) AND (r.outcome = 1) AND (r.validate_state >= 0) AND (r.validate_state <= 0 OR r.validate_state >= 4) AND (r.validate_state <= 4) ";
     break;
-  case STATE_VALID:
+    case STATE_VALID:
     $sqlsub .= "AND (r.server_state = 5) AND (r.outcome = 1) AND (r.validate_state = 1) ";
     break;
-  case STATE_INVALID:
+    case STATE_INVALID:
     $sqlsub .= "AND (r.server_state = 5) AND ((r.outcome = 6) OR ((r.outcome = 1) AND ((r.validate_state = 2) OR (r.validate_state = 3) OR (r.validate_state = 5)))) ";
     break;
-  case STATE_ERROR:
+    case STATE_ERROR:
     $sqlsub .= "AND (r.server_state = 5) AND (r.outcome >= 3) AND (r.outcome <= 4 OR r.outcome >= 7) AND (r.outcome <= 7) ";
     break;
-  }
+    }
 
-  if (is_numeric($app_id) AND $app_id>0 ) {
+    if (is_numeric($app_id) AND $app_id>0 ) {
     $sqlsub .= " AND r.appid = '%s'";
     $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), 20, 0, NULL, $queryid, $app_id);
-  }
-  else {
+    }
+    else {
     $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), 20, 0, NULL, $queryid);
-  }
-  db_set_active('default');
+    }
+    db_set_active('default');
 
-  // Loop 2 over DB results.
-  if ($dbres_sub) {
+    // Loop 2 over DB results.
+    if ($dbres_sub) {
     while ($result = db_fetch_object($dbres_sub)) {
-      // check if state matches selection
-      if ( (state_num($result) == $tselect) OR ($tselect==STATE_ALL) ) {
+        // check if state matches selection
+        if ( (state_num($result) == $tselect) OR ($tselect==STATE_ALL) ) {
         // create pretty result row
         $prettyresult = array(
-          array(
+            array(
             'data' => l($result->name, "task/{$result->id}"),
             'class' => 'task-name',
-          ),
-          l($result->workunitid, "workunit/{$result->workunitid}"),
-          l($result->hostid, "host/{$result->hostid}"),
-          date('j M Y G:i:s T', $result->sent_time),
-          boincwork_task_time_reported($result->received_time, $result->report_deadline),
-          state_string($result),
-          $nf->format($result->elapsed_time),
-          $nf->format($result->cpu_time),
-          $nf->format($result->granted_credit),
-          array(
+            ),
+            l($result->workunitid, "workunit/{$result->workunitid}"),
+            l($result->hostid, "host/{$result->hostid}"),
+            date('j M Y G:i:s T', $result->sent_time),
+            boincwork_task_time_reported($result->received_time, $result->report_deadline),
+            state_string($result),
+            $nf->format($result->elapsed_time),
+            $nf->format($result->cpu_time),
+            $nf->format($result->granted_credit),
+            array(
             'data' => $result->user_friendly_name . " " . pretty_application_version($result->version_number, $result->plan_class, $result->platform),
             'class' => 'task-app',
-          ),
+            ),
         );
         $resultdata[] = array_values($prettyresult);
-      }
+        }
     }// while
-  }
-  else {
-  }
-  // Begin result navigation
+    }
+    else {
+    }
+    // Begin result navigation
 
-  // Set pathprefix based on type
-  if ($category==0) {
+    // Set pathprefix based on type
+    if ($category==0) {
     $pathprefix = 'account/tasks';
-  }
-  elseif ($category==1) {
+    }
+    elseif ($category==1) {
     $pathprefix = 'workunit/' . $queryid . '/tasks';
-  }
-  elseif ($category==2) {
+    }
+    elseif ($category==2) {
     $pathprefix = 'host/' . $queryid . '/tasks';
-  }
-  // Need an "All" tab as well, maps to app_id of zero.
-  $application_map[0] = bts('All', array(), NULL, 'boinc:task-table');
-  $stitems = array();
-  foreach ($taskstates as $state => $numstates) {
+    }
+    // Need an "All" tab as well, maps to app_id of zero.
+    $application_map[0] = bts('All', array(), NULL, 'boinc:task-table');
+    $stitems = array();
+    foreach ($taskstates as $state => $numstates) {
     $mypath = $pathprefix . '/' . $state . '/' . $app_id;
     if ($state==STATE_ALL) {
-      $ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+        $ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
     }
     else {
-      $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+        $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
     }
     $myitem = array(
-      'data' => l($ltext, $mypath, array('html' => TRUE) ),
+        'data' => l($ltext, $mypath, array('html' => TRUE) ),
     );
     if ($state==$tselect) {
-      $myitem['class'] = 'active';
+        $myitem['class'] = 'active';
     }
     $stitems[] = $myitem;
-  }
-  // Add reset button
-  $mypath = $pathprefix . '/0/0';
-  $ltext = '<span class="tab">' . bts('Reset', array(), NULL, 'boinc:task-table') . '</span>';
-  $stitems[] = array( 'data' => l($ltext, $mypath, array('html' => TRUE) ) );
+    }
+    // Add reset button
+    $mypath = $pathprefix . '/0/0';
+    $ltext = '<span class="tab">' . bts('Reset', array(), NULL, 'boinc:task-table') . '</span>';
+    $stitems[] = array( 'data' => l($ltext, $mypath, array('html' => TRUE) ) );
 
-  $output .= theme_item_list($stitems, $title = NULL, $type='ul'. $attributes=' class="tabs secondary clearfix"');
+    $output .= theme_item_list($stitems, $title = NULL, $type='ul'. $attributes=' class="tabs secondary clearfix"');
 
-  // Application select-drop down form
-  // Hack to place Application form into header
-  // App ID of zero maps to "-1" for drop-down box.
-  if ($app_id==0) {
+    // Application select-drop down form
+    // Hack to place Application form into header
+    // App ID of zero maps to "-1" for drop-down box.
+    if ($app_id==0) {
     $app_id=-1;
-  }
-  $resultheader[] = drupal_get_form('boincwork_selectapp_form', $applications, $app_id);
+    }
+    $resultheader[] = drupal_get_form('boincwork_selectapp_form', $applications, $app_id);
 
-  // Begin table of results
-  if ( is_array($resultheader) AND is_array($resultdata) ) {
+    // Begin table of results
+    if ( is_array($resultheader) AND is_array($resultdata) ) {
 
     // Take advantage of the fact that $category is the same as the row/column we want to remove.
     if ( ($category==1) OR ($category==2) ) {
-      unset($resultheader[$category]);
-      delete_col($resultdata, $category);
+        unset($resultheader[$category]);
+        delete_col($resultdata, $category);
     }
 
     $output .= theme_table($resultheader, $resultdata);
     if (count($resultdata) > 0) {
-      $output .= theme('pager');
+        $output .= theme('pager');
     }
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Function to delete a column from an array.
  */
 function delete_col(&$array, $offset) {
-  return array_walk($array, function (&$v) use ($offset) {
-     array_splice($v, $offset, 1);
-  });
+    return array_walk($array, function (&$v) use ($offset) {
+        array_splice($v, $offset, 1);
+    });
 }
 
 /**
  * Pretty print the application version
  */
 function pretty_application_version($vernum, $plan_class, $plfm) {
-  $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
-  $prettyc = ($plan_class) ? "($av->plan_class)" : '';
-  return "v$prettyv $prettyc $plfm";
+    $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
+    $prettyc = ($plan_class) ? "($av->plan_class)" : '';
+    return "v$prettyv $prettyc $plfm";
 }
\ No newline at end of file

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

@@ -173,7 +173,7 @@ 
         $preset_prefs['preset'] = array($preset_prefs['preset']);
       }
       foreach ($preset_prefs['preset'] as $key => $prefs) {
-        if (isset($prefs['@attributes']['name']) AND $prefs['@attributes']['name'] == $preset) {
+        if (isset($prefs['@attributes']['name']) and $prefs['@attributes']['name'] == $preset) {
           return $preset_prefs['preset'][$key];
         }
       }
@@ -198,7 +198,7 @@ 
     $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;
+    return null;
   }
   
   // Convert XML to array for validation
@@ -217,7 +217,7 @@ 
     $xml = $xml['project_specific_preferences'];
   }
   foreach ($xml as $type => $elements) {
-    if (is_array($elements) AND !is_numeric(key($elements))) {
+    if (is_array($elements) and !is_numeric(key($elements))) {
       $elements = array($elements);
     }
     switch ($type) {
@@ -306,7 +306,7 @@ 
   }
   foreach ($xml as $type => $elements) {
     $structure_data = array();
-    if (is_array($elements) AND !is_numeric(key($elements))) {
+    if (is_array($elements) and !is_numeric(key($elements))) {
       $elements = array($elements);
     }
     switch ($type) {
@@ -330,7 +330,7 @@ 
     case 'boolean':
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
-        if (isset($element['@attributes']['entitytype']) AND $element['@attributes']['entitytype'] == 'attribute') {
+        if (isset($element['@attributes']['entitytype']) and $element['@attributes']['entitytype'] == 'attribute') {
           $defaults['@attributes'][$name] = $values[$name];
         }
         else {
@@ -382,7 +382,7 @@ 
         $user_pref = $user_prefs['@attributes'];
       }
       if (isset($user_pref[$name])) {
-        if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
+        if (is_array($user_pref[$name]) and isset($user_pref[$name]['@value'])) {
           $value = $user_pref[$name]['@value'];
         }
         else {
@@ -420,7 +420,7 @@ 
         '#type' => 'textfield',
         '#default_value' => $value,
         '#size' => 5,
-        '#description' => $description . bts(' Default value: @default', array('@default' => $default), NULL, 'boinc:account-preferences-project')
+        '#description' => $description . bts(' Default value: @default', array('@default' => $default), null, 'boinc:account-preferences-project')
       );
     }
     break;
@@ -432,7 +432,7 @@ 
     foreach ($elements as $element) {
       $name = $element['@attributes']['name'];
       $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $default = (isset($element['@attributes']['selected']) AND $element['@attributes']['selected'] == 'true') ? 1 : 0;
+      $default = (isset($element['@attributes']['selected']) and $element['@attributes']['selected'] == 'true') ? 1 : 0;
       $description = '';
       if (isset($element['description'])) {
         $description = is_array($element['description']) ? $element['description']['@value'] : $element['description'];
@@ -445,7 +445,7 @@ 
         $user_pref = $user_prefs['@attributes'];
       }
       if (isset($user_pref[$name])) {
-        if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
+        if (is_array($user_pref[$name]) and isset($user_pref[$name]['@value'])) {
           $value = $user_pref[$name]['@value'];
         }
         else {
@@ -466,7 +466,7 @@ 
       $form[$name] = array(
         '#title' => $title,
         '#type' => 'radios',
-        '#options' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
+        '#options' => array(1 => bts('yes', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), null, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $value,
         '#description' => $description
@@ -487,8 +487,8 @@ 
       foreach($element['items']['item'] as $item) {
         if (is_array($item)) {
           $value = $item['@value'];
-          if ($default === NULL AND
-              isset($item['@attributes']) AND
+          if ($default === null and
+              isset($item['@attributes']) and
               isset($item['@attributes']['selected'])) {
             $default = ($item['@attributes']['selected'] == 'true') ? $item['@value'] : null;
           }
@@ -526,7 +526,7 @@ 
         '#options' => $options,
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $value,
-        '#description' => $description . bts(' Default value: @default', array('@default' =>$default), NULL, 'boinc:account-preferences-project')
+        '#description' => $description . bts(' Default value: @default', array('@default' =>$default), null, 'boinc:account-preferences-project')
       );
     }
     break;
@@ -541,11 +541,11 @@ 
       }
     
     $form['applications'] = array(
-      '#title' => bts('Applications', array(), NULL, 'boinc:account-preferences'),
+      '#title' => bts('Applications', array(), null, 'boinc:account-preferences'),
       '#type' => 'fieldset',
       '#description' => $title,
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE
+      '#collapsible' => true,
+      '#collapsed' => false
     );
     $applications = array();
     if (!is_array($user_prefs['app_id'])) {
@@ -553,7 +553,7 @@ 
     }
     foreach ($user_prefs['app_id'] as $app) {
       if (!$app) continue;
-      if (is_array($app) AND isset($app['@value'])) {
+      if (is_array($app) and isset($app['@value'])) {
         $app = $app['@value'];
       }
       $applications[] = $app;
@@ -561,18 +561,18 @@ 
     foreach ($elements['app'] as $app) {
       $app_id = $app['@attributes']['id'];
       $app_name = $app['@value'];
-      $app_enabled = TRUE;
-      if (isset($app['@attributes']['enabled']) AND
+      $app_enabled = true;
+      if (isset($app['@attributes']['enabled']) and
           $app['@attributes']['enabled'] == 'false') {
-        $app_enabled = FALSE;
+        $app_enabled = false;
       }
       if ($applications) {
         $checked = in_array($app_id, $applications);
       } else {
-        $checked = TRUE;
-        if (isset($app['@attributes']['selected']) AND
+        $checked = true;
+        if (isset($app['@attributes']['selected']) and
             $app['@attributes']['selected'] == 'false') {
-          $checked = FALSE;
+          $checked = false;
         }
       }
       $form['applications']["app_{$app_id}"] = array(
@@ -603,10 +603,10 @@ 
       $form[$name] = array(
           '#title' => $title,
           '#type' => 'fieldset',
-          '#tree' => FALSE,
+          '#tree' => false,
           //'#description' => t('Notes about this group of fields'),
-          '#collapsible' => TRUE,
-          '#collapsed' => FALSE
+          '#collapsible' => true,
+          '#collapsed' => false
       );
       // Recursively populate the compound element
       foreach ($element as $child_type => $child) {
@@ -633,8 +633,8 @@ 
           '#title' => $title,
           '#type' => 'fieldset',
           //'#description' => t('Notes about this group of fields'),
-          '#collapsible' => TRUE,
-          '#collapsed' => FALSE
+          '#collapsible' => true,
+          '#collapsed' => false
       );
       // Recursively populate the compound element
       foreach ($element['attributes'] as $child_type => $child) {
@@ -653,7 +653,7 @@ 
  * Generate a tabular structure out of preferences for use in comparison
  * views of preference sets
  */
-function boincwork_make_prefs_table($prefs, $top_level = TRUE) {
+function boincwork_make_prefs_table($prefs, $top_level = true) {
 
   $prefs_table = array();
   $uncategorized = array();
@@ -662,15 +662,15 @@ 
   foreach ($prefs as $key => $element) {
     
     // Determine which type of element this is and act accordingly
-    $element_type = NULL;
-    if (is_array($element) AND isset($element['#type'])) {
+    $element_type = null;
+    if (is_array($element) and isset($element['#type'])) {
       $element_type = $element['#type'];
     }
     switch ($element_type) {
     case 'fieldset':
       $prefs_table[$key] = array(
         'name' => $element['#title'],
-        'elements' => boincwork_make_prefs_table($element, FALSE),
+        'elements' => boincwork_make_prefs_table($element, false),
       );
       break;
     case 'textfield':
@@ -681,10 +681,10 @@ 
       if (in_array($key, array('start_hour', 'net_start_hour'))) {
         switch ($key) {
         case 'start_hour':
-          $element['#title'] = bts('Compute only between:', array(), NULL, 'boinc:account-preferences-computing');
+          $element['#title'] = bts('Compute only between:', array(), null, 'boinc:account-preferences-computing');
           break;
         case 'net_start_hour':
-          $element['#title'] = bts('Transfer files only between:', array(), NULL, 'boinc:account-preferences-comuting');
+          $element['#title'] = bts('Transfer files only between:', array(), null, 'boinc:account-preferences-comuting');
           break;
         default:
         }
@@ -692,7 +692,7 @@ 
       $prefs_element = array(
         'name' => (isset($element['#title'])) ? $element['#title'] : '',
         'description' => (isset($element['#description'])) ? $element['#description'] : '',
-        'default_value' => (isset($element['#default_value'])) ? $element['#default_value'] : NULL,
+        'default_value' => (isset($element['#default_value'])) ? $element['#default_value'] : null,
       );
       if ($top_level) {
         $uncategorized[$key] = $prefs_element;
@@ -705,17 +705,17 @@ 
     }
   }
   
-  if ($prefs_table AND $uncategorized) {
+  if ($prefs_table and $uncategorized) {
     // Throw any settings that don't fit elsewhere into "other"
     $prefs_table['other'] = array(
-      'name' => bts('Other settings', array(), NULL, 'boinc:account-preferences'),
+      'name' => bts('Other settings', array(), null, 'boinc:account-preferences'),
       'elements' => $uncategorized,
     );
   }
   elseif ($uncategorized) {
     // If nothing is categorized, output all prefs under a general "settings"
     $prefs_table['settings'] = array(
-      'name' => bts('Settings', array(), NULL, 'boinc:account-preferences'),
+      'name' => bts('Settings', array(), null, 'boinc:account-preferences'),
       'elements' => $uncategorized,
     );
   }
@@ -754,7 +754,7 @@ 
   }
   
   // Return general preferences or a subset based on venue
-  if (!$venue OR $venue == 'generic') {
+  if (!$venue or $venue == 'generic') {
     unset($main_prefs['venue']);
     // Use the length of the $main_prefs array as a condition as to
     // whether the preferences have already been set. This is
@@ -769,7 +769,7 @@ 
         $main_prefs['venue'] = array($main_prefs['venue']);
       }
       foreach ($main_prefs['venue'] as $key => $prefs_venue) {
-        if (isset($prefs_venue['@attributes']['name']) AND $prefs_venue['@attributes']['name'] == $venue) {
+        if (isset($prefs_venue['@attributes']['name']) and $prefs_venue['@attributes']['name'] == $venue) {
           return $main_prefs['venue'][$key];
         }
       }
@@ -814,7 +814,7 @@ 
   // Save all preferences or a subset based on venue
   //drupal_set_message('<pre>' . print_r($main_prefs, true) . '</pre>');
   $new_venue = true;
-  if (!$venue OR $venue == 'generic') {
+  if (!$venue or $venue == 'generic') {
     //$main_prefs = $prefs;
     $main_prefs = $prefs + $main_prefs;
   }
@@ -824,7 +824,7 @@ 
         $main_prefs['venue'] = array($main_prefs['venue']);
       }
       foreach ($main_prefs['venue'] as $key => $prefs_venue) {
-        if (isset($prefs_venue['@attributes']['name']) AND $prefs_venue['@attributes']['name'] == $venue) {
+        if (isset($prefs_venue['@attributes']['name']) and $prefs_venue['@attributes']['name'] == $venue) {
           if ($prefs) {
             $main_prefs['venue'][$key] = $prefs;
           }
@@ -930,14 +930,14 @@ 
       else {
         $form_field = $field;
       }
-      if (isset($rules['datatype']) AND !boincwork_validate_datatype($values[$field], $rules['datatype'])) {
-        form_set_error($form_field, bts('Invalid data type for @field', array('@field' => $field), NULL, 'boinc:account-preferences'));
+      if (isset($rules['datatype']) and !boincwork_validate_datatype($values[$field], $rules['datatype'])) {
+        form_set_error($form_field, bts('Invalid data type for @field', array('@field' => $field), null, 'boinc:account-preferences'));
       }
-      if (isset($rules['min']) AND $values[$field] < $rules['min']) {
-        form_set_error($form_field, bts('Minimum value not met for @field', array('@field' => $field), NULL, 'boinc:account-preferences'));
+      if (isset($rules['min']) and $values[$field] < $rules['min']) {
+        form_set_error($form_field, bts('Minimum value not met for @field', array('@field' => $field), null, 'boinc:account-preferences'));
       }
-      if (isset($rules['max']) AND $values[$field] > $rules['max']) {
-        form_set_error($form_field, bts('Maximum value exceeded for @field', array('@field' => $field), NULL, 'boinc:account-preferences'));
+      if (isset($rules['max']) and $values[$field] > $rules['max']) {
+        form_set_error($form_field, bts('Maximum value exceeded for @field', array('@field' => $field), null, 'boinc:account-preferences'));
       }
     }
   }
@@ -946,25 +946,25 @@ 
 /**
  * Check that numeric data conforms to specifications
  */
-function boincwork_validate_datatype($data, $datatype = NULL) {
+function boincwork_validate_datatype($data, $datatype = null) {
   switch ($datatype) {
   case 'float':
     if (!is_numeric($data)) {
-      return FALSE;
+      return false;
     }
     $data += 0.0;
     if (!is_float($data)) {
-      return FALSE;
+      return false;
     }
     break;
     
   case 'integer':
     if (!is_numeric($data)) {
-      return FALSE;
+      return false;
     }
     $data += 0;
     if (!is_int($data)) {
-      return FALSE;
+      return false;
     }
     break;
   
@@ -972,7 +972,7 @@ 
   default:
     
   }
-  return TRUE;
+  return true;
 }
 
 /**
@@ -1050,7 +1050,7 @@ 
       if (is_array($value)) {
         if (is_numeric(key($value))) {
           foreach ($value as $item) {
-            if (is_array($item) AND isset($item['@position'])) {
+            if (is_array($item) and isset($item['@position'])) {
               $ordered_array[$item['@position']] = array(
                 $name => $item
               );
@@ -1203,10 +1203,10 @@ 
               $sibling = $node->nextSibling;
               
               // Determine if this node forms a set with siblings (share a node name)
-              while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->nextSibling;
+              while (($sibling) and (($sibling->nodeType != XML_ELEMENT_NODE) or ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->nextSibling;
               if (!$sibling) {
                   $sibling = $node->previousSibling;
-                  while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->previousSibling;
+                  while (($sibling) and (($sibling->nodeType != XML_ELEMENT_NODE) or ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->previousSibling;
               }
               
               if ($sibling) {
@@ -1216,7 +1216,7 @@ 
                   }
                   if ($node->hasAttributes()) {
                       $attributes = $node->attributes;
-                      if ($result[$node_name][$index] !== '' AND !is_array($result[$node_name][$index])) {
+                      if ($result[$node_name][$index] !== '' and !is_array($result[$node_name][$index])) {
                           $result[$node_name][$index] = array('@value' => $result[$node_name][$index]);
                       }
                       foreach ($attributes as $key => $attribute) {
@@ -1239,7 +1239,7 @@ 
                   }
                   if ($node->hasAttributes()) {
                       $attributes = $node->attributes;
-                      if ($result[$node_name] !== '' AND !is_array($result[$node_name])) {
+                      if ($result[$node_name] !== '' and !is_array($result[$node_name])) {
                           $result[$node_name] = array('@value' => $result[$node_name]);
                       }
                       foreach($attributes as $key => $attribute) {
@@ -1270,7 +1270,7 @@ 
 /**
   * Determine output for host list views when no hosts are found.
   */
-function boincwork_views_host_list_empty_text($context = NULL) {
+function boincwork_views_host_list_empty_text($context = null) {
   
   // Pull the BOINC user ID from the view arguments to get show_hosts 
   // preference for that user
@@ -1284,28 +1284,28 @@ 
   if ($boincuser->show_hosts) {
     switch($context) {
     case 'active':
-      $output .=  '<h2>' . bts('No active computers', array(), NULL, 'boinc:host-list') . '</h2>';
+      $output .=  '<h2>' . bts('No active computers', array(), null, 'boinc:host-list') . '</h2>';
       $output .=  '<p>' . bts('This user has no computers that have been'
-      . ' active in the last 30 days.', array(), NULL, 'boinc:host-list') . '</p>';
+      . ' active in the last 30 days.', array(), null, 'boinc:host-list') . '</p>';
       break;
       
     case 'preferences':
-      $output .=  '<h2>' . bts('No computers', array(), NULL, 'boinc:host-list') . '</h2>';
+      $output .=  '<h2>' . bts('No computers', array(), null, 'boinc:host-list') . '</h2>';
       $output .=  '<p>' . bts('There are no computers assigned to this'
-      . ' preference set.', array(), NULL, 'boinc:host-list') . '</p>';
+      . ' preference set.', array(), null, 'boinc:host-list') . '</p>';
       break;
     
     default:
-      $output .=  '<h2>' . bts('Computers pending', array(), NULL, 'boinc:host-list') . '</h2>';
+      $output .=  '<h2>' . bts('Computers pending', array(), null, 'boinc:host-list') . '</h2>';
       $output .=  '<p>' . bts('This user does not yet have any associated'
       . ' computers. Computers will be displayed when they have earned their'
-      . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
+      . ' first credits.', array(), null, 'boinc:host-list') . '</p>';
     }
   }
   else {
-    $output .=  '<h2>' . bts('Computers hidden', array(), NULL, 'boinc:host-list') . '</h2>';
+    $output .=  '<h2>' . bts('Computers hidden', array(), null, 'boinc:host-list') . '</h2>';
     $output .=  '<p>' . bts('This user has chosen not to show information'
-    . ' about their computers.', array(), NULL, 'boinc:host-list') . '</p>';
+    . ' about their computers.', array(), null, 'boinc:host-list') . '</p>';
   }
   return $output;
 }
@@ -1313,15 +1313,15 @@ 
 /**
   * Determine output for task list views when no tasks are found.
   */
-function boincwork_views_task_list_empty_text($context = NULL) {
+function boincwork_views_task_list_empty_text($context = null) {
   
   // 
   $output = '';
   switch($context) {
   default:
-    $output .=  '<h2>' . bts('No @type tasks', array('@type' => $context), NULL, 'boinc:task-list')
+    $output .=  '<h2>' . bts('No @type tasks', array('@type' => $context), null, 'boinc:task-list')
     . '</h2>';
-    $output .=  '<p>' . bts('There are no tasks of this type on record', array(), NULL, 'boinc:task-list')
+    $output .=  '<p>' . bts('There are no tasks of this type on record', array(), null, 'boinc:task-list')
     . '</p>';
   }
   return $output;
@@ -1335,18 +1335,18 @@ 
   if (boincwork_host_user_is_owner($host_id)) {
     // Show merge hosts option
     $output = '<ul class="tab-list"><li class="first tab">';
-    $output .= l(bts('Merge', array(), NULL, 'boinc:form-merge'), "host/{$host_id}/merge");
+    $output .= l(bts('Merge', array(), null, 'boinc:form-merge'), "host/{$host_id}/merge");
     $output .= '</li>';
     // If host has no tasks, allow the host to be deleted
     if (!boincwork_host_get_task_count($host_id)) {
       $output .= '<li class="tab">';
-      $output .= l(bts('Delete', array(), NULL, 'boinc:form-delete'), "host/{$host_id}/delete",
+      $output .= l(bts('Delete', array(), null, 'boinc:form-delete'), "host/{$host_id}/delete",
         array(
           'attributes' => array(
             'onclick' => 'return confirm(\'' . bts('This will delete host @id'
               . ' from your account forever. Are you sure this is OK?',
               array('@id' => $host_id),
-              NULL, 'boinc:account-host-delete') . '\')'
+              null, 'boinc:account-host-delete') . '\')'
           )
         )
       );
@@ -1386,7 +1386,7 @@ 
 /**
  * Check whether a user is the owner of a host
  */
-function boincwork_host_user_is_owner($host_id, $uid = NULL) {
+function boincwork_host_user_is_owner($host_id, $uid = null) {
   if (!$uid) {
     global $user;
     $uid = $user->uid;
@@ -1405,18 +1405,18 @@ 
 /**
   * Determine output for host last contact time
   */
-function boincwork_host_last_contact($timestamp, $host_id = NULL, $context = NULL) {
+function boincwork_host_last_contact($timestamp, $host_id = null, $context = null) {
   $output = '---';
   $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
   $log = '';
   if ($timestamp) {
     $output = date('j M Y G:i:s T', $timestamp);
   }
-  if ($root_log_dir AND $host_id) {
-    $subdir = substr($host_id, 0, -3) OR $subdir = 0;
+  if ($root_log_dir and $host_id) {
+    $subdir = substr($host_id, 0, -3) or $subdir = 0;
     $log = implode('/', array($root_log_dir, $subdir, $host_id));
   }
-  if ($log AND file_exists($log)) {
+  if ($log and file_exists($log)) {
     $output = l($output, "host/{$host_id}/log");
   }
   return $output;
@@ -1430,10 +1430,10 @@ 
   if (function_exists('jump_quickly')) {
     $path = "host/{$host_id}/set-venue";
     $venues = array(
-      "{$path}/generic" => bts('Generic', array(), NULL, 'boinc:account-preferences-location'),
-      "{$path}/home" => bts('Home', array(), NULL, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
-      "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location'),
-      "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location')
+      "{$path}/generic" => bts('Generic', array(), null, 'boinc:account-preferences-location'),
+      "{$path}/home" => bts('Home', array(), null, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
+      "{$path}/work" => bts('Work', array(), null, 'boinc:account-preferences-location'),
+      "{$path}/school" => bts('School', array(), null, 'boinc:account-preferences-location')
     );
     variable_set('jump_use_js_venues-Array', 1);
     drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
@@ -1453,9 +1453,9 @@ 
 /**
   * Determine output for task reported time / deadline
   */
-function boincwork_task_time_reported($received_time = NULL, $deadline = NULL, $context = NULL) {
+function boincwork_task_time_reported($received_time = null, $deadline = null, $context = null) {
   $output = '---';
-  if ($received_time OR $deadline) {
+  if ($received_time or $deadline) {
     $timestamp = ($received_time) ? $received_time : $deadline;
     $output = date('j M Y G:i:s T', $timestamp);
     // Add a wrapper to deadline text
@@ -1496,9 +1496,9 @@ 
  *   Application id of the application chosen by user. 0 and -1 are
  *   for all applications.
  */
-function boincwork_tasktable($category = 0, $queryid = 1, $tselect = NULL, $app_id = 0) {
+function boincwork_tasktable($category = 0, $queryid = 1, $tselect = null, $app_id = 0) {
   // Check type parameter, if not (0,2) then return an error.
-  if ( ($category!=0) AND ($category!=1) AND ($category!=2) ) {
+  if ( ($category!=0) and ($category!=1) and ($category!=2) ) {
     watchdog('boincwork', 'task table called with invalid category = %category', array('%category' => $category), WATCHDOG_WARNING);
     return '';
   }
@@ -1571,7 +1571,7 @@ 
   if ($dbres_all) {
     while ($result = db_fetch_object($dbres_all)) {
       $mystate = state_num($result);
-      if ( ($result->appid==$app_id) OR ($app_id==0) OR ($app_id==-1) ) {
+      if ( ($result->appid==$app_id) or ($app_id==0) or ($app_id==-1) ) {
         $taskstates[STATE_ALL]++;
         switch ($mystate) {
         case STATE_IN_PROGRESS:
@@ -1594,7 +1594,7 @@ 
 
       //map holds a map between app ids and user friendly names for all applications.
       $application_map[$result->appid] = $result->user_friendly_name;
-      if ( ($mystate == $tselect) OR ($tselect==STATE_ALL) ) {
+      if ( ($mystate == $tselect) or ($tselect==STATE_ALL) ) {
         //count of appids in the results.
         $application_select_count[$result->appid]++;
       }// if mystate
@@ -1606,8 +1606,8 @@ 
   
   // Entry for all applications.
   $allcount = $application_select_count ? array_sum($application_select_count) : 0;
-  $applications[-1] = bts('Application', array(), NULL, 'boinc:task-table');
-  $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table') . ' (' . $allcount . ')';
+  $applications[-1] = bts('Application', array(), null, 'boinc:task-table');
+  $applications[0] = bts('All applications', array(), null, 'boinc:task-table') . ' (' . $allcount . ')';
   // Create application filter from application_map and application_select_count.
   foreach($application_map as $akey => $aname) {
     $acount = 0;
@@ -1619,37 +1619,37 @@ 
   // Header array for (sub) results table.
   $resultheader = array(
     array(
-      'data' => bts('Task ID', array(), NULL, 'boinc:task-table'),
+      'data' => bts('Task ID', array(), null, 'boinc:task-table'),
       'field' => 'id',
     ),
     array(
-      'data' => bts('Workunit ID', array(), NULL, 'boinc:task-table'),
+      'data' => bts('Workunit ID', array(), null, 'boinc:task-table'),
       'field' => 'workunitid',
     ),
     array(
-      'data' => bts('Computer', array(), NULL, 'boinc:task-table'),
+      'data' => bts('Computer', array(), null, 'boinc:task-table'),
       'field' => 'hostid',
     ),
     array(
-      'data' => bts('Sent', array(), NULL, 'boinc:task-table'),
+      'data' => bts('Sent', array(), null, 'boinc:task-table'),
       'field' => 'sent_time',
     ),
     array(
-      'data' => bts('Time Reported or Deadline', array(), NULL, 'boinc:task-table')
+      'data' => bts('Time Reported or Deadline', array(), null, 'boinc:task-table')
     ),
     array(
-      'data' => bts('Status', array(), NULL, 'boinc:task-table')
+      'data' => bts('Status', array(), null, 'boinc:task-table')
     ),
     array(
-      'data' => bts('Run time', array(), NULL, 'boinc:task-table'),
+      'data' => bts('Run time', array(), null, 'boinc:task-table'),
       'field' => 'elapsed_time',
     ),
     array(
-      'data' => bts('CPU time', array(), NULL, 'boinc:task-table'),
+      'data' => bts('CPU time', array(), null, 'boinc:task-table'),
       'field' => 'cpu_time',
     ),
     array(
-      'data' => bts('Granted Credit', array(), NULL, 'boinc:task-table'),
+      'data' => bts('Granted Credit', array(), null, 'boinc:task-table'),
       'field' => 'granted_credit',
     ),
     // Application is a column, but won't be added until after tablesort_sql().
@@ -1716,12 +1716,12 @@ 
     break;
   }
 
-  if (is_numeric($app_id) AND $app_id>0 ) {
+  if (is_numeric($app_id) and $app_id>0 ) {
     $sqlsub .= " AND r.appid = '%s'";
-    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), 20, 0, NULL, $queryid, $app_id);
+    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), 20, 0, null, $queryid, $app_id);
   }
   else {
-    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), 20, 0, NULL, $queryid);
+    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), 20, 0, null, $queryid);
   }
   db_set_active('default');
 
@@ -1729,7 +1729,7 @@ 
   if ($dbres_sub) {
     while ($result = db_fetch_object($dbres_sub)) {
       // check if state matches selection
-      if ( (state_num($result) == $tselect) OR ($tselect==STATE_ALL) ) {
+      if ( (state_num($result) == $tselect) or ($tselect==STATE_ALL) ) {
         // create pretty result row
         $prettyresult = array(
           array(
@@ -1768,18 +1768,18 @@ 
     $pathprefix = 'host/' . $queryid . '/tasks';
   }
   // Need an "All" tab as well, maps to app_id of zero.
-  $application_map[0] = bts('All', array(), NULL, 'boinc:task-table');
+  $application_map[0] = bts('All', array(), null, 'boinc:task-table');
   $stitems = array();
   foreach ($taskstates as $state => $numstates) {
     $mypath = $pathprefix . '/' . $state . '/' . $app_id;
     if ($state==STATE_ALL) {
-      $ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+      $ltext = '<span class="tab task-app-name">' . bts('All', array(), null, 'boinc:task-table') . ' (' . $numstates . ')</span>';
     }
     else {
-      $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+      $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), null, 'boinc:task-table') . ' (' . $numstates . ')</span>';
     }
     $myitem = array(
-      'data' => l($ltext, $mypath, array('html' => TRUE) ),
+      'data' => l($ltext, $mypath, array('html' => true) ),
     );
     if ($state==$tselect) {
       $myitem['class'] = 'active';
@@ -1788,10 +1788,10 @@ 
   }
   // Add reset button
   $mypath = $pathprefix . '/0/0';
-  $ltext = '<span class="tab">' . bts('Reset', array(), NULL, 'boinc:task-table') . '</span>';
-  $stitems[] = array( 'data' => l($ltext, $mypath, array('html' => TRUE) ) );
+  $ltext = '<span class="tab">' . bts('Reset', array(), null, 'boinc:task-table') . '</span>';
+  $stitems[] = array( 'data' => l($ltext, $mypath, array('html' => true) ) );
 
-  $output .= theme_item_list($stitems, $title = NULL, $type='ul'. $attributes=' class="tabs secondary clearfix"');
+  $output .= theme_item_list($stitems, $title = null, $type='ul'. $attributes=' class="tabs secondary clearfix"');
 
   // Application select-drop down form
   // Hack to place Application form into header
@@ -1802,10 +1802,10 @@ 
   $resultheader[] = drupal_get_form('boincwork_selectapp_form', $applications, $app_id);
 
   // Begin table of results
-  if ( is_array($resultheader) AND is_array($resultdata) ) {
+  if ( is_array($resultheader) and is_array($resultdata) ) {
 
     // Take advantage of the fact that $category is the same as the row/column we want to remove.
-    if ( ($category==1) OR ($category==2) ) {
+    if ( ($category==1) or ($category==2) ) {
       unset($resultheader[$category]);
       delete_col($resultdata, $category);
     }

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

Spacing +30 added lines, -30 removed lines

@@ -65,15 +65,15 @@ 
   */
 function boincwork_admin_prefs_upload_form_validate($form, &$form_state) {
   
-  $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
+  $xsd = './'.drupal_get_path('module', 'boincwork').'/includes/projectprefs.xsd';
   libxml_use_internal_errors(true);
   $xml = new DomDocument();
   $xml->loadXML($form_state['values']['prefs_xml'], LIBXML_NOBLANKS);
   if (!$xml->schemaValidate($xsd)) {
     $errors = libxml_get_errors();
     $lines = explode("\r", $form_state['values']['prefs_xml']);
-    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
-      ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
+    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}".
+      ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), 'error');
     form_set_error('upload', t('XML file failed validation'));
   }
 }
@@ -101,7 +101,7 @@ 
       "{$path}/minimum" => t('Minimum')
     );
     variable_set('jump_use_js_presets-Array', 1);
-    drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
+    drupal_add_js(drupal_get_path('module', 'jump').'/jump.js');
     $output .= '<div class="simple-form-controls"><div class="form-item venue">';
     $output .= '<label>Preset:</label>';
     $output .= jump_quickly($preset_options, 'presets');
@@ -150,7 +150,7 @@ 
     '#type' => 'submit',
     '#value' => t('Save configuration')
   );
-  $form['saveuseconfigxml'] = array (
+  $form['saveuseconfigxml'] = array(
       '#type' => 'submit',
       '#value' => t('Save configuration with disk usage settings from config.xml'),
       '#validate' => array('boincwork_admin_prefs_preset_saveuseconfigxml'),
@@ -175,33 +175,33 @@ 
   // Verify all non-boolean user input values and notify form API of failures
   
   // Processing preferences
-  if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', t('Invalid setting for') . " \"{$form['processor']['idle_time_to_run']['#title']} [x] {$form['processor']['idle_time_to_run']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', t('Invalid setting for') . " \"{$form['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['processor']['suspend_if_no_recent_input']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', t('Invalid setting for') . " \"{$form['processor']['suspend_cpu_usage']['#title']} [x] {$form['processor']['suspend_cpu_usage']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', t('Invalid setting for') . " \"{$form['processor']['start_hour']['#title']} [x] {$form['processor']['start_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', t('Invalid setting for') . " \"{$form['processor']['end_hour']['#title']} [x] {$form['processor']['end_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', t('Invalid setting for') . " \"{$form['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['processor']['cpu_scheduling_period_minutes']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', t('Invalid setting for') . " \"{$form['processor']['max_ncpus_pct']['#title']} [x] {$form['processor']['max_ncpus_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', t('Invalid setting for') . " \"{$form['processor']['cpu_usage_limit']['#title']} [x] {$form['processor']['cpu_usage_limit']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', t('Invalid setting for')." \"{$form['processor']['idle_time_to_run']['#title']} [x] {$form['processor']['idle_time_to_run']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', t('Invalid setting for')." \"{$form['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['processor']['suspend_if_no_recent_input']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', t('Invalid setting for')." \"{$form['processor']['suspend_cpu_usage']['#title']} [x] {$form['processor']['suspend_cpu_usage']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', t('Invalid setting for')." \"{$form['processor']['start_hour']['#title']} [x] {$form['processor']['start_hour']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', t('Invalid setting for')." \"{$form['processor']['end_hour']['#title']} [x] {$form['processor']['end_hour']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', t('Invalid setting for')." \"{$form['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['processor']['cpu_scheduling_period_minutes']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', t('Invalid setting for')." \"{$form['processor']['max_ncpus_pct']['#title']} [x] {$form['processor']['max_ncpus_pct']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', t('Invalid setting for')." \"{$form['processor']['cpu_usage_limit']['#title']} [x] {$form['processor']['cpu_usage_limit']['#field_suffix']}\"");
 
   // Storage preferences
-  if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_gb']['#title']} [x] {$form['storage']['disk_max_used_gb']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', t('Invalid setting for') . " \"{$form['storage']['disk_min_free_gb']['#title']} [x] {$form['storage']['disk_min_free_gb']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_pct']['#title']} [x] {$form['storage']['disk_max_used_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', t('Invalid setting for') . " \"{$form['storage']['disk_interval']['#title']} [x] {$form['storage']['disk_interval']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['vm_max_used_pct']['#title']} [x] {$form['storage']['vm_max_used_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['storage']['ram_max_used_busy_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['storage']['ram_max_used_idle_pct']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', t('Invalid setting for')." \"{$form['storage']['disk_max_used_gb']['#title']} [x] {$form['storage']['disk_max_used_gb']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', t('Invalid setting for')." \"{$form['storage']['disk_min_free_gb']['#title']} [x] {$form['storage']['disk_min_free_gb']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', t('Invalid setting for')." \"{$form['storage']['disk_max_used_pct']['#title']} [x] {$form['storage']['disk_max_used_pct']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', t('Invalid setting for')." \"{$form['storage']['disk_interval']['#title']} [x] {$form['storage']['disk_interval']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', t('Invalid setting for')." \"{$form['storage']['vm_max_used_pct']['#title']} [x] {$form['storage']['vm_max_used_pct']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', t('Invalid setting for')." \"{$form['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['storage']['ram_max_used_busy_pct']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', t('Invalid setting for')." \"{$form['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['storage']['ram_max_used_idle_pct']['#field_suffix']}\"");
 
   // Network preferences
-  if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', t('Invalid setting for') . " \"{$form['network']['work_buf_min_days']['#title']} [x] {$form['network']['work_buf_min_days']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', t('Invalid setting for') . " \"{$form['network']['work_buf_additional_days']['#title']} [x] {$form['network']['work_buf_additional_days']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_down']['#title']} [x] {$form['network']['max_bytes_sec_down']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_up']['#title']} [x] {$form['network']['max_bytes_sec_up']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', t('Invalid setting for') . " \"{$form['network']['net_start_hour']['#title']} [x] {$form['network']['net_start_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', t('Invalid setting for') . " \"{$form['network']['net_end_hour']['#title']} [x] {$form['network']['net_end_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', t('Invalid setting for')." \"{$form['network']['work_buf_min_days']['#title']} [x] {$form['network']['work_buf_min_days']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', t('Invalid setting for')." \"{$form['network']['work_buf_additional_days']['#title']} [x] {$form['network']['work_buf_additional_days']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', t('Invalid setting for')." \"{$form['network']['max_bytes_sec_down']['#title']} [x] {$form['network']['max_bytes_sec_down']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', t('Invalid setting for')." \"{$form['network']['max_bytes_sec_up']['#title']} [x] {$form['network']['max_bytes_sec_up']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', t('Invalid setting for')." \"{$form['network']['net_start_hour']['#title']} [x] {$form['network']['net_start_hour']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', t('Invalid setting for')." \"{$form['network']['net_end_hour']['#title']} [x] {$form['network']['net_end_hour']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', t('Invalid setting for')." \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', t('Invalid setting for')." \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
 }
 
 /**
@@ -217,7 +217,7 @@ 
   // Processing preferences
   $prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
   $prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
-  $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0: 1;
+  $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0 : 1;
   $prefs['idle_time_to_run'] = $values['processor']['idle_time_to_run'];
   $prefs['suspend_if_no_recent_input'] = $values['processor']['suspend_if_no_recent_input'];
   $prefs['suspend_cpu_usage'] = $values['processor']['suspend_cpu_usage'];
@@ -267,7 +267,7 @@ 
   
   // Get the full configuration
   $all_presets = boincwork_get_preset_prefs();
-  $all_presets = (array) $all_presets['general_preferences'];
+  $all_presets = (array)$all_presets['general_preferences'];
   
   // Check for sane config
   if (isset($all_presets['preset'])) {

Indentation +168 added lines, -168 removed lines

@@ -10,80 +10,80 @@ 
  * Allow configuration of general options for preference pages
  */
 function boincwork_admin_prefs_options_form(&$form_state) {
-  $form = array(); 
-  $form['beta'] = array(
+    $form = array(); 
+    $form['beta'] = array(
     '#type' => 'checkbox',
     '#title' => t('Allow users to opt in to test beta applications'),
     '#default_value' => variable_get('boinc_prefs_options_beta', 0),
     '#required' => TRUE
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Submit')
-  );
-  // Add the official mechanical things and return
-  //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
-  return $form;
+    );
+    // Add the official mechanical things and return
+    //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
+    return $form;
 } 
 
 /**
-  * Handle validation of preference general settings form.
-  */
+ * Handle validation of preference general settings form.
+ */
 function boincwork_admin_prefs_options_form_validate($form, &$form_state) {
 }
 
 /**
-  * Handle submission of preference general settings form.
-  */
+ * Handle submission of preference general settings form.
+ */
 function boincwork_admin_prefs_options_form_submit($form, &$form_state) {
-  variable_set('boinc_prefs_options_beta', $form_state['values']['beta']);
-  drupal_set_message('Preference options have been updated.');
+    variable_set('boinc_prefs_options_beta', $form_state['values']['beta']);
+    drupal_set_message('Preference options have been updated.');
 }
 
 /**
  * 
  */
 function boincwork_admin_prefs_upload_form(&$form_state) {
-  $form = array(); 
-  $form['prefs_xml'] = array(
+    $form = array(); 
+    $form['prefs_xml'] = array(
     '#type' => 'textarea',
     '#title' => t('Project specific preferences XML'),
     '#default_value' => variable_get('boinc_project_specific_prefs_config', "<project_specific_preferences>\n\n</project_specific_preferences>"),
     '#required' => TRUE
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Submit')
-  );
-  // Add the official mechanical things and return
-  //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
-  return $form;
+    );
+    // Add the official mechanical things and return
+    //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
+    return $form;
 } 
 
 /**
-  * Handle validation of preference upload form.
-  */
+ * Handle validation of preference upload form.
+ */
 function boincwork_admin_prefs_upload_form_validate($form, &$form_state) {
   
-  $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
-  libxml_use_internal_errors(true);
-  $xml = new DomDocument();
-  $xml->loadXML($form_state['values']['prefs_xml'], LIBXML_NOBLANKS);
-  if (!$xml->schemaValidate($xsd)) {
+    $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
+    libxml_use_internal_errors(true);
+    $xml = new DomDocument();
+    $xml->loadXML($form_state['values']['prefs_xml'], LIBXML_NOBLANKS);
+    if (!$xml->schemaValidate($xsd)) {
     $errors = libxml_get_errors();
     $lines = explode("\r", $form_state['values']['prefs_xml']);
     drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
-      ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
+        ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
     form_set_error('upload', t('XML file failed validation'));
-  }
+    }
 }
 
 /**
-  * Handle submission of preference upload form.
-  */
+ * Handle submission of preference upload form.
+ */
 function boincwork_admin_prefs_upload_form_submit($form, &$form_state) {
-  variable_set('boinc_project_specific_prefs_config', $form_state['values']['prefs_xml']);
-  drupal_set_message('The XML has been validated and any changes to
+    variable_set('boinc_project_specific_prefs_config', $form_state['values']['prefs_xml']);
+    drupal_set_message('The XML has been validated and any changes to
       preferences are now in place.');
 }
 
@@ -91,14 +91,14 @@ 
  * 
  */
 function boincwork_admin_prefs_presets_page($preset = 'standard') {
-  // Configure preference presets
-  if (function_exists('jump_quickly')) {
+    // Configure preference presets
+    if (function_exists('jump_quickly')) {
     $path = 'admin/boinc/prefs/presets';
     $preset_options = array(
-      "{$path}/standard" => t('Standard'),
-      "{$path}/maximum" => t('Maximum'),
-      "{$path}/green" => t('Green'),
-      "{$path}/minimum" => t('Minimum')
+        "{$path}/standard" => t('Standard'),
+        "{$path}/maximum" => t('Maximum'),
+        "{$path}/green" => t('Green'),
+        "{$path}/minimum" => t('Minimum')
     );
     variable_set('jump_use_js_presets-Array', 1);
     drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
@@ -106,15 +106,15 @@ 
     $output .= '<label>Preset:</label>';
     $output .= jump_quickly($preset_options, 'presets');
     $output .= '</div></div>';
-  }
-  $output .= drupal_get_form('boincwork_admin_prefs_presets_form', $preset);
+    }
+    $output .= drupal_get_form('boincwork_admin_prefs_presets_form', $preset);
 
-  $output .= '<div>';
-  $output .= bts('Usage: \'Save configuration\' will save the above preferences into the drupal database. These will be the preset computing (global) preferences that will fill in the preferences form once a user loads the Account Preferences page.', array(), NULL, 'boinc:admin-boinc-preference-presets');
-  $output .= '<p>';
-  $output .= bts('\'Save configuration with disk usage settings from config.xml\' will save the above preferences into the drupal database, but also load disk usage settings from the BOINC project\'s config.xml file. These will overwrite any disk usage settings you have placed above. Caution: A user\'s personal preferences will not change if you load the disk usage settings from config.xml here into the drupal database. They must change their preference settings manually.', array(), NULL, 'boinc:admin-boinc-preference-presets');
-  $output .= '</div>';
-  return $output;
+    $output .= '<div>';
+    $output .= bts('Usage: \'Save configuration\' will save the above preferences into the drupal database. These will be the preset computing (global) preferences that will fill in the preferences form once a user loads the Account Preferences page.', array(), NULL, 'boinc:admin-boinc-preference-presets');
+    $output .= '<p>';
+    $output .= bts('\'Save configuration with disk usage settings from config.xml\' will save the above preferences into the drupal database, but also load disk usage settings from the BOINC project\'s config.xml file. These will overwrite any disk usage settings you have placed above. Caution: A user\'s personal preferences will not change if you load the disk usage settings from config.xml here into the drupal database. They must change their preference settings manually.', array(), NULL, 'boinc:admin-boinc-preference-presets');
+    $output .= '</div>';
+    return $output;
 }
 
 /**
@@ -122,141 +122,141 @@ 
  */
 function boincwork_admin_prefs_presets_form(&$form_state, $preset = 'standard') {
 
-  // Check database for preset prefs
-  if (!variable_get('boincwork_preset_prefs', null))
+    // Check database for preset prefs
+    if (!variable_get('boincwork_preset_prefs', null))
     drupal_set_message(bts('No presets found in database, loading a default set of preferences for each preset. These will be saved to the database once you click \'Save configuration\'.', array(), NULL, 'boinc:admin-boinc-preference-presets'), 'status');
 
-  // Load a copy of the general prefs form
-  $form = boincwork_generalprefs_form($form_state, NULL, $preset);
-  if ($key = array_search('boincwork_generalprefs_form_submit', $form['#submit'])) {
+    // Load a copy of the general prefs form
+    $form = boincwork_generalprefs_form($form_state, NULL, $preset);
+    if ($key = array_search('boincwork_generalprefs_form_submit', $form['#submit'])) {
     unset($form['#submit'][$key]);
-  }
-  $form['#submit'][] = 'boincwork_admin_prefs_presets_form_submit';
+    }
+    $form['#submit'][] = 'boincwork_admin_prefs_presets_form_submit';
   
-  // Just keep the necessary items
-  $form['processor'] = $form['prefs']['advanced']['processor'];
-  $form['storage'] = $form['prefs']['advanced']['storage'];
-  $form['network'] = $form['prefs']['advanced']['network'];
-  unset($form['prefs']);
+    // Just keep the necessary items
+    $form['processor'] = $form['prefs']['advanced']['processor'];
+    $form['storage'] = $form['prefs']['advanced']['storage'];
+    $form['network'] = $form['prefs']['advanced']['network'];
+    unset($form['prefs']);
   
-  // Tweak some things so it behaves a little better
-  $form['#tree'] = TRUE;
-  $form['processor']['#collapsible'] = TRUE;
-  $form['storage']['#collapsible'] = TRUE;
-  $form['network']['#collapsible'] = TRUE;
+    // Tweak some things so it behaves a little better
+    $form['#tree'] = TRUE;
+    $form['processor']['#collapsible'] = TRUE;
+    $form['storage']['#collapsible'] = TRUE;
+    $form['network']['#collapsible'] = TRUE;
   
-  // Add a submit button and a hidden field to pass the preset
-  $form['submit'] = array(
+    // Add a submit button and a hidden field to pass the preset
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save configuration')
-  );
-  $form['saveuseconfigxml'] = array (
-      '#type' => 'submit',
-      '#value' => t('Save configuration with disk usage settings from config.xml'),
-      '#validate' => array('boincwork_admin_prefs_preset_saveuseconfigxml'),
-  );
-  $form['preset'] = array(
+    );
+    $form['saveuseconfigxml'] = array (
+        '#type' => 'submit',
+        '#value' => t('Save configuration with disk usage settings from config.xml'),
+        '#validate' => array('boincwork_admin_prefs_preset_saveuseconfigxml'),
+    );
+    $form['preset'] = array(
     '#type' => 'hidden',
     '#value' => $preset
-  );
+    );
   
-  // Add the official mechanical things and return
-  drupal_prepare_form('boincwork_admin_prefs_presets_form', $form, $form_state);
-  return $form;
+    // Add the official mechanical things and return
+    drupal_prepare_form('boincwork_admin_prefs_presets_form', $form, $form_state);
+    return $form;
 }
 
 /**
-  * Validate the preference presets form.
-  */
+ * Validate the preference presets form.
+ */
 function boincwork_admin_prefs_presets_form_validate($form, &$form_state) {
-  require_boinc('util');
-  $values = $form_state['values'];
+    require_boinc('util');
+    $values = $form_state['values'];
   
-  // Verify all non-boolean user input values and notify form API of failures
+    // Verify all non-boolean user input values and notify form API of failures
   
-  // Processing preferences
-  if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', t('Invalid setting for') . " \"{$form['processor']['idle_time_to_run']['#title']} [x] {$form['processor']['idle_time_to_run']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', t('Invalid setting for') . " \"{$form['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['processor']['suspend_if_no_recent_input']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', t('Invalid setting for') . " \"{$form['processor']['suspend_cpu_usage']['#title']} [x] {$form['processor']['suspend_cpu_usage']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', t('Invalid setting for') . " \"{$form['processor']['start_hour']['#title']} [x] {$form['processor']['start_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', t('Invalid setting for') . " \"{$form['processor']['end_hour']['#title']} [x] {$form['processor']['end_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', t('Invalid setting for') . " \"{$form['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['processor']['cpu_scheduling_period_minutes']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', t('Invalid setting for') . " \"{$form['processor']['max_ncpus_pct']['#title']} [x] {$form['processor']['max_ncpus_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', t('Invalid setting for') . " \"{$form['processor']['cpu_usage_limit']['#title']} [x] {$form['processor']['cpu_usage_limit']['#field_suffix']}\"");
+    // Processing preferences
+    if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', t('Invalid setting for') . " \"{$form['processor']['idle_time_to_run']['#title']} [x] {$form['processor']['idle_time_to_run']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', t('Invalid setting for') . " \"{$form['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['processor']['suspend_if_no_recent_input']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', t('Invalid setting for') . " \"{$form['processor']['suspend_cpu_usage']['#title']} [x] {$form['processor']['suspend_cpu_usage']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', t('Invalid setting for') . " \"{$form['processor']['start_hour']['#title']} [x] {$form['processor']['start_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', t('Invalid setting for') . " \"{$form['processor']['end_hour']['#title']} [x] {$form['processor']['end_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', t('Invalid setting for') . " \"{$form['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['processor']['cpu_scheduling_period_minutes']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', t('Invalid setting for') . " \"{$form['processor']['max_ncpus_pct']['#title']} [x] {$form['processor']['max_ncpus_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', t('Invalid setting for') . " \"{$form['processor']['cpu_usage_limit']['#title']} [x] {$form['processor']['cpu_usage_limit']['#field_suffix']}\"");
 
-  // Storage preferences
-  if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_gb']['#title']} [x] {$form['storage']['disk_max_used_gb']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', t('Invalid setting for') . " \"{$form['storage']['disk_min_free_gb']['#title']} [x] {$form['storage']['disk_min_free_gb']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_pct']['#title']} [x] {$form['storage']['disk_max_used_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', t('Invalid setting for') . " \"{$form['storage']['disk_interval']['#title']} [x] {$form['storage']['disk_interval']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['vm_max_used_pct']['#title']} [x] {$form['storage']['vm_max_used_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['storage']['ram_max_used_busy_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['storage']['ram_max_used_idle_pct']['#field_suffix']}\"");
+    // Storage preferences
+    if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_gb']['#title']} [x] {$form['storage']['disk_max_used_gb']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', t('Invalid setting for') . " \"{$form['storage']['disk_min_free_gb']['#title']} [x] {$form['storage']['disk_min_free_gb']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_pct']['#title']} [x] {$form['storage']['disk_max_used_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', t('Invalid setting for') . " \"{$form['storage']['disk_interval']['#title']} [x] {$form['storage']['disk_interval']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['vm_max_used_pct']['#title']} [x] {$form['storage']['vm_max_used_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['storage']['ram_max_used_busy_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['storage']['ram_max_used_idle_pct']['#field_suffix']}\"");
 
-  // Network preferences
-  if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', t('Invalid setting for') . " \"{$form['network']['work_buf_min_days']['#title']} [x] {$form['network']['work_buf_min_days']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', t('Invalid setting for') . " \"{$form['network']['work_buf_additional_days']['#title']} [x] {$form['network']['work_buf_additional_days']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_down']['#title']} [x] {$form['network']['max_bytes_sec_down']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_up']['#title']} [x] {$form['network']['max_bytes_sec_up']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', t('Invalid setting for') . " \"{$form['network']['net_start_hour']['#title']} [x] {$form['network']['net_start_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', t('Invalid setting for') . " \"{$form['network']['net_end_hour']['#title']} [x] {$form['network']['net_end_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
+    // Network preferences
+    if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', t('Invalid setting for') . " \"{$form['network']['work_buf_min_days']['#title']} [x] {$form['network']['work_buf_min_days']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', t('Invalid setting for') . " \"{$form['network']['work_buf_additional_days']['#title']} [x] {$form['network']['work_buf_additional_days']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_down']['#title']} [x] {$form['network']['max_bytes_sec_down']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_up']['#title']} [x] {$form['network']['max_bytes_sec_up']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', t('Invalid setting for') . " \"{$form['network']['net_start_hour']['#title']} [x] {$form['network']['net_start_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', t('Invalid setting for') . " \"{$form['network']['net_end_hour']['#title']} [x] {$form['network']['net_end_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
 }
 
 /**
-  * Handle post-validation submission of preference presets form.
-  */
+ * Handle post-validation submission of preference presets form.
+ */
 function boincwork_admin_prefs_presets_form_submit($form, &$form_state) {
-  $values = $form_state['values'];
-  $preset = $form_state['values']['preset'];
+    $values = $form_state['values'];
+    $preset = $form_state['values']['preset'];
   
-  // Load baseline settings from configuration
-  $prefs = boincwork_get_preset_prefs($preset);
+    // Load baseline settings from configuration
+    $prefs = boincwork_get_preset_prefs($preset);
   
-  // Processing preferences
-  $prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
-  $prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
-  $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0: 1;
-  $prefs['idle_time_to_run'] = $values['processor']['idle_time_to_run'];
-  $prefs['suspend_if_no_recent_input'] = $values['processor']['suspend_if_no_recent_input'];
-  $prefs['suspend_cpu_usage'] = $values['processor']['suspend_cpu_usage'];
-  $prefs['start_hour'] = $values['processor']['start_hour'];
-  $prefs['end_hour'] = $values['processor']['end_hour'];
-  $prefs['leave_apps_in_memory'] = ($values['processor']['leave_apps_in_memory']) ? 1 : 0;
-  $prefs['cpu_scheduling_period_minutes'] = $values['processor']['cpu_scheduling_period_minutes'];
-  $prefs['max_ncpus_pct'] = $values['processor']['max_ncpus_pct'];
-  $prefs['cpu_usage_limit'] = $values['processor']['cpu_usage_limit'];
+    // Processing preferences
+    $prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
+    $prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
+    $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0: 1;
+    $prefs['idle_time_to_run'] = $values['processor']['idle_time_to_run'];
+    $prefs['suspend_if_no_recent_input'] = $values['processor']['suspend_if_no_recent_input'];
+    $prefs['suspend_cpu_usage'] = $values['processor']['suspend_cpu_usage'];
+    $prefs['start_hour'] = $values['processor']['start_hour'];
+    $prefs['end_hour'] = $values['processor']['end_hour'];
+    $prefs['leave_apps_in_memory'] = ($values['processor']['leave_apps_in_memory']) ? 1 : 0;
+    $prefs['cpu_scheduling_period_minutes'] = $values['processor']['cpu_scheduling_period_minutes'];
+    $prefs['max_ncpus_pct'] = $values['processor']['max_ncpus_pct'];
+    $prefs['cpu_usage_limit'] = $values['processor']['cpu_usage_limit'];
   
-  // Storage preferences
-  $prefs['disk_max_used_gb'] = $values['storage']['disk_max_used_gb'];
-  $prefs['disk_min_free_gb'] = $values['storage']['disk_min_free_gb'];
-  $prefs['disk_max_used_pct'] = $values['storage']['disk_max_used_pct'];
-  $prefs['disk_interval'] = $values['storage']['disk_interval'];
-  $prefs['vm_max_used_pct'] = $values['storage']['vm_max_used_pct'];
-  $prefs['ram_max_used_busy_pct'] = $values['storage']['ram_max_used_busy_pct'];
-  $prefs['ram_max_used_idle_pct'] = $values['storage']['ram_max_used_idle_pct'];
+    // Storage preferences
+    $prefs['disk_max_used_gb'] = $values['storage']['disk_max_used_gb'];
+    $prefs['disk_min_free_gb'] = $values['storage']['disk_min_free_gb'];
+    $prefs['disk_max_used_pct'] = $values['storage']['disk_max_used_pct'];
+    $prefs['disk_interval'] = $values['storage']['disk_interval'];
+    $prefs['vm_max_used_pct'] = $values['storage']['vm_max_used_pct'];
+    $prefs['ram_max_used_busy_pct'] = $values['storage']['ram_max_used_busy_pct'];
+    $prefs['ram_max_used_idle_pct'] = $values['storage']['ram_max_used_idle_pct'];
   
-  // Network preferences
-  $prefs['work_buf_min_days'] = $values['network']['work_buf_min_days'];
-  $prefs['work_buf_additional_days'] = $values['network']['work_buf_additional_days'];
-  $prefs['confirm_before_connecting'] = ($values['network']['confirm_before_connecting']) ? 1 : 0;
-  $prefs['hangup_if_dialed'] = ($values['network']['hangup_if_dialed']) ? 1 : 0;
-  $prefs['max_bytes_sec_down'] = $values['network']['max_bytes_sec_down']*1000;
-  $prefs['max_bytes_sec_up'] = $values['network']['max_bytes_sec_up']*1000;
-  $prefs['net_start_hour'] = $values['network']['net_start_hour'];
-  $prefs['net_end_hour'] = $values['network']['net_end_hour'];
-  $prefs['daily_xfer_limit_mb'] = $values['network']['daily_xfer_limit_mb'];
-  $prefs['daily_xfer_period_days'] = $values['network']['daily_xfer_period_days'];
-  $prefs['dont_verify_images'] = ($values['network']['dont_verify_images']) ? 1 : 0;
+    // Network preferences
+    $prefs['work_buf_min_days'] = $values['network']['work_buf_min_days'];
+    $prefs['work_buf_additional_days'] = $values['network']['work_buf_additional_days'];
+    $prefs['confirm_before_connecting'] = ($values['network']['confirm_before_connecting']) ? 1 : 0;
+    $prefs['hangup_if_dialed'] = ($values['network']['hangup_if_dialed']) ? 1 : 0;
+    $prefs['max_bytes_sec_down'] = $values['network']['max_bytes_sec_down']*1000;
+    $prefs['max_bytes_sec_up'] = $values['network']['max_bytes_sec_up']*1000;
+    $prefs['net_start_hour'] = $values['network']['net_start_hour'];
+    $prefs['net_end_hour'] = $values['network']['net_end_hour'];
+    $prefs['daily_xfer_limit_mb'] = $values['network']['daily_xfer_limit_mb'];
+    $prefs['daily_xfer_period_days'] = $values['network']['daily_xfer_period_days'];
+    $prefs['dont_verify_images'] = ($values['network']['dont_verify_images']) ? 1 : 0;
   
-  //Remove @attributes to match new format (see boincwork.forms.inc
-  //function boincwork_generalprefs_form)
-  unset($prefs['@attributes']['preset']);
+    //Remove @attributes to match new format (see boincwork.forms.inc
+    //function boincwork_generalprefs_form)
+    unset($prefs['@attributes']['preset']);
   
-  // Update the configuration
-  boincwork_save_preset_prefs($prefs, $preset);
-  drupal_set_message(t('The "@name" preset has been updated.',
+    // Update the configuration
+    boincwork_save_preset_prefs($prefs, $preset);
+    drupal_set_message(t('The "@name" preset has been updated.',
     array('@name' => $preset)));
 }
 
@@ -265,26 +265,26 @@ 
  */
 function boincwork_save_preset_prefs($updated_prefs, $preset = 'standard') {
   
-  // Get the full configuration
-  $all_presets = boincwork_get_preset_prefs();
-  $all_presets = (array) $all_presets['general_preferences'];
+    // Get the full configuration
+    $all_presets = boincwork_get_preset_prefs();
+    $all_presets = (array) $all_presets['general_preferences'];
   
-  // Check for sane config
-  if (isset($all_presets['preset'])) {
+    // Check for sane config
+    if (isset($all_presets['preset'])) {
     if (!is_numeric(key($all_presets['preset']))) {
-      $all_presets['preset'] = array($all_presets['preset']);
+        $all_presets['preset'] = array($all_presets['preset']);
     }
     foreach ($all_presets['preset'] as $key => $old_preset) {
-      // Find the preset being updated and... update it
-      if (isset($old_preset['@attributes']['name']) AND $old_preset['@attributes']['name'] == $preset) {
+        // Find the preset being updated and... update it
+        if (isset($old_preset['@attributes']['name']) AND $old_preset['@attributes']['name'] == $preset) {
         $all_presets['preset'][$key] = $updated_prefs + $old_preset;
-      }
+        }
+    }
     }
-  }
   
-  // Convert prefs back to XML and save to database
-  $all_presets = array('general_preferences' => $all_presets);
-  variable_set('boincwork_preset_prefs', save_configuration($all_presets));
+    // Convert prefs back to XML and save to database
+    $all_presets = array('general_preferences' => $all_presets);
+    variable_set('boincwork_preset_prefs', save_configuration($all_presets));
 }
 
 /**

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

@@ -15,7 +15,7 @@ 
     '#type' => 'checkbox',
     '#title' => t('Allow users to opt in to test beta applications'),
     '#default_value' => variable_get('boinc_prefs_options_beta', 0),
-    '#required' => TRUE
+    '#required' => true
   );
   $form['submit'] = array(
     '#type' => 'submit',
@@ -49,7 +49,7 @@ 
     '#type' => 'textarea',
     '#title' => t('Project specific preferences XML'),
     '#default_value' => variable_get('boinc_project_specific_prefs_config', "<project_specific_preferences>\n\n</project_specific_preferences>"),
-    '#required' => TRUE
+    '#required' => true
   );
   $form['submit'] = array(
     '#type' => 'submit',
@@ -110,9 +110,9 @@ 
   $output .= drupal_get_form('boincwork_admin_prefs_presets_form', $preset);
 
   $output .= '<div>';
-  $output .= bts('Usage: \'Save configuration\' will save the above preferences into the drupal database. These will be the preset computing (global) preferences that will fill in the preferences form once a user loads the Account Preferences page.', array(), NULL, 'boinc:admin-boinc-preference-presets');
+  $output .= bts('Usage: \'Save configuration\' will save the above preferences into the drupal database. These will be the preset computing (global) preferences that will fill in the preferences form once a user loads the Account Preferences page.', array(), null, 'boinc:admin-boinc-preference-presets');
   $output .= '<p>';
-  $output .= bts('\'Save configuration with disk usage settings from config.xml\' will save the above preferences into the drupal database, but also load disk usage settings from the BOINC project\'s config.xml file. These will overwrite any disk usage settings you have placed above. Caution: A user\'s personal preferences will not change if you load the disk usage settings from config.xml here into the drupal database. They must change their preference settings manually.', array(), NULL, 'boinc:admin-boinc-preference-presets');
+  $output .= bts('\'Save configuration with disk usage settings from config.xml\' will save the above preferences into the drupal database, but also load disk usage settings from the BOINC project\'s config.xml file. These will overwrite any disk usage settings you have placed above. Caution: A user\'s personal preferences will not change if you load the disk usage settings from config.xml here into the drupal database. They must change their preference settings manually.', array(), null, 'boinc:admin-boinc-preference-presets');
   $output .= '</div>';
   return $output;
 }
@@ -124,10 +124,10 @@ 
 
   // Check database for preset prefs
   if (!variable_get('boincwork_preset_prefs', null))
-    drupal_set_message(bts('No presets found in database, loading a default set of preferences for each preset. These will be saved to the database once you click \'Save configuration\'.', array(), NULL, 'boinc:admin-boinc-preference-presets'), 'status');
+    drupal_set_message(bts('No presets found in database, loading a default set of preferences for each preset. These will be saved to the database once you click \'Save configuration\'.', array(), null, 'boinc:admin-boinc-preference-presets'), 'status');
 
   // Load a copy of the general prefs form
-  $form = boincwork_generalprefs_form($form_state, NULL, $preset);
+  $form = boincwork_generalprefs_form($form_state, null, $preset);
   if ($key = array_search('boincwork_generalprefs_form_submit', $form['#submit'])) {
     unset($form['#submit'][$key]);
   }
@@ -140,10 +140,10 @@ 
   unset($form['prefs']);
   
   // Tweak some things so it behaves a little better
-  $form['#tree'] = TRUE;
-  $form['processor']['#collapsible'] = TRUE;
-  $form['storage']['#collapsible'] = TRUE;
-  $form['network']['#collapsible'] = TRUE;
+  $form['#tree'] = true;
+  $form['processor']['#collapsible'] = true;
+  $form['storage']['#collapsible'] = true;
+  $form['network']['#collapsible'] = true;
   
   // Add a submit button and a hidden field to pass the preset
   $form['submit'] = array(
@@ -276,7 +276,7 @@ 
     }
     foreach ($all_presets['preset'] as $key => $old_preset) {
       // Find the preset being updated and... update it
-      if (isset($old_preset['@attributes']['name']) AND $old_preset['@attributes']['name'] == $preset) {
+      if (isset($old_preset['@attributes']['name']) and $old_preset['@attributes']['name'] == $preset) {
         $all_presets['preset'][$key] = $updated_prefs + $old_preset;
       }
     }

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

Indentation +4 added lines, -4 removed lines

@@ -7,15 +7,15 @@
  */
 
 class views_handler_argument_boincuser_id extends views_handler_argument_numeric {
-  function construct() {
+    function construct() {
     parent::construct();
-  }
+    }
 
-  function set_argument($arg) {
+    function set_argument($arg) {
     // When setting the ID argument, convert to BOINC ID
     $id = is_numeric($arg) ? $arg : 0;
     $boinc_id = db_result(db_query("SELECT boinc_id FROM {boincuser} WHERE uid = %d", $id));
     $this->argument = $boinc_id;
     return $this->validate_arg($boinc_id);
-  }
+    }
 }

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

Indentation +5 added lines, -5 removed lines

@@ -6,15 +6,15 @@
  */
 
 class views_handler_field_boincwork_host_app_et_avg extends views_handler_field {
-  function construct() {
+    function construct() {
     parent::construct();
-  }
+    }
 
-  function render($values) {
+    function render($values) {
     $gflops = 0;
     if ($values->host_app_version_et_avg) {
-      $gflops = 1e-9 / $values->host_app_version_et_avg;
+        $gflops = 1e-9 / $values->host_app_version_et_avg;
     }
     return round($gflops, 2) . ' GFLOPS';
-  }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
   function render($values) {
     $gflops = 0;
     if ($values->host_app_version_et_avg) {
-      $gflops = 1e-9 / $values->host_app_version_et_avg;
+      $gflops = 1e-9/$values->host_app_version_et_avg;
     }
-    return round($gflops, 2) . ' GFLOPS';
+    return round($gflops, 2).' GFLOPS';
   }
 }

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

Indentation +4 added lines, -4 removed lines

@@ -6,12 +6,12 @@
  */
 
 class views_handler_field_boincwork_host_app_turnaround_avg extends views_handler_field {
-  function construct() {
+    function construct() {
     parent::construct();
-  }
+    }
 
-  function render($values) {
+    function render($values) {
     $time_in_days = $values->host_app_version_turnaround_avg / (24*60*60);
     return round($time_in_days, 2) . ' ' . t('days');
-  }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@
   }
 
   function render($values) {
-    $time_in_days = $values->host_app_version_turnaround_avg / (24*60*60);
-    return round($time_in_days, 2) . ' ' . t('days');
+    $time_in_days = $values->host_app_version_turnaround_avg/(24*60*60);
+    return round($time_in_days, 2).' '.t('days');
   }
 }

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

Indentation +4 added lines, -4 removed lines

@@ -6,11 +6,11 @@
  */
 
 class views_handler_field_boincwork_app_version_number extends views_handler_field {
-  function construct() {
+    function construct() {
     parent::construct();
-  }
+    }
 
-  function render($values) {
+    function render($values) {
     return sprintf("%01.2f", $values->app_version_host_app_version_version_num / 100);
-  }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -11,6 +11,6 @@
   }
 
   function render($values) {
-    return sprintf("%01.2f", $values->app_version_host_app_version_version_num / 100);
+    return sprintf("%01.2f", $values->app_version_host_app_version_version_num/100);
   }
 }

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

Spacing +1 added lines, -1 removed lines

@@ -1637,7 +1637,7 @@
   
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincwork') . '/views',
+      'path' => drupal_get_path('module', 'boincwork').'/views',
     ),
     'handlers' => array(
       'views_handler_argument_boincuser_id' => array(

Indentation +793 added lines, -793 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'
-  );
+    $data['host']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC host'),
+        'help' => t('Computers attached to BOINC'),
+        'database' => 'boinc'
+    );
   
-  // 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(
+    $data['host']['table']['join'] = array(
     'user' => array(
-      'left_field' => 'id',
-      'field' => 'userid',
+        '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(
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['venue'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['host']['userid'] = array(
+    $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'
+        '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')
+        'base' => 'user',
+        'field' => 'userid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('User')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of general host fields (alphabetized)
+    // Descriptions of general host fields (alphabetized)
   
-  $data['host']['active_frac'] = array(
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['avg_turnaround'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['create_time'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['host']['connected_frac'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['cpu_efficiency'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['d_free'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['d_total'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['domain_name'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['duration_correction_factor'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['expavg_credit'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['external_ip_addr'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['host_cpid'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['last_ip_addr'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['m_cache'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['m_nbytes'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['m_swap'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['max_results_day'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['n_bwdown'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['n_bwup'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['nsame_ip_addr'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['on_frac'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['os_name'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );  
-  $data['host']['os_version'] = array(
+    );  
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['p_fpops'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['p_iops'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['p_model'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['p_ncpus'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['p_vendor'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['rpc_seqno'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['rpc_time'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['host']['serialnum'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['timezone'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['total_credit'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        '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'
-  );
+    $data['platform']['table']['group'] = t('BOINC');
+    $data['platform']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC platform'),
+        'help' => t('Operating system platforms'),
+        'database' => 'boinc'
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['platform']['id'] = array(
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of app fields (alphabetized)
+    // Descriptions of app fields (alphabetized)
   
-  $data['platform']['name'] = array(
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        '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'
-  );
+    $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'
+    );
   
-  // 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(
+    $data['result']['table']['join'] = array(
     'user' => array(
-      'left_field' => 'id',
-      'field' => 'userid'
+        'left_field' => 'id',
+        'field' => 'userid'
     ),
     'workunit' => array(
-      'left_field' => 'id',
-      'field' => 'workunitid'
+        'left_field' => 'id',
+        'field' => 'workunitid'
     ),
     'host' => array(
-      'left_field' => 'id',
-      'field' => 'hostid'
+        'left_field' => 'id',
+        'field' => 'hostid'
     )
-  );
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['result']['id'] = array(
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['result']['userid'] = array(
+    $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'
+        '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')
+        'base' => 'user',
+        'field' => 'userid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('User')
     )
-  );
-  $data['result']['workunitid'] = array(
+    );
+    $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'
+        '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')
+        'base' => 'workunit',
+        'field' => 'workunitid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Workunit')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['hostid'] = array(
+    );
+    $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'
+        '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')
+        'base' => 'host',
+        'field' => 'hostid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Host')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of result fields (alphabetized)
+    // Descriptions of result fields (alphabetized)
   
-  $data['result']['appid'] = array(
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['app_version_id'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['claimed_credit'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['client_state'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['cpu_time'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['create_time'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['result']['elapsed_time'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['exit_status'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['granted_credit'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['name'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['result']['outcome'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['received_time'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['result']['report_deadline'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['result']['sent_time'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['result']['server_state'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['stderr_out'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['result']['validate_state'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['peak_working_set_size'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['peak_swap_size'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        '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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        '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'
-  );
+    $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'
+    );
   
-  // Create implicit relationship to the app table
+    // Create implicit relationship to the app table
   
-  $data['workunit']['table']['join'] = array(
+    $data['workunit']['table']['join'] = array(
     'app' => array(
-      'left_field' => 'id',
-      'field' => 'appid'
+        'left_field' => 'id',
+        'field' => 'appid'
     )
-  );
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
   
-  $data['workunit']['id'] = array(
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['workunit']['appid'] = array(
+    $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'
+        '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')
+        'base' => 'app',
+        'field' => 'appid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Application')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of workunit fields (alphabetized)
+    // Descriptions of workunit fields (alphabetized)
   
-  $data['workunit']['canonical_credit'] = array(
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['canonical_resultid'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['create_time'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['workunit']['error_mask'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['min_quorum'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['name'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['workunit']['max_error_results'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['max_success_results'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['max_total_results'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['need_validate'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['target_nresults'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        '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'
-  );
+    $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'
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['app']['id'] = array(
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of app fields (alphabetized)
+    // Descriptions of app fields (alphabetized)
   
-  $data['app']['target_nresults'] = array(
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['app']['user_friendly_name'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        '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'
-  );
+    $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'
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['app_version']['id'] = array(
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['app_version']['appid'] = array(
+    $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'
+        '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')
+        'base' => 'app',
+        'field' => 'id',
+        'handler' => 'views_handler_relationship',
+        'label' => t('App ID')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  $data['app_version']['platformid'] = array(
+    $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'
+        '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')
+        'base' => 'platform',
+        'field' => 'id',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Platform ID')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of app fields (alphabetized)
+    // Descriptions of app fields (alphabetized)
   
-  $data['app_version']['plan_class'] = array(
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['app_version']['version_num'] = array(
+    );
+    $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,
+        'handler' => 'views_handler_field_boincwork_app_version_number',
+        'click sortable' => TRUE,
+        'float' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        '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(
+    $data['host_app_version']['table']['join'] = array(
     'host' => array(
-      'left_field' => 'id',
-      'field' => 'host_id',
+        'left_field' => 'id',
+        'field' => 'host_id',
     )
-  );
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['host_app_version']['host_id'] = array(
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['host_app_version']['app_version_id'] = array(
+    $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'
+        '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')
+        'base' => 'app_version',
+        'field' => 'id',
+        'handler' => 'views_handler_relationship',
+        'label' => t('App version')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        '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(
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['et_avg'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_boincwork_host_app_et_avg',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['et_n'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['max_jobs_per_day'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['n_jobs_today'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['turnaround_avg'] = array(
+    );
+    $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,
+        'handler' => 'views_handler_field_boincwork_host_app_turnaround_avg',
+        'click sortable' => TRUE,
+        'float' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['user_friendly_name'] = array(
+    );
+    $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
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
+    );
   
-  return $data;
+    return $data;
 }
 
 /*
@@ -1678,23 +1678,23 @@ 
 
 function boincwork_views_handlers() {
   
-  return array(
+    return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincwork') . '/views',
+        'path' => drupal_get_path('module', 'boincwork') . '/views',
     ),
     'handlers' => array(
-      'views_handler_argument_boincuser_id' => array(
+        'views_handler_argument_boincuser_id' => array(
         'parent' => 'views_handler_argument_numeric'
-      ),
-      'views_handler_field_boincwork_app_version_number' => array(
+        ),
+        'views_handler_field_boincwork_app_version_number' => array(
         'parent' => 'views_handler_field_numeric'
-      ),
-      'views_handler_field_boincwork_host_app_et_avg' => array(
+        ),
+        'views_handler_field_boincwork_host_app_et_avg' => array(
         'parent' => 'views_handler_field_numeric'
-      ),
-      'views_handler_field_boincwork_host_app_turnaround_avg' => array(
+        ),
+        'views_handler_field_boincwork_host_app_turnaround_avg' => array(
         'parent' => 'views_handler_field_numeric'
-      ),
+        ),
     )
-  );
+    );
 }

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

@@ -49,16 +49,16 @@ 
   // Primary keys allowed as arguments
   
   $data['host']['id'] = array(
-    'title' => bts('Computer ID', array(), NULL, 'boinc:host-list'),
+    '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
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -69,11 +69,11 @@ 
     )
   );
   $data['host']['venue'] = array(
-    'title' => bts('Location', array(), NULL, 'boinc:host-list'),
+    '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
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
@@ -90,7 +90,7 @@ 
   // Foreign key fields
   
   $data['host']['userid'] = array(
-    'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
+    '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
@@ -98,7 +98,7 @@ 
     'argument' => array(
       'handler' => 'views_handler_argument_boincuser_id',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -109,7 +109,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -122,12 +122,12 @@ 
   // 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'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -137,12 +137,12 @@ 
     )
   );
   $data['host']['avg_turnaround'] = array(
-    'title' => bts('Average turnaround time', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -152,11 +152,11 @@ 
     )
   );
   $data['host']['create_time'] = array(
-    'title' => bts('Created', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -166,12 +166,12 @@ 
     )
   );
   $data['host']['connected_frac'] = array(
-    'title' => bts('While BOINC running, % of time host has an Internet connection', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -181,12 +181,12 @@ 
     )
   );
   $data['host']['cpu_efficiency'] = array(
-    'title' => bts('Average CPU efficiency', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -196,11 +196,11 @@ 
     )
   );
   $data['host']['d_free'] = array(
-    'title' => bts('Free disk space', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -210,11 +210,11 @@ 
     )
   );
   $data['host']['d_total'] = array(
-    'title' => bts('Total disk space', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -224,11 +224,11 @@ 
     )
   );
   $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'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -238,12 +238,12 @@ 
     )
   );
   $data['host']['duration_correction_factor'] = array(
-    'title' => bts('Task duration correction factor', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -253,12 +253,12 @@ 
     )
   );
   $data['host']['expavg_credit'] = array(
-    'title' => bts('Avg. credit', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -268,11 +268,11 @@ 
     )
   );
   $data['host']['external_ip_addr'] = array(
-    'title' => bts('External IP address', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -282,11 +282,11 @@ 
     )
   );
   $data['host']['host_cpid'] = array(
-    'title' => bts('Cross project ID', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -296,11 +296,11 @@ 
     )
   );
   $data['host']['last_ip_addr'] = array(
-    'title' => bts('Last IP address', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -310,11 +310,11 @@ 
     )
   );
   $data['host']['m_cache'] = array(
-    'title' => bts('Cache', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -324,11 +324,11 @@ 
     )
   );
   $data['host']['m_nbytes'] = array(
-    'title' => bts('Memory', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -338,11 +338,11 @@ 
     )
   );
   $data['host']['m_swap'] = array(
-    'title' => bts('Swap space', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -352,11 +352,11 @@ 
     )
   );
   $data['host']['max_results_day'] = array(
-    'title' => bts('Maximum daily WU quota per CPU', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -366,12 +366,12 @@ 
     )
   );
   $data['host']['n_bwdown'] = array(
-    'title' => bts('Average download rate', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -381,12 +381,12 @@ 
     )
   );
   $data['host']['n_bwup'] = array(
-    'title' => bts('Average upload rate', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -396,11 +396,11 @@ 
     )
   );
   $data['host']['nsame_ip_addr'] = array(
-    'title' => bts('Same IP address count', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -410,12 +410,12 @@ 
     )
   );
   $data['host']['on_frac'] = array(
-    'title' => bts('% of time BOINC client is running', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -425,11 +425,11 @@ 
     )
   );
   $data['host']['os_name'] = array(
-    'title' => bts('Operating system', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -439,11 +439,11 @@ 
     )
   );  
   $data['host']['os_version'] = array(
-    'title' => bts('Operating system version', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -453,12 +453,12 @@ 
     )
   );
   $data['host']['p_fpops'] = array(
-    'title' => bts('Measured floating point speed', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -468,12 +468,12 @@ 
     )
   );
   $data['host']['p_iops'] = array(
-    'title' => bts('Measured integer speed', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -483,11 +483,11 @@ 
     )
   );
   $data['host']['p_model'] = array(
-    'title' => bts('CPU model', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -497,11 +497,11 @@ 
     )
   );
   $data['host']['p_ncpus'] = array(
-    'title' => bts('Number of processors', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -511,11 +511,11 @@ 
     )
   );
   $data['host']['p_vendor'] = array(
-    'title' => bts('CPU', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -525,11 +525,11 @@ 
     )
   );
   $data['host']['rpc_seqno'] = array(
-    'title' => bts('Number of times client has contacted server', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -539,11 +539,11 @@ 
     )
   );
   $data['host']['rpc_time'] = array(
-    'title' => bts('Last contact', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -553,11 +553,11 @@ 
     )
   );
   $data['host']['serialnum'] = array(
-    'title' => bts('Serial number', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -567,11 +567,11 @@ 
     )
   );
   $data['host']['timezone'] = array(
-    'title' => bts('Timezone', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -581,12 +581,12 @@ 
     )
   );
   $data['host']['total_credit'] = array(
-    'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -611,16 +611,16 @@ 
   // Primary keys allowed as arguments
 
   $data['platform']['id'] = array(
-    'title' => bts('Platform ID', array(), NULL, 'boinc:platform-details'),
+    '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
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -634,11 +634,11 @@ 
   // 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'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -680,16 +680,16 @@ 
   // Primary keys allowed as arguments
 
   $data['result']['id'] = array(
-    'title' => bts('Task ID', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -703,13 +703,13 @@ 
   // Foreign key fields
   
   $data['result']['userid'] = array(
-    'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
+    '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,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -720,13 +720,13 @@ 
     )
   );
   $data['result']['workunitid'] = array(
-    'title' => bts('Workunit ID', array(), NULL, 'boinc:workunit-details'),
+    '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,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -737,7 +737,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -747,13 +747,13 @@ 
     )
   );
   $data['result']['hostid'] = array(
-    'title' => bts('Host ID', array(), NULL, 'boinc:task-details'),
+    '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,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -764,7 +764,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -777,11 +777,11 @@ 
   // Descriptions of result fields (alphabetized)
   
   $data['result']['appid'] = array(
-    'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -791,11 +791,11 @@ 
     )
   );
   $data['result']['app_version_id'] = array(
-    'title' => bts('Application version', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -805,12 +805,12 @@ 
     )
   );
   $data['result']['claimed_credit'] = array(
-    'title' => bts('Claimed credit', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -820,11 +820,11 @@ 
     )
   );
   $data['result']['client_state'] = array(
-    'title' => bts('Client state', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -834,12 +834,12 @@ 
     )
   );
   $data['result']['cpu_time'] = array(
-    'title' => bts('CPU time', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -849,11 +849,11 @@ 
     )
   );
   $data['result']['create_time'] = array(
-    'title' => bts('Created', array(), NULL, 'boinc:task-details:-1:ignoreoverwrite'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -863,12 +863,12 @@ 
     )
   );
   $data['result']['elapsed_time'] = array(
-    'title' => bts('Run time', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -878,11 +878,11 @@ 
     )
   );
   $data['result']['exit_status'] = array(
-    'title' => bts('Exit status', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -892,12 +892,12 @@ 
     )
   );
   $data['result']['granted_credit'] = array(
-    'title' => bts('Granted credit', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -907,11 +907,11 @@ 
     )
   );
   $data['result']['name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -921,11 +921,11 @@ 
     )
   );
   $data['result']['outcome'] = array(
-    'title' => bts('Outcome', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -935,11 +935,11 @@ 
     )
   );
   $data['result']['received_time'] = array(
-    'title' => bts('Received time', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -949,11 +949,11 @@ 
     )
   );
   $data['result']['report_deadline'] = array(
-    'title' => bts('Report deadline', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -963,11 +963,11 @@ 
     )
   );
   $data['result']['sent_time'] = array(
-    'title' => bts('Sent', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -977,11 +977,11 @@ 
     )
   );
   $data['result']['server_state'] = array(
-    'title' => bts('Server state', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -991,11 +991,11 @@ 
     )
   );
   $data['result']['stderr_out'] = array(
-    'title' => bts('Stderr out', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -1005,11 +1005,11 @@ 
     )
   );
   $data['result']['validate_state'] = array(
-    'title' => bts('Validation state', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1019,11 +1019,11 @@ 
     )
   );
   $data['result']['peak_working_set_size'] = array(
-    'title' => bts('Peak working set size', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1033,11 +1033,11 @@ 
     )
   );
   $data['result']['peak_swap_size'] = array(
-    'title' => bts('Peak swap size', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1047,11 +1047,11 @@ 
     )
   );
     $data['result']['peak_disk_usage'] = array(
-    'title' => bts('Peak disk usage', array(), NULL, 'boinc:task-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1086,16 +1086,16 @@ 
   // Primary keys allowed as arguments
   
   $data['workunit']['id'] = array(
-    'title' => bts('Workunit ID', array(), NULL, 'boinc:workunit-details'),
+    '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
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -1109,12 +1109,12 @@ 
   // Foreign key fields
   
   $data['workunit']['appid'] = array(
-    'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
+    '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,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -1125,7 +1125,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1138,12 +1138,12 @@ 
   // Descriptions of workunit fields (alphabetized)
   
   $data['workunit']['canonical_credit'] = array(
-    'title' => bts('Canonical credit', array(), NULL, 'boinc:workunit-details'),
+    '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
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1153,11 +1153,11 @@ 
     )
   );
   $data['workunit']['canonical_resultid'] = array(
-    'title' => bts('Canonical result ID', array(), NULL, 'boinc:workunit-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1167,11 +1167,11 @@ 
     )
   );
   $data['workunit']['create_time'] = array(
-    'title' => bts('Created time', array(), NULL, 'boinc:workunit-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -1181,11 +1181,11 @@ 
     )
   );
   $data['workunit']['error_mask'] = array(
-    'title' => bts('Error mask', array(), NULL, 'boinc:workunit-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1195,11 +1195,11 @@ 
     )
   );
   $data['workunit']['min_quorum'] = array(
-    'title' => bts('Minimum quorum', array(), NULL, 'boinc:workunit-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1209,11 +1209,11 @@ 
     )
   );
   $data['workunit']['name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreovewrite'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -1223,11 +1223,11 @@ 
     )
   );
   $data['workunit']['max_error_results'] = array(
-    'title' => bts('Max error tasks', array(), NULL, 'boinc:workunit-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1237,11 +1237,11 @@ 
     )
   );
   $data['workunit']['max_success_results'] = array(
-    'title' => bts('Max success tasks', array(), NULL, 'boinc:workunit-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1251,11 +1251,11 @@ 
     )
   );
   $data['workunit']['max_total_results'] = array(
-    'title' => bts('Max total tasks', array(), NULL, 'boinc:workunit-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1265,11 +1265,11 @@ 
     )
   );
   $data['workunit']['need_validate'] = array(
-    'title' => bts('Needs validation', array(), NULL, 'boinc:workunit-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1279,11 +1279,11 @@ 
     )
   );
   $data['workunit']['target_nresults'] = array(
-    'title' => bts('Initial replication', array(), NULL, 'boinc:workunit-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1308,16 +1308,16 @@ 
   // Primary keys allowed as arguments
 
   $data['app']['id'] = array(
-    'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
+    '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
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -1331,11 +1331,11 @@ 
   // Descriptions of app fields (alphabetized)
   
   $data['app']['target_nresults'] = array(
-    'title' => bts('Target number of results', array(), NULL, 'boinc:application-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1345,11 +1345,11 @@ 
     )
   );
   $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'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -1374,16 +1374,16 @@ 
   // Primary keys allowed as arguments
 
   $data['app_version']['id'] = array(
-    'title' => bts('Application version ID', array(), NULL, 'boinc:application-details'),
+    '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
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -1397,7 +1397,7 @@ 
   // Foreign key fields
   
   $data['app_version']['appid'] = array(
-    'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
+    '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
@@ -1405,7 +1405,7 @@ 
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -1416,7 +1416,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1427,7 +1427,7 @@ 
   );
   
   $data['app_version']['platformid'] = array(
-    'title' => bts('Platform ID', array(), NULL, 'boinc:platform-details'),
+    '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
@@ -1435,7 +1435,7 @@ 
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -1446,7 +1446,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1459,11 +1459,11 @@ 
   // Descriptions of app fields (alphabetized)
   
   $data['app_version']['plan_class'] = array(
-    'title' => bts('Plan class', array(), NULL, 'boinc:application-details'),
+    'title' => bts('Plan class', array(), null, 'boinc:application-details'),
     'help' => t('App version plan class.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -1473,12 +1473,12 @@ 
     )
   );
   $data['app_version']['version_num'] = array(
-    'title' => bts('Version number', array(), NULL, 'boinc:application-details'),
+    '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,
+      'click sortable' => true,
+      'float' => true,
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1512,16 +1512,16 @@ 
   // Primary keys allowed as arguments
 
   $data['host_app_version']['host_id'] = array(
-    'title' => bts('Computer', array(), NULL, 'boinc:host-details'),
+    '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
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -1535,7 +1535,7 @@ 
   // Foreign key fields
   
   $data['host_app_version']['app_version_id'] = array(
-    'title' => bts('App version ID', array(), NULL, 'boinc:application-details'),
+    '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
@@ -1543,7 +1543,7 @@ 
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -1554,7 +1554,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1567,11 +1567,11 @@ 
   // Descriptions of host_app_version fields (alphabetized)
   
   $data['host_app_version']['consecutive_valid'] = array(
-    'title' => bts('Consecutive valid tasks', array(), NULL, 'boinc:application-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1585,7 +1585,7 @@ 
     '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1595,11 +1595,11 @@ 
     )
   );
   $data['host_app_version']['et_n'] = array(
-    'title' => bts('Number of tasks completed', array(), NULL, 'boinc:application-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1609,11 +1609,11 @@ 
     )
   );
   $data['host_app_version']['max_jobs_per_day'] = array(
-    'title' => bts('Max tasks per day', array(), NULL, 'boinc:application-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1623,11 +1623,11 @@ 
     )
   );
   $data['host_app_version']['n_jobs_today'] = array(
-    'title' => bts('Number of tasks today', array(), NULL, 'boinc:application-details'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1637,12 +1637,12 @@ 
     )
   );
   $data['host_app_version']['turnaround_avg'] = array(
-    'title' => bts('Average turnaround time', array(), NULL, 'boinc:application-details:-1:ignoreoverwrite'),
+    '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,
+      'click sortable' => true,
+      'float' => true,
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -1652,11 +1652,11 @@ 
     )
   );
   $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'),
+    '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
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'

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

Switch Indentation +6 added lines, -6 removed lines

@@ -180,12 +180,12 @@
  */
 function boincwork_locale($op = 'groups', $group = NULL) {
   switch ($op) {
-    case 'groups':
-      return array('project' => bts('Project'));
-    case 'info':
-      $info['project']['refresh callback'] = 'boincwork_locale_refresh';
-      $info['project']['format'] = FALSE;
-      return $info;
+  case 'groups':
+    return array('project' => bts('Project'));
+  case 'info':
+    $info['project']['refresh callback'] = 'boincwork_locale_refresh';
+    $info['project']['format'] = FALSE;
+    return $info;
   }
 }
 

Braces +8 added lines, -16 removed lines

@@ -301,8 +301,7 @@ 
             }
             if (!$special) {
               $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
-            }
-            else {
+            } else {
               // The "very special" case where we merge two prefs
               $second_pref = $special_map[$name];
               $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref];
@@ -310,8 +309,7 @@ 
               $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
                 " {$second_value} {$second_pref_setting['#field_suffix']} </td>";
             }
-          }
-          else  {
+          } else {
             $output .= '<td>---</td>';
           }
         }
@@ -836,22 +834,19 @@ 
         drupal_set_message(t('Host @id has been removed from your account.',
           array('@id' => $host_id)));
         drupal_goto('account/computers');
-      }
-      else {
+      } else {
         drupal_set_message(t('Host @id could not be deleted. Not sure why...',
           array('@id' => $host_id)), 'error'
         );
       }
-    }
-    else {
+    } else {
       drupal_set_message(t('Host @id cannot be deleted because it still has
         tasks associated with it. These tasks should be processed within the
         next few days, after which the host can be deleted.', 
         array('@id' => $host_id)), 'warning'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(t('You are not the owner of host @id, so you cannot
       delete it.', 
       array('@id' => $host_id)), 'error'
@@ -896,15 +891,13 @@ 
         bts('The location for this host has been updated.', array(), NULL, 'boinc:account-host-details')
         . bts('This will take effect next time the host contacts the project.', array(), NULL, 'boinc:account-host-details')
       );
-    }
-    else {
+    } else {
       drupal_set_message(
         bts('Unable to save changes to this host for some reason!', array(), NULL, 'boinc:account-host-details'),
         'error'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(
       bts('You are not allowed to make changes to this host.', array(), NULL, 'boinc:account-host-details'),
       'warning'
@@ -996,8 +989,7 @@ 
       $venue = $active_venue;
       //unset($_SESSION['prefs venue']);
     }
-  }
-  else {
+  } else {
     // Set the active venue to keep it selected between computing and project
     // preference pages
     $_SESSION['prefs venue'] = $venue;

Indentation +333 added lines, -333 removed lines

@@ -2,9 +2,9 @@ 
 // $Id$
 
 /**
-  * @file
-  * Enable BOINC features related to processing work and credit.
-  */
+ * @file
+ * Enable BOINC features related to processing work and credit.
+ */
 
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -20,52 +20,52 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * Implementation of hook_menu().
-  */
+ * Implementation of hook_menu().
+ */
 function boincwork_menu() {
-  require_boinc('util');
-  $items['account/prefs'] = array(
+    require_boinc('util');
+    $items['account/prefs'] = array(
     'title' => 'Computing',
     'description' => '',
     'page callback' => 'generalprefs_page', 
     'access callback' => 'user_is_logged_in',
     'type' => MENU_NORMAL_ITEM
-  );
-  $items['account/prefs/computing'] = array(
+    );
+    $items['account/prefs/computing'] = array(
     'title' => 'Computing',
     'page callback' => 'generalprefs_page',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => 0
-  );
-  $items['account/prefs/project'] = array(
+    );
+    $items['account/prefs/project'] = array(
     'title' => 'Project',
     'page callback' => 'projectprefs_page',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_LOCAL_TASK,
     'weight' => 5
-  );
-  $items['account/prefs/community'] = array(
+    );
+    $items['account/prefs/community'] = array(
     'title' => 'Community',
     'page callback' => 'communityprefs_page',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_LOCAL_TASK,
     'weight' => 10
-  );
-  $items['account/prefs/privacy'] = array(
+    );
+    $items['account/prefs/privacy'] = array(
     'title' => 'Privacy',
     'page callback' => 'privacyprefs_page',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_LOCAL_TASK,
     'weight' => 15
-  );
-  $items['account/certs'] = array(
+    );
+    $items['account/certs'] = array(
     'title' =>'Account certificate',
     'page callback' => 'boincwork_certificates',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['admin/boinc/prefs/general'] = array(
+    );
+    $items['admin/boinc/prefs/general'] = array(
     'title' => 'Preferences: General',
     'description' => 'Set options for BOINC preference set pages',
     'page callback' => 'drupal_get_form',
@@ -73,16 +73,16 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincwork.admin.inc'
-  );
-  $items['admin/boinc/prefs/presets'] = array(
+    );
+    $items['admin/boinc/prefs/presets'] = array(
     'title' => 'Preferences: Presets',
     'description' => 'Set values for BOINC preference set presets.',
     'page callback' => 'boincwork_admin_prefs_presets_page',
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincwork.admin.inc'
-  );
-  $items['admin/boinc/prefs/upload'] = array(
+    );
+    $items['admin/boinc/prefs/upload'] = array(
     'title' => 'Preferences: Project-specific XML upload',
     'description' => 'Upload XML configuration for project specific preferences.',
     'page callback' => 'drupal_get_form',
@@ -90,142 +90,142 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincwork.admin.inc'
-  );
-  $items['host/%/delete'] = array(
+    );
+    $items['host/%/delete'] = array(
     'title' => 'Delete host',
     'page callback' => 'boincwork_host_delete',
     'page arguments' => array(1),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['host/%/log'] = array(
+    );
+    $items['host/%/log'] = array(
     'title' => 'Host log',
     'page callback' => 'boincwork_host_log',
     'page arguments' => array(1),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['host/%/merge'] = array(
+    );
+    $items['host/%/merge'] = array(
     'title' => 'Merge computer',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincwork_host_merge_form', 1),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['host/%/set-venue/%'] = array(
+    );
+    $items['host/%/set-venue/%'] = array(
     'title' => 'Set host venue',
     'page callback' => 'boincwork_host_set_venue',
     'page arguments' => array(1,3),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['user/%/mobile'] = array(
+    );
+    $items['user/%/mobile'] = array(
     'title' => 'Mobile stats',
     'page callback' => 'boincwork_mobile_stats',
     'page arguments' => array(1),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK
-  );
-  $items['server_status.php'] = array(
+    );
+    $items['server_status.php'] = array(
     'title' => 'Server status',
     'page callback' => 'boincwork_server_status',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['job_file.php'] = array(
+    );
+    $items['job_file.php'] = array(
     'title' => 'Job file input',
     'page callback' => 'boincwork_job_file',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['get_output.php'] = array(
+    );
+    $items['get_output.php'] = array(
     'title' => 'Get output file',
     'page callback' => 'boincwork_get_output',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['get_project_config.php'] = array(
+    );
+    $items['get_project_config.php'] = array(
     'title' => 'Project config',
     'page callback' => 'boincwork_get_project_config',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['submit_rpc_handler.php'] = array(
+    );
+    $items['submit_rpc_handler.php'] = array(
     'title' => 'Remote job submission',
     'page callback' => 'boincwork_submit_rpc_handler',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['userw.php'] = array(
+    );
+    $items['userw.php'] = array(
     'title' => 'User WAP',
     'page callback' => 'boincwork_user_wap',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['account/tasks/%/%'] = array(
+    );
+    $items['account/tasks/%/%'] = array(
     'title' => 'Account Tasks Table',
     'description' => '',
     'page callback' => 'boincwork_account_task_table',
     'page arguments' => array(2,3),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
-  );
-  $items['host/%/tasks/%/%'] = array(
+    );
+    $items['host/%/tasks/%/%'] = array(
     'title' => 'Host Tasks Table',
     'description' => '',
     'page callback' => 'boincwork_host_task_table',
     'page arguments' => array(1,3,4),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
-  );
-  // Workunit task table disabled
-  //$items['workunit/%/tasks/%/%'] = array(
-  //  'title' => 'Workunit Tasks Table',
-  //  'description' => '',
-  //  'page callback' => 'boincwork_workunit_task_table',
-  //  'page arguments' => array(1,3,4),
-  //  'access arguments' => array('access content'),
-  //  'type' => MENU_CALLBACK,
-  //);
-  return $items;
+    );
+    // Workunit task table disabled
+    //$items['workunit/%/tasks/%/%'] = array(
+    //  'title' => 'Workunit Tasks Table',
+    //  'description' => '',
+    //  'page callback' => 'boincwork_workunit_task_table',
+    //  'page arguments' => array(1,3,4),
+    //  'access arguments' => array('access content'),
+    //  'type' => MENU_CALLBACK,
+    //);
+    return $items;
 }
 
 /**
 * Implementation of hook_views_api().
 */
 function boincwork_views_api() {
-  return array(
+    return array(
     'api' => 2.0,
     'path' => drupal_get_path('module', 'boincwork')
-  );
+    );
 }
 
 /**
  * Implementation of hook_locale().
  */
 function boincwork_locale($op = 'groups', $group = NULL) {
-  switch ($op) {
+    switch ($op) {
     case 'groups':
       return array('project' => bts('Project'));
     case 'info':
       $info['project']['refresh callback'] = 'boincwork_locale_refresh';
-      $info['project']['format'] = FALSE;
-      return $info;
-  }
+        $info['project']['format'] = FALSE;
+        return $info;
+    }
 }
 
 /**
  * Refresh strings.
  */
 function boincwork_locale_refresh() {
-  // Mimic process of adding project specific prefs to the project preferences
-  // form -- this parses the prefs XML and calls i18nstrings_update()
-  $form = array();
-  $prefs = array(
+    // Mimic process of adding project specific prefs to the project preferences
+    // form -- this parses the prefs XML and calls i18nstrings_update()
+    $form = array();
+    $prefs = array(
     'project_specific' => array(),
-  );
-  boincwork_add_project_specific_prefs($form, $prefs);
-  return TRUE; // Meaning it completed with no issues
+    );
+    boincwork_add_project_specific_prefs($form, $prefs);
+    return TRUE; // Meaning it completed with no issues
 }
 
 
@@ -234,41 +234,41 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
  
 /**
-  * General preferences menu callback.
-  * Called when user goes to edit preferences page
-  */
+ * General preferences menu callback.
+ * Called when user goes to edit preferences page
+ */
 function generalprefs_page($action = null, $venue = null, $advanced = FALSE) {
   
-  // Keep the venue selected across preference pages
-  boincwork_select_venue($venue);
+    // Keep the venue selected across preference pages
+    boincwork_select_venue($venue);
   
-  $pref_sets = array('generic', 'home', 'school', 'work');
-  $output = null;
-  // Set the page title
-  $title = 'Computing';
-  drupal_set_title($title);
+    $pref_sets = array('generic', 'home', 'school', 'work');
+    $output = null;
+    // Set the page title
+    $title = 'Computing';
+    drupal_set_title($title);
   
-  switch ($action) {
+    switch ($action) {
   
-  case 'clear':
+    case 'clear':
     // Remove settings from this preference set
     if ($venue AND $venue != 'generic') {
-      boincwork_save_prefs(NULL, 'general', $venue);
-      drupal_set_message(t('Settings for the "@name" preference set have been
+        boincwork_save_prefs(NULL, 'general', $venue);
+        drupal_set_message(t('Settings for the "@name" preference set have been
         cleared', array('@name' => ucfirst($venue))));
-      // Set the generic preference set as active
-      $_SESSION['prefs venue'] = 'generic';
+        // Set the generic preference set as active
+        $_SESSION['prefs venue'] = 'generic';
     }
     drupal_goto();
     break;
     
-  case 'combined':
+    case 'combined':
     // Compare preference sets; tabular view
     
     foreach ($pref_sets as $pref_set) {
-      $form_state = array();
-      $prefs[$pref_set] = drupal_retrieve_form('boincwork_generalprefs_form', $form_state, $pref_set);
-      drupal_prepare_form('boincwork_generalprefs_form', $prefs[$pref_set], $form_state);
+        $form_state = array();
+        $prefs[$pref_set] = drupal_retrieve_form('boincwork_generalprefs_form', $form_state, $pref_set);
+        drupal_prepare_form('boincwork_generalprefs_form', $prefs[$pref_set], $form_state);
     }
 
     $output .= '<p>' . bts('These apply to all BOINC projects in which you participate.', array(), NULL, 'boinc:account-preferences-computing') . '<br/>';
@@ -281,29 +281,29 @@ 
     $prefs_table = boincwork_make_prefs_table($prefs['generic']['prefs']['advanced']);
     
     foreach ($prefs_table as $category => $section) {
-      $output .= '<tr class="section-heading">';
-      $output .= "<td>{$section['name']}</td>";
-      foreach ($pref_sets as $pref_set) {
+        $output .= '<tr class="section-heading">';
+        $output .= "<td>{$section['name']}</td>";
+        foreach ($pref_sets as $pref_set) {
         $output .= '<td>' . $pref_set . '</td>';
-      }
-      $output .= '</tr>';
-      foreach ($section['elements'] as $name => $setting) {
+        }
+        $output .= '</tr>';
+        foreach ($section['elements'] as $name => $setting) {
         // Output the setting name and description, with an ugly exception
         // made for preferences with special formatting
         $special_map = array(
-          'start_hour' => 'end_hour',
-          'net_start_hour'=> 'net_end_hour',
-          'daily_xfer_limit_mb' => 'daily_xfer_period_days',
+            'start_hour' => 'end_hour',
+            'net_start_hour'=> 'net_end_hour',
+            'daily_xfer_limit_mb' => 'daily_xfer_period_days',
         );
         $special_delimiter = array(
-          'start_hour' => bts('and', array(), NULL, 'boinc:account-preference'),
-          'net_start_hour'=> bts('and', array(), NULL, 'boinc:account-preference'),
-          'daily_xfer_limit_mb' => bts('every', array(), NULL, 'boinc:account-preference'),
+            'start_hour' => bts('and', array(), NULL, 'boinc:account-preference'),
+            'net_start_hour'=> bts('and', array(), NULL, 'boinc:account-preference'),
+            'daily_xfer_limit_mb' => bts('every', array(), NULL, 'boinc:account-preference'),
         );
         $special = isset($special_map[$name]);
         $very_special = in_array($name, $special_map);
         if ($very_special) {
-          continue;
+            continue;
         }
         $output .= '<tr>';
         $output .= '<td>';
@@ -313,35 +313,35 @@ 
         // Output values for each preference set, again with ugly hacks for
         // time range preferences
         foreach ($pref_sets as $pref_set) {
-          if (($prefs[$pref_set]) AND 
+            if (($prefs[$pref_set]) AND 
               $prefs[$pref_set]['#established'] AND
               isset($prefs[$pref_set]['prefs']['advanced'][$category])) {
             $pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$name];
             $value = isset($pref_setting['#options']) ? $pref_setting['#options'][$pref_setting['#default_value']] : $pref_setting['#default_value'];
             if ($value == '') {
-              $value = '---';
+                $value = '---';
             }
             if (!isset($pref_setting['#field_suffix'])) {
-              $pref_setting['#field_suffix'] = '';
+                $pref_setting['#field_suffix'] = '';
             }
             if (!$special) {
-              $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
+                $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
             }
             else {
-              // The "very special" case where we merge two prefs
-              $second_pref = $special_map[$name];
-              $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref];
-              $second_value = isset($second_pref_setting['#options']) ? $second_pref_setting['#options'][$second_pref_setting['#default_value']] : $second_pref_setting['#default_value'];
-              $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
+                // The "very special" case where we merge two prefs
+                $second_pref = $special_map[$name];
+                $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref];
+                $second_value = isset($second_pref_setting['#options']) ? $second_pref_setting['#options'][$second_pref_setting['#default_value']] : $second_pref_setting['#default_value'];
+                $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
                 " {$second_value} {$second_pref_setting['#field_suffix']} </td>";
             }
-          }
-          else  {
+            }
+            else  {
             $output .= '<td>---</td>';
-          }
+            }
         }
         $output .= '</tr>';
-      }
+        }
     }
     
     // Empty line above action links... :/
@@ -357,24 +357,24 @@ 
     $output .= '<tr>';
     $output .= '<td></td>';
     foreach ($pref_sets as $pref_set) {
-      $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
-      $output .= '<td><ul class="tab-list"><li class="first tab">';
-      $output .= l($action_text, "account/prefs/computing/edit/{$pref_set}/1",
+        $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
+        $output .= '<td><ul class="tab-list"><li class="first tab">';
+        $output .= l($action_text, "account/prefs/computing/edit/{$pref_set}/1",
         array('fragment' => "")
-      );
-      // Show Clear links for established preference sets
-      if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
+        );
+        // Show Clear links for established preference sets
+        if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
         $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$pref_set}",
-          array(
+            array(
             'query' => drupal_get_destination(),
             'attributes' => array(
-              'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
+                'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
                 array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-computing-preferences') . '\')'
             )
-          )
+            )
         );
-      }
-      $output .= '</li></ul></td>';
+        }
+        $output .= '</li></ul></td>';
     }
     $output .= '</tr>';
     
@@ -382,28 +382,28 @@ 
     
     break;
     
-  case 'edit':
+    case 'edit':
   default:
   
     // Return the HTML generated from the $form data structure.
     if (function_exists('jump_quickly')) {
-      $path = 'account/prefs/computing/edit';
-      $venues = array(
+        $path = 'account/prefs/computing/edit';
+        $venues = array(
         "{$path}/generic" => bts('Generic', array(), NULL, 'boinc:account-preferences-location'),
         "{$path}/home" => bts('Home', array(), NULL, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
         "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location'),
         "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location')
-      );
-      variable_set('jump_use_js_venues-Array', 1);
-      drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-      drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
+        );
+        variable_set('jump_use_js_venues-Array', 1);
+        drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
+        drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
       
-      $output .= '<div id="venue-selector" class="simple-form-controls">';
-      $output .= '  <div class="form-item venue">';
-      $output .= '    <label>Preference set:</label>';
-      $output .= jump_quickly($venues, 'venues', 1, "{$path}/{$venue}");
-      $output .= '  </div>';
-      $output .= '</div>';
+        $output .= '<div id="venue-selector" class="simple-form-controls">';
+        $output .= '  <div class="form-item venue">';
+        $output .= '    <label>Preference set:</label>';
+        $output .= jump_quickly($venues, 'venues', 1, "{$path}/{$venue}");
+        $output .= '  </div>';
+        $output .= '</div>';
     }
     $output .= drupal_get_form('boincwork_generalprefs_form', $venue, NULL, $advanced);
     
@@ -414,54 +414,54 @@ 
     drupal_prepare_form('boincwork_generalprefs_form', $current_set, $form_state);
 
     if (!$current_set['#established']) {
-      drupal_set_message(bts(
-          "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
-          array( '@venue' => $venue, ),
-          NULL, 'boinc:account-preferences'), 'status');
+        drupal_set_message(bts(
+            "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
+            array( '@venue' => $venue, ),
+            NULL, 'boinc:account-preferences'), 'status');
     }
     
     break;
-  }
+    }
   
-  return $output;
+    return $output;
 }
 
 /**
-  * Project preferences menu callback
-  * Called when user goes to edit project preferences page.
-  */
+ * Project preferences menu callback
+ * Called when user goes to edit project preferences page.
+ */
 function projectprefs_page($action = null, $venue = null) {
   
-  // Keep the venue selected across preference pages
-  boincwork_select_venue($venue);
+    // Keep the venue selected across preference pages
+    boincwork_select_venue($venue);
   
-  require_boinc(array('util', 'prefs'));
-  global $project_has_beta;
-  $pref_sets = array('generic', 'home', 'school', 'work');
-  $output = null;
+    require_boinc(array('util', 'prefs'));
+    global $project_has_beta;
+    $pref_sets = array('generic', 'home', 'school', 'work');
+    $output = null;
   
-  $title = 'Project';
-  drupal_set_title($title);
+    $title = 'Project';
+    drupal_set_title($title);
   
-  switch ($action) {
+    switch ($action) {
   
-  case 'clear':
+    case 'clear':
     // Remove settings from this preference set
     if ($venue AND $venue != 'generic') {
-      boincwork_save_prefs(NULL, 'project', $venue);
-      drupal_set_message(t('Settings for the "@name" preference set have been
+        boincwork_save_prefs(NULL, 'project', $venue);
+        drupal_set_message(t('Settings for the "@name" preference set have been
         cleared', array('@name' => ucfirst($venue))));
       
-      // Set the generic preference set as active
-      $_SESSION['prefs venue'] = 'generic';
+        // Set the generic preference set as active
+        $_SESSION['prefs venue'] = 'generic';
       
-      // If the user has removed their default preference set, make it generic
-      boincwork_set_default_venue();
+        // If the user has removed their default preference set, make it generic
+        boincwork_set_default_venue();
     }
     drupal_goto();
     break;
     
-  case 'combined':
+    case 'combined':
   
     // Compare preference sets; tabular view
     
@@ -470,9 +470,9 @@ 
     $boincuser = BoincUser::lookup_id($account->boincuser_id);
     
     foreach ($pref_sets as $pref_set) {
-      $form_state = array();
-      $prefs[$pref_set] = drupal_retrieve_form('boincwork_projectprefs_form', $form_state, $pref_set);
-      drupal_prepare_form('boincwork_projectprefs_form', $prefs[$pref_set], $form_state);
+        $form_state = array();
+        $prefs[$pref_set] = drupal_retrieve_form('boincwork_projectprefs_form', $form_state, $pref_set);
+        drupal_prepare_form('boincwork_projectprefs_form', $prefs[$pref_set], $form_state);
     }
     
     $output .= '<h2>' . bts('Combined preferences', array(), NULL, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project') . '</h2>';
@@ -482,20 +482,20 @@ 
     $prefs_table = boincwork_make_prefs_table($prefs['generic']);
     
     foreach ($prefs_table as $category => $section) {
-      $output .= '<tr class="section-heading">';
-      $output .= "<td>{$section['name']}</td>";
-      foreach ($pref_sets as $pref_set) {
+        $output .= '<tr class="section-heading">';
+        $output .= "<td>{$section['name']}</td>";
+        foreach ($pref_sets as $pref_set) {
         $output .= '<td>' . $pref_set . '</td>';
-      }
-      $output .= '</tr>';
-      foreach ($section['elements'] as $name => $setting) {
+        }
+        $output .= '</tr>';
+        foreach ($section['elements'] as $name => $setting) {
         $output .= '<tr>';
         $output .= '<td>';
         $output .= "<div class=\"title\">{$setting['name']}</div>";
         $output .= "<div class=\"description\">{$setting['description']}</div>";
         $output .= '</td>';
         foreach ($pref_sets as $pref_set) {
-          if (($prefs[$pref_set]) AND
+            if (($prefs[$pref_set]) AND
               $prefs[$pref_set]['#established'] AND
               isset($prefs[$pref_set][$category])) {
             $pref_setting = $prefs[$pref_set][$category][$name];
@@ -503,10 +503,10 @@ 
             if ($value == '') $value = '---';
             if (!isset($pref_setting['#field_suffix'])) $pref_setting['#field_suffix'] = '';
             $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
-          } else $output .= '<td>---</td>';
+            } else $output .= '<td>---</td>';
         }
         $output .= '</tr>';
-      }
+        }
     }
     
     // Empty line above action links... :/
@@ -522,29 +522,29 @@ 
     $output .= '<tr>';
     $output .= '<td></td>';
     foreach ($pref_sets as $pref_set) {
-      $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
-      $output .= '<td><ul class="tab-list"><li class="first tab">';
-      $output .= l($action_text, "account/prefs/project/edit/{$pref_set}");
-      // Show Clear links for established preference sets
-      if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
+        $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
+        $output .= '<td><ul class="tab-list"><li class="first tab">';
+        $output .= l($action_text, "account/prefs/project/edit/{$pref_set}");
+        // Show Clear links for established preference sets
+        if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
         $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$pref_set}",
-          array(
+            array(
             'query' => drupal_get_destination(),
             'attributes' => array(
-              'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
+                'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
                 array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-preferences-project') . '\')'
             )
-          )
+            )
         );
-      }
-      $output .= '</li></ul></td>';
+        }
+        $output .= '</li></ul></td>';
     }
     
     $output .= '</table>';
     
     break;
     
-  case 'set-default':
+    case 'set-default':
     // Set this preference set as the one to use for any new hosts attached
     // to the user account
     boincwork_set_default_venue($venue);
@@ -552,30 +552,30 @@ 
     drupal_goto('account/prefs/project/combined');
     break;
     
-  case 'edit':
+    case 'edit':
   default:
     
     // Return the HTML generated from the $form data structure.
     require_boinc('util');
     
     if (function_exists('jump_quickly')) {
-      $path = 'account/prefs/project/edit';
-      $venues = array(
+        $path = 'account/prefs/project/edit';
+        $venues = array(
         "{$path}/generic" => bts('Generic', array(), NULL, 'boinc:account-preferences-location'),
         "{$path}/home" => bts('Home', array(), NULL, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
         "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location'),
         "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location')
-      );
-      variable_set('jump_use_js_venues-Array', 1);
-      drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-      drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
+        );
+        variable_set('jump_use_js_venues-Array', 1);
+        drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
+        drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
       
-      $output .= '<div id="venue-selector" class="simple-form-controls">';
-      $output .= '  <div class="form-item venue">';
-      $output .= '    <label>Preference set:</label>';
-      $output .= jump_quickly($venues, 'venues', 1, "{$path}/{$venue}");
-      $output .= '  </div>';
-      $output .= '</div>';
+        $output .= '<div id="venue-selector" class="simple-form-controls">';
+        $output .= '  <div class="form-item venue">';
+        $output .= '    <label>Preference set:</label>';
+        $output .= jump_quickly($venues, 'venues', 1, "{$path}/{$venue}");
+        $output .= '  </div>';
+        $output .= '</div>';
     }
     $output .= drupal_get_form('boincwork_projectprefs_form', $venue);
     
@@ -586,63 +586,63 @@ 
     drupal_prepare_form('boincwork_projectprefs_form', $current_set, $form_state);
     
     if (!$current_set['#established']) {
-      drupal_set_message(bts(
-          "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
-          array( '@venue' => $venue, ),
-          NULL, 'boinc:account-preferences'), 'status');
+        drupal_set_message(bts(
+            "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
+            array( '@venue' => $venue, ),
+            NULL, 'boinc:account-preferences'), 'status');
     }
     
     break;
     
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
-  * Community preferences menu callback
-  * Called when user goes to edit community preferences page.
-  */
+ * Community preferences menu callback
+ * Called when user goes to edit community preferences page.
+ */
 function communityprefs_page($action = null) {
   
-  require_boinc(array('util', 'prefs'));
-  $output = null;
+    require_boinc(array('util', 'prefs'));
+    $output = null;
   
-  $title = 'Community';
-  drupal_set_title($title);
+    $title = 'Community';
+    drupal_set_title($title);
   
-  //$output .= '<h2>Community preferences</h2>';
+    //$output .= '<h2>Community preferences</h2>';
   
-  $output .= drupal_get_form('communityprefs_form');
+    $output .= drupal_get_form('communityprefs_form');
   
-  return $output;
+    return $output;
 }
 
 /**
-  * Privacy preferences menu callback
-  * Called when user goes to edit privacy preferences page.
-  */
+ * Privacy preferences menu callback
+ * Called when user goes to edit privacy preferences page.
+ */
 function privacyprefs_page($action = null) {
   
-  require_boinc(array('util', 'prefs'));
-  $output = null;
-  $title = 'Privacy';
-  drupal_set_title($title);
+    require_boinc(array('util', 'prefs'));
+    $output = null;
+    $title = 'Privacy';
+    drupal_set_title($title);
   
-  switch ($action) {
-  case 'view':
+    switch ($action) {
+    case 'view':
     $form_state = array();
     $prefs = drupal_retrieve_form('boincwork_privacyprefs_form', $form_state);
     drupal_prepare_form('boincwork_privacyprefs_form', $prefs, $form_state);
     $output .= '<table>';
     
     $sections = array(
-      'privacy' => $prefs['privacy']
+        'privacy' => $prefs['privacy']
     );
     
     foreach ($sections as $section) {
-      $output .= '<tr class="section-heading">';
-      $output .= "<td>{$section['#title']}</td></tr>";
-      foreach ($section as $name => $setting) {
+        $output .= '<tr class="section-heading">';
+        $output .= "<td>{$section['#title']}</td></tr>";
+        foreach ($section as $name => $setting) {
         if ($name{0} == '#') continue;
         $value = isset($setting['#default_value']) ? $setting['#default_value'] : '';
         if ($value AND isset($setting['#options'])) $value = $setting['#options'][$value];
@@ -654,7 +654,7 @@ 
         $output .= "<td>{$setting['#title']}<br/>{$setting['#description']}</td>";
         $output .= "<td>{$value} {$setting['#field_suffix']}</td>";
         $output .= '</tr>';
-      }
+        }
     }
     
     // Edit preferences link
@@ -667,33 +667,33 @@ 
     
     break;
     
-  case 'edit':
+    case 'edit':
   default:
     require_boinc('util');
     // Return the HTML generated from the $form data structure.
     $output .= drupal_get_form('boincwork_privacyprefs_form');
     break;
     
-  }
+    }
   
-  return $output;
+    return $output;
 }
 
 /**
-  * Certificates menu callback
-  * Called when user goes to account certificate pages
-  */
+ * Certificates menu callback
+ * Called when user goes to account certificate pages
+ */
 function boincwork_certificates($type = null, $border = null) {
-  global $user;
-  $drupuser = user_load($user->uid);
-  // Load BOINC account and pre-authenticate with BOINC code
-  require_boinc(array('util', 'cert'));
-  $boincuser = BoincUser::lookup_id($drupuser->boincuser_id);
-  //global $g_logged_in_user;
-  //$g_logged_in_user = $boincuser;
-  //print_r($boincuser); exit;
-  switch ($type) {
-  case 'all':
+    global $user;
+    $drupuser = user_load($user->uid);
+    // Load BOINC account and pre-authenticate with BOINC code
+    require_boinc(array('util', 'cert'));
+    $boincuser = BoincUser::lookup_id($drupuser->boincuser_id);
+    //global $g_logged_in_user;
+    //$g_logged_in_user = $boincuser;
+    //print_r($boincuser); exit;
+    switch ($type) {
+    case 'all':
     //include_boinc('user/cert_all.php');
     require_boinc(array('util','cert','user'));
 
@@ -763,7 +763,7 @@ 
     ";
     break;
     
-  case 'account':
+    case 'account':
   default:
     //include_boinc('user/cert1.php');
     require_boinc(array('util','cert'));
@@ -839,7 +839,7 @@ 
     echo "
     </td><tr></table>
     ";
-  }
+    }
 }
 
 /**
@@ -847,42 +847,42 @@ 
  * Called when user selects to delete a host
  */
 function boincwork_host_delete($host_id) {
-  // Verify that host has no tasks
-  if (boincwork_host_user_is_owner($host_id)) {
+    // Verify that host has no tasks
+    if (boincwork_host_user_is_owner($host_id)) {
     if (!boincwork_host_get_task_count($host_id)) {
-      // Delete the host record
-      db_set_active('boinc');
-      $host_deleted = db_query(
+        // Delete the host record
+        db_set_active('boinc');
+        $host_deleted = db_query(
         "DELETE FROM {host} WHERE id = '%d'",
         $host_id
-      );
-      db_set_active('default');
-      if ($host_deleted) {
+        );
+        db_set_active('default');
+        if ($host_deleted) {
         drupal_set_message(t('Host @id has been removed from your account.',
-          array('@id' => $host_id)));
+            array('@id' => $host_id)));
         drupal_goto('account/computers');
-      }
-      else {
+        }
+        else {
         drupal_set_message(t('Host @id could not be deleted. Not sure why...',
-          array('@id' => $host_id)), 'error'
+            array('@id' => $host_id)), 'error'
         );
-      }
+        }
     }
     else {
-      drupal_set_message(t('Host @id cannot be deleted because it still has
+        drupal_set_message(t('Host @id cannot be deleted because it still has
         tasks associated with it. These tasks should be processed within the
         next few days, after which the host can be deleted.', 
         array('@id' => $host_id)), 'warning'
-      );
+        );
+    }
     }
-  }
-  else {
+    else {
     drupal_set_message(t('You are not the owner of host @id, so you cannot
       delete it.', 
-      array('@id' => $host_id)), 'error'
+        array('@id' => $host_id)), 'error'
     );
-  }
-  drupal_goto("host/{$host_id}");
+    }
+    drupal_goto("host/{$host_id}");
 }
 
 /**
@@ -890,55 +890,55 @@ 
  * Called when user accesses the log for a host
  */
 function boincwork_host_log($host_id = null) {
-  $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
-  $log = '';
-  if ($root_log_dir AND $host_id) {
+    $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
+    $log = '';
+    if ($root_log_dir AND $host_id) {
     $subdir = substr($host_id, 0, -3) OR $subdir = 0;
     $log = implode('/', array($root_log_dir, $subdir, $host_id));
-  }
-  if ($log AND file_exists($log)) {
+    }
+    if ($log AND file_exists($log)) {
     header('Content-type: text/plain');
     include($log);
-  }
+    }
 }
 
 function boincwork_host_set_venue($host_id = NULL, $venue = NULL) {
-  global $user;
-  $account = user_load($user->uid);
-  db_set_active('boinc');
-  // Verify that this is my host
-  $host_owner = db_result(db_query(
+    global $user;
+    $account = user_load($user->uid);
+    db_set_active('boinc');
+    // Verify that this is my host
+    $host_owner = db_result(db_query(
     "SELECT userid FROM {host} WHERE id = '%d'",
     $host_id
-  ));
-  db_set_active('default');
-  if ($host_owner AND $host_owner == $account->boincuser_id) {
+    ));
+    db_set_active('default');
+    if ($host_owner AND $host_owner == $account->boincuser_id) {
     db_set_active('boinc');
     $updated = db_query(
-      "UPDATE {host} SET venue = '%s' WHERE id = '%d'",
-      $venue, $host_id
+        "UPDATE {host} SET venue = '%s' WHERE id = '%d'",
+        $venue, $host_id
     );
     db_set_active('default');
     if ($updated) {
-      drupal_set_message(
+        drupal_set_message(
         bts('The location for this host has been updated.', array(), NULL, 'boinc:account-host-details')
         . bts('This will take effect next time the host contacts the project.', array(), NULL, 'boinc:account-host-details')
-      );
+        );
     }
     else {
-      drupal_set_message(
+        drupal_set_message(
         bts('Unable to save changes to this host for some reason!', array(), NULL, 'boinc:account-host-details'),
         'error'
-      );
+        );
     }
-  }
-  else {
+    }
+    else {
     drupal_set_message(
-      bts('You are not allowed to make changes to this host.', array(), NULL, 'boinc:account-host-details'),
-      'warning'
+        bts('You are not allowed to make changes to this host.', array(), NULL, 'boinc:account-host-details'),
+        'warning'
     );
-  }
-  drupal_goto("host/{$host_id}");
+    }
+    drupal_goto("host/{$host_id}");
 }
 
 /**
@@ -946,8 +946,8 @@ 
  * Called when user accesses cell phone stats
  */
 function boincwork_mobile_stats($userid = null) {
-  $_GET['id'] = $userid;
-  include_boinc('user/userw.php');
+    $_GET['id'] = $userid;
+    include_boinc('user/userw.php');
 }
 
 /**
@@ -955,7 +955,7 @@ 
  * Called to build the server status page
  */
 function boincwork_server_status() {
-  include_boinc('user/server_status.php');
+    include_boinc('user/server_status.php');
 }
 
 /**
@@ -963,7 +963,7 @@ 
  * RPC for managing job input files
  */
 function boincwork_job_file() {
-  include_boinc('user/job_file.php');
+    include_boinc('user/job_file.php');
 }
 
 /**
@@ -971,7 +971,7 @@ 
  * Get output file from remote job submission
  */
 function boincwork_get_output() {
-  include_boinc('user/get_output.php');
+    include_boinc('user/get_output.php');
 }
 
 /**
@@ -979,23 +979,23 @@ 
  * Get the project configuration XML; used by client software
  */
 function boincwork_get_project_config() {
-  include_boinc('user/get_project_config.php');
+    include_boinc('user/get_project_config.php');
 }
 
 /**
  * Page callback for the remote job submission RPC (submit_rpc_handler.php).
  */
 function boincwork_submit_rpc_handler() {
-  include_boinc('user/submit_rpc_handler.php');
+    include_boinc('user/submit_rpc_handler.php');
 }
 
 /**
  * Page callback for user WAP (userw.php).
  */
 function boincwork_user_wap() {
-  // Remove q from the GET request or BOINC will panic
-  unset($_GET['q']);
-  include_boinc('user/userw.php');
+    // Remove q from the GET request or BOINC will panic
+    unset($_GET['q']);
+    include_boinc('user/userw.php');
 }
 
 
@@ -1003,44 +1003,44 @@ 
  * Page callback for user account task table
  */
 function boincwork_account_task_table($tselect = NULL, $app_id = NULL) {
-  $title = bts('Tasks for your account', array(), NULL, 'boinc:account-task-table');
-  drupal_set_title($title);
+    $title = bts('Tasks for your account', array(), NULL, 'boinc:account-task-table');
+    drupal_set_title($title);
 
-  global $user;
-  $account = user_load($user->uid);
-  return boincwork_tasktable(0, $account->boincuser_id, $tselect, $app_id);
+    global $user;
+    $account = user_load($user->uid);
+    return boincwork_tasktable(0, $account->boincuser_id, $tselect, $app_id);
 }
 
 /**
  * Page callback for host task table
  */
 function boincwork_host_task_table($host_id = NULL, $tselect = NULL, $app_id = NULL) {
-  require_boinc( array('util', 'result') );
+    require_boinc( array('util', 'result') );
 
-  $title = bts('Tasks for computer @host_id', array('@host_id' => $host_id), NULL, 'boinc:host-task-table');
-  drupal_set_title($title);
+    $title = bts('Tasks for computer @host_id', array('@host_id' => $host_id), NULL, 'boinc:host-task-table');
+    drupal_set_title($title);
 
-  if (is_null($host_id)) {
+    if (is_null($host_id)) {
     drupal_set_message(bts('ERROR: Invalid host ID', array(), NULL, 'boinc:host-task-table'), 'error');
     return '';
-  }
+    }
 
-  return boincwork_tasktable(2, $host_id, $tselect, $app_id);
+    return boincwork_tasktable(2, $host_id, $tselect, $app_id);
 }
 
 /**
  * Page callback for workunit task table
  */
 function boincwork_workunit_task_table($workunit_id = NULL, $tselect = NULL, $app_id = NULL) {
-  $title = bts('Tasks for workunit @workunit_id', array('@workunit_id' => $workunit_id), NULL, 'boinc:workunit-task-table');
-  drupal_set_title($title);
+    $title = bts('Tasks for workunit @workunit_id', array('@workunit_id' => $workunit_id), NULL, 'boinc:workunit-task-table');
+    drupal_set_title($title);
 
-  if (is_null($workunit_id)) {
+    if (is_null($workunit_id)) {
     drupal_set_message(bts('ERROR: Invalid workunit ID', array(), NULL, 'boinc:workunit-task-table'), 'error');
     return '';
-  }
+    }
   
-  return boincwork_tasktable(1, $workunit_id, $tselect, $app_id);
+    return boincwork_tasktable(1, $workunit_id, $tselect, $app_id);
 }
 
 /**
@@ -1048,8 +1048,8 @@ 
  * Take a node ID and render that node as a page
  */
 function boincwork_view_page($nid) {
-  $node = node_load($nid);
-  return node_page_view($node);
+    $node = node_load($nid);
+    return node_page_view($node);
 }
 
 
@@ -1061,16 +1061,16 @@ 
  * Determine which venue should be selected
  */
 function boincwork_select_venue(&$venue) {
-  if (!$venue) {
+    if (!$venue) {
     $active_venue = isset($_SESSION['prefs venue']) ? $_SESSION['prefs venue'] : NULL;
     if ($active_venue) {
-      $venue = $active_venue;
-      //unset($_SESSION['prefs venue']);
+        $venue = $active_venue;
+        //unset($_SESSION['prefs venue']);
+    }
     }
-  }
-  else {
+    else {
     // Set the active venue to keep it selected between computing and project
     // preference pages
     $_SESSION['prefs venue'] = $venue;
-  }
+    }
 }

Spacing +34 added lines, -34 removed lines

@@ -115,7 +115,7 @@ 
   $items['host/%/set-venue/%'] = array(
     'title' => 'Set host venue',
     'page callback' => 'boincwork_host_set_venue',
-    'page arguments' => array(1,3),
+    'page arguments' => array(1, 3),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
   );
@@ -166,7 +166,7 @@ 
     'title' => 'Account Tasks Table',
     'description' => '',
     'page callback' => 'boincwork_account_task_table',
-    'page arguments' => array(2,3),
+    'page arguments' => array(2, 3),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
   );
@@ -174,7 +174,7 @@ 
     'title' => 'Host Tasks Table',
     'description' => '',
     'page callback' => 'boincwork_host_task_table',
-    'page arguments' => array(1,3,4),
+    'page arguments' => array(1, 3, 4),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
   );
@@ -271,10 +271,10 @@ 
       drupal_prepare_form('boincwork_generalprefs_form', $prefs[$pref_set], $form_state);
     }
 
-    $output .= '<p>' . bts('These apply to all BOINC projects in which you participate.', array(), NULL, 'boinc:account-preferences-computing') . '<br/>';
-    $output .= bts('On computers attached to multiple projects, the most recently modified preferences will be used.', array(), NULL, 'boinc:account-preferences-computing') . '</p>';
-    $output .= '<p>' . bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['prefs']['modified']['#value'])), NULL, 'boinc:account-preferences-computing') . '</p>';
-    $output .= '<h2>' . bts('Combined preferences', array(), NULL, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/computing') . '</h2>';
+    $output .= '<p>'.bts('These apply to all BOINC projects in which you participate.', array(), NULL, 'boinc:account-preferences-computing').'<br/>';
+    $output .= bts('On computers attached to multiple projects, the most recently modified preferences will be used.', array(), NULL, 'boinc:account-preferences-computing').'</p>';
+    $output .= '<p>'.bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['prefs']['modified']['#value'])), NULL, 'boinc:account-preferences-computing').'</p>';
+    $output .= '<h2>'.bts('Combined preferences', array(), NULL, 'boinc:account-preferences').' '.l('('.bts('Switch View', array(), NULL, 'boinc:account-preferences').')', 'account/prefs/computing').'</h2>';
     
     $output .= '<table class="preferences combined">';
     
@@ -284,7 +284,7 @@ 
       $output .= '<tr class="section-heading">';
       $output .= "<td>{$section['name']}</td>";
       foreach ($pref_sets as $pref_set) {
-        $output .= '<td>' . $pref_set . '</td>';
+        $output .= '<td>'.$pref_set.'</td>';
       }
       $output .= '</tr>';
       foreach ($section['elements'] as $name => $setting) {
@@ -332,11 +332,11 @@ 
               $second_pref = $special_map[$name];
               $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref];
               $second_value = isset($second_pref_setting['#options']) ? $second_pref_setting['#options'][$second_pref_setting['#default_value']] : $second_pref_setting['#default_value'];
-              $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
+              $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}".
                 " {$second_value} {$second_pref_setting['#field_suffix']} </td>";
             }
           }
-          else  {
+          else {
             $output .= '<td>---</td>';
           }
         }
@@ -364,12 +364,12 @@ 
       );
       // Show Clear links for established preference sets
       if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
-        $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$pref_set}",
+        $output .= ' </li><li class="tab"> '.l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$pref_set}",
           array(
             'query' => drupal_get_destination(),
             'attributes' => array(
-              'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
-                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-computing-preferences') . '\')'
+              'onclick' => 'return confirm(\''.bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
+                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-computing-preferences').'\')'
             )
           )
         );
@@ -395,8 +395,8 @@ 
         "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location')
       );
       variable_set('jump_use_js_venues-Array', 1);
-      drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-      drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
+      drupal_add_js(drupal_get_path('module', 'jump').'/jump.js');
+      drupal_add_js(drupal_get_path('theme', 'boinc').'/js/prefs.js', 'theme');
       
       $output .= '<div id="venue-selector" class="simple-form-controls">';
       $output .= '  <div class="form-item venue">';
@@ -416,7 +416,7 @@ 
     if (!$current_set['#established']) {
       drupal_set_message(bts(
           "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
-          array( '@venue' => $venue, ),
+          array('@venue' => $venue,),
           NULL, 'boinc:account-preferences'), 'status');
     }
     
@@ -475,7 +475,7 @@ 
       drupal_prepare_form('boincwork_projectprefs_form', $prefs[$pref_set], $form_state);
     }
     
-    $output .= '<h2>' . bts('Combined preferences', array(), NULL, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project') . '</h2>';
+    $output .= '<h2>'.bts('Combined preferences', array(), NULL, 'boinc:account-preferences').' '.l('('.bts('Switch View', array(), NULL, 'boinc:account-preferences').')', 'account/prefs/project').'</h2>';
     
     $output .= '<table class="preferences combined">';
     
@@ -485,7 +485,7 @@ 
       $output .= '<tr class="section-heading">';
       $output .= "<td>{$section['name']}</td>";
       foreach ($pref_sets as $pref_set) {
-        $output .= '<td>' . $pref_set . '</td>';
+        $output .= '<td>'.$pref_set.'</td>';
       }
       $output .= '</tr>';
       foreach ($section['elements'] as $name => $setting) {
@@ -527,12 +527,12 @@ 
       $output .= l($action_text, "account/prefs/project/edit/{$pref_set}");
       // Show Clear links for established preference sets
       if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
-        $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$pref_set}",
+        $output .= ' </li><li class="tab"> '.l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$pref_set}",
           array(
             'query' => drupal_get_destination(),
             'attributes' => array(
-              'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
-                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-preferences-project') . '\')'
+              'onclick' => 'return confirm(\''.bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
+                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-preferences-project').'\')'
             )
           )
         );
@@ -548,7 +548,7 @@ 
     // Set this preference set as the one to use for any new hosts attached
     // to the user account
     boincwork_set_default_venue($venue);
-    drupal_set_message( bts('The primary preference set has been changed to "@set"', array('@set' => $venue), NULL, 'boinc:account-preferences-project') );
+    drupal_set_message(bts('The primary preference set has been changed to "@set"', array('@set' => $venue), NULL, 'boinc:account-preferences-project'));
     drupal_goto('account/prefs/project/combined');
     break;
     
@@ -567,8 +567,8 @@ 
         "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location')
       );
       variable_set('jump_use_js_venues-Array', 1);
-      drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-      drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
+      drupal_add_js(drupal_get_path('module', 'jump').'/jump.js');
+      drupal_add_js(drupal_get_path('theme', 'boinc').'/js/prefs.js', 'theme');
       
       $output .= '<div id="venue-selector" class="simple-form-controls">';
       $output .= '  <div class="form-item venue">';
@@ -588,7 +588,7 @@ 
     if (!$current_set['#established']) {
       drupal_set_message(bts(
           "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
-          array( '@venue' => $venue, ),
+          array('@venue' => $venue,),
           NULL, 'boinc:account-preferences'), 'status');
     }
     
@@ -660,7 +660,7 @@ 
     // Edit preferences link
     $output .= '<tr>';
     $output .= '<td></td>';
-    $output .= '<td>' . l(bts('Edit privacy preferences', array('@project' => PROJECT), NULL, 'boinc:account-preferences-privacy'), "account/prefs/privacy/edit") . '</td>';
+    $output .= '<td>'.l(bts('Edit privacy preferences', array('@project' => PROJECT), NULL, 'boinc:account-preferences-privacy'), "account/prefs/privacy/edit").'</td>';
     $output .= '</tr>';
     
     $output .= '</table>';
@@ -695,15 +695,15 @@ 
   switch ($type) {
   case 'all':
     //include_boinc('user/cert_all.php');
-    require_boinc(array('util','cert','user'));
+    require_boinc(array('util', 'cert', 'user'));
 
     $join = date('j F Y', $boincuser->create_time);
     $today = date('j F Y', time(0));
 
-    if ($border=="no") {
+    if ($border == "no") {
         $border = 0;
     } else {
-        $border=8;
+        $border = 8;
     }
 
     $title_font = "\"Optima,ZapfChancery\"";
@@ -747,7 +747,7 @@ 
         <tr><th align=left>Project</th><th align=left>Cobblestones</th><th align=left>Joined</th></tr>
     ";
     foreach ($boincuser->projects as $p) {
-        if ($p->total_credit<100) continue;
+        if ($p->total_credit < 100) continue;
         show_proj($p);
     }
     echo "
@@ -766,15 +766,15 @@ 
   case 'account':
   default:
     //include_boinc('user/cert1.php');
-    require_boinc(array('util','cert'));
+    require_boinc(array('util', 'cert'));
 
     $join = date('j F Y', $boincuser->create_time);
     $today = date('j F Y', time(0));
 
-    if ($border=="no") {
+    if ($border == "no") {
         $border = 0;
     } else {
-        $border=8;
+        $border = 8;
     }
 
     $credit = credit_string($boincuser->total_credit, false);
@@ -1015,7 +1015,7 @@ 
  * Page callback for host task table
  */
 function boincwork_host_task_table($host_id = NULL, $tselect = NULL, $app_id = NULL) {
-  require_boinc( array('util', 'result') );
+  require_boinc(array('util', 'result'));
 
   $title = bts('Tasks for computer @host_id', array('@host_id' => $host_id), NULL, 'boinc:host-task-table');
   drupal_set_title($title);

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

@@ -203,13 +203,13 @@ 
 /**
  * Implementation of hook_locale().
  */
-function boincwork_locale($op = 'groups', $group = NULL) {
+function boincwork_locale($op = 'groups', $group = null) {
   switch ($op) {
     case 'groups':
       return array('project' => bts('Project'));
     case 'info':
       $info['project']['refresh callback'] = 'boincwork_locale_refresh';
-      $info['project']['format'] = FALSE;
+      $info['project']['format'] = false;
       return $info;
   }
 }
@@ -225,7 +225,7 @@ 
     'project_specific' => array(),
   );
   boincwork_add_project_specific_prefs($form, $prefs);
-  return TRUE; // Meaning it completed with no issues
+  return true; // Meaning it completed with no issues
 }
 
 
@@ -237,7 +237,7 @@ 
   * General preferences menu callback.
   * Called when user goes to edit preferences page
   */
-function generalprefs_page($action = null, $venue = null, $advanced = FALSE) {
+function generalprefs_page($action = null, $venue = null, $advanced = false) {
   
   // Keep the venue selected across preference pages
   boincwork_select_venue($venue);
@@ -252,8 +252,8 @@ 
   
   case 'clear':
     // Remove settings from this preference set
-    if ($venue AND $venue != 'generic') {
-      boincwork_save_prefs(NULL, 'general', $venue);
+    if ($venue and $venue != 'generic') {
+      boincwork_save_prefs(null, 'general', $venue);
       drupal_set_message(t('Settings for the "@name" preference set have been
         cleared', array('@name' => ucfirst($venue))));
       // Set the generic preference set as active
@@ -271,10 +271,10 @@ 
       drupal_prepare_form('boincwork_generalprefs_form', $prefs[$pref_set], $form_state);
     }
 
-    $output .= '<p>' . bts('These apply to all BOINC projects in which you participate.', array(), NULL, 'boinc:account-preferences-computing') . '<br/>';
-    $output .= bts('On computers attached to multiple projects, the most recently modified preferences will be used.', array(), NULL, 'boinc:account-preferences-computing') . '</p>';
-    $output .= '<p>' . bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['prefs']['modified']['#value'])), NULL, 'boinc:account-preferences-computing') . '</p>';
-    $output .= '<h2>' . bts('Combined preferences', array(), NULL, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/computing') . '</h2>';
+    $output .= '<p>' . bts('These apply to all BOINC projects in which you participate.', array(), null, 'boinc:account-preferences-computing') . '<br/>';
+    $output .= bts('On computers attached to multiple projects, the most recently modified preferences will be used.', array(), null, 'boinc:account-preferences-computing') . '</p>';
+    $output .= '<p>' . bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['prefs']['modified']['#value'])), null, 'boinc:account-preferences-computing') . '</p>';
+    $output .= '<h2>' . bts('Combined preferences', array(), null, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), null, 'boinc:account-preferences') . ')', 'account/prefs/computing') . '</h2>';
     
     $output .= '<table class="preferences combined">';
     
@@ -296,9 +296,9 @@ 
           'daily_xfer_limit_mb' => 'daily_xfer_period_days',
         );
         $special_delimiter = array(
-          'start_hour' => bts('and', array(), NULL, 'boinc:account-preference'),
-          'net_start_hour'=> bts('and', array(), NULL, 'boinc:account-preference'),
-          'daily_xfer_limit_mb' => bts('every', array(), NULL, 'boinc:account-preference'),
+          'start_hour' => bts('and', array(), null, 'boinc:account-preference'),
+          'net_start_hour'=> bts('and', array(), null, 'boinc:account-preference'),
+          'daily_xfer_limit_mb' => bts('every', array(), null, 'boinc:account-preference'),
         );
         $special = isset($special_map[$name]);
         $very_special = in_array($name, $special_map);
@@ -313,8 +313,8 @@ 
         // Output values for each preference set, again with ugly hacks for
         // time range preferences
         foreach ($pref_sets as $pref_set) {
-          if (($prefs[$pref_set]) AND 
-              $prefs[$pref_set]['#established'] AND
+          if (($prefs[$pref_set]) and 
+              $prefs[$pref_set]['#established'] and
               isset($prefs[$pref_set]['prefs']['advanced'][$category])) {
             $pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$name];
             $value = isset($pref_setting['#options']) ? $pref_setting['#options'][$pref_setting['#default_value']] : $pref_setting['#default_value'];
@@ -357,19 +357,19 @@ 
     $output .= '<tr>';
     $output .= '<td></td>';
     foreach ($pref_sets as $pref_set) {
-      $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
+      $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), null, 'boinc:form-edit') : bts('Add', array(), null, 'boinc:form-add');
       $output .= '<td><ul class="tab-list"><li class="first tab">';
       $output .= l($action_text, "account/prefs/computing/edit/{$pref_set}/1",
         array('fragment' => "")
       );
       // Show Clear links for established preference sets
-      if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
-        $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$pref_set}",
+      if ($pref_set != 'generic' and $prefs[$pref_set]['#established']) {
+        $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), null, 'boinc:form-clear'), "account/prefs/computing/clear/{$pref_set}",
           array(
             'query' => drupal_get_destination(),
             'attributes' => array(
               'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
-                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-computing-preferences') . '\')'
+                array('@name' => ucfirst($pref_set)), null, 'boinc:account-computing-preferences') . '\')'
             )
           )
         );
@@ -389,10 +389,10 @@ 
     if (function_exists('jump_quickly')) {
       $path = 'account/prefs/computing/edit';
       $venues = array(
-        "{$path}/generic" => bts('Generic', array(), NULL, 'boinc:account-preferences-location'),
-        "{$path}/home" => bts('Home', array(), NULL, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
-        "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location'),
-        "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location')
+        "{$path}/generic" => bts('Generic', array(), null, 'boinc:account-preferences-location'),
+        "{$path}/home" => bts('Home', array(), null, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
+        "{$path}/school" => bts('School', array(), null, 'boinc:account-preferences-location'),
+        "{$path}/work" => bts('Work', array(), null, 'boinc:account-preferences-location')
       );
       variable_set('jump_use_js_venues-Array', 1);
       drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
@@ -405,7 +405,7 @@ 
       $output .= '  </div>';
       $output .= '</div>';
     }
-    $output .= drupal_get_form('boincwork_generalprefs_form', $venue, NULL, $advanced);
+    $output .= drupal_get_form('boincwork_generalprefs_form', $venue, null, $advanced);
     
     // If viewing the edit page for a preference set that doesn't
     // exist, inform the user that preferences are not set.
@@ -417,7 +417,7 @@ 
       drupal_set_message(bts(
           "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
           array( '@venue' => $venue, ),
-          NULL, 'boinc:account-preferences'), 'status');
+          null, 'boinc:account-preferences'), 'status');
     }
     
     break;
@@ -447,8 +447,8 @@ 
   
   case 'clear':
     // Remove settings from this preference set
-    if ($venue AND $venue != 'generic') {
-      boincwork_save_prefs(NULL, 'project', $venue);
+    if ($venue and $venue != 'generic') {
+      boincwork_save_prefs(null, 'project', $venue);
       drupal_set_message(t('Settings for the "@name" preference set have been
         cleared', array('@name' => ucfirst($venue))));
       
@@ -475,7 +475,7 @@ 
       drupal_prepare_form('boincwork_projectprefs_form', $prefs[$pref_set], $form_state);
     }
     
-    $output .= '<h2>' . bts('Combined preferences', array(), NULL, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project') . '</h2>';
+    $output .= '<h2>' . bts('Combined preferences', array(), null, 'boinc:account-preferences') . ' ' . l('(' . bts('Switch View', array(), null, 'boinc:account-preferences') . ')', 'account/prefs/project') . '</h2>';
     
     $output .= '<table class="preferences combined">';
     
@@ -495,8 +495,8 @@ 
         $output .= "<div class=\"description\">{$setting['description']}</div>";
         $output .= '</td>';
         foreach ($pref_sets as $pref_set) {
-          if (($prefs[$pref_set]) AND
-              $prefs[$pref_set]['#established'] AND
+          if (($prefs[$pref_set]) and
+              $prefs[$pref_set]['#established'] and
               isset($prefs[$pref_set][$category])) {
             $pref_setting = $prefs[$pref_set][$category][$name];
             $value = isset($pref_setting['#options']) ? $pref_setting['#options'][$pref_setting['#default_value']] : $pref_setting['#default_value'];
@@ -522,17 +522,17 @@ 
     $output .= '<tr>';
     $output .= '<td></td>';
     foreach ($pref_sets as $pref_set) {
-      $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
+      $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), null, 'boinc:form-edit') : bts('Add', array(), null, 'boinc:form-add');
       $output .= '<td><ul class="tab-list"><li class="first tab">';
       $output .= l($action_text, "account/prefs/project/edit/{$pref_set}");
       // Show Clear links for established preference sets
-      if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
-        $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$pref_set}",
+      if ($pref_set != 'generic' and $prefs[$pref_set]['#established']) {
+        $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), null, 'boinc:form-clear'), "account/prefs/project/clear/{$pref_set}",
           array(
             'query' => drupal_get_destination(),
             'attributes' => array(
               'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
-                array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-preferences-project') . '\')'
+                array('@name' => ucfirst($pref_set)), null, 'boinc:account-preferences-project') . '\')'
             )
           )
         );
@@ -548,7 +548,7 @@ 
     // Set this preference set as the one to use for any new hosts attached
     // to the user account
     boincwork_set_default_venue($venue);
-    drupal_set_message( bts('The primary preference set has been changed to "@set"', array('@set' => $venue), NULL, 'boinc:account-preferences-project') );
+    drupal_set_message( bts('The primary preference set has been changed to "@set"', array('@set' => $venue), null, 'boinc:account-preferences-project') );
     drupal_goto('account/prefs/project/combined');
     break;
     
@@ -561,10 +561,10 @@ 
     if (function_exists('jump_quickly')) {
       $path = 'account/prefs/project/edit';
       $venues = array(
-        "{$path}/generic" => bts('Generic', array(), NULL, 'boinc:account-preferences-location'),
-        "{$path}/home" => bts('Home', array(), NULL, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
-        "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location'),
-        "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location')
+        "{$path}/generic" => bts('Generic', array(), null, 'boinc:account-preferences-location'),
+        "{$path}/home" => bts('Home', array(), null, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
+        "{$path}/school" => bts('School', array(), null, 'boinc:account-preferences-location'),
+        "{$path}/work" => bts('Work', array(), null, 'boinc:account-preferences-location')
       );
       variable_set('jump_use_js_venues-Array', 1);
       drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
@@ -589,7 +589,7 @@ 
       drupal_set_message(bts(
           "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
           array( '@venue' => $venue, ),
-          NULL, 'boinc:account-preferences'), 'status');
+          null, 'boinc:account-preferences'), 'status');
     }
     
     break;
@@ -645,7 +645,7 @@ 
       foreach ($section as $name => $setting) {
         if ($name{0} == '#') continue;
         $value = isset($setting['#default_value']) ? $setting['#default_value'] : '';
-        if ($value AND isset($setting['#options'])) $value = $setting['#options'][$value];
+        if ($value and isset($setting['#options'])) $value = $setting['#options'][$value];
         elseif ($value == '') $value = '---';
         if (!isset($setting['#title'])) $setting['#title'] = '';
         if (!isset($setting['#description'])) $setting['#description'] = '';
@@ -660,7 +660,7 @@ 
     // Edit preferences link
     $output .= '<tr>';
     $output .= '<td></td>';
-    $output .= '<td>' . l(bts('Edit privacy preferences', array('@project' => PROJECT), NULL, 'boinc:account-preferences-privacy'), "account/prefs/privacy/edit") . '</td>';
+    $output .= '<td>' . l(bts('Edit privacy preferences', array('@project' => PROJECT), null, 'boinc:account-preferences-privacy'), "account/prefs/privacy/edit") . '</td>';
     $output .= '</tr>';
     
     $output .= '</table>';
@@ -892,17 +892,17 @@ 
 function boincwork_host_log($host_id = null) {
   $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
   $log = '';
-  if ($root_log_dir AND $host_id) {
-    $subdir = substr($host_id, 0, -3) OR $subdir = 0;
+  if ($root_log_dir and $host_id) {
+    $subdir = substr($host_id, 0, -3) or $subdir = 0;
     $log = implode('/', array($root_log_dir, $subdir, $host_id));
   }
-  if ($log AND file_exists($log)) {
+  if ($log and file_exists($log)) {
     header('Content-type: text/plain');
     include($log);
   }
 }
 
-function boincwork_host_set_venue($host_id = NULL, $venue = NULL) {
+function boincwork_host_set_venue($host_id = null, $venue = null) {
   global $user;
   $account = user_load($user->uid);
   db_set_active('boinc');
@@ -912,7 +912,7 @@ 
     $host_id
   ));
   db_set_active('default');
-  if ($host_owner AND $host_owner == $account->boincuser_id) {
+  if ($host_owner and $host_owner == $account->boincuser_id) {
     db_set_active('boinc');
     $updated = db_query(
       "UPDATE {host} SET venue = '%s' WHERE id = '%d'",
@@ -921,20 +921,20 @@ 
     db_set_active('default');
     if ($updated) {
       drupal_set_message(
-        bts('The location for this host has been updated.', array(), NULL, 'boinc:account-host-details')
-        . bts('This will take effect next time the host contacts the project.', array(), NULL, 'boinc:account-host-details')
+        bts('The location for this host has been updated.', array(), null, 'boinc:account-host-details')
+        . bts('This will take effect next time the host contacts the project.', array(), null, 'boinc:account-host-details')
       );
     }
     else {
       drupal_set_message(
-        bts('Unable to save changes to this host for some reason!', array(), NULL, 'boinc:account-host-details'),
+        bts('Unable to save changes to this host for some reason!', array(), null, 'boinc:account-host-details'),
         'error'
       );
     }
   }
   else {
     drupal_set_message(
-      bts('You are not allowed to make changes to this host.', array(), NULL, 'boinc:account-host-details'),
+      bts('You are not allowed to make changes to this host.', array(), null, 'boinc:account-host-details'),
       'warning'
     );
   }
@@ -1002,8 +1002,8 @@ 
 /**
  * Page callback for user account task table
  */
-function boincwork_account_task_table($tselect = NULL, $app_id = NULL) {
-  $title = bts('Tasks for your account', array(), NULL, 'boinc:account-task-table');
+function boincwork_account_task_table($tselect = null, $app_id = null) {
+  $title = bts('Tasks for your account', array(), null, 'boinc:account-task-table');
   drupal_set_title($title);
 
   global $user;
@@ -1014,14 +1014,14 @@ 
 /**
  * Page callback for host task table
  */
-function boincwork_host_task_table($host_id = NULL, $tselect = NULL, $app_id = NULL) {
+function boincwork_host_task_table($host_id = null, $tselect = null, $app_id = null) {
   require_boinc( array('util', 'result') );
 
-  $title = bts('Tasks for computer @host_id', array('@host_id' => $host_id), NULL, 'boinc:host-task-table');
+  $title = bts('Tasks for computer @host_id', array('@host_id' => $host_id), null, 'boinc:host-task-table');
   drupal_set_title($title);
 
   if (is_null($host_id)) {
-    drupal_set_message(bts('ERROR: Invalid host ID', array(), NULL, 'boinc:host-task-table'), 'error');
+    drupal_set_message(bts('ERROR: Invalid host ID', array(), null, 'boinc:host-task-table'), 'error');
     return '';
   }
 
@@ -1031,12 +1031,12 @@ 
 /**
  * Page callback for workunit task table
  */
-function boincwork_workunit_task_table($workunit_id = NULL, $tselect = NULL, $app_id = NULL) {
-  $title = bts('Tasks for workunit @workunit_id', array('@workunit_id' => $workunit_id), NULL, 'boinc:workunit-task-table');
+function boincwork_workunit_task_table($workunit_id = null, $tselect = null, $app_id = null) {
+  $title = bts('Tasks for workunit @workunit_id', array('@workunit_id' => $workunit_id), null, 'boinc:workunit-task-table');
   drupal_set_title($title);
 
   if (is_null($workunit_id)) {
-    drupal_set_message(bts('ERROR: Invalid workunit ID', array(), NULL, 'boinc:workunit-task-table'), 'error');
+    drupal_set_message(bts('ERROR: Invalid workunit ID', array(), null, 'boinc:workunit-task-table'), 'error');
     return '';
   }
   
@@ -1062,7 +1062,7 @@ 
  */
 function boincwork_select_venue(&$venue) {
   if (!$venue) {
-    $active_venue = isset($_SESSION['prefs venue']) ? $_SESSION['prefs venue'] : NULL;
+    $active_venue = isset($_SESSION['prefs venue']) ? $_SESSION['prefs venue'] : null;
     if ($active_venue) {
       $venue = $active_venue;
       //unset($_SESSION['prefs venue']);

drupal/sites/default/boinc/modules/boinccore/boinccore.admin.inc

Indentation +84 added lines, -84 removed lines

@@ -7,185 +7,185 @@ 
 */
 
 /**
-  * The BOINC community form allows the setting of requirements for interaction
-  * in the community sections of the site.
-  */
+ * The BOINC community form allows the setting of requirements for interaction
+ * in the community sections of the site.
+ */
 function boinccore_admin_community(&$form_state) {
-  $form = array();
-  $default = array(
+    $form = array();
+    $default = array(
     'min_credit_to_post' => variable_get('boinc_comment_min_credit', 0),
     'penalty_period' => variable_get('boinc_penalty_period', 7*24*60*60),
     'moderator_mailing_list' => variable_get('boinc_moderator_mailing_list', ''),
     'moderator_force_individual_notifications' => variable_get('boinc_moderator_force_individual_notifications', 0),
-  );
+    );
   
-  // Define the form
-  $form['boinc_comment_min_credit'] = array(
+    // Define the form
+    $form['boinc_comment_min_credit'] = array(
     '#type' => 'textfield',
     '#title' => t('Credit required for community participation'),
     '#default_value' => $default['min_credit_to_post'],
     '#description' => t('Set a minimum threshold of credit a user must have
       earned before being allowed to create a profile, post comments or participate in forums.'),
-  );
-  $form['boinc_penalty_period'] = array(
+    );
+    $form['boinc_penalty_period'] = array(
     '#type' => 'textfield',
     '#title' => t('Penalty period'),
     '#default_value' => $default['penalty_period'],
     '#description' => t('The amount of time (in seconds) that user privileges
       are revoked when a user is banned from community participation.'),
-  );
-  $form['boinc_moderator_mailing_list'] = array(
+    );
+    $form['boinc_moderator_mailing_list'] = array(
     '#type' => 'textfield',
     '#title' => t('Moderator mailing list'),
     '#default_value' => $default['moderator_mailing_list'],
     '#description' => t('As an alternative to sending moderator notifications
       to individual users with the moderator role, enter a mailing list address
       here to be the only target of the notification emails.'),
-  );
-  $form['boinc_moderator_force_individual_notifications'] = array(
+    );
+    $form['boinc_moderator_force_individual_notifications'] = array(
     '#type' => 'checkbox',
     '#title' => t('Always send individual notifications'),
     '#default_value' => $default['moderator_force_individual_notifications'],
     '#description' => t('Continue to send individual moderator notification
       emails even when a mailing list is provided.'),
-  );
+    );
   
-  $form['tools'] = array(
+    $form['tools'] = array(
     '#title' => t('Tools'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
     '#attributes' => array('class' => '')
-  );
-  $form['tools']['reset_uotd'] = array(
+    );
+    $form['tools']['reset_uotd'] = array(
     '#type' => 'submit',
     '#value' => t('Force new UOTD'),
     '#submit' => array('boinccore_reset_user_of_the_day'),
-  );
+    );
   
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 
 /**
-  * Validate the BOINC community form.
-  */
+ * Validate the BOINC community form.
+ */
 function boinccore_admin_community_validate($form, &$form_state) {
-  $values = $form_state['values'];
-  if (!is_numeric($values['boinc_comment_min_credit'])) {
+    $values = $form_state['values'];
+    if (!is_numeric($values['boinc_comment_min_credit'])) {
     form_set_error('boinc_comment_min_credit', t('The minimum credit value must be a number.'));
-  }
+    }
 }
 
 /**
-  * Handle post-validation submission of BOINC community form.
-  */
+ * Handle post-validation submission of BOINC community form.
+ */
 function boinccore_admin_community_submit($form, &$form_state) {
-  drupal_set_message(t('BOINC community settings have been updated.'));
+    drupal_set_message(t('BOINC community settings have been updated.'));
 }
 
 /**
  * Force a reset of the user of the day
  */
 function boinccore_reset_user_of_the_day() {
-  if (boincuser_select_user_of_the_day()) {
+    if (boincuser_select_user_of_the_day()) {
     drupal_set_message(t('The user of the day has been reset.'));
-  }
+    }
 }
 
 /**
-  * The standard page generator form provides an interface to create standard
-  * pages, such as a Help or About page.
-  */
+ * The standard page generator form provides an interface to create standard
+ * pages, such as a Help or About page.
+ */
 function boinccore_admin_default_content(&$form_state) {
-  $form = array();
+    $form = array();
   
-  // Define the form
-  $form['page'] = array(
+    // Define the form
+    $form['page'] = array(
     '#type' => 'select',
     '#title' => t('Generate default content for'),
     '#options' => array(
-      0 => t('all standard pages'),
+        0 => t('all standard pages'),
 //      'about' => t('About page'),
-      'help' => t('Help page'),
+        'help' => t('Help page'),
     ),
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => 'Generate content',
-  );
+    );
   
-  return $form;
+    return $form;
 }
 
 /**
-  * Generate content based on the selection made on the form
-  */
+ * Generate content based on the selection made on the form
+ */
 function boinccore_admin_default_content_submit($form, &$form_state) {
-  $option = $form_state['values']['page'];
-  $page_list = boinccore_admin_default_content_generate($option);
-  $pages_generated = count($page_list);
-  if ($pages_generated > 0) {
+    $option = $form_state['values']['page'];
+    $page_list = boinccore_admin_default_content_generate($option);
+    $pages_generated = count($page_list);
+    if ($pages_generated > 0) {
     switch ($pages_generated) {
     case 1:
       $page_list = reset($page_list);
-      break;
+        break;
     case 2:
       $page_list = implode(' and ', $page_list);
-      break;
+        break;
     default:
       end($page_list);
-      $page_list[key($page_list)] = 'and ' . $page_list[key($page_list)];
-      $page_list = implode(', ', $page_list);
+        $page_list[key($page_list)] = 'and ' . $page_list[key($page_list)];
+        $page_list = implode(', ', $page_list);
     }
     drupal_set_message(t('Default content has been generated for the @listed
       @pages.', array(
         '@listed' => $page_list, 
         '@pages' => format_plural($pages_generated, 'page', 'pages'),
-      )
+        )
     ));
-  }
-  else {
+    }
+    else {
     if ($option) {
-      drupal_set_message(t('The @specified page already exists.',
+        drupal_set_message(t('The @specified page already exists.',
         array('@specified' => $option)), 'warning');
     }
     else {
-      drupal_set_message(t('All pages already exist, so none can be recreated
+        drupal_set_message(t('All pages already exist, so none can be recreated
         automatically.'), 'warning');
     }
     drupal_set_message(t('To recreate a page, first delete the existing page (or
       remove its URL alias), then try this function again.'), 'warning');
-  }
+    }
 }
 
 /**
-  * 
-  */
+ * 
+ */
 function boinccore_admin_default_content_generate($pages = array()) {
-  if (!$pages) {
+    if (!$pages) {
     // If not specified, attempt to generate all pages by default
     $pages = array(
-      'help',
+        'help',
 //      'about',
     );
-  }
-  elseif (!is_array($pages)) {
+    }
+    elseif (!is_array($pages)) {
     $pages = array($pages);
-  }
-  $pages_generated = array();
-  if (in_array('about', $pages)) {
+    }
+    $pages_generated = array();
+    if (in_array('about', $pages)) {
     // Create the default About page, if it doesn't exist
     // TODO: what is the default About page...?
     if (!drupal_lookup_path('source', 'about')) {
-      drupal_set_message('The about page doesn\'t yet have a definition...', 'warning');
-      //$pages_generated[] = 'about';
+        drupal_set_message('The about page doesn\'t yet have a definition...', 'warning');
+        //$pages_generated[] = 'about';
+    }
     }
-  }
-  if (in_array('help', $pages)) {
+    if (in_array('help', $pages)) {
     // Create the default Help page, if it doesn't exist
     if (!drupal_lookup_path('source', 'help')) {
-      $node = array(
+        $node = array(
         'type' => 'page',
         'title' => t('Help'),
         'uid' => 1,
@@ -198,7 +198,7 @@ 
         'comment' => 0, // disable comments
         'moderate' => 0,
         'body' => preg_replace('/>\s+</', '><',
-          '<p>Use this page to provide help and support for your site\'s
+            '<p>Use this page to provide help and support for your site\'s
           visitors:</p>
           <ul>
             <li>Add a link to your primary forum for getting help</li>
@@ -209,21 +209,21 @@ 
         'sticky' => 0,
         'format' => 4,
         //'teaser' => $teaser,
-      );
-      $node = (object) $node; // node_save requires an object
-      node_save($node);
+        );
+        $node = (object) $node; // node_save requires an object
+        node_save($node);
       
-      $item = array(
+        $item = array(
         'link_path' => drupal_get_normal_path('help'),
         'link_title' => t('Help'),
         'menu_name' => 'primary-links',
         'weight' => 50,
-      );
-      menu_link_save($item);
-      $pages_generated[] = 'help';
+        );
+        menu_link_save($item);
+        $pages_generated[] = 'help';
+    }
     }
-  }
-  // Refresh the cache with these changes
-  menu_cache_clear_all();
-  return $pages_generated;
+    // Refresh the cache with these changes
+    menu_cache_clear_all();
+    return $pages_generated;
 }

Spacing +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
       break;
     default:
       end($page_list);
-      $page_list[key($page_list)] = 'and ' . $page_list[key($page_list)];
+      $page_list[key($page_list)] = 'and '.$page_list[key($page_list)];
       $page_list = implode(', ', $page_list);
     }
     drupal_set_message(t('Default content has been generated for the @listed
@@ -189,7 +189,7 @@ 
         'type' => 'page',
         'title' => t('Help'),
         'uid' => 1,
-        'status' => 1,  // published
+        'status' => 1, // published
         'promote' => 0, // not promoted to front page
         'path' => 'help',
         'pathauto_perform_alias' => FALSE,
@@ -210,7 +210,7 @@ 
         'format' => 4,
         //'teaser' => $teaser,
       );
-      $node = (object) $node; // node_save requires an object
+      $node = (object)$node; // node_save requires an object
       node_save($node);
       
       $item = array(

Braces +3 added lines, -6 removed lines

@@ -144,13 +144,11 @@ 
         '@pages' => format_plural($pages_generated, 'page', 'pages'),
       )
     ));
-  }
-  else {
+  } else {
     if ($option) {
       drupal_set_message(t('The @specified page already exists.',
         array('@specified' => $option)), 'warning');
-    }
-    else {
+    } else {
       drupal_set_message(t('All pages already exist, so none can be recreated
         automatically.'), 'warning');
     }
@@ -169,8 +167,7 @@ 
       'help',
 //      'about',
     );
-  }
-  elseif (!is_array($pages)) {
+  } elseif (!is_array($pages)) {
     $pages = array($pages);
   }
   $pages_generated = array();

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

@@ -54,8 +54,8 @@ 
     '#title' => t('Tools'),
     '#type' => 'fieldset',
     '#description' => '',
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE,
+    '#collapsible' => true,
+    '#collapsed' => false,
     '#attributes' => array('class' => '')
   );
   $form['tools']['reset_uotd'] = array(
@@ -192,7 +192,7 @@ 
         'status' => 1,  // published
         'promote' => 0, // not promoted to front page
         'path' => 'help',
-        'pathauto_perform_alias' => FALSE,
+        'pathauto_perform_alias' => false,
         'created' => time(),
         'changed' => time(),
         'comment' => 0, // disable comments