BOINC / boinc

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

Indentation +35 added lines, -35 removed lines

@@ -9,45 +9,45 @@ 
  * Implements hook_block() for Drupal 6 compatibility
  */
 function node_comment_block_block($op = 'list', $delta = 0, $edit = array()) {
-  switch ($op) {
-  case 'view':
+    switch ($op) {
+    case 'view':
     //$block = node_comment_block_block_view($delta);
     $block = array();
     if ($delta == 'node_comments') {
-      if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
+        if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
         $node = node_load($nid);
         if ($node->comment !== 0) {
-          $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
-          $block['content'] = '';
-          if ($node->comment) {
+            $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
+            $block['content'] = '';
+            if ($node->comment) {
             $block['content'] .= comment_render($node);
-          }
+            }
+        }
         }
-      }
     }
     break;
-  case 'list':
+    case 'list':
     $blocks = node_comment_block_block_info();
     return $blocks;
     break;
-  default:
+    default:
   }
-  return $block;
+    return $block;
 }
 
 /**
  * Port Drupal 7 render() function to Drupal 6
  */
 function render(&$element) {
-  if (is_array($element)) {
+    if (is_array($element)) {
     show($element);
     return drupal_render($element);
-  }
-  else {
+    }
+    else {
     // Safe-guard for inappropriate use of render() on flat variables: return
     // the variable as-is.
     return $element;
-  }
+    }
 }
 
 
@@ -56,50 +56,50 @@ 
  * Implements hook_block_info().
  */
 function node_comment_block_block_info() {
-  $blocks['node_comments'] = array(
+    $blocks['node_comments'] = array(
     'info' => t('Node comments'),
-  );
+    );
 
-  return $blocks;
+    return $blocks;
 }
 
 /**
  * Implements hook_block_view().
  */
 function node_comment_block_block_view($delta = '') {
-  $block = array();
+    $block = array();
 
-  if ($delta == 'node_comments') {
+    if ($delta == 'node_comments') {
     if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
-      $node = node_load($nid);
+        $node = node_load($nid);
 
-      if ($node->comment !== 0) {
+        if ($node->comment !== 0) {
         $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
         $block['content'] = '';
 
         $node = node_view($node);
 
         if ($node['comments']) {
-          $block['content'] .= render($node['comments']);
+            $block['content'] .= render($node['comments']);
+        }
         }
-      }
     }
-  }
+    }
 
-  return $block;
+    return $block;
 }
 
 /**
  * Implements hook_preprocess_HOOK() for nodes.
  */
 function node_comment_block_preprocess_node(&$variables) {
-  $node = $variables['node'];
-  // Only hide standard comments for news content
-  if ($variables['type'] == 'news') {
+    $node = $variables['node'];
+    // Only hide standard comments for news content
+    if ($variables['type'] == 'news') {
     $variables['node']->comment = 0;
-  }
+    }
   
-  /* Drupal 7...
+    /* Drupal 7...
   if ($node->comment !== 0 && $variables['view_mode'] == 'full') {
     if (isset($variables['content']['comments'])) {
       unset($variables['content']['comments']);
@@ -113,10 +113,10 @@ 
  * Implements hook_form_FORM_ID_alter() for block_admin_configure.
  */
 function node_comment_block_form_block_admin_configure_alter(&$form, &$form_state) {
-  if (isset($form['delta'])) {
+    if (isset($form['delta'])) {
     if ($form['delta']['#value'] == 'node_comments') {
-      $form['settings']['title']['#disabled'] = TRUE;
-      $form['settings']['title']['#description'] = t('The title for this block cannot be overridden.');
+        $form['settings']['title']['#disabled'] = TRUE;
+        $form['settings']['title']['#description'] = t('The title for this block cannot be overridden.');
+    }
     }
-  }
 }

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
   if (is_array($element)) {
     show($element);
     return drupal_render($element);
-  }
-  else {
+  } else {
     // Safe-guard for inappropriate use of render() on flat variables: return
     // the variable as-is.
     return $element;

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

@@ -17,7 +17,7 @@ 
       if (arg(0) == 'node' && is_numeric($nid = arg(1)) && !arg(2)) {
         $node = node_load($nid);
         if ($node->comment !== 0) {
-          $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
+          $block['subject'] = null; // This should be NULL otherwise there will be duplicate h2 elements.
           $block['content'] = '';
           if ($node->comment) {
             $block['content'] .= comment_render($node);
@@ -74,7 +74,7 @@ 
       $node = node_load($nid);
 
       if ($node->comment !== 0) {
-        $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
+        $block['subject'] = null; // This should be NULL otherwise there will be duplicate h2 elements.
         $block['content'] = '';
 
         $node = node_view($node);
@@ -115,7 +115,7 @@ 
 function node_comment_block_form_block_admin_configure_alter(&$form, &$form_state) {
   if (isset($form['delta'])) {
     if ($form['delta']['#value'] == 'node_comments') {
-      $form['settings']['title']['#disabled'] = TRUE;
+      $form['settings']['title']['#disabled'] = true;
       $form['settings']['title']['#description'] = t('The title for this block cannot be overridden.');
     }
   }

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

Switch Indentation +13 added lines, -13 removed lines

@@ -280,12 +280,12 @@ 
   }
 
   switch ($op) {
-    case 'delete':
-      // Only call delete function on certain node types
-      if (in_array( $node->type, $node_types)) {
-        boinc_solr_comments_delete($node);
-      }
-      break;
+  case 'delete':
+    // Only call delete function on certain node types
+    if (in_array( $node->type, $node_types)) {
+      boinc_solr_comments_delete($node);
+    }
+    break;
   } //switch
 }
 
@@ -335,13 +335,13 @@ 
  */
 function boinc_solr_comments_comment(&$a1, $op) {
   switch ($op) {
-    case 'view':
-    case 'update':
-      break;
-    case 'delete':
-      // $a1 should be a comment object
-      boinc_solr_comments_deletecomment($a1);
-      break;
+  case 'view':
+  case 'update':
+    break;
+  case 'delete':
+    // $a1 should be a comment object
+    boinc_solr_comments_deletecomment($a1);
+    break;
   }// switch
 }
 

Braces +3 added lines, -6 removed lines

@@ -131,8 +131,7 @@ 
         if ($comment->uid == 0 || strlen($comment->name) == 0) {
           // @see user_validate_name(). !'0' === TRUE.
           $comment_document->ss_name = '0';
-        }
-        else {
+        } else {
           $comment_document->ss_name = $comment->name;
           // We want the name to be searchable for keywords.
           $comment_document->tos_name = $comment->name;
@@ -318,8 +317,7 @@ 
     $solr->deleteByQuery($query);
     // Log the query used for deletion.
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
-  }
-  catch (Exception $e) {
+  } catch (Exception $e) {
       watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
       return FALSE;
   }// try
@@ -376,8 +374,7 @@ 
     $solr->deleteByQuery($query);
     // Log the query used for deletion.
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
-    }
-  catch (Exception $e) {
+    } catch (Exception $e) {
     watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
     return FALSE;
   }// try

Indentation +117 added lines, -117 removed lines

@@ -14,19 +14,19 @@ 
  * Implementation of hook_menu()
  */
 function boinc_solr_comments_menu() {
-  $items = array();
-  $base_path = 'admin/settings/apachesolr/indexcomments';
-  $items[$base_path] = array(
-      'title' => 'Index Comments',
-      'description' => 'Administer Indexing of Comments',
-      'page callback' => 'drupal_get_form',
-      'page arguments' => array('boinc_solr_comments_form'),
-      'access arguments' => array('administer search'),
-      'file' => 'boinc_solr_comments.admin.inc',
-      'weight' => '10',
-  );
-
-  return $items;
+    $items = array();
+    $base_path = 'admin/settings/apachesolr/indexcomments';
+    $items[$base_path] = array(
+        'title' => 'Index Comments',
+        'description' => 'Administer Indexing of Comments',
+        'page callback' => 'drupal_get_form',
+        'page arguments' => array('boinc_solr_comments_form'),
+        'access arguments' => array('administer search'),
+        'file' => 'boinc_solr_comments.admin.inc',
+        'weight' => '10',
+    );
+
+    return $items;
 }
 
 
@@ -58,11 +58,11 @@ 
  *   Environment ID for apache solr.
  */
 function boinc_solr_comments_apachesolr_index_documents_alter(array &$documents, $entity, $entity_type, $env_id) {
-  $comdocs = array();
+    $comdocs = array();
 
-  // Array of node types that will have comments indexed.
-  $node_types = variable_get('boinc_solr_comments_nodetypes', '');
-  if (empty($node_types)) {
+    // Array of node types that will have comments indexed.
+    $node_types = variable_get('boinc_solr_comments_nodetypes', '');
+    if (empty($node_types)) {
     // If the variable has not been set, then by default index
     // comments for all known node types.
     $node_types = array(
@@ -72,28 +72,28 @@ 
         'story'      => 'story',
         'team_forum' => 'team_forum',
     );
-  }
+    }
 
-  // Loop over all documents and alter:
-  foreach ($documents as $document) {
+    // Loop over all documents and alter:
+    foreach ($documents as $document) {
     //dd($document, "index documents alter - document");
 
     $to_process = ( array_key_exists($document->bundle, $node_types) AND $node_types[$document->bundle] );
     if ( $document->entity_type=='node' AND $to_process) {
 
-      // Remove ts_comments if present.
-      if (isset($document->ts_comments)) {
+        // Remove ts_comments if present.
+        if (isset($document->ts_comments)) {
         unset($document->ts_comments);
-      }
-      // Node information.
-      $nid = $document->entity_id;
-      $node = node_load($nid);
-
-      // Query database for comments of node. Only return comments
-      // with status 0 (0 is published for comments).
-      $sql = 'SELECT cid from {comments} WHERE nid = %d AND status = 0 ORDER by timestamp DESC';
-      $resource = db_query($sql, $nid);
-      while ($row = db_fetch_array($resource)) {
+        }
+        // Node information.
+        $nid = $document->entity_id;
+        $node = node_load($nid);
+
+        // Query database for comments of node. Only return comments
+        // with status 0 (0 is published for comments).
+        $sql = 'SELECT cid from {comments} WHERE nid = %d AND status = 0 ORDER by timestamp DESC';
+        $resource = db_query($sql, $nid);
+        while ($row = db_fetch_array($resource)) {
         // Load the comment from cid.
         $comment = _comment_load($row['cid']);
 
@@ -116,10 +116,10 @@ 
         // Comment object has no language
         $comment_document->ss_language = 'und';
         if (function_exists('drupal_get_path_alias')) {
-          $output = drupal_get_path_alias($comment_document->path, NULL);
-          if ($output && $output != $document->path) {
+            $output = drupal_get_path_alias($comment_document->path, NULL);
+            if ($output && $output != $document->path) {
             $comment_document->path_alias = $output;
-          }
+            }
         }
 
         // Code derived from apachesolr_index_node_solr_document
@@ -129,13 +129,13 @@ 
 
         // Author information
         if ($comment->uid == 0 || strlen($comment->name) == 0) {
-          // @see user_validate_name(). !'0' === TRUE.
-          $comment_document->ss_name = '0';
+            // @see user_validate_name(). !'0' === TRUE.
+            $comment_document->ss_name = '0';
         }
         else {
-          $comment_document->ss_name = $comment->name;
-          // We want the name to be searchable for keywords.
-          $comment_document->tos_name = $comment->name;
+            $comment_document->ss_name = $comment->name;
+            // We want the name to be searchable for keywords.
+            $comment_document->tos_name = $comment->name;
         }
 
         // Index formatted username so it can be searched and sorted
@@ -157,59 +157,59 @@ 
         // Unset the following fields (if set) that don't make sense
         // for a comment.
         if (isset($comment_document->bs_sticky)) {
-          unset($comment_document->bs_sticky);
+            unset($comment_document->bs_sticky);
         }
         if (isset($comment_document->bs_promote)) {
-          unset($comment_document->bs_promote);
+            unset($comment_document->bs_promote);
         }
         if (isset($comment_document->is_tnid)) {
-          unset($comment_document->is_tnid);
+            unset($comment_document->is_tnid);
         }
         if (isset($comment_document->bs_translate)) {
-          unset($comment_document->bs_translate);
+            unset($comment_document->bs_translate);
         }
         if (isset($comment_document->ts_last_comment_timestamp)) {
-          unset($comment_document->ts_last_comment_timestamp);
+            unset($comment_document->ts_last_comment_timestamp);
         }
         if (isset($comment_document->ds_last_comment_or_change)) {
-          unset($comment_document->ds_last_comment_or_change);
+            unset($comment_document->ds_last_comment_or_change);
         }
         if (isset($comment_document->is_comment_count)) {
-          unset($comment_document->is_comment_count);
+            unset($comment_document->is_comment_count);
         }
 
         // Loop over fields in document and copy relevant values into
         // comment_document.
         foreach ($document as $fieldName => $fieldValue) {
 
-          // Copy over fields [im_taxonomy_vid_1], [tid], [im_vid_1],
-          // [im_vid_Forums], [tm_vid_1_names]
-          if ( ( preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName) ) AND is_array($fieldValue) ) {
+            // Copy over fields [im_taxonomy_vid_1], [tid], [im_vid_1],
+            // [im_vid_Forums], [tm_vid_1_names]
+            if ( ( preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName) ) AND is_array($fieldValue) ) {
             foreach ($fieldValue as $subkey => $subvalue) {
-              $comment_document->addField($fieldName, $subvalue);
+                $comment_document->addField($fieldName, $subvalue);
             }
-          }// if preg_match
+            }// if preg_match
 
-          // Set the access keys so this module will work with
-          // apachesolr_access.
-          if (module_exists('apachesolr_access')) {
+            // Set the access keys so this module will work with
+            // apachesolr_access.
+            if (module_exists('apachesolr_access')) {
             if (preg_match('/^access/', $fieldName) AND is_array($fieldValue)) {
-              foreach ($fieldValue as $subkey => $subvalue) {
+                foreach ($fieldValue as $subkey => $subvalue) {
                 $comment_document->addField($fieldName, $subvalue);
-              }
+                }
             }// if preg_match
-          }// if module_exist
+            }// if module_exist
 
         }// foreach document
 
         $comdocs[] = $comment_document;
-      }// while
+        }// while
     }// if entity_type=node
-  }// documents
+    }// documents
 
-  // Merge the comment documents with the input documents array. These
-  // documents will now be added to the Solr search index.
-  $documents = array_merge($documents, $comdocs);
+    // Merge the comment documents with the input documents array. These
+    // documents will now be added to the Solr search index.
+    $documents = array_merge($documents, $comdocs);
 }
 
 /**
@@ -225,19 +225,19 @@ 
  *   The Solr query used for the search.
  */
 function boinc_solr_comments_apachesolr_process_results(&$results, DrupalSolrQueryInterface $query) {
-  //dpm($query->getSolrParams(), "process_results query getSolrParams");
-  foreach($results as $id => $result) {
+    //dpm($query->getSolrParams(), "process_results query getSolrParams");
+    foreach($results as $id => $result) {
     if ($result['entity_type']=='comment') {
         $results[$id]['type'] = 'Comment';
         $results[$id]['date'] = $result['fields']['changed'];
         if (isset($result['fields']['is_uid'])) {
-          $uid = $result['fields']['is_uid'];
-          $results[$id]['uid']  = $uid;
-          $results[$id]['user'] = theme('username', user_load($uid));
+            $uid = $result['fields']['is_uid'];
+            $results[$id]['uid']  = $uid;
+            $results[$id]['user'] = theme('username', user_load($uid));
         }
     } //if result entity_type == comment
-  }// foreach $result
-  //dpm($results, "process_results array_results");
+    }// foreach $result
+    //dpm($results, "process_results array_results");
 }
 
 /**
@@ -251,8 +251,8 @@ 
  *   The Solr query used for the search.
  */
 function boinc_solr_comments_apachesolr_query_alter($query) {
-  // Add custom field to query results
-  $query->addParam('fl','tos_content_extra');
+    // Add custom field to query results
+    $query->addParam('fl','tos_content_extra');
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -265,9 +265,9 @@ 
  *
  */
 function boinc_solr_comments_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
-  // Array of node types that will have comments indexed.
-  $node_types = variable_get('boinc_solr_comments_nodetypes', '');
-  if (empty($node_types)) {
+    // Array of node types that will have comments indexed.
+    $node_types = variable_get('boinc_solr_comments_nodetypes', '');
+    if (empty($node_types)) {
     // If the variable has not been set, then by default index
     // comments for all known node types.
     $node_types = array(
@@ -277,16 +277,16 @@ 
         'story'      => 'story',
         'team_forum' => 'team_forum',
     );
-  }
+    }
 
-  switch ($op) {
+    switch ($op) {
     case 'delete':
       // Only call delete function on certain node types
       if (in_array( $node->type, $node_types)) {
         boinc_solr_comments_delete($node);
-      }
-      break;
-  } //switch
+        }
+        break;
+    } //switch
 }
 
 
@@ -303,30 +303,30 @@ 
  *   Returns TRUE if the comment was deleted, otherwise return FALSE.
  */
 function boinc_solr_comments_delete($node) {
-  // Load the Solr environment.
-  $env_id = apachesolr_default_environment();
-  // Check to see if Solr is read-only.
-  if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
+    // Load the Solr environment.
+    $env_id = apachesolr_default_environment();
+    // Check to see if Solr is read-only.
+    if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
     return FALSE;
-  }
+    }
 
-  // Code derived from apachesolr_index_delete_entity_from_index
-  try {
+    // Code derived from apachesolr_index_delete_entity_from_index
+    try {
     $solr = apachesolr_get_solr($env_id);
     // Custom query to find all comments with parent nid of the node bing deleted.
     $query = "entity_type:comment AND tos_content_extra:" . $node->nid;
     $solr->deleteByQuery($query);
     // Log the query used for deletion.
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
-  }
-  catch (Exception $e) {
-      watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
-      return FALSE;
-  }// try
-
-  // all deletions sucessful
-  apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
-  return TRUE;
+    }
+    catch (Exception $e) {
+        watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
+        return FALSE;
+    }// try
+
+    // all deletions sucessful
+    apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
+    return TRUE;
 }
 
 /**
@@ -334,15 +334,15 @@ 
  *
  */
 function boinc_solr_comments_comment(&$a1, $op) {
-  switch ($op) {
+    switch ($op) {
     case 'view':
     case 'update':
       break;
     case 'delete':
       // $a1 should be a comment object
       boinc_solr_comments_deletecomment($a1);
-      break;
-  }// switch
+        break;
+    }// switch
 }
 
 /**
@@ -358,16 +358,16 @@ 
  *   Returns TRUE if the comment was deleted, otherwise return FALSE.
  */
 function boinc_solr_comments_deletecomment($comment) {
-  // Load the Solr environment.
-  $env_id = apachesolr_default_environment();
-  // Check to see if Solr is read-only.
-  if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
+    // Load the Solr environment.
+    $env_id = apachesolr_default_environment();
+    // Check to see if Solr is read-only.
+    if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
     return FALSE;
-  }
-  //dd($comment->cid, "delete - nid begin");
+    }
+    //dd($comment->cid, "delete - nid begin");
 
-  // Code derived from apachesolr_index_delete_entity_from_index.
-  try {
+    // Code derived from apachesolr_index_delete_entity_from_index.
+    try {
     $solr = apachesolr_get_solr($env_id);
     $entity_id = $comment->cid;
     $entity_type = 'comment';
@@ -377,14 +377,14 @@ 
     // Log the query used for deletion.
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
     }
-  catch (Exception $e) {
+    catch (Exception $e) {
     watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
     return FALSE;
-  }// try
+    }// try
 
-  // deletion sucessful
-  apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
-  return TRUE;
+    // deletion sucessful
+    apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
+    return TRUE;
 }
 
 
@@ -399,7 +399,7 @@ 
  */
 
 function boinc_solr_comments_enable() {
-  drupal_set_message( bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
+    drupal_set_message( bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
 }
 
 /**
@@ -410,12 +410,12 @@ 
  *   The comment to be published (unhidden).
  */
 function boinc_solr_comments_publish($comment) {
-  if ( ($comment->cid) AND ($comment->nid) ) {
+    if ( ($comment->cid) AND ($comment->nid) ) {
     $node = node_load($comment->nid);
     // Tell Solr that the node has been updated, so the comment can be
     // indexed.
     apachesolr_entity_update($node, 'node');
-  }
+    }
 }
 
 /**
@@ -426,9 +426,9 @@ 
  *   The comment to be unpublished (hidden).
  */
 function boinc_solr_comments_unpublish($comment) {
-  if ( ($comment->cid) ) {
+    if ( ($comment->cid) ) {
     // Call the deletecomment function for hook comment.
     boinc_solr_comments_deletecomment($comment);
-  }
+    }
 }
 

Spacing +13 added lines, -13 removed lines

@@ -78,8 +78,8 @@ 
   foreach ($documents as $document) {
     //dd($document, "index documents alter - document");
 
-    $to_process = ( array_key_exists($document->bundle, $node_types) AND $node_types[$document->bundle] );
-    if ( $document->entity_type=='node' AND $to_process) {
+    $to_process = (array_key_exists($document->bundle, $node_types) AND $node_types[$document->bundle]);
+    if ($document->entity_type == 'node' AND $to_process) {
 
       // Remove ts_comments if present.
       if (isset($document->ts_comments)) {
@@ -110,7 +110,7 @@ 
         $comment_document->bundle = 'Comment';
         $comment_document->bundle_name = 'Comment';
 
-        $comment_document->path = 'goto/comment/' . $comment->cid;
+        $comment_document->path = 'goto/comment/'.$comment->cid;
         $comment_document->url = url($comment_document->path, $url_options);
 
         // Comment object has no language
@@ -140,7 +140,7 @@ 
 
         // Index formatted username so it can be searched and sorted
         // on.
-        $account = (object) array('uid' => $comment->uid, 'name' => $comment->name);
+        $account = (object)array('uid' => $comment->uid, 'name' => $comment->name);
         $username = check_plain($account->name);
         $comment_document->ss_name_formatted = $username;
         $comment_document->tos_name_formatted = $username;
@@ -184,7 +184,7 @@ 
 
           // Copy over fields [im_taxonomy_vid_1], [tid], [im_vid_1],
           // [im_vid_Forums], [tm_vid_1_names]
-          if ( ( preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName) ) AND is_array($fieldValue) ) {
+          if ((preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName)) AND is_array($fieldValue)) {
             foreach ($fieldValue as $subkey => $subvalue) {
               $comment_document->addField($fieldName, $subvalue);
             }
@@ -226,8 +226,8 @@ 
  */
 function boinc_solr_comments_apachesolr_process_results(&$results, DrupalSolrQueryInterface $query) {
   //dpm($query->getSolrParams(), "process_results query getSolrParams");
-  foreach($results as $id => $result) {
-    if ($result['entity_type']=='comment') {
+  foreach ($results as $id => $result) {
+    if ($result['entity_type'] == 'comment') {
         $results[$id]['type'] = 'Comment';
         $results[$id]['date'] = $result['fields']['changed'];
         if (isset($result['fields']['is_uid'])) {
@@ -252,7 +252,7 @@ 
  */
 function boinc_solr_comments_apachesolr_query_alter($query) {
   // Add custom field to query results
-  $query->addParam('fl','tos_content_extra');
+  $query->addParam('fl', 'tos_content_extra');
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -282,7 +282,7 @@ 
   switch ($op) {
     case 'delete':
       // Only call delete function on certain node types
-      if (in_array( $node->type, $node_types)) {
+      if (in_array($node->type, $node_types)) {
         boinc_solr_comments_delete($node);
       }
       break;
@@ -314,7 +314,7 @@ 
   try {
     $solr = apachesolr_get_solr($env_id);
     // Custom query to find all comments with parent nid of the node bing deleted.
-    $query = "entity_type:comment AND tos_content_extra:" . $node->nid;
+    $query = "entity_type:comment AND tos_content_extra:".$node->nid;
     $solr->deleteByQuery($query);
     // Log the query used for deletion.
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
@@ -399,7 +399,7 @@ 
  */
 
 function boinc_solr_comments_enable() {
-  drupal_set_message( bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
+  drupal_set_message(bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
 }
 
 /**
@@ -410,7 +410,7 @@ 
  *   The comment to be published (unhidden).
  */
 function boinc_solr_comments_publish($comment) {
-  if ( ($comment->cid) AND ($comment->nid) ) {
+  if (($comment->cid) AND ($comment->nid)) {
     $node = node_load($comment->nid);
     // Tell Solr that the node has been updated, so the comment can be
     // indexed.
@@ -426,7 +426,7 @@ 
  *   The comment to be unpublished (hidden).
  */
 function boinc_solr_comments_unpublish($comment) {
-  if ( ($comment->cid) ) {
+  if (($comment->cid)) {
     // Call the deletecomment function for hook comment.
     boinc_solr_comments_deletecomment($comment);
   }

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

@@ -78,8 +78,8 @@ 
   foreach ($documents as $document) {
     //dd($document, "index documents alter - document");
 
-    $to_process = ( array_key_exists($document->bundle, $node_types) AND $node_types[$document->bundle] );
-    if ( $document->entity_type=='node' AND $to_process) {
+    $to_process = ( array_key_exists($document->bundle, $node_types) and $node_types[$document->bundle] );
+    if ( $document->entity_type=='node' and $to_process) {
 
       // Remove ts_comments if present.
       if (isset($document->ts_comments)) {
@@ -98,7 +98,7 @@ 
         $comment = _comment_load($row['cid']);
 
         // Code derived from _apachesolr_index_process_entity_get_document
-        $url_options = array('absolute' => TRUE);
+        $url_options = array('absolute' => true);
         $comment_document = new ApacheSolrdocument();
 
         $comment_document->id = apachesolr_document_id($comment->cid, 'comment');
@@ -116,16 +116,16 @@ 
         // Comment object has no language
         $comment_document->ss_language = 'und';
         if (function_exists('drupal_get_path_alias')) {
-          $output = drupal_get_path_alias($comment_document->path, NULL);
+          $output = drupal_get_path_alias($comment_document->path, null);
           if ($output && $output != $document->path) {
             $comment_document->path_alias = $output;
           }
         }
 
         // Code derived from apachesolr_index_node_solr_document
-        $comment_document->label = truncate_utf8(apachesolr_clean_text($comment->comment), 32, TRUE);
+        $comment_document->label = truncate_utf8(apachesolr_clean_text($comment->comment), 32, true);
         $comment_document->content = apachesolr_clean_text($comment->comment);
-        $comment_document->teaser = truncate_utf8($document->content, 300, TRUE);
+        $comment_document->teaser = truncate_utf8($document->content, 300, true);
 
         // Author information
         if ($comment->uid == 0 || strlen($comment->name) == 0) {
@@ -184,7 +184,7 @@ 
 
           // Copy over fields [im_taxonomy_vid_1], [tid], [im_vid_1],
           // [im_vid_Forums], [tm_vid_1_names]
-          if ( ( preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName) ) AND is_array($fieldValue) ) {
+          if ( ( preg_match('/tid/', $fieldName) or preg_match('/vid/', $fieldName) ) and is_array($fieldValue) ) {
             foreach ($fieldValue as $subkey => $subvalue) {
               $comment_document->addField($fieldName, $subvalue);
             }
@@ -193,7 +193,7 @@ 
           // Set the access keys so this module will work with
           // apachesolr_access.
           if (module_exists('apachesolr_access')) {
-            if (preg_match('/^access/', $fieldName) AND is_array($fieldValue)) {
+            if (preg_match('/^access/', $fieldName) and is_array($fieldValue)) {
               foreach ($fieldValue as $subkey => $subvalue) {
                 $comment_document->addField($fieldName, $subvalue);
               }
@@ -264,7 +264,7 @@ 
  * Implementation of hook_nodeapi()
  *
  */
-function boinc_solr_comments_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
+function boinc_solr_comments_nodeapi(&$node, $op, $a3 = null, $a4 = null) {
   // Array of node types that will have comments indexed.
   $node_types = variable_get('boinc_solr_comments_nodetypes', '');
   if (empty($node_types)) {
@@ -307,7 +307,7 @@ 
   $env_id = apachesolr_default_environment();
   // Check to see if Solr is read-only.
   if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
-    return FALSE;
+    return false;
   }
 
   // Code derived from apachesolr_index_delete_entity_from_index
@@ -320,13 +320,13 @@ 
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
   }
   catch (Exception $e) {
-      watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
-      return FALSE;
+      watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), null, WATCHDOG_ERROR);
+      return false;
   }// try
 
   // all deletions sucessful
   apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
-  return TRUE;
+  return true;
 }
 
 /**
@@ -362,7 +362,7 @@ 
   $env_id = apachesolr_default_environment();
   // Check to see if Solr is read-only.
   if (apachesolr_environment_variable_get($env_id, 'apachesolr_read_only', APACHESOLR_READ_WRITE) == APACHESOLR_READ_ONLY) {
-    return FALSE;
+    return false;
   }
   //dd($comment->cid, "delete - nid begin");
 
@@ -378,13 +378,13 @@ 
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
     }
   catch (Exception $e) {
-    watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), NULL, WATCHDOG_ERROR);
-    return FALSE;
+    watchdog('Apache Solr', nl2br(check_plain($e->getMessage())), null, WATCHDOG_ERROR);
+    return false;
   }// try
 
   // deletion sucessful
   apachesolr_set_last_index_updated($env_id, APACHESOLR_REQUEST_TIME);
-  return TRUE;
+  return true;
 }
 
 
@@ -399,7 +399,7 @@ 
  */
 
 function boinc_solr_comments_enable() {
-  drupal_set_message( bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
+  drupal_set_message( bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), null, 'boinc:admin-solr-index-comments-message'), 'warning');
 }
 
 /**
@@ -410,7 +410,7 @@ 
  *   The comment to be published (unhidden).
  */
 function boinc_solr_comments_publish($comment) {
-  if ( ($comment->cid) AND ($comment->nid) ) {
+  if ( ($comment->cid) and ($comment->nid) ) {
     $node = node_load($comment->nid);
     // Tell Solr that the node has been updated, so the comment can be
     // indexed.

drupal/sites/default/boinc/modules/boinc_solr_search/boinc_solr_comments/boinc_solr_comments.admin.inc

Switch Indentation +4 added lines, -4 removed lines

@@ -19,10 +19,10 @@
   foreach (content_types() as $key => $info) {
     // Exclude node types profile, team, and panel
     switch ($key) {
-      case 'profile':
-      case 'team':
-      case 'panel':
-        continue 2;
+    case 'profile':
+    case 'team':
+    case 'panel':
+      continue 2;
     }// switch key
     $options[$key] = $info['name'];
   }

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     'boinc_solr_comments_nodetypes' => variable_get('boinc_solr_comments_nodetypes', ''),
   );
   if (empty($default['boinc_solr_comments_nodetypes'])) {
-    $default['boinc_solr_comments_nodetypes'] = array('forum','team_forum','news','page','story');
+    $default['boinc_solr_comments_nodetypes'] = array('forum', 'team_forum', 'news', 'page', 'story');
   }
   
   // Define the form

Indentation +19 added lines, -19 removed lines

@@ -7,48 +7,48 @@
  */
 
 function boinc_solr_comments_form(&$form_state) {
-  $form = array();
+    $form = array();
 
-  $form['config'] = array(
+    $form['config'] = array(
     '#type' => 'fieldset',
     '#title' => t('Configuration'),
     '#collapsible' => TRUE,
-  );
+    );
 
-  $options = array();
-  foreach (content_types() as $key => $info) {
+    $options = array();
+    foreach (content_types() as $key => $info) {
     // Exclude node types profile, team, and panel
     switch ($key) {
-      case 'profile':
+        case 'profile':
       case 'team':
       case 'panel':
         continue 2;
     }// switch key
     $options[$key] = $info['name'];
-  }
-  asort($options);
+    }
+    asort($options);
   
-  // Form defaults
-  $default = array(
+    // Form defaults
+    $default = array(
     'boinc_solr_comments_nodetypes' => variable_get('boinc_solr_comments_nodetypes', ''),
-  );
-  if (empty($default['boinc_solr_comments_nodetypes'])) {
+    );
+    if (empty($default['boinc_solr_comments_nodetypes'])) {
     $default['boinc_solr_comments_nodetypes'] = array('forum','team_forum','news','page','story');
-  }
+    }
   
-  // Define the form
-  $form['config']['nodes'] = array(
+    // Define the form
+    $form['config']['nodes'] = array(
     '#type'  => 'markup',
     '#value' => bts('Select the content types where the comments are indexed by Apace Solr. Your content must be re-indexed after changing this configuration.', array(), NULL, 'boinc:admin-solr-search-comments-option'),
-  );
+    );
       
-  $form['config']['boinc_solr_comments_nodetypes'] = array(
+    $form['config']['boinc_solr_comments_nodetypes'] = array(
     '#type'          => 'checkboxes',
     '#title'         => 'node',
     '#options'       => $options,
     '#default_value' => $default['boinc_solr_comments_nodetypes'],
-  );
+    );
 
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 

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

@@ -12,7 +12,7 @@ 
   $form['config'] = array(
     '#type' => 'fieldset',
     '#title' => t('Configuration'),
-    '#collapsible' => TRUE,
+    '#collapsible' => true,
   );
 
   $options = array();
@@ -39,7 +39,7 @@ 
   // Define the form
   $form['config']['nodes'] = array(
     '#type'  => 'markup',
-    '#value' => bts('Select the content types where the comments are indexed by Apace Solr. Your content must be re-indexed after changing this configuration.', array(), NULL, 'boinc:admin-solr-search-comments-option'),
+    '#value' => bts('Select the content types where the comments are indexed by Apace Solr. Your content must be re-indexed after changing this configuration.', array(), null, 'boinc:admin-solr-search-comments-option'),
   );
       
   $form['config']['boinc_solr_comments_nodetypes'] = array(

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

Indentation +4 added lines, -4 removed lines

@@ -7,15 +7,15 @@
  */
 
 class views_handler_argument_boincteam_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 team_id FROM {boincteam} WHERE nid = %d", $id));
     $this->argument = $boinc_id;
     return $this->validate_arg($boinc_id);
-  }
+    }
 }

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

Spacing +1 added lines, -1 removed lines

@@ -444,7 +444,7 @@
 function boincteam_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincteam') . '/views',
+      'path' => drupal_get_path('module', 'boincteam').'/views',
     ),
     'handlers' => array(
       'views_handler_argument_boincteam_id' => array(

Indentation +206 added lines, -206 removed lines

@@ -13,103 +13,103 @@ 
  */
 function boincteam_views_data() {
 
-  // -----------------------------------------------------------------------------------------------
-  // Definition for team table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for team table
+    // -----------------------------------------------------------------------------------------------
 
-  $data['team']['table']['group'] = t('BOINC');
+    $data['team']['table']['group'] = t('BOINC');
 
-  $data['team']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC team'),
-      'help' => t('BOINC data for a team'),
-      'database' => 'boinc_rw'
-  );
+    $data['team']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC team'),
+        'help' => t('BOINC data for a team'),
+        'database' => 'boinc_rw'
+    );
 
-  // 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['team']['table']['join'] = array(
+    $data['team']['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['team']['id'] = array(
+    $data['team']['id'] = array(
     'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
     'help' => t('The BOINC ID of the team.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincteam_id', // custom handler
+        'name field' => 'title', // the field to display in the summary.
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'team_delta',
-      'field' => 'id',
-      'base field' => 'teamid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Team History')
+        'base' => 'team_delta',
+        'field' => 'id',
+        'base field' => 'teamid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Team History')
     ),
     '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['team']['userid'] = array(
+    $data['team']['userid'] = array(
     'title' => bts('Founder', array(), NULL, 'boinc:view-team-info'),
     'help' => t('The founder of this team.'),
     // This is a foreign key to the {user} table. When the view is configured
     // with this relationship, all the fields for the related user node will be
     // 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 fields (alphabetized)
-  /*
+    // Descriptions of general fields (alphabetized)
+    /*
   $data['team']['create_time'] = array(
     'title' => bts('Team established', array(), NULL, 'boinc:date-team-established'),
     'help' => t('When the BOINC team was created.'),
@@ -140,298 +140,298 @@ 
   );
   */
 
-  $data['team']['country'] = array(
+    $data['team']['country'] = array(
     'title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     'help' => t('The country of a team.'),
     '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['team']['expavg_credit'] = array(
+    );
+    $data['team']['expavg_credit'] = array(
     'title' => bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC'),
     'help' => t('A decaying average of team 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['team']['name'] = array(
+    );
+    $data['team']['name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
     'help' => t('The name of the team.'),
     '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['team']['nusers'] = array(
+    );
+    $data['team']['nusers'] = array(
     'title' => bts('Members', array(), NULL, 'boinc:team-members'),
     'help' => t('Count of team members.'),
     '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['team']['total_credit'] = array(
+    );
+    $data['team']['total_credit'] = array(
     'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
     'help' => t('The total team accumulated BOINC credit.'),
     '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 team_admin table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for team_admin table
+    // -----------------------------------------------------------------------------------------------
 
-  $data['team_admin']['table']['group'] = t('BOINC');
+    $data['team_admin']['table']['group'] = t('BOINC');
 
-  $data['team_admin']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC team admins'),
-      'help' => t('BOINC admins for a team'),
-      'database' => 'boinc_rw'
-  );
+    $data['team_admin']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC team admins'),
+        'help' => t('BOINC admins for a team'),
+        'database' => 'boinc_rw'
+    );
 
-  // This table references the {team} table.
-  // This join creates an 'implicit' relationship to the team table, so that when
-  // "Team" is the base table, the fields are automatically available.
+    // This table references the {team} table.
+    // This join creates an 'implicit' relationship to the team table, so that when
+    // "Team" 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['team_admin']['table']['join'] = array(
+    $data['team_admin']['table']['join'] = array(
     'team' => array(
-      'left_field' => 'id',
-      'field' => 'teamid',
+        'left_field' => 'id',
+        'field' => 'teamid',
     ),
-  );
+    );
 
-  // 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['team_admin']['teamid'] = array(
+    $data['team_admin']['teamid'] = array(
     'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
     'help' => t('The BOINC ID of the team on which this user is an admin.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincteam_id', // custom handler
+        'name field' => 'title', // the field to display in the summary.
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'team',
-      'field' => 'teamid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Team')
+        'base' => 'team',
+        'field' => 'teamid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Team')
     ),
     '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['team_admin']['userid'] = array(
+    $data['team_admin']['userid'] = array(
     'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
     'help' => t('The user that is a team admin.'),
     // This is a foreign key to the {user} table. When the view is configured
     // with this relationship, all the fields for the related user node will be
     // available.
     'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincteam_id',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'user',
-      'field' => 'userid',
-      'handler' => 'views_handler_relationship',
-      'label' => bts('User', array(), NULL, 'boinc:user-on-team')
+        'base' => 'user',
+        'field' => 'userid',
+        'handler' => 'views_handler_relationship',
+        'label' => bts('User', array(), NULL, 'boinc:user-on-team')
     ),
     '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 fields (alphabetized)
+    // Descriptions of general fields (alphabetized)
 
-  $data['team_admin']['create_time'] = array(
+    $data['team_admin']['create_time'] = array(
     'title' => bts('Admin since', array(), NULL, 'boinc:team-when-user-became-an-admin'),
     'help' => t('When the BOINC user became a team admin.'),
     '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'
     )
-  );
+    );
 
-  // -----------------------------------------------------------------------------------------------
-  // Definition for team_delta table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for team_delta table
+    // -----------------------------------------------------------------------------------------------
 
-  $data['team_delta']['table']['group'] = t('BOINC');
+    $data['team_delta']['table']['group'] = t('BOINC');
 
-  // 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['team_delta']['teamid'] = array(
+    $data['team_delta']['teamid'] = array(
     'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
     'help' => t('The team ID for this team history event.'),
     // This is a foreign key to the {team} table. When the view is configured
     // with this relationship, all the fields for the related user node will be
     // available.
     'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincteam_id',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => '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'
     )
-  );
+    );
 
-  // Foreign key fields
+    // Foreign key fields
 
-  $data['team_delta']['userid'] = array(
+    $data['team_delta']['userid'] = array(
     'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
     'help' => t('The user for this team history event.'),
     '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 fields (alphabetized)
+    // Descriptions of general fields (alphabetized)
 
-  $data['team_delta']['joining'] = array(
+    $data['team_delta']['joining'] = array(
     'title' => bts('User joined', array(), NULL, 'boinc:user-joined-or-leaving-team'),
     'help' => t('Whether the event is the user joining the team or leaving.'),
     '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['team_delta']['timestamp'] = array(
+    );
+    $data['team_delta']['timestamp'] = array(
     'title' => bts('Timestamp', array(), NULL, 'boinc:team-history-timestamp'),
     'help' => t('When the BOINC team history event took place.'),
     '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['team_delta']['total_credit'] = array(
+    );
+    $data['team_delta']['total_credit'] = array(
     'title' => bts('Total credit', array(), NULL, 'user-or-team-total-credits'),
     'help' => t('The total accumulated BOINC credit of the user when the
       history event took place.'),
     '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'
     )
-  );
+    );
 
-  return $data;
+    return $data;
 }
 
 /*
@@ -442,14 +442,14 @@ 
  */
 
 function boincteam_views_handlers() {
-  return array(
+    return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincteam') . '/views',
+        'path' => drupal_get_path('module', 'boincteam') . '/views',
     ),
     'handlers' => array(
-      'views_handler_argument_boincteam_id' => array(
+        'views_handler_argument_boincteam_id' => array(
         'parent' => 'views_handler_argument_numeric'
-      )
+        )
     )
-  );
+    );
 }

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

@@ -49,16 +49,16 @@ 
   // Primary keys allowed as arguments
 
   $data['team']['id'] = array(
-    'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
+    'title' => bts('Team ID', array(), null, 'boinc:team-id'),
     'help' => t('The BOINC ID of the team.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_boincteam_id', // custom handler
       'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -79,7 +79,7 @@ 
   // Foreign key fields
 
   $data['team']['userid'] = array(
-    'title' => bts('Founder', array(), NULL, 'boinc:view-team-info'),
+    'title' => bts('Founder', array(), null, 'boinc:view-team-info'),
     'help' => t('The founder of this team.'),
     // This is a foreign key to the {user} table. When the view is configured
     // with this relationship, all the fields for the related user node will be
@@ -87,7 +87,7 @@ 
     'argument' => array(
       'handler' => 'views_handler_argument_boincuser_id',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -98,7 +98,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -141,11 +141,11 @@ 
   */
 
   $data['team']['country'] = array(
-    'title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
+    'title' => bts('Country', array(), null, 'boinc:country-of-origin'),
     'help' => t('The country of a team.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -155,12 +155,12 @@ 
     )
   );
   $data['team']['expavg_credit'] = array(
-    'title' => bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC'),
+    'title' => bts('Recent average credit', array(), null, 'boinc:user-or-team-RAC'),
     'help' => t('A decaying average of team 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'
@@ -170,11 +170,11 @@ 
     )
   );
   $data['team']['name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
+    'title' => bts('Name', array(), null, 'boinc:user-or-team-name'),
     'help' => t('The name of the team.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -184,11 +184,11 @@ 
     )
   );
   $data['team']['nusers'] = array(
-    'title' => bts('Members', array(), NULL, 'boinc:team-members'),
+    'title' => bts('Members', array(), null, 'boinc:team-members'),
     'help' => t('Count of team members.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -198,12 +198,12 @@ 
     )
   );
   $data['team']['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 team accumulated BOINC credit.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -249,16 +249,16 @@ 
   // Primary keys allowed as arguments
 
   $data['team_admin']['teamid'] = array(
-    'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
+    'title' => bts('Team ID', array(), null, 'boinc:team-id'),
     'help' => t('The BOINC ID of the team on which this user is an admin.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_boincteam_id', // custom handler
       'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -278,7 +278,7 @@ 
   // Foreign key fields
 
   $data['team_admin']['userid'] = array(
-    'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
+    'title' => bts('User ID', array(), null, 'boinc:user-details'),
     'help' => t('The user that is a team admin.'),
     // This is a foreign key to the {user} table. When the view is configured
     // with this relationship, all the fields for the related user node will be
@@ -286,18 +286,18 @@ 
     'argument' => array(
       'handler' => 'views_handler_argument_boincteam_id',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
       'base' => 'user',
       'field' => 'userid',
       'handler' => 'views_handler_relationship',
-      'label' => bts('User', array(), NULL, 'boinc:user-on-team')
+      'label' => bts('User', array(), null, 'boinc:user-on-team')
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -310,11 +310,11 @@ 
   // Descriptions of general fields (alphabetized)
 
   $data['team_admin']['create_time'] = array(
-    'title' => bts('Admin since', array(), NULL, 'boinc:team-when-user-became-an-admin'),
+    'title' => bts('Admin since', array(), null, 'boinc:team-when-user-became-an-admin'),
     'help' => t('When the BOINC user became a team admin.'),
     'field' => array(
       'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -338,7 +338,7 @@ 
   // Primary keys allowed as arguments
 
   $data['team_delta']['teamid'] = array(
-    'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
+    'title' => bts('Team ID', array(), null, 'boinc:team-id'),
     'help' => t('The team ID for this team history event.'),
     // This is a foreign key to the {team} table. When the view is configured
     // with this relationship, all the fields for the related user node will be
@@ -346,12 +346,12 @@ 
     'argument' => array(
       'handler' => 'views_handler_argument_boincteam_id',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -364,7 +364,7 @@ 
   // Foreign key fields
 
   $data['team_delta']['userid'] = array(
-    'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
+    'title' => bts('User ID', array(), null, 'boinc:user-details'),
     'help' => t('The user for this team history event.'),
     'relationship' => array(
       'base' => 'user',
@@ -374,7 +374,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -387,11 +387,11 @@ 
   // Descriptions of general fields (alphabetized)
 
   $data['team_delta']['joining'] = array(
-    'title' => bts('User joined', array(), NULL, 'boinc:user-joined-or-leaving-team'),
+    'title' => bts('User joined', array(), null, 'boinc:user-joined-or-leaving-team'),
     'help' => t('Whether the event is the user joining the team or leaving.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -401,11 +401,11 @@ 
     )
   );
   $data['team_delta']['timestamp'] = array(
-    'title' => bts('Timestamp', array(), NULL, 'boinc:team-history-timestamp'),
+    'title' => bts('Timestamp', array(), null, 'boinc:team-history-timestamp'),
     'help' => t('When the BOINC team history event took place.'),
     'field' => array(
       'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -415,13 +415,13 @@ 
     )
   );
   $data['team_delta']['total_credit'] = array(
-    'title' => bts('Total credit', array(), NULL, 'user-or-team-total-credits'),
+    'title' => bts('Total credit', array(), null, 'user-or-team-total-credits'),
     'help' => t('The total accumulated BOINC credit of the user when the
       history event took place.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'

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'])) {

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;
       }
     }

Indentation +182 added lines, -182 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 .= '<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 .= 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;
 }
 
 /**
@@ -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';
-
-  // 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;
-
-  // Add a submit button and a hidden field to pass the preset
-  $form['submit'] = array(
+    }
+    $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']);
+
+    // 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(
     '#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'];
-
-  // 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']}\"");
-
-  // 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']}\"");
+    require_boinc('util');
+    $values = $form_state['values'];
+
+    // 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']}\"");
+
+    // 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']}\"");
 }
 
 /**
-  * 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'];
-
-  // 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'];
-
-  // 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;
-
-  //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.',
+    $values = $form_state['values'];
+    $preset = $form_state['values']['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'];
+
+    // 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;
+
+    //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.',
     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));
 }
 
 /**

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');
   }
 }