BOINC / boinc

html/inc/consent.inc

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

@@ -44,10 +44,10 @@ 
     if ($checkct) {
         $consent_result = BoincLatestConsent::lookup("userid={$user->id} AND consent_type_id=$ctid AND consent_flag=1");
         if ($consent_result) {
-            return TRUE;
+            return true;
         }
     }
-    return FALSE;
+    return false;
 }
 
 // Checks to see if a particular consent_type name is in
@@ -56,12 +56,12 @@ 
 // if checkenabled=TRUE, if the consent_type is enabled/available for
 // use. The integer is the consent_type_id- the id from consent_type
 // table. If the boolean is FALSE, the integer returned is -1.
-function check_consent_type($name, $checkenabled=TRUE) {
+function check_consent_type($name, $checkenabled=true) {
     $ct = BoincConsentType::lookup("shortname = '{$name}'");
     if ($ct and ( !$checkenabled or ($ct->enabled)) ) {
-        return array(TRUE, $ct->id);
+        return array(true, $ct->id);
     }
-    return array(FALSE, -1);
+    return array(false, -1);
 }
 
 // When a user uses the Web site to login, this funtion checks the

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
 require_once("../inc/boinc_db.inc");
 require_once("../inc/util.inc");
 
-define('CONSENT_TYPE_ENROLL','ENROLL');
+define('CONSENT_TYPE_ENROLL', 'ENROLL');
 
 // Utility function to check the terms of use.
 function check_termsofuse() {
@@ -30,13 +30,13 @@ 
 
 function consent_to_a_policy($user, $consent_type_id, $consent_flag, $consent_not_required, $source, $ctime = 0) {
     $mys = BoincDb::escape_string($source);
-    if ($ctime==0) {
+    if ($ctime == 0) {
         $mytime = $user->create_time;
     } else {
         $mytime = $ctime;
     }
     return BoincConsent::insert(
-        "(userid, consent_type_id, consent_time, consent_flag, consent_not_required, source) " .
+        "(userid, consent_type_id, consent_time, consent_flag, consent_not_required, source) ".
         "values($user->id, $consent_type_id, $mytime, $consent_flag, $consent_not_required, '$mys')"
     );
 
@@ -60,9 +60,9 @@ 
 // if checkenabled=TRUE, if the consent_type is enabled/available for
 // use. The integer is the consent_type_id- the id from consent_type
 // table. If the boolean is FALSE, the integer returned is -1.
-function check_consent_type($name, $checkenabled=TRUE) {
+function check_consent_type($name, $checkenabled = TRUE) {
     $ct = BoincConsentType::lookup("shortname = '{$name}'");
-    if ($ct and ( !$checkenabled or ($ct->enabled)) ) {
+    if ($ct and (!$checkenabled or ($ct->enabled))) {
         return array(TRUE, $ct->id);
     }
     return array(FALSE, -1);
@@ -74,7 +74,7 @@ 
 function intercept_login($user, $perm, $in_next_url = "") {
     list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
     $config = get_config();
-    if ( parse_bool($config, "enable_login_mustagree_termsofuse") and $checkct and check_termsofuse() and (!check_user_consent($user, CONSENT_TYPE_ENROLL))) {
+    if (parse_bool($config, "enable_login_mustagree_termsofuse") and $checkct and check_termsofuse() and (!check_user_consent($user, CONSENT_TYPE_ENROLL))) {
         // sent user to terms-of-use Web form after login
         $mytoken = create_token($user->id, TOKEN_TYPE_LOGIN_INTERCEPT, TOKEN_DURATION_TWO_HOURS);
         send_cookie('logintoken', $mytoken, false);

html/inc/user.inc

Braces +3 added lines, -3 removed lines

@@ -343,7 +343,7 @@ 
         $name = substr($name, 0, $name_limit)."...";
     }
     $x .= " <a href=\"".url_base()."show_user.php?userid=".$user->id."\">".$name."</a>";
-    if (function_exists("project_user_links")){
+    if (function_exists("project_user_links")) {
         $x .= project_user_links($user);
     }
     if ($badge_height) {
@@ -464,7 +464,7 @@ 
 // Returns a cacheable community links data object
 // @param user The user to produce a community links object for
 
-function get_community_links_object($user){
+function get_community_links_object($user) {
     $cache_object = new StdClass;
     $cache_object->post_count = total_posts($user);
     $cache_object->user = $user;
@@ -480,7 +480,7 @@ 
     return $cache_object;
 }
 
-function community_links($clo, $logged_in_user){
+function community_links($clo, $logged_in_user) {
     $user = $clo->user;
     $team = $clo->team;
     $friends = $clo->friends;

Spacing +14 added lines, -14 removed lines

@@ -33,7 +33,7 @@ 
 // they've participated in
 //
 function get_other_projects($user) {
-    $cpid = md5($user->cross_project_id . $user->email_addr);
+    $cpid = md5($user->cross_project_id.$user->email_addr);
     $url = "http://boinc.netsoft-online.com/get_user.php?cpid=".$cpid;
 
     // Check the cache for that URL
@@ -174,7 +174,7 @@ 
     }
 
     if (!NO_STATS) {
-        $cpid = md5($user->cross_project_id . $user->email_addr);
+        $cpid = md5($user->cross_project_id.$user->email_addr);
         $x = "";
         shuffle($cpid_stats_sites);
         foreach ($cpid_stats_sites as $site) {
@@ -328,7 +328,7 @@ 
 // if $badge_height is > 0, show badges
 // if $name_limit, limit name to N chars
 //
-function user_links($user, $badge_height=0, $name_limit=0) {
+function user_links($user, $badge_height = 0, $name_limit = 0) {
     BoincForumPrefs::lookup($user);
     if (is_banished($user)) {
         return "(banished: ID $user->id)";
@@ -343,13 +343,13 @@ 
         $name = substr($name, 0, $name_limit)."...";
     }
     $x .= " <a href=\"".url_base()."show_user.php?userid=".$user->id."\">".$name."</a>";
-    if (function_exists("project_user_links")){
+    if (function_exists("project_user_links")) {
         $x .= project_user_links($user);
     }
     if ($badge_height) {
         $x .= badges_string(true, $user, $badge_height);
     }
-    return $name_limit?"<nobr>$x</nobr>":$x;
+    return $name_limit ? "<nobr>$x</nobr>" : $x;
 }
 
 function show_community_private($user) {
@@ -396,7 +396,7 @@ 
 
             // if there's a foundership request, notify the founder
             //
-            if ($user->id==$team->userid && $team->ping_user >0) {
+            if ($user->id == $team->userid && $team->ping_user > 0) {
                 $x .= "<p class=\"text-danger\">".tra("(foundership change request pending)")."</p>";
             }
             row2(tra("Member of team"), $x);
@@ -421,7 +421,7 @@ 
     $x = "<a href=\"user_search.php\">".tra("Find friends")."</a><br/>\n";
     $n = count($friends);
     if ($n) {
-        foreach($friends as $friend) {
+        foreach ($friends as $friend) {
             $fuser = BoincUser::lookup_id($friend->user_dest);
             if (!$fuser) continue;
             $x .= friend_links($fuser);
@@ -464,7 +464,7 @@ 
 // Returns a cacheable community links data object
 // @param user The user to produce a community links object for
 
-function get_community_links_object($user){
+function get_community_links_object($user) {
     $cache_object = new StdClass;
     $cache_object->post_count = total_posts($user);
     $cache_object->user = $user;
@@ -472,7 +472,7 @@ 
     $cache_object->friends = array();
 
     $friends = BoincFriend::enum("user_src=$user->id and reciprocated=1");
-    foreach($friends as $friend) {
+    foreach ($friends as $friend) {
         $fuser = BoincUser::lookup_id($friend->user_dest);
         if (!$fuser) continue;
         $cache_object->friends[] = $fuser;
@@ -480,7 +480,7 @@ 
     return $cache_object;
 }
 
-function community_links($clo, $logged_in_user){
+function community_links($clo, $logged_in_user) {
     $user = $clo->user;
     $team = $clo->team;
     $friends = $clo->friends;
@@ -506,15 +506,15 @@ 
                 "<a href=\"friend.php?action=cancel_confirm&userid=$user->id\">".tra("Cancel friendship")."</a>"
             );
         } else if ($friend) {
-            row2(tra("Friends"),  "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Request pending")."</a>");
+            row2(tra("Friends"), "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Request pending")."</a>");
         } else {
-            row2(tra("Friends"),  "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Add as friend")."</a>");
+            row2(tra("Friends"), "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Add as friend")."</a>");
         }
     }
     
     if ($friends) {
         $x = "";
-        foreach($friends as $friend) {
+        foreach ($friends as $friend) {
             $x .= friend_links($friend);
         }
         row2(tra("Friends")." (".sizeof($friends).")", $x);
@@ -558,6 +558,6 @@ 
 }
 
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

Indentation +5 added lines, -5 removed lines

@@ -286,11 +286,11 @@
 
         require_once("../inc/account_ownership.inc");
         if (file_exists($account_ownership_private_key_file_path)) {
-          // If the server has keys configured show the account ownership form
-          row2(
-              tra("Account Ownership"),
-              "<a href=\"account_ownership.php?$url_tokens\">Generate ownership proof</a>"
-          );
+            // If the server has keys configured show the account ownership form
+            row2(
+                tra("Account Ownership"),
+                "<a href=\"account_ownership.php?$url_tokens\">Generate ownership proof</a>"
+            );
         }
 
     }

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

Spacing +13 added lines, -13 removed lines

@@ -165,8 +165,8 @@ 
       WHERE n.type = 'profile'
       AND n.status = 1
       AND n.moderate = 0
-      " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '') . "
-      " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '') . "
+      " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '')."
+      " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '')."
       ORDER BY RAND()
       LIMIT 1"
     ));
@@ -212,7 +212,7 @@ 
  * this function is called, it may be called with optional parameters
  * new and prev email.
  */
-function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) {
+function _boincuser_send_emailchange($account, $new_email = NULL, $prev_email = NULL, $adminuser = FALSE) {
   require_boinc('token');
   module_load_include('inc', 'rules', 'modules/system.rules');
 
@@ -303,7 +303,7 @@ 
     // Name is limited to 60 characters, but we want to leave space to add a
     // tally if needed (for users with duplicate names); Limit to 56 chars and
     // replace the middle of the string with "..." if too long
-    $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length-56)+3);
+    $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length - 56) + 3);
   }
 
   // Determine if there are duplicate names, if so append a number to end.
@@ -373,7 +373,7 @@ 
     // delimiters. Curly brace is not really allowed un URLs, but a
     // more robust function would first check for these curly braces
     // in the path_to_ignore patterms, just in case.
-    if (preg_match('{' . $pi . '}', $path)) {
+    if (preg_match('{'.$pi.'}', $path)) {
       return TRUE;
     }
   }
@@ -499,15 +499,15 @@ 
   elseif (!in_array($_GET['q'], $page_blacklist)) {
     watchdog('boincuser', 'The BOINC scheduling server settings are not yet
         configured. Please !verify for the settings to become effective.',
-          array('!verify' => l(t('verify the default values') . ' <strong>' . 
-            t('and') . '</strong> ' . t('save the configuration'),
+          array('!verify' => l(t('verify the default values').' <strong>'. 
+            t('and').'</strong> '.t('save the configuration'),
             'admin/boinc/scheduler', array('html' => TRUE))
           ), WATCHDOG_WARNING);
     if (user_access('administer site configuration')) {
       drupal_set_message(t('The BOINC scheduling server settings are not yet
           configured. Please !verify for the settings to become effective',
-            array('!verify' => l(t('verify the default values') . ' <strong>' . 
-              t('and') . '</strong> ' . t('save the configuration'),
+            array('!verify' => l(t('verify the default values').' <strong>'. 
+              t('and').'</strong> '.t('save the configuration'),
               'admin/boinc/scheduler', array('html' => TRUE))
             )), 'warning', FALSE);
     }
@@ -569,7 +569,7 @@ 
  */
 function _boincuser_node_profile_delete_submit($form, &$form_state) {
   $node = $form['#node'];
-  $deleteurl = 'node/'. $node->nid .'/delete';
+  $deleteurl = 'node/'.$node->nid.'/delete';
   $afterq = 'destination=account';
   drupal_goto($deleteurl, $afterq);
 }
@@ -599,8 +599,8 @@ 
   $view = views_get_current_view();
   $account_id = $view->args[0];
   $friend_count = flag_friend_get_friend_count($account_id);
-  return '<h2 class="pane-title">' . bts('Friends (@count)', 
-    array('@count' => $friend_count)) . '</h2>';
+  return '<h2 class="pane-title">'.bts('Friends (@count)', 
+    array('@count' => $friend_count)).'</h2>';
 }
 
 /**
@@ -613,7 +613,7 @@ 
   $result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10);
   db_set_active('default');
   while ($user = db_fetch_object($result)) {
-      $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')';
+      $matches[$user->name.'_'.$user->id] = htmlentities($user->name)." (".$user->id.')';
   }
 
   drupal_json((object)$matches);

Indentation +244 added lines, -244 removed lines

@@ -11,12 +11,12 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 if (!function_exists('user_load_by_mail')) {
-  /**
-   * user_load_by_mail will be broken out of user_load
-   */
-  function user_load_by_mail($mail) {
+    /**
+     * user_load_by_mail will be broken out of user_load
+     */
+    function user_load_by_mail($mail) {
     return user_load(array('mail' => $mail));
-  }
+    }
 }
  
 
@@ -28,14 +28,14 @@ 
  * Get an image object from a given file and cck field
  */ 
 function get_cck_image_object($image_path, $field_name, $content_type, $ignore_resolution = FALSE) {
-  $field = content_fields($field_name, $content_type); 
-  $validators = array_merge(filefield_widget_upload_validators($field), imagefield_widget_upload_validators($field));
-  if ($ignore_resolution) {
+    $field = content_fields($field_name, $content_type); 
+    $validators = array_merge(filefield_widget_upload_validators($field), imagefield_widget_upload_validators($field));
+    if ($ignore_resolution) {
     unset($validators['filefield_validate_image_resolution']);
-  }
-  $target_path = filefield_widget_file_path($field);
-  // Create the image object
-  return field_file_save_file($image_path, $validators, $target_path, FILE_EXISTS_REPLACE);
+    }
+    $target_path = filefield_widget_file_path($field);
+    // Create the image object
+    return field_file_save_file($image_path, $validators, $target_path, FILE_EXISTS_REPLACE);
 }
 
 
@@ -47,73 +47,73 @@ 
  * 
  */
 function boincuser_check_credit_requirements() {
-  global $user;
-  if (!$user->uid) {
+    global $user;
+    if (!$user->uid) {
     return FALSE;
-  }
-  $account = user_load($user->uid);
-  $min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
-  $community_role = array_search('community member', user_roles(true));
-  $unrestricted_role = array_search('verified contributor', user_roles(true));
+    }
+    $account = user_load($user->uid);
+    $min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
+    $community_role = array_search('community member', user_roles(true));
+    $unrestricted_role = array_search('verified contributor', user_roles(true));
   
-  // Set user roles based on current penalty status...
-  if ($account->boincuser_penalty_expiration > time()) {
+    // Set user roles based on current penalty status...
+    if ($account->boincuser_penalty_expiration > time()) {
     drupal_set_message(bts(
-      'You are banned from community participation until @date',
-      array('@date' => format_date($account->boincuser_penalty_expiration))
+        'You are banned from community participation until @date',
+        array('@date' => format_date($account->boincuser_penalty_expiration))
     ), 'warning', FALSE);
     if (isset($account->roles[$community_role])) {
-      // Remove from the community role, if not already
-      unset($account->roles[$community_role]);
+        // Remove from the community role, if not already
+        unset($account->roles[$community_role]);
     }
     if (isset($account->roles[$unrestricted_role])) {
-      // Likewise, revoke extra privileges
-      unset($account->roles[$unrestricted_role]);
+        // Likewise, revoke extra privileges
+        unset($account->roles[$unrestricted_role]);
     }
     user_save($account, array('roles' => $account->roles));
-  }
-  else {
+    }
+    else {
     if (!isset($account->roles[$community_role])) {
-      // The user should be a 'community member' role. If the user was
-      // previously banned, this will restore that role.
-      $account->roles[$community_role] = 'community member';
-      user_save($account, array('roles' => $account->roles));
+        // The user should be a 'community member' role. If the user was
+        // previously banned, this will restore that role.
+        $account->roles[$community_role] = 'community member';
+        user_save($account, array('roles' => $account->roles));
     }
 
     // ... and total credit.
     if ($account->boincuser_total_credit >= $min_credit_to_post) {
-      if (!isset($account->roles[$unrestricted_role])) {
+        if (!isset($account->roles[$unrestricted_role])) {
         // This user is now above the credit threshold and is allowed full
         // privileges
         $account->roles[$unrestricted_role] = 'verified contributor';
         user_save($account, array('roles' => $account->roles));
-      }
+        }
     }
     else {
-      drupal_set_message(bts(
+        drupal_set_message(bts(
         'You must earn @count more credits to be able to post comments on this site and create or modify your user profile.',
         array('@count' => $min_credit_to_post - $account->boincuser_total_credit)
-      ), 'warning', FALSE);
-      if (isset($account->roles[$unrestricted_role])) {
+        ), 'warning', FALSE);
+        if (isset($account->roles[$unrestricted_role])) {
         // Either the threshold has been raised or credits have been revoked;
         // this user no longer qualifies for full privileges
         unset($account->roles[$unrestricted_role]);
         user_save($account, array('roles' => $account->roles));
-      }
+        }
     }
 
-  }
+    }
 }
 
 /**
  * Get the cid of the first comment the user has not seen on a given node
  */
 function boincuser_get_first_unread_comment_id($nid, $uid = NULL) {
-  if (!$uid) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  return db_result(db_query("
+    }
+    return db_result(db_query("
     SELECT c.cid
     FROM {node} n
     INNER JOIN {comments} c ON c.nid = n.nid
@@ -124,40 +124,40 @@ 
     ORDER BY c.timestamp ASC
     LIMIT 1",
     $uid, $nid
-  ));
+    ));
 }
 
 /**
  * Choose and set the user of the day
  */
 function boincuser_select_user_of_the_day() {
-  // First get a list of users with recent credit
-  db_set_active('boinc_rw');
-  $users_with_credit = db_query("
+    // First get a list of users with recent credit
+    db_set_active('boinc_rw');
+    $users_with_credit = db_query("
     SELECT
       id
     FROM {user} u
     JOIN {profile} p ON p.userid = u.id
     WHERE expavg_credit > 1
     ORDER BY uotd_time ASC, RAND()"
-  );
-  db_set_active('default');
-  $active_users = array();
-  while ($user_with_credit = db_fetch_object($users_with_credit)) {
+    );
+    db_set_active('default');
+    $active_users = array();
+    while ($user_with_credit = db_fetch_object($users_with_credit)) {
     $active_users[] = $user_with_credit->id;
-  }
-  $active_users = implode(',', $active_users);
-  // Limit to users who have never been user of the day, if there are any
-  $never_been_picked = db_result(db_query("
+    }
+    $active_users = implode(',', $active_users);
+    // Limit to users who have never been user of the day, if there are any
+    $never_been_picked = db_result(db_query("
     SELECT COUNT(*)
     FROM {boincuser} bu
     WHERE bu.uotd_time = 0
     " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '')
-  ));
-  $new_uotd_uid = 0;
-  while (!$new_uotd_uid) {
+    ));
+    $new_uotd_uid = 0;
+    while (!$new_uotd_uid) {
     // Select a user of the day randomly from the pool
-      $new_uotd_uid = db_result(db_query("
+        $new_uotd_uid = db_result(db_query("
       SELECT
         n.uid
       FROM {node} n
@@ -171,31 +171,31 @@ 
       LIMIT 1"
     ));
     if (!$new_uotd_uid) {
-      // Can't find a user with a profile; remove constraints on the pool
-      if ($never_been_picked) {
+        // Can't find a user with a profile; remove constraints on the pool
+        if ($never_been_picked) {
         // Allow users who have been previously selected
         $never_been_picked = FALSE;
-      }
-      elseif ($active_users) {
+        }
+        elseif ($active_users) {
         // Allow users who are not even active (getting desperate)
         $active_users = FALSE;
-      }
-      else {
+        }
+        else {
         // Process failed...
         return FALSE;
-      }
+        }
     }
-  }
-  $uotd = user_load($new_uotd_uid);
-  if ($uotd->uid) {
+    }
+    $uotd = user_load($new_uotd_uid);
+    if ($uotd->uid) {
     db_query("
       UPDATE {boincuser}
       SET uotd_time = '%d'
       WHERE uid = '%d'",
-      time(), $uotd->uid
+        time(), $uotd->uid
     );
-  }
-  return $uotd;
+    }
+    return $uotd;
 }
 
 
@@ -213,71 +213,71 @@ 
  * new and prev email.
  */
 function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) {
-  require_boinc('token');
-  module_load_include('inc', 'rules', 'modules/system.rules');
+    require_boinc('token');
+    module_load_include('inc', 'rules', 'modules/system.rules');
 
-  global $base_url;
-  $site_name = variable_get('site_name', 'Drupal-BOINC');
+    global $base_url;
+    $site_name = variable_get('site_name', 'Drupal-BOINC');
 
-  if (is_null($new_email)) {
+    if (is_null($new_email)) {
     $new_email = $account->mail;
-  }
-  if (is_null($prev_email)) {
+    }
+    if (is_null($prev_email)) {
     $prev_email = $account->boincuser_previous_email_addr;
-  }
-
-  // @todo - set constant in drupal, or use BOINC contsants
-  $duration = TOKEN_DURATION_ONE_WEEK;
-  $changedate = date('F j, Y \a\t G:i T', time());
-  $newdate = date('F j, Y \a\t G:i T', $account->boincuser_email_addr_change_time + $duration);
-  $token = create_token($account->boincuser_id, TOKEN_TYPE_CHANGE_EMAIL, $duration);
-  if ($adminuser) {
+    }
+
+    // @todo - set constant in drupal, or use BOINC contsants
+    $duration = TOKEN_DURATION_ONE_WEEK;
+    $changedate = date('F j, Y \a\t G:i T', time());
+    $newdate = date('F j, Y \a\t G:i T', $account->boincuser_email_addr_change_time + $duration);
+    $token = create_token($account->boincuser_id, TOKEN_TYPE_CHANGE_EMAIL, $duration);
+    if ($adminuser) {
     $graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
-      . "on {$changedate}. If you need to reverse this change, please look for "
-      . "an email send to the email address: {$prev_email}.\n";
-  }
-  else {
+        . "on {$changedate}. If you need to reverse this change, please look for "
+        . "an email send to the email address: {$prev_email}.\n";
+    }
+    else {
     $graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
-      . "on {$changedate}. You will not be able to change your email address "
-      . "until {$newdate}. If you need to reverse this change, please look for "
-      . "an email send to the email address: {$prev_email}.\n";
-  }
-
-  // Send email #1 to current address
-  $mysubject = "Notification of email change at {$site_name}";
-  $mymessage = ''
-      . "{$account->boincuser_name},\n"
-      . "\n"
-      . $graf1
-      . "\n"
-      . "Thanks, \n"
-      . "{$site_name} support team\n";
-
-  $settings = array(
+        . "on {$changedate}. You will not be able to change your email address "
+        . "until {$newdate}. If you need to reverse this change, please look for "
+        . "an email send to the email address: {$prev_email}.\n";
+    }
+
+    // Send email #1 to current address
+    $mysubject = "Notification of email change at {$site_name}";
+    $mymessage = ''
+        . "{$account->boincuser_name},\n"
+        . "\n"
+        . $graf1
+        . "\n"
+        . "Thanks, \n"
+        . "{$site_name} support team\n";
+
+    $settings = array(
     'from' => '',
     'to' => $new_email,
     'subject' => $mysubject,
     'message' => $mymessage,
-  );
-  rules_action_mail_to_user($account, $settings);
-
-  // Send email #2 to previous address.
-  $mymessage = ''
-      . "Your email address has been changed. If you did not intend to take this action, then please click this link to reverse this change, or copy-and-paste the link into your browser location bar. You will need to change your password as well.\n"
-      . "\n"
-      . "{$base_url}/user/{$account->uid}/recoveremail/{$token}\n"
-      . "\n"
-      . "Thanks, \n"
-      . "{$site_name} support team\n";
-
-  $settings = array(
+    );
+    rules_action_mail_to_user($account, $settings);
+
+    // Send email #2 to previous address.
+    $mymessage = ''
+        . "Your email address has been changed. If you did not intend to take this action, then please click this link to reverse this change, or copy-and-paste the link into your browser location bar. You will need to change your password as well.\n"
+        . "\n"
+        . "{$base_url}/user/{$account->uid}/recoveremail/{$token}\n"
+        . "\n"
+        . "Thanks, \n"
+        . "{$site_name} support team\n";
+
+    $settings = array(
     'from' => '',
     'to' => $prev_email,
     'subject' => $mysubject,
     'message' => $mymessage,
-  );
+    );
 
-  rules_action_mail($settings);
+    rules_action_mail($settings);
 }
 
 /**
@@ -287,32 +287,32 @@ 
  *
  */
 function create_proper_drupalname($requested_name) {
-  if (!$requested_name) {
+    if (!$requested_name) {
     // If the name is empty, set it
     $requested_name = 'anonymous';
-  }
-  $same_name_tally = 1;
-
-  // Remove extra spaces
-  $name2 = preg_replace("/ {2,}/", " ", trim($requested_name));
-  // Remove any non-valid characters
-  $cleaned_name = preg_replace('/[^a-zA-Z0-9_ \.-]/s', '_', $name2);
-  // Truncate name
-  $name_length = strlen($cleaned_name);
-  if ($name_length > 56) {
+    }
+    $same_name_tally = 1;
+
+    // Remove extra spaces
+    $name2 = preg_replace("/ {2,}/", " ", trim($requested_name));
+    // Remove any non-valid characters
+    $cleaned_name = preg_replace('/[^a-zA-Z0-9_ \.-]/s', '_', $name2);
+    // Truncate name
+    $name_length = strlen($cleaned_name);
+    if ($name_length > 56) {
     // Name is limited to 60 characters, but we want to leave space to add a
     // tally if needed (for users with duplicate names); Limit to 56 chars and
     // replace the middle of the string with "..." if too long
     $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length-56)+3);
-  }
+    }
 
-  // Determine if there are duplicate names, if so append a number to end.
-  $unique_name = $cleaned_name;
-  while (db_result(db_query("SELECT uid FROM {users} WHERE name = '{$unique_name}' LIMIT 1"))) {
+    // Determine if there are duplicate names, if so append a number to end.
+    $unique_name = $cleaned_name;
+    while (db_result(db_query("SELECT uid FROM {users} WHERE name = '{$unique_name}' LIMIT 1"))) {
     $same_name_tally++;
     $unique_name = "{$cleaned_name}_{$same_name_tally}";
-  }
-  return $unique_name;
+    }
+    return $unique_name;
 }
 
 
@@ -326,9 +326,9 @@ 
  *
  */
 function boincuser_check_termsofuse($user) {
-  require_boinc('consent');
-  $boinc_user = boincuser_load($user->uid, TRUE);
-  return check_user_consent($boinc_user, CONSENT_TYPE_ENROLL);
+    require_boinc('consent');
+    $boinc_user = boincuser_load($user->uid, TRUE);
+    return check_user_consent($boinc_user, CONSENT_TYPE_ENROLL);
 }
 
 /**
@@ -339,33 +339,33 @@ 
  *
  */
 function boincuser_consentto_termsofuse($user) {
-  require_boinc('consent');
-  $boinc_user = boincuser_load($user->uid, TRUE);
+    require_boinc('consent');
+    $boinc_user = boincuser_load($user->uid, TRUE);
 
-  list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
-  if ($checkct) {
+    list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
+    if ($checkct) {
     $rc1 = consent_to_a_policy($boinc_user, $ctid, 1, 0, 'Webform', time());
     if (!$rc1) {
-      drupal_set_message(
+        drupal_set_message(
         bts("ERROR: Database error when attempting to INSERT into table consent with ID=@id. The @project administrators have been notified.",
         array(
-          '@id' => $boinc_user->id,
-          '@project' => variable_get('site_name', 'Drupal-BOINC'), NULL, 'boinc:add-new-user'
+            '@id' => $boinc_user->id,
+            '@project' => variable_get('site_name', 'Drupal-BOINC'), NULL, 'boinc:add-new-user'
         ),
         'NULL', 'boinc:consent-termsofuse'),
-      'error');
-      rules_invoke_event('boincuser_general_consent_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
+        'error');
+        rules_invoke_event('boincuser_general_consent_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
     }
     return $rc1;
-  }
-  else {
+    }
+    else {
     drupal_set_message(
-      bts('ERROR: Consent type for enrollment not found. The @project administrators have been nofitifed.',
+        bts('ERROR: Consent type for enrollment not found. The @project administrators have been nofitifed.',
         array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:consent-termsofuse'),
     'error');
     rules_invoke_event('boincuser_general_consent_type_error', CONSENT_TYPE_ENROLL, variable_get('boinc_admin_mailing_list_subject_tag', ''));
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
@@ -374,16 +374,16 @@ 
  */
 function _boincuser_ignore_paths($path, $paths_to_ignore) {
 
-  foreach ($paths_to_ignore as $pi) {
+    foreach ($paths_to_ignore as $pi) {
     // @todo Currently this function uses {} as PHP regexp
     // delimiters. Curly brace is not really allowed un URLs, but a
     // more robust function would first check for these curly braces
     // in the path_to_ignore patterms, just in case.
     if (preg_match('{' . $pi . '}', $path)) {
-      return TRUE;
+        return TRUE;
     }
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
@@ -391,20 +391,20 @@ 
  * Drupal's recover email path.
  */
 function _boincuser_redirect_recover_email() {
-  $params = array(
+    $params = array(
     'boincid' => isset($_GET['id']) ? $_GET['id'] : '',
     'token' => isset($_GET['token']) ? $_GET['token'] : ''
-  );
+    );
 
-  // If boincid or token is not present, then go to the home page.
-  if (empty($params['boincid']) or empty($params['token'])) {
+    // If boincid or token is not present, then go to the home page.
+    if (empty($params['boincid']) or empty($params['token'])) {
     $redirect = '';
-  }
-  else {
+    }
+    else {
     $uid = boincuser_lookup_uid($params['boincid']);
     $redirect = "/user/${uid}/recoveremail/${params['token']}";
-  }
-  drupal_goto($redirect);
+    }
+    drupal_goto($redirect);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -415,17 +415,17 @@ 
  * Require BOINC library
  */
 function require_boinc($libraries) {
-  if ($include_dir = boinc_get_path('html_inc')) {
+    if ($include_dir = boinc_get_path('html_inc')) {
     $working_dir = getcwd();
     chdir($include_dir);
     if (!is_array($libraries)) {
-      $libraries = array($libraries);
+        $libraries = array($libraries);
     }
     foreach ($libraries as $library) {
-      require_once("{$library}.inc");
+        require_once("{$library}.inc");
     }
     chdir($working_dir);
-  }
+    }
 }
 
 /**
@@ -433,7 +433,7 @@ 
  * The path from the BOINC html root must be included (e.g. user/file.php)
  */
 function include_boinc($file) {
-  if ($include_dir = boinc_get_path()) {
+    if ($include_dir = boinc_get_path()) {
     $include_dir .= '/html';
     $workingDir = getcwd();
     $path = dirname($file);
@@ -441,84 +441,84 @@ 
     chdir("{$include_dir}/{$path}");
     include($file);
     chdir($workingDir);
-  }
+    }
 }
 
 /**
  * Get the BOINC include path
  */
 function boinc_get_path($type = 'root') {
-  $dir = "boinc_{$type}_dir";
-  if ($include_dir = variable_get("boinc_{$type}_dir", '')) {
+    $dir = "boinc_{$type}_dir";
+    if ($include_dir = variable_get("boinc_{$type}_dir", '')) {
     return $include_dir;
-  }
-  else {
+    }
+    else {
     // Don't show errors on blacklisted pages
     $page_blacklist = array(
-      'admin/boinc/environment'
+        'admin/boinc/environment'
     );
     if (!in_array($_GET['q'], $page_blacklist)) {
-      watchdog('boincuser', 'The BOINC environment is not configured. Please
+        watchdog('boincuser', 'The BOINC environment is not configured. Please
           !configure_it', array('!configure_it' => l(t('configure it now'),
             'admin/boinc/environment')), WATCHDOG_WARNING);
-      if (user_access('administer site configuration')) {
+        if (user_access('administer site configuration')) {
         drupal_set_message(t('The BOINC environment is not configured. Please
           !configure_it', array('!configure_it' => l(t('configure it now'),
             'admin/boinc/environment'))), 'warning', FALSE);
-      }
-      else {
+        }
+        else {
         drupal_set_message(t('There is a problem with the site. Please contact
           the system administrator.'), 'error', FALSE);
-      }
-      // Redirect home to display the error message and avoid fatal errors
-      // (unless on a blacklisted page)
-      $redirect_blacklist = array(
+        }
+        // Redirect home to display the error message and avoid fatal errors
+        // (unless on a blacklisted page)
+        $redirect_blacklist = array(
         'admin/settings/performance',
         'admin/boinc/environment',
         'home',
         ''
-      );
-      if (!in_array($_GET['q'], $redirect_blacklist)) {
+        );
+        if (!in_array($_GET['q'], $redirect_blacklist)) {
         drupal_goto('');
-      }
+        }
     }
     else {
-      // Clear the messages on the environment config page
-      drupal_get_messages();
+        // Clear the messages on the environment config page
+        drupal_get_messages();
     }
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
  * Get the configured scheduler tags
  */
 function boinc_get_scheduler_tags() {
-  // Don't generate messages for blacklisted pages
-  $page_blacklist = array(
+    // Don't generate messages for blacklisted pages
+    $page_blacklist = array(
     'admin/boinc/environment',
     'admin/boinc/scheduler'
-  );
-  if ($url_config = variable_get('boinc_scheduler_urls', '')) {
+    );
+    if ($url_config = variable_get('boinc_scheduler_urls', '')) {
     return explode("\r\n", $url_config);
-  }
-  elseif (!in_array($_GET['q'], $page_blacklist)) {
+    }
+    elseif (!in_array($_GET['q'], $page_blacklist)) {
     watchdog('boincuser', 'The BOINC scheduling server settings are not yet
         configured. Please !verify for the settings to become effective.',
-          array('!verify' => l(t('verify the default values') . ' <strong>' . 
+            array('!verify' => l(t('verify the default values') . ' <strong>' . 
             t('and') . '</strong> ' . t('save the configuration'),
             'admin/boinc/scheduler', array('html' => TRUE))
-          ), WATCHDOG_WARNING);
+            ), WATCHDOG_WARNING);
     if (user_access('administer site configuration')) {
-      drupal_set_message(t('The BOINC scheduling server settings are not yet
+        drupal_set_message(t('The BOINC scheduling server settings are not yet
           configured. Please !verify for the settings to become effective',
             array('!verify' => l(t('verify the default values') . ' <strong>' . 
-              t('and') . '</strong> ' . t('save the configuration'),
-              'admin/boinc/scheduler', array('html' => TRUE))
+                t('and') . '</strong> ' . t('save the configuration'),
+                'admin/boinc/scheduler', array('html' => TRUE))
             )), 'warning', FALSE);
     }
-  }
-  return array();
+    }
+    return array();
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -530,41 +530,41 @@ 
  * Determine if a BOINC ID matches the logged in user
  */
 function is_current_boinc_user($boinc_id) {
-  global $user;
-  if (!$user->uid) {
+    global $user;
+    if (!$user->uid) {
     return FALSE;
-  }
-  // boincuser_id is not stored in the global user, so load a new instance
-  $drupuser = user_load($user->uid);
-  return ($boinc_id == $drupuser->boincuser_id);
+    }
+    // boincuser_id is not stored in the global user, so load a new instance
+    $drupuser = user_load($user->uid);
+    return ($boinc_id == $drupuser->boincuser_id);
 }
 
 /**
  * Convert a BOINC ID to a Drupal ID
  */
 function boincuser_lookup_uid($boinc_id) {
-  $drupal_id = db_result(db_query("SELECT uid FROM {boincuser} WHERE boinc_id='%d'", $boinc_id));
-  return $drupal_id;
+    $drupal_id = db_result(db_query("SELECT uid FROM {boincuser} WHERE boinc_id='%d'", $boinc_id));
+    return $drupal_id;
 }
 function get_drupal_id($boinc_id) {
-  return boincuser_lookup_uid($boinc_id);
+    return boincuser_lookup_uid($boinc_id);
 }
 
 /**
  * Get a BOINC user object
  */
 function boincuser_load($user_id = NULL, $is_drupal_id = FALSE) {
-  if (!$user_id) {
+    if (!$user_id) {
     global $user;
     $user_id = $user->uid;
     $is_drupal_id = TRUE;
-  }
-  if ($is_drupal_id) {
+    }
+    if ($is_drupal_id) {
     $account = user_load($user_id);
     $user_id = $account->boincuser_id;
-  }
-  require_boinc('boinc_db');
-  return BoincUser::lookup_id($user_id);
+    }
+    require_boinc('boinc_db');
+    return BoincUser::lookup_id($user_id);
 }
 
 /**
@@ -574,10 +574,10 @@ 
  * page, delete button.
  */
 function _boincuser_node_profile_delete_submit($form, &$form_state) {
-  $node = $form['#node'];
-  $deleteurl = 'node/'. $node->nid .'/delete';
-  $afterq = 'destination=account';
-  drupal_goto($deleteurl, $afterq);
+    $node = $form['#node'];
+    $deleteurl = 'node/'. $node->nid .'/delete';
+    $afterq = 'destination=account';
+    drupal_goto($deleteurl, $afterq);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -588,8 +588,8 @@ 
  * Wrapper for boinc_version() function
  */
 function get_boinc_version($x) {
-  require_boinc('host');
-  return function_exists('boinc_version') ? boinc_version($x) : 'err!';
+    require_boinc('host');
+    return function_exists('boinc_version') ? boinc_version($x) : 'err!';
 }
   
 
@@ -598,14 +598,14 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * Generate the friend block header
-  */
+ * Generate the friend block header
+ */
 function boincuser_views_friends_block_header($context = null) {
-  // Get the friend count for the user being viewed
-  $view = views_get_current_view();
-  $account_id = $view->args[0];
-  $friend_count = flag_friend_get_friend_count($account_id);
-  return '<h2 class="pane-title">' . bts('Friends (@count)', 
+    // Get the friend count for the user being viewed
+    $view = views_get_current_view();
+    $account_id = $view->args[0];
+    $friend_count = flag_friend_get_friend_count($account_id);
+    return '<h2 class="pane-title">' . bts('Friends (@count)', 
     array('@count' => $friend_count)) . '</h2>';
 }
 
@@ -614,13 +614,13 @@ 
  * database.
  */
 function _boincuser_user_name_autocomplete($string) {
-  $matches = array();
-  db_set_active('boinc_ro');
-  $result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10);
-  db_set_active('default');
-  while ($user = db_fetch_object($result)) {
-      $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')';
-  }
-
-  drupal_json((object)$matches);
+    $matches = array();
+    db_set_active('boinc_ro');
+    $result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10);
+    db_set_active('default');
+    while ($user = db_fetch_object($result)) {
+        $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')';
+    }
+
+    drupal_json((object)$matches);
 }

Braces +11 added lines, -22 removed lines

@@ -71,8 +71,7 @@ 
       unset($account->roles[$unrestricted_role]);
     }
     user_save($account, array('roles' => $account->roles));
-  }
-  else {
+  } else {
     if (!isset($account->roles[$community_role])) {
       // The user should be a 'community member' role. If the user was
       // previously banned, this will restore that role.
@@ -88,8 +87,7 @@ 
         $account->roles[$unrestricted_role] = 'verified contributor';
         user_save($account, array('roles' => $account->roles));
       }
-    }
-    else {
+    } else {
       drupal_set_message(bts(
         'You must earn @count more credits to be able to post comments on this site and create or modify your user profile.',
         array('@count' => $min_credit_to_post - $account->boincuser_total_credit)
@@ -175,12 +173,10 @@ 
       if ($never_been_picked) {
         // Allow users who have been previously selected
         $never_been_picked = FALSE;
-      }
-      elseif ($active_users) {
+      } elseif ($active_users) {
         // Allow users who are not even active (getting desperate)
         $active_users = FALSE;
-      }
-      else {
+      } else {
         // Process failed...
         return FALSE;
       }
@@ -235,8 +231,7 @@ 
     $graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
       . "on {$changedate}. If you need to reverse this change, please look for "
       . "an email send to the email address: {$prev_email}.\n";
-  }
-  else {
+  } else {
     $graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
       . "on {$changedate}. You will not be able to change your email address "
       . "until {$newdate}. If you need to reverse this change, please look for "
@@ -357,8 +352,7 @@ 
       rules_invoke_event('boincuser_general_consent_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
     }
     return $rc1;
-  }
-  else {
+  } else {
     drupal_set_message(
       bts('ERROR: Consent type for enrollment not found. The @project administrators have been nofitifed.',
         array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:consent-termsofuse'),
@@ -399,8 +393,7 @@ 
   // If boincid or token is not present, then go to the home page.
   if (empty($params['boincid']) or empty($params['token'])) {
     $redirect = '';
-  }
-  else {
+  } else {
     $uid = boincuser_lookup_uid($params['boincid']);
     $redirect = "/user/${uid}/recoveremail/${params['token']}";
   }
@@ -451,8 +444,7 @@ 
   $dir = "boinc_{$type}_dir";
   if ($include_dir = variable_get("boinc_{$type}_dir", '')) {
     return $include_dir;
-  }
-  else {
+  } else {
     // Don't show errors on blacklisted pages
     $page_blacklist = array(
       'admin/boinc/environment'
@@ -465,8 +457,7 @@ 
         drupal_set_message(t('The BOINC environment is not configured. Please
           !configure_it', array('!configure_it' => l(t('configure it now'),
             'admin/boinc/environment'))), 'warning', FALSE);
-      }
-      else {
+      } else {
         drupal_set_message(t('There is a problem with the site. Please contact
           the system administrator.'), 'error', FALSE);
       }
@@ -481,8 +472,7 @@ 
       if (!in_array($_GET['q'], $redirect_blacklist)) {
         drupal_goto('');
       }
-    }
-    else {
+    } else {
       // Clear the messages on the environment config page
       drupal_get_messages();
     }
@@ -501,8 +491,7 @@ 
   );
   if ($url_config = variable_get('boinc_scheduler_urls', '')) {
     return explode("\r\n", $url_config);
-  }
-  elseif (!in_array($_GET['q'], $page_blacklist)) {
+  } elseif (!in_array($_GET['q'], $page_blacklist)) {
     watchdog('boincuser', 'The BOINC scheduling server settings are not yet
         configured. Please !verify for the settings to become effective.',
           array('!verify' => l(t('verify the default values') . ' <strong>' . 

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

@@ -27,7 +27,7 @@ 
 /**
  * Get an image object from a given file and cck field
  */ 
-function get_cck_image_object($image_path, $field_name, $content_type, $ignore_resolution = FALSE) {
+function get_cck_image_object($image_path, $field_name, $content_type, $ignore_resolution = false) {
   $field = content_fields($field_name, $content_type); 
   $validators = array_merge(filefield_widget_upload_validators($field), imagefield_widget_upload_validators($field));
   if ($ignore_resolution) {
@@ -49,7 +49,7 @@ 
 function boincuser_check_credit_requirements() {
   global $user;
   if (!$user->uid) {
-    return FALSE;
+    return false;
   }
   $account = user_load($user->uid);
   $min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
@@ -61,7 +61,7 @@ 
     drupal_set_message(bts(
       'You are banned from community participation until @date',
       array('@date' => format_date($account->boincuser_penalty_expiration))
-    ), 'warning', FALSE);
+    ), 'warning', false);
     if (isset($account->roles[$community_role])) {
       // Remove from the community role, if not already
       unset($account->roles[$community_role]);
@@ -93,7 +93,7 @@ 
       drupal_set_message(bts(
         'You must earn @count more credits to be able to post comments on this site and create or modify your user profile.',
         array('@count' => $min_credit_to_post - $account->boincuser_total_credit)
-      ), 'warning', FALSE);
+      ), 'warning', false);
       if (isset($account->roles[$unrestricted_role])) {
         // Either the threshold has been raised or credits have been revoked;
         // this user no longer qualifies for full privileges
@@ -108,7 +108,7 @@ 
 /**
  * Get the cid of the first comment the user has not seen on a given node
  */
-function boincuser_get_first_unread_comment_id($nid, $uid = NULL) {
+function boincuser_get_first_unread_comment_id($nid, $uid = null) {
   if (!$uid) {
     global $user;
     $uid = $user->uid;
@@ -174,15 +174,15 @@ 
       // Can't find a user with a profile; remove constraints on the pool
       if ($never_been_picked) {
         // Allow users who have been previously selected
-        $never_been_picked = FALSE;
+        $never_been_picked = false;
       }
       elseif ($active_users) {
         // Allow users who are not even active (getting desperate)
-        $active_users = FALSE;
+        $active_users = false;
       }
       else {
         // Process failed...
-        return FALSE;
+        return false;
       }
     }
   }
@@ -212,7 +212,7 @@ 
  * this function is called, it may be called with optional parameters
  * new and prev email.
  */
-function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) {
+function _boincuser_send_emailchange($account, $new_email=null, $prev_email=null, $adminuser=false) {
   require_boinc('token');
   module_load_include('inc', 'rules', 'modules/system.rules');
 
@@ -327,7 +327,7 @@ 
  */
 function boincuser_check_termsofuse($user) {
   require_boinc('consent');
-  $boinc_user = boincuser_load($user->uid, TRUE);
+  $boinc_user = boincuser_load($user->uid, true);
   return check_user_consent($boinc_user, CONSENT_TYPE_ENROLL);
 }
 
@@ -340,7 +340,7 @@ 
  */
 function boincuser_consentto_termsofuse($user) {
   require_boinc('consent');
-  $boinc_user = boincuser_load($user->uid, TRUE);
+  $boinc_user = boincuser_load($user->uid, true);
 
   list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
   if ($checkct) {
@@ -350,7 +350,7 @@ 
         bts("ERROR: Database error when attempting to INSERT into table consent with ID=@id. The @project administrators have been notified.",
         array(
           '@id' => $boinc_user->id,
-          '@project' => variable_get('site_name', 'Drupal-BOINC'), NULL, 'boinc:add-new-user'
+          '@project' => variable_get('site_name', 'Drupal-BOINC'), null, 'boinc:add-new-user'
         ),
         'NULL', 'boinc:consent-termsofuse'),
       'error');
@@ -361,11 +361,11 @@ 
   else {
     drupal_set_message(
       bts('ERROR: Consent type for enrollment not found. The @project administrators have been nofitifed.',
-        array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:consent-termsofuse'),
+        array('@project' => variable_get('site_name', 'Drupal-BOINC')), null, 'boinc:consent-termsofuse'),
     'error');
     rules_invoke_event('boincuser_general_consent_type_error', CONSENT_TYPE_ENROLL, variable_get('boinc_admin_mailing_list_subject_tag', ''));
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -380,10 +380,10 @@ 
     // more robust function would first check for these curly braces
     // in the path_to_ignore patterms, just in case.
     if (preg_match('{' . $pi . '}', $path)) {
-      return TRUE;
+      return true;
     }
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -464,11 +464,11 @@ 
       if (user_access('administer site configuration')) {
         drupal_set_message(t('The BOINC environment is not configured. Please
           !configure_it', array('!configure_it' => l(t('configure it now'),
-            'admin/boinc/environment'))), 'warning', FALSE);
+            'admin/boinc/environment'))), 'warning', false);
       }
       else {
         drupal_set_message(t('There is a problem with the site. Please contact
-          the system administrator.'), 'error', FALSE);
+          the system administrator.'), 'error', false);
       }
       // Redirect home to display the error message and avoid fatal errors
       // (unless on a blacklisted page)
@@ -487,7 +487,7 @@ 
       drupal_get_messages();
     }
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -507,15 +507,15 @@ 
         configured. Please !verify for the settings to become effective.',
           array('!verify' => l(t('verify the default values') . ' <strong>' . 
             t('and') . '</strong> ' . t('save the configuration'),
-            'admin/boinc/scheduler', array('html' => TRUE))
+            'admin/boinc/scheduler', array('html' => true))
           ), WATCHDOG_WARNING);
     if (user_access('administer site configuration')) {
       drupal_set_message(t('The BOINC scheduling server settings are not yet
           configured. Please !verify for the settings to become effective',
             array('!verify' => l(t('verify the default values') . ' <strong>' . 
               t('and') . '</strong> ' . t('save the configuration'),
-              'admin/boinc/scheduler', array('html' => TRUE))
-            )), 'warning', FALSE);
+              'admin/boinc/scheduler', array('html' => true))
+            )), 'warning', false);
     }
   }
   return array();
@@ -532,7 +532,7 @@ 
 function is_current_boinc_user($boinc_id) {
   global $user;
   if (!$user->uid) {
-    return FALSE;
+    return false;
   }
   // boincuser_id is not stored in the global user, so load a new instance
   $drupuser = user_load($user->uid);
@@ -553,11 +553,11 @@ 
 /**
  * Get a BOINC user object
  */
-function boincuser_load($user_id = NULL, $is_drupal_id = FALSE) {
+function boincuser_load($user_id = null, $is_drupal_id = false) {
   if (!$user_id) {
     global $user;
     $user_id = $user->uid;
-    $is_drupal_id = TRUE;
+    $is_drupal_id = true;
   }
   if ($is_drupal_id) {
     $account = user_load($user_id);

html/inc/util_basic.inc

Spacing +5 added lines, -5 removed lines

@@ -46,10 +46,10 @@ 
     ";
 }
 
-function xml_error($num, $msg=null, $file=null, $line=null) {
+function xml_error($num, $msg = null, $file = null, $line = null) {
     global $xml_outer_tag;
     if (!$msg) {
-        switch($num) {
+        switch ($num) {
         case -112: $msg = "Invalid XML"; break;
         case -136: $msg = "Not found"; break;
         case -137: $msg = "Name or email address is not unique"; break;
@@ -95,7 +95,7 @@ 
 // If it's a single-tag element, and it's present, just return the tag
 //
 function parse_element($xml, $tag) {
-    $closetag = "</" . substr($tag,1);
+    $closetag = "</".substr($tag, 1);
     $x = strstr($xml, $tag);
     if ($x) {
         if (strstr($tag, "/>")) return $tag;
@@ -111,8 +111,8 @@ 
 
 function parse_next_element($xml, $tag, &$cursor) {
     $element = null;
-    $closetag = "</" . substr($tag,1);
-    $pos = substr($xml,$cursor);
+    $closetag = "</".substr($tag, 1);
+    $pos = substr($xml, $cursor);
     $x = strstr($pos, $tag);
     if ($x) {
         if (strstr($tag, "/>")) return $tag;

html/ops/mass_email_script.php

Spacing +6 added lines, -6 removed lines

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

html/inc/translation.inc

Spacing +33 added lines, -33 removed lines

@@ -64,11 +64,11 @@ 
     $dh = opendir($langdir.$transdir);
     if (!$dh) die("can't open translation dir");
     while (($file = readdir($dh)) !== false) {
-        if ($file==".." || $file==".") {
+        if ($file == ".." || $file == ".") {
             continue;
         }
         // only do files ending in .po
-        if (substr($file,-3) != ".po"){
+        if (substr($file, -3) != ".po") {
             //debug("File $file with unknown extension found in $info_dir");
             continue;
         }
@@ -76,7 +76,7 @@ 
             "-------------Compiling $transdir$file------------", 0
         );
         $language = parse_po_file($langdir.$transdir.$file);
-        if (!$language){
+        if (!$language) {
             language_log(
                 "WARNING: Could not parse language ".$file
             );
@@ -95,10 +95,10 @@ 
             );
             exit;
         }
-        foreach ($language as $key => $value){
+        foreach ($language as $key => $value) {
             if ($value !== "") {
                 // Skip if the msgstr is empty
-                fwrite($fh, "\$language_lookup_array[\"".str_replace("\"", "\\\"", substr($file,0,-3))."\"][\"".$key."\"] = \"".$value."\";\n");
+                fwrite($fh, "\$language_lookup_array[\"".str_replace("\"", "\\\"", substr($file, 0, -3))."\"][\"".$key."\"] = \"".$value."\";\n");
             }
         }
         // don't write \?\> - may append
@@ -115,27 +115,27 @@ 
 function parse_po_file($file) {
     $translation_file = file($file);
     $first_entry = true;
-    $current_token_text="";
-    $current_token ="";
+    $current_token_text = "";
+    $current_token = "";
     $parsing_token = false;
     $parsing_text = false;
     $size = sizeof($translation_file);
     $output = array();
-    for ($i=0; $i<$size; $i++){
+    for ($i = 0; $i < $size; $i++) {
         $entry = trim($translation_file[$i]);
         //echo "line $i: $entry\n";
-        if (substr($entry, 0, 1)=="#") {
+        if (substr($entry, 0, 1) == "#") {
             continue;
         } elseif (strpos($entry, "msgid") !== false) {
-            if (!$first_entry){
+            if (!$first_entry) {
                 //If this is not the first, save the previous entry
-                $output[$current_token]=$current_token_text;
+                $output[$current_token] = $current_token_text;
             }
             $current_token = get_po_line($entry, $file);
-            $current_token_text="";
+            $current_token_text = "";
             $parsing_token = true;
             $parsing_text = false;
-            $first_entry=false;
+            $first_entry = false;
         } elseif (strpos($entry, "msgstr") !== false) {
             $current_token_text = get_po_line($entry, $file);
             $parsing_token = false;
@@ -149,7 +149,7 @@ 
     
     // Get the last token
     //
-    if ($current_token && $current_token_text){
+    if ($current_token && $current_token_text) {
         $output[$current_token] = $current_token_text;
     }
     return $output;
@@ -159,9 +159,9 @@ 
 // Returns the contents of a line (ie removes "" from start and end)
 //
 function get_po_line($line, $file) {
-    $start = strpos($line, '"')+1;
+    $start = strpos($line, '"') + 1;
     $stop = strrpos($line, '"');
-    $x = substr($line, $start, $stop-$start);
+    $x = substr($line, $start, $stop - $start);
     $n = preg_match("/[^\\\\]\"/", $x);
     if ($n) {
         echo "ERROR - MISMATCHED QUOTES IN $file: $line\n";
@@ -180,11 +180,11 @@ 
     
     // Find the string in the user's language
     //
-    foreach ($languages_in_use as $language){
+    foreach ($languages_in_use as $language) {
         if (isset($language_lookup_array[$language][$text])) {
             $text = $language_lookup_array[$language][$text];
             break;
-        } else if ($language=="en"){ 
+        } else if ($language == "en") { 
             // This language is defined in the code and is always available
             break;
         }
@@ -193,7 +193,7 @@ 
     // Replace relevant substrings with given arguments.
     // Use strtr to avoid problems if an argument contains %n.
     $replacements = array();
-    for ($i=1; $i<func_num_args(); $i++){
+    for ($i = 1; $i < func_num_args(); $i++) {
         $replacements["%".$i] = func_get_arg($i);
     }
 
@@ -210,14 +210,14 @@ 
     return $text;
 }
 
-function language_log($message, $loglevel=0) {
+function language_log($message, $loglevel = 0) {
     global $lang_log_level;
     $msg = "";
-    if ($loglevel==0) $msg = "[ Debug    ]";
-    if ($loglevel==1) $msg = "[ Warning  ]";
-    if ($loglevel==2) $msg = "[ CRITICAL ]";
+    if ($loglevel == 0) $msg = "[ Debug    ]";
+    if ($loglevel == 1) $msg = "[ Warning  ]";
+    if ($loglevel == 2) $msg = "[ CRITICAL ]";
 
-    if ($loglevel >= $lang_log_level){
+    if ($loglevel >= $lang_log_level) {
         echo gmdate("Y-m-d H:i:s", time())." ".$msg." ".$message."\n";
     }
 }
@@ -226,7 +226,7 @@ 
 // (by looking at cookies and browser settings)
 // cookies have highest priority.
 
-if (isset($_COOKIE['lang'])){
+if (isset($_COOKIE['lang'])) {
     $language_string = $_COOKIE['lang'].",";
 } else {
     $language_string = '';
@@ -257,10 +257,10 @@ 
 // Loop over languages that the client requests
 //
 $size = sizeof($client_languages);
-for ($i=0; $i<$size; $i++) {
-    if ((strlen($client_languages[$i])>2)
+for ($i = 0; $i < $size; $i++) {
+    if ((strlen($client_languages[$i]) > 2)
         && (substr($client_languages[$i], 2, 1) == "_" || substr($client_languages[$i], 2, 1) == "-")
-    ){
+    ) {
         // If this is defined as primary-secondary, represent it as xx_YY
         //
         $language = substr(
@@ -279,7 +279,7 @@ 
 
     // if main language is english, look no further
     //
-    if ((count($languages_in_use)==0) && ($language == 'en' || $language2 == 'en')) {
+    if ((count($languages_in_use) == 0) && ($language == 'en' || $language2 == 'en')) {
         break;
     }
 
@@ -287,7 +287,7 @@ 
     //
     $file_name = $lang_language_dir.$lang_compiled_dir.$language.".po.inc";
     if (file_exists($file_name)) {
-        if (!in_array($language, $languages_in_use)){
+        if (!in_array($language, $languages_in_use)) {
             require_once($file_name);
             $languages_in_use[] = $language;
         }
@@ -295,7 +295,7 @@ 
     if ($language2) {
         $file_name = $lang_language_dir.$lang_compiled_dir.$language2.".po.inc";
         if (file_exists($file_name)) {
-            if (!in_array($language2, $languages_in_use)){
+            if (!in_array($language2, $languages_in_use)) {
                 require_once($file_name);
                 $languages_in_use[] = $language2;
             }
@@ -303,7 +303,7 @@ 
     }
 }
 
-$GLOBALS['languages_in_use'] = $languages_in_use;   // for Drupal
+$GLOBALS['languages_in_use'] = $languages_in_use; // for Drupal
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

Braces +14 added lines, -14 removed lines

@@ -68,7 +68,7 @@ 
             continue;
         }
         // only do files ending in .po
-        if (substr($file,-3) != ".po"){
+        if (substr($file,-3) != ".po") {
             //debug("File $file with unknown extension found in $info_dir");
             continue;
         }
@@ -76,7 +76,7 @@ 
             "-------------Compiling $transdir$file------------", 0
         );
         $language = parse_po_file($langdir.$transdir.$file);
-        if (!$language){
+        if (!$language) {
             language_log(
                 "WARNING: Could not parse language ".$file
             );
@@ -95,7 +95,7 @@ 
             );
             exit;
         }
-        foreach ($language as $key => $value){
+        foreach ($language as $key => $value) {
             if ($value !== "") {
                 // Skip if the msgstr is empty
                 fwrite($fh, "\$language_lookup_array[\"".str_replace("\"", "\\\"", substr($file,0,-3))."\"][\"".$key."\"] = \"".$value."\";\n");
@@ -121,13 +121,13 @@ 
     $parsing_text = false;
     $size = sizeof($translation_file);
     $output = array();
-    for ($i=0; $i<$size; $i++){
+    for ($i=0; $i<$size; $i++) {
         $entry = trim($translation_file[$i]);
         //echo "line $i: $entry\n";
         if (substr($entry, 0, 1)=="#") {
             continue;
         } elseif (strpos($entry, "msgid") !== false) {
-            if (!$first_entry){
+            if (!$first_entry) {
                 //If this is not the first, save the previous entry
                 $output[$current_token]=$current_token_text;
             }
@@ -149,7 +149,7 @@ 
     
     // Get the last token
     //
-    if ($current_token && $current_token_text){
+    if ($current_token && $current_token_text) {
         $output[$current_token] = $current_token_text;
     }
     return $output;
@@ -180,11 +180,11 @@ 
     
     // Find the string in the user's language
     //
-    foreach ($languages_in_use as $language){
+    foreach ($languages_in_use as $language) {
         if (isset($language_lookup_array[$language][$text])) {
             $text = $language_lookup_array[$language][$text];
             break;
-        } else if ($language=="en"){ 
+        } else if ($language=="en") {
             // This language is defined in the code and is always available
             break;
         }
@@ -193,7 +193,7 @@ 
     // Replace relevant substrings with given arguments.
     // Use strtr to avoid problems if an argument contains %n.
     $replacements = array();
-    for ($i=1; $i<func_num_args(); $i++){
+    for ($i=1; $i<func_num_args(); $i++) {
         $replacements["%".$i] = func_get_arg($i);
     }
 
@@ -217,7 +217,7 @@ 
     if ($loglevel==1) $msg = "[ Warning  ]";
     if ($loglevel==2) $msg = "[ CRITICAL ]";
 
-    if ($loglevel >= $lang_log_level){
+    if ($loglevel >= $lang_log_level) {
         echo gmdate("Y-m-d H:i:s", time())." ".$msg." ".$message."\n";
     }
 }
@@ -226,7 +226,7 @@ 
 // (by looking at cookies and browser settings)
 // cookies have highest priority.
 
-if (isset($_COOKIE['lang'])){
+if (isset($_COOKIE['lang'])) {
     $language_string = $_COOKIE['lang'].",";
 } else {
     $language_string = '';
@@ -260,7 +260,7 @@ 
 for ($i=0; $i<$size; $i++) {
     if ((strlen($client_languages[$i])>2)
         && (substr($client_languages[$i], 2, 1) == "_" || substr($client_languages[$i], 2, 1) == "-")
-    ){
+    ) {
         // If this is defined as primary-secondary, represent it as xx_YY
         //
         $language = substr(
@@ -287,7 +287,7 @@ 
     //
     $file_name = $lang_language_dir.$lang_compiled_dir.$language.".po.inc";
     if (file_exists($file_name)) {
-        if (!in_array($language, $languages_in_use)){
+        if (!in_array($language, $languages_in_use)) {
             require_once($file_name);
             $languages_in_use[] = $language;
         }
@@ -295,7 +295,7 @@ 
     if ($language2) {
         $file_name = $lang_language_dir.$lang_compiled_dir.$language2.".po.inc";
         if (file_exists($file_name)) {
-            if (!in_array($language2, $languages_in_use)){
+            if (!in_array($language2, $languages_in_use)) {
                 require_once($file_name);
                 $languages_in_use[] = $language2;
             }

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

Braces +17 added lines, -34 removed lines

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

Indentation +964 added lines, -964 removed lines

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

Spacing +46 added lines, -46 removed lines

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

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

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

html/user/cert_all.php

Spacing +3 added lines, -3 removed lines

@@ -29,10 +29,10 @@ 
 
 $border = get_str("border", true);
 
-if ($border=="no") {
+if ($border == "no") {
     $border = 0;
 } else {
-    $border=8;
+    $border = 8;
 }
 
 $font = "\"Optima,Lucida Bright,Times New Roman\"";
@@ -75,7 +75,7 @@ 
     <tr><th align=left>Project</th><th align=left>Cobblestones</th><th align=left>Joined</th></tr>
 ";
 foreach ($user->projects as $p) {
-    if ($p->total_credit<100) continue;
+    if ($p->total_credit < 100) continue;
     show_proj($p);
 }
 echo "

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

Spacing +133 added lines, -133 removed lines

@@ -62,21 +62,21 @@ 
   );
   $items['community/teams/%/edit/admins/remove/%'] = array(
     'page callback' => 'boincteam_remove_admin',
-    'page arguments' => array(2,6),
+    'page arguments' => array(2, 6),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
   );
   $items['community/teams/%/edit/founder/set/%'] = array(
     'page callback' => 'boincteam_set_founder',
-    'page arguments' => array(2,6),
+    'page arguments' => array(2, 6),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
   );
   $items['community/teams/%/edit/members/remove/%'] = array(
     'page callback' => 'boincteam_remove_member',
-    'page arguments' => array(2,6),
+    'page arguments' => array(2, 6),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
@@ -724,12 +724,12 @@ 
   $boincteam = boincteam_load($boincteam_id);
   $now = time();
   if ($boincteam->ping_user <= 0) {
-    if ($boincteam->ping_time < $now - 60 * (24*60*60)) {
+    if ($boincteam->ping_time < $now - 60*(24*60*60)) {
       return TRUE;
     }
     return FALSE;
   }
-  if ($boincteam->ping_time < $now - 90 * (24*60*60)) {
+  if ($boincteam->ping_time < $now - 90*(24*60*60)) {
     return TRUE;
   }
   return FALSE;
@@ -740,7 +740,7 @@ 
  * responded to the request
  */
 function boincteam_foundership_transfer_ok_time($boincteam) {
-    return $boincteam->ping_time + 60 * (24*60*60);
+    return $boincteam->ping_time + 60*(24*60*60);
 }
 
 /**
@@ -778,26 +778,26 @@ 
  */                                         
 function boincteam_about_admins_panel() {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('About team admins', array(), NULL, 'boinc:team-admins-panel') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('About team admins', array(), NULL, 'boinc:team-admins-panel').'</h2>';
   $output .= '<div>';
-  $output .= '<p>' . bts('Team admins can:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
+  $output .= '<p>'.bts('Team admins can:', array(), NULL, 'boinc:team-admins-panel').'</p>';
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Edit team information', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts("View the team's join / quit history", array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Moderate the team forum', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Remove members from the team', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Disband a team if it has no members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+  $output .= '  <li>'.bts('Edit team information', array(), NULL, 'boinc:team-admins-panel').'</li>';
+  $output .= '  <li>'.bts("View the team's join / quit history", array(), NULL, 'boinc:team-admins-panel').'</li>';
+  $output .= '  <li>'.bts('Moderate the team forum', array(), NULL, 'boinc:team-admins-panel').'</li>';
+  $output .= '  <li>'.bts('Remove members from the team', array(), NULL, 'boinc:team-admins-panel').'</li>';
+  $output .= '  <li>'.bts('Disband a team if it has no members', array(), NULL, 'boinc:team-admins-panel').'</li>';
   $output .= '</ul>';
   $output .= '</div>';
   $output .= '<div>';
-  $output .= '<p>' . bts('Team admins cannot:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
+  $output .= '<p>'.bts('Team admins cannot:', array(), NULL, 'boinc:team-admins-panel').'</p>';
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Change the team founder', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Remove members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Add / Remove team admins', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+  $output .= '  <li>'.bts('Change the team founder', array(), NULL, 'boinc:team-admins-panel').'</li>';
+  $output .= '  <li>'.bts('Remove members', array(), NULL, 'boinc:team-admins-panel').'</li>';
+  $output .= '  <li>'.bts('Add / Remove team admins', array(), NULL, 'boinc:team-admins-panel').'</li>';
   $output .= '</ul>';
   $output .= '</div>';
-  $output .= '<p>' . bts('If a team admin quits the team, they cease to be a'
+  $output .= '<p>'.bts('If a team admin quits the team, they cease to be a'
     . ' team admin. We recommend only selecting people you know and trust', array(), NULL, 'boinc:team-admins-panel')
     . '</p>';
   return $output;
@@ -808,26 +808,26 @@ 
  */                                         
 function boincteam_about_founder_panel() {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Changing the team founder', array(), NULL, 'boinc:team-founder-panel')
+  $output .= '<h2 class="pane-title">'.bts('Changing the team founder', array(), NULL, 'boinc:team-founder-panel')
     . '</h2>';
   $output .= '<div>';
-  $output .= '<p>' . bts('Notes about changes in foundership:', array(), NULL, 'boinc:team-founder-panel') . '</p>';
+  $output .= '<p>'.bts('Notes about changes in foundership:', array(), NULL, 'boinc:team-founder-panel').'</p>';
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Any member of the team is eligible', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '  <li>' . bts('Current founder becomes a normal user', array(), NULL, 'boinc:team-founder-panel') . '</li>';
+  $output .= '  <li>'.bts('Any member of the team is eligible', array(), NULL, 'boinc:team-founder-panel').'</li>';
+  $output .= '  <li>'.bts('Current founder becomes a normal user', array(), NULL, 'boinc:team-founder-panel').'</li>';
   $output .= '</ul>';
   $output .= '</div>';
   $output .= '<div>';
-  $output .= '<p>' . bts('Foundership can be requested by team members:', array(), NULL, 'boinc:team-founder-panel')
+  $output .= '<p>'.bts('Foundership can be requested by team members:', array(), NULL, 'boinc:team-founder-panel')
     . '</p>';
   $output .= '<ul>';
-  $output .= '  <li>' . bts('One request is allowed at a time', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '  <li>' . bts('It must be 60 days since any previous request', array(), NULL, 'boinc:team-founder-panel')
+  $output .= '  <li>'.bts('One request is allowed at a time', array(), NULL, 'boinc:team-founder-panel').'</li>';
+  $output .= '  <li>'.bts('It must be 60 days since any previous request', array(), NULL, 'boinc:team-founder-panel')
     . '</li>';
-  $output .= '  <li>' . bts('Any active request must be older than 90 days', array(), NULL, 'boinc:team-founder-panel')
+  $output .= '  <li>'.bts('Any active request must be older than 90 days', array(), NULL, 'boinc:team-founder-panel')
     . '</li>';
-  $output .= '  <li>' . bts('Current founder has 60 days to respond to a'
-    . ' request', array(), NULL, 'boinc:team-founder-panel') . '</li>';
+  $output .= '  <li>'.bts('Current founder has 60 days to respond to a'
+    . ' request', array(), NULL, 'boinc:team-founder-panel').'</li>';
   $output .= '</ul>';
   $output .= '</div>';
   return $output;
@@ -841,9 +841,9 @@ 
   $account = user_load($user->uid);
   $unrestricted_role = array_search('verified contributor', user_roles(true));
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create a new team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
-  $output .= '<p>' . bts('If you cannot find a team that is right for you, you'
-    . ' can create a team.', array(), NULL, 'boinc:create-team-panel') . '</p>';
+  $output .= '<h2 class="pane-title">'.bts('Create a new team', array(), NULL, 'boinc:create-team-panel').'</h2>';
+  $output .= '<p>'.bts('If you cannot find a team that is right for you, you'
+    . ' can create a team.', array(), NULL, 'boinc:create-team-panel').'</p>';
   $output .= '<ul class="tab-list">';
   $output .= '  <li class="first last tab">';
   if (isset($account->roles[$unrestricted_role])) {
@@ -879,7 +879,7 @@ 
  */
 function boincteam_create_team_panel() {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create a team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Create a team', array(), NULL, 'boinc:create-team-panel').'</h2>';
   $output .= drupal_get_form('boincteam_create_form');
   
   return $output;
@@ -897,26 +897,26 @@ 
   $account = user_load($uid);
   if ($account->team) {
     $team = boincteam_load(boincteam_lookup_id($account->team));
-    $output .= '<h2 class="pane-title">' . bts('Team', array(), NULL, 'boinc:team-dashboard') . '</h2>';
+    $output .= '<h2 class="pane-title">'.bts('Team', array(), NULL, 'boinc:team-dashboard').'</h2>';
     $output .= '<div class="stats">';
-    $output .= '  <label>' . bts('Name', array(), NULL, 'boinc:user-or-team-name') . ': </label>';
-    $output .= '  <span>' . l($team->name, "community/teams/{$account->team}") . '</span>';
-    $output .= '</div>' . "\n";
+    $output .= '  <label>'.bts('Name', array(), NULL, 'boinc:user-or-team-name').': </label>';
+    $output .= '  <span>'.l($team->name, "community/teams/{$account->team}").'</span>';
+    $output .= '</div>'."\n";
     $output .= '<div class="stats">';
-    $output .= '  <label>' . bts('Member since', array(), NULL, 'boinc:user-info') . ': </label>';
-    $output .= '  <span>' . date('j F Y', boincteam_get_member_join_date($team->id, $account->boincuser_id)) . '</span>';
-    $output .= '</div>' . "\n";
+    $output .= '  <label>'.bts('Member since', array(), NULL, 'boinc:user-info').': </label>';
+    $output .= '  <span>'.date('j F Y', boincteam_get_member_join_date($team->id, $account->boincuser_id)).'</span>';
+    $output .= '</div>'."\n";
     $output .= '<div class="stats">';
-    $output .= '  <label>' . bts('Country', array(), NULL, 'boinc:country-of-origin') . ': </label>';
-    $output .= '  <span>' . $team->country . '</span>';
-    $output .= '</div>' . "\n";
+    $output .= '  <label>'.bts('Country', array(), NULL, 'boinc:country-of-origin').': </label>';
+    $output .= '  <span>'.$team->country.'</span>';
+    $output .= '</div>'."\n";
     $output .= '<div class="stats">';
-    $output .= '  <label>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': </label>';
-    $output .= '  <span>' . number_format($team->total_credit, 0) . '</span>';
-    $output .= '</div>' . "\n";
+    $output .= '  <label>'.bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits').': </label>';
+    $output .= '  <span>'.number_format($team->total_credit, 0).'</span>';
+    $output .= '</div>'."\n";
   }
   else if ($user->uid == $account->uid) {
-    $output .= '<h2 class="pane-title">' . bts('Team (None)', array(), NULL, 'boinc:team-dashboard') . '</h2>';
+    $output .= '<h2 class="pane-title">'.bts('Team (None)', array(), NULL, 'boinc:team-dashboard').'</h2>';
     $output .= '<ul class="tab-list action-list">';
     $output .= '<li class="tab primary">';
     $output .= l(bts('Join a Team', array(), NULL, 'boinc:team-dashboard'), 'community/teams');
@@ -932,7 +932,7 @@ 
 function boincteam_edit_team_panel($team_id) {
   $team = node_load($team_id);
   $output = '';
-  $output .= '<h2 class="pane-title">' . $team->title . '</h2>';
+  $output .= '<h2 class="pane-title">'.$team->title.'</h2>';
   $output .= drupal_get_form('boincteam_edit_form', $team_id);
   
   return $output;
@@ -944,12 +944,12 @@ 
 function boincteam_join_team_panel($team_id) {
   $team = node_load($team_id);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Join team', array(), NULL, 'boinc:join-team-panel') . '</h2>';
-  $output .= '<p>' . bts('Click here to become a member of @this_team',
-    array('@this_team' =>$team->title), NULL, 'boinc:join-team-panel') . '</p>';
+  $output .= '<h2 class="pane-title">'.bts('Join team', array(), NULL, 'boinc:join-team-panel').'</h2>';
+  $output .= '<p>'.bts('Click here to become a member of @this_team',
+    array('@this_team' =>$team->title), NULL, 'boinc:join-team-panel').'</p>';
   $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">' . 
-    l(bts('Join this team', array(), NULL, 'boinc:join-team-panel'), "community/teams/{$team_id}/join") . '</li>';
+  $output .= '  <li class="first last tab">'. 
+    l(bts('Join this team', array(), NULL, 'boinc:join-team-panel'), "community/teams/{$team_id}/join").'</li>';
   $output .= '</ul>';
   return $output;
 }
@@ -960,12 +960,12 @@ 
 function boincteam_leave_team_panel($team_id) {
   $team = node_load($team_id);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Leave team', array(), NULL, 'boinc:leave-team-panel') . '</h2>';
-  $output .= '<p>' . bts('Click here to revoke your membership with'
-    . ' @this_team', array('@this_team' =>$team->title), NULL, 'boinc:leave-team-panel') . '</p>';
+  $output .= '<h2 class="pane-title">'.bts('Leave team', array(), NULL, 'boinc:leave-team-panel').'</h2>';
+  $output .= '<p>'.bts('Click here to revoke your membership with'
+    . ' @this_team', array('@this_team' =>$team->title), NULL, 'boinc:leave-team-panel').'</p>';
   $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">' . 
-    l(bts('Leave this team', array(), NULL, 'boinc:leave-team-panel'), "community/teams/{$team_id}/leave") . '</li>';
+  $output .= '  <li class="first last tab">'. 
+    l(bts('Leave this team', array(), NULL, 'boinc:leave-team-panel'), "community/teams/{$team_id}/leave").'</li>';
   $output .= '</ul>';
   return $output;
 }
@@ -975,10 +975,10 @@ 
  */                                         
 function boincteam_manage_admins_panel_header($team_id) {
   $output = '';
-  $output .= '<h4>' . bts('Add team admin', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
+  $output .= '<h4>'.bts('Add team admin', array(), NULL, 'boinc:team-manage-admins').'</h4>';
   $output .= drupal_get_form('boincteam_add_admin_form', $team_id);
   $output .= '<div class="clearfix"></div>';
-  $output .= '<h4>' . bts('Current team admins', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
+  $output .= '<h4>'.bts('Current team admins', array(), NULL, 'boinc:team-manage-admins').'</h4>';
   
   return $output;
 }
@@ -991,17 +991,17 @@ 
   $team = node_load($team_id);
 
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Manage team', array(), NULL, 'boinc:team-manage') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Manage team', array(), NULL, 'boinc:team-manage').'</h2>';
   
   // PM all members
   if (module_exists('privatemsg')) {
     $output .= '<div class="form-item">';
     $output .= '  <ul class="tab-list action-list">';
-    $output .= '    <li class="first tab primary">' .
-      l('Send message to team', "community/teams/{$team_id}/message-all-members") . '</li>';
+    $output .= '    <li class="first tab primary">'.
+      l('Send message to team', "community/teams/{$team_id}/message-all-members").'</li>';
     $output .= '  </ul>';
     $output .= '  <div class="description">';
-    $output .=   bts('Contact all team members using e-mail.', array(), NULL, 'boinc:team-manage');
+    $output .= bts('Contact all team members using e-mail.', array(), NULL, 'boinc:team-manage');
     $output .= '  </div>';
     $output .= '</div>';
   }
@@ -1019,13 +1019,13 @@ 
       }
       $output .= '<div class="form-item">';
       $output .= '  <ul class="tab-list action-list">';
-      $output .= '    <li class="first tab primary">' .   
+      $output .= '    <li class="first tab primary">'.   
         l(bts('Manage team message board', array(), NULL, 'boinc:team-manage'),
           "community/teams/{$team_id}/forum/{$team_forum_link_path}"
         );
       $output .= '    </li>';
       $output .= '  <div class="description">';
-      $output .=   bts('Create or manage message board', array(), NULL, 'boinc:team-manage');
+      $output .= bts('Create or manage message board', array(), NULL, 'boinc:team-manage');
       $output .= '  </div>';
       $output .= '</div>';
     }
@@ -1033,15 +1033,15 @@ 
   
   // Team history
   $output .= '<div class="form-item">';
-  $output .= '  <label>' . bts('View change history', array(), NULL, 'boinc:team-manage') . '</label>';
+  $output .= '  <label>'.bts('View change history', array(), NULL, 'boinc:team-manage').'</label>';
   $output .= '  <ul class="tab-list">';
-  $output .= '    <li class="first tab primary">' . 
-    l('HTML', "community/teams/{$team_id}/history") . '</li>';
-  $output .= '    <li class="last tab primary">' .
-    l('XML', "community/teams/{$team_id}/history/xml") . '</li>';
+  $output .= '    <li class="first tab primary">'. 
+    l('HTML', "community/teams/{$team_id}/history").'</li>';
+  $output .= '    <li class="last tab primary">'.
+    l('XML', "community/teams/{$team_id}/history/xml").'</li>';
   $output .= '  </ul>';
   $output .= '  <div class="description">';
-  $output .=   bts('See member activity', array(), NULL, 'boinc:team-manage');
+  $output .= bts('See member activity', array(), NULL, 'boinc:team-manage');
   $output .= '  </div>';
   $output .= '</div>';
   
@@ -1049,30 +1049,30 @@ 
   $output .= '  <ul class="tab-list action-list">';
   
   // Edit team information
-  $output .= '    <li class="first tab primary">' . 
-    l(bts('Edit team info', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/info") . '</li>';
+  $output .= '    <li class="first tab primary">'. 
+    l(bts('Edit team info', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/info").'</li>';
     
   // Member list
-  $output .= '    <li class="tab primary">' . 
-    l(bts('View member list', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/members") . '</li>';
+  $output .= '    <li class="tab primary">'. 
+    l(bts('View member list', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/members").'</li>';
 
   // Remove members
-  $output .= '    <li class="tab primary">' . 
-    l(bts('Remove members', array(), NULL, 'boinc:team-admins-panel'), "community/teams/{$team_id}/edit/members") . '</li>';
+  $output .= '    <li class="tab primary">'. 
+    l(bts('Remove members', array(), NULL, 'boinc:team-admins-panel'), "community/teams/{$team_id}/edit/members").'</li>';
   
   if ($is_founder) {
     
     // Change founder
-    $output .= '    <li class="tab primary">' . 
-      l(bts('Change founder', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/founder") . '</li>';
+    $output .= '    <li class="tab primary">'. 
+      l(bts('Change founder', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/founder").'</li>';
       
       // Manage admins
-    $output .= '    <li class="tab primary">' . 
-      l(bts('Manage team admins', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/admins") . '</li>';
+    $output .= '    <li class="tab primary">'. 
+      l(bts('Manage team admins', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/admins").'</li>';
     
     // Delete the team
-    $output .= '    <li class="last tab primary">' . 
-      l(bts('Remove team', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/delete") . '</li>';
+    $output .= '    <li class="last tab primary">'. 
+      l(bts('Remove team', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/delete").'</li>';
   }
   
   $output .= '  </ul>';
@@ -1089,12 +1089,12 @@ 
   $account = user_load($user->uid);
   $team = node_load($account->team);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('My team', array(), NULL, 'boinc:account-team-panel') . '</h2>';
-  $output .= '<p>' . bts('You are a member of @team.', 
-    array('@team' => $team->title), NULL, 'boinc:account-team-panel') . '</p>';
+  $output .= '<h2 class="pane-title">'.bts('My team', array(), NULL, 'boinc:account-team-panel').'</h2>';
+  $output .= '<p>'.bts('You are a member of @team.', 
+    array('@team' => $team->title), NULL, 'boinc:account-team-panel').'</p>';
   $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">' . 
-    l(bts('View my team', array(), NULL, 'boinc:account-team-panel'), "community/teams/{$account->team}") . '</li>';
+  $output .= '  <li class="first last tab">'. 
+    l(bts('View my team', array(), NULL, 'boinc:account-team-panel'), "community/teams/{$account->team}").'</li>';
   $output .= '</ul>';
   return $output;
 }
@@ -1110,11 +1110,11 @@ 
   $boincteam = boincteam_load($boincteam_id);
   $boincuser_id = $account->boincuser_id;
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Request foundership', array(), NULL, 'boinc:team-request-foundership') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Request foundership', array(), NULL, 'boinc:team-request-foundership').'</h2>';
   
   if (boincteam_user_requested_foundership($team_id)) {
     $deadline = boincteam_foundership_transfer_ok_time($boincteam);
-    $days_to_deadline = ceil(($deadline - time()) / (24*60*60));
+    $days_to_deadline = ceil(($deadline - time())/(24*60*60));
     $request_age = 60 - $days_to_deadline;
     $days_to_respond = 30 + $days_to_deadline;
     if (time() > $deadline) {
@@ -1142,8 +1142,8 @@ 
       }
       $output .= '</p>';
       $output .= '<ul class="tab-list">';
-      $output .= '  <li class="first last tab">' . 
-        l(bts('Assume foundership', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/assume-foundership") . '</li>';
+      $output .= '  <li class="first last tab">'. 
+        l(bts('Assume foundership', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/assume-foundership").'</li>';
       $output .= '</ul>';
     }
     else {
@@ -1167,29 +1167,29 @@ 
     // who made the request has 30 additional days to assume foundership if 
     // there is no response to the request)
     $deadline = boincteam_foundership_transfer_ok_time($boincteam);
-    $days_to_deadline = ceil(($deadline - time()) / (24*60*60)) + 30;
+    $days_to_deadline = ceil(($deadline - time())/(24*60*60)) + 30;
     $output .= '<p>';
     $output .= bts('A team foundership change was already requested recently.'
       . ' Only one request is allowed within a period of 90 days.',
       NULL, 'boinc:team-request-foundership');
     if ($days_to_deadline == 1) {
-      $output .= ' (' . bts('1 day remaining', array(), NULL, 'boinc:team-request-foundership') . ')';
+      $output .= ' ('.bts('1 day remaining', array(), NULL, 'boinc:team-request-foundership').')';
     }
     else {
-      $output .= ' (' . bts('@count days remaining',
+      $output .= ' ('.bts('@count days remaining',
         array('@count' => $days_to_deadline),
-        NULL, 'boinc:team-request-foundership') . ')';
+        NULL, 'boinc:team-request-foundership').')';
     }
     $output .= '</p>';
   }
   else {
-    $output .= '<p>' . bts('If the team founder is not active and you want to'
+    $output .= '<p>'.bts('If the team founder is not active and you want to'
       . ' assume the role of founder, click below to request foundership of'
       . ' @this_team.',
-      array('@this_team' =>$team->title), NULL, 'boinc:team-request-foundership') . '</p>';
+      array('@this_team' =>$team->title), NULL, 'boinc:team-request-foundership').'</p>';
     $output .= '<ul class="tab-list">';
-    $output .= '  <li class="first last tab">' . 
-      l(bts('Initiate request', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/request-foundership") . '</li>';
+    $output .= '  <li class="first last tab">'. 
+      l(bts('Initiate request', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/request-foundership").'</li>';
     $output .= '</ul>';
   }
   return $output;
@@ -1210,15 +1210,15 @@ 
   if ($boincteam->ping_user) {
     if ($boincteam->ping_user < 0) {
       $member = user_load(boincuser_lookup_uid(-$boincteam->ping_user));
-      $output .= '<h2 class="pane-title">' . bts('Obsolete transfer request', array(), NULL, 'boinc:team-request-foundership-response')
+      $output .= '<h2 class="pane-title">'.bts('Obsolete transfer request', array(), NULL, 'boinc:team-request-foundership-response')
         . '</h2>';
-      $output .= '<p>' . bts('Team member @name requested team foundership on'
+      $output .= '<p>'.bts('Team member @name requested team foundership on'
         . ' @date, but then left the team. This request is now canceled.',
         array(
           '@name' => $member->boincuser_name,
           '@date' => date('j M Y', $boincteam->ping_time),
         ),
-        NULL, 'boinc:team-request-foundership-response') . '</p>';
+        NULL, 'boinc:team-request-foundership-response').'</p>';
       // Automatically cancel the request
       db_set_active('boinc_rw');
       db_query("
@@ -1231,15 +1231,15 @@ 
     }
     else {
       $member = user_load(boincuser_lookup_uid($boincteam->ping_user));
-      $output .= '<h2 class="pane-title">' . bts('Respond to transfer request', array(), NULL, 'boinc:team-request-foundership-response')
+      $output .= '<h2 class="pane-title">'.bts('Respond to transfer request', array(), NULL, 'boinc:team-request-foundership-response')
         . '</h2>';
-      $output .= '<p>' . bts('Team member @name has requested team foundership.'
+      $output .= '<p>'.bts('Team member @name has requested team foundership.'
         . ' This may be because you left the team or have not had contact with'
         . ' the team for a long time.', array(
           '@name' => $member->boincuser_name,
         )
-      , array(), NULL, 'boinc:team-request-foundership-response') . '</p>';
-      $output .= '<p>' . bts("If you don't decline the request by @date, @name"
+      , array(), NULL, 'boinc:team-request-foundership-response').'</p>';
+      $output .= '<p>'.bts("If you don't decline the request by @date, @name"
         . ' will have the option of assuming team foundership. (note: To'
         . ' accept the request, assign foundership to @name using the form'
         . ' below)',
@@ -1247,10 +1247,10 @@ 
           '@name' => $member->boincuser_name,
           '@date' => date('j M Y', boincteam_foundership_transfer_ok_time($boincteam)),
         ),
-        NULL, 'boinc:team-request-foundership-response') . '</p>';
+        NULL, 'boinc:team-request-foundership-response').'</p>';
       $output .= '<ul class="tab-list">';
-      $output .= '  <li class="first last tab">' . 
-        l(bts('Deny request', array(), NULL, 'boinc:team-request-foundership-response'), "community/teams/{$team_id}/deny-foundership-request") . '</li>';
+      $output .= '  <li class="first last tab">'. 
+        l(bts('Deny request', array(), NULL, 'boinc:team-request-foundership-response'), "community/teams/{$team_id}/deny-foundership-request").'</li>';
       $output .= '</ul>';
     }
   }
@@ -1260,9 +1260,9 @@ 
 function boincteam_search_panel() {
   $output = '';
   if (module_exists('global_search_teams_solr')) {
-    $output .= '<h2 class="pane-title">' . bts('Search teams', array(), NULL, 'boinc:search-team') . '</h2>';
+    $output .= '<h2 class="pane-title">'.bts('Search teams', array(), NULL, 'boinc:search-team').'</h2>';
     //$output .= '<p>' . bts('Render a search form here.', array(), NULL, 'boinc:search-team') . '</p>';
-    $output .= '<p>' . boincteam_search_view() . '</p>';
+    $output .= '<p>'.boincteam_search_view().'</p>';
   }
   return $output;
 }
@@ -1278,20 +1278,20 @@ 
  * General info about the concept of teams
  */                                         
 function boincteam_topic_overview_panel() {
-  $site_name =  variable_get('site_name', 'Drupal-BOINC');
+  $site_name = variable_get('site_name', 'Drupal-BOINC');
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Teams', array(), NULL, 'boinc:team-general-info') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Teams', array(), NULL, 'boinc:team-general-info').'</h2>';
   $output .= '<div class="">';
-  $output .= '<p>' . bts('@project participants may form teams. You may belong'
+  $output .= '<p>'.bts('@project participants may form teams. You may belong'
     . ' to only one team. You can join or quit a team at any time. To join a'
     . ' team, visit its team page and click "Join this team". Each team has a'
-    . ' founder who may:', array('@project' => $site_name), NULL, 'boinc:team-general-info') . '</p>';
+    . ' founder who may:', array('@project' => $site_name), NULL, 'boinc:team-general-info').'</p>';
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Private Message all team members', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts("edit the team's name and description", array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts('add or remove team admins', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts('remove members from the team', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts('disband a team if it has no members', array(), NULL, 'boinc:team-general-info') . '</li>';
+  $output .= '  <li>'.bts('Private Message all team members', array(), NULL, 'boinc:team-general-info').'</li>';
+  $output .= '  <li>'.bts("edit the team's name and description", array(), NULL, 'boinc:team-general-info').'</li>';
+  $output .= '  <li>'.bts('add or remove team admins', array(), NULL, 'boinc:team-general-info').'</li>';
+  $output .= '  <li>'.bts('remove members from the team', array(), NULL, 'boinc:team-general-info').'</li>';
+  $output .= '  <li>'.bts('disband a team if it has no members', array(), NULL, 'boinc:team-general-info').'</li>';
   $output .= '</ul>';
   $output .= '</div>';
   return $output;
@@ -1336,34 +1336,34 @@ 
     }
   }
   $output = '';
-  $output .= '<h2 class="pane-title">' . $boincteam->name . '</h2>';
+  $output .= '<h2 class="pane-title">'.$boincteam->name.'</h2>';
   $output .= '<div>';
   $output .= '<div class="left-column">';
   $output .= '<ul class="stats">';
-  $output .= '  <li>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': ' . number_format($boincteam->total_credit, 0) . '</li>';
-  $output .= '  <li>' . bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC') . ': ' . number_format($boincteam->expavg_credit, 2) . '</li>';
-  $output .= '  <li>' . bts('Country', array(), NULL, 'boinc:country-of-origin') . ': ' . $boincteam->country . '</li>';
-  $output .= '  <li>' . bts('Type', array(), NULL, 'boinc:view-team-info') . ': ' . boincteam_get_type($team_id) . '</li>';
+  $output .= '  <li>'.bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits').': '.number_format($boincteam->total_credit, 0).'</li>';
+  $output .= '  <li>'.bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC').': '.number_format($boincteam->expavg_credit, 2).'</li>';
+  $output .= '  <li>'.bts('Country', array(), NULL, 'boinc:country-of-origin').': '.$boincteam->country.'</li>';
+  $output .= '  <li>'.bts('Type', array(), NULL, 'boinc:view-team-info').': '.boincteam_get_type($team_id).'</li>';
   $output .= '</ul>';
   $output .= '</div>';
   $output .= '<div class="right-column">';
   $output .= '<ul class="stats">';
-  $output .= '  <li>' . bts('Founder', array(), NULL, 'boinc:view-team-info') . ': ' . l($founder->boincuser_name, "account/{$founder->uid}") . '</li>';
-  $output .= '  <li>' . bts('New members in last day', array(), NULL, 'boinc:view-team-info') . ': ' . implode('&middot;', $new_members) . '</li>';
-  $output .= '  <li>' . bts('Total members', array(), NULL, 'boinc:view-team-info') . ': ' . l($boincteam->nusers, "community/teams/{$team_id}/members") . '</li>';
-  $output .= '  <li>' . bts('Active members', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_active . '</li>';
-  $output .= '  <li>' . bts('Members with credit', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_worked . '</li>';
+  $output .= '  <li>'.bts('Founder', array(), NULL, 'boinc:view-team-info').': '.l($founder->boincuser_name, "account/{$founder->uid}").'</li>';
+  $output .= '  <li>'.bts('New members in last day', array(), NULL, 'boinc:view-team-info').': '.implode('&middot;', $new_members).'</li>';
+  $output .= '  <li>'.bts('Total members', array(), NULL, 'boinc:view-team-info').': '.l($boincteam->nusers, "community/teams/{$team_id}/members").'</li>';
+  $output .= '  <li>'.bts('Active members', array(), NULL, 'boinc:view-team-info').': '.$boincteam->nusers_active.'</li>';
+  $output .= '  <li>'.bts('Members with credit', array(), NULL, 'boinc:view-team-info').': '.$boincteam->nusers_worked.'</li>';
   $output .= '</ul>';
   $output .= '</div>';
   $output .= '</div>';
   $output .= '<div class="clearfix"></div>';
   if ($boincteam->url) {
     $output .= '<div class="stats">';
-    $output .= bts('Website', array(), NULL, 'boinc:website-of-user-or-team') . ': ' . l("http://{$boincteam->url}", "http://{$boincteam->url}");
+    $output .= bts('Website', array(), NULL, 'boinc:website-of-user-or-team').': '.l("http://{$boincteam->url}", "http://{$boincteam->url}");
     $output .= '</div>';
   }
   if ($team->body) {
-    $output .= '<h3>' . bts('Description', array(), NULL, 'boinc:team-description') . '</h3>';
+    $output .= '<h3>'.bts('Description', array(), NULL, 'boinc:team-description').'</h3>';
     $output .= check_markup($team->body, $team->format);
     $output .= '</div>';
   }

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

@@ -102,8 +102,8 @@ 
     'type' => MENU_CALLBACK,
   );
   $items['community/teams/%/message-all-members'] = array(
-    'title' => bts('Send Message to Team', array(), NULL, 'boinc:team-manage'),
-    'description' => bts('Send Message to Team', array(), NULL, 'boinc:team-manage'),
+    'title' => bts('Send Message to Team', array(), null, 'boinc:team-manage'),
+    'description' => bts('Send Message to Team', array(), null, 'boinc:team-manage'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincteam_sendmessagetoteam', 2),
     'access callback' => 'boincteam_is_admin',
@@ -139,7 +139,7 @@ 
 */
   return array(
     'boincteam_utility_team_table' => array(
-      'arguments' => array('form' => NULL),
+      'arguments' => array('form' => null),
       'file' => 'boincteam.admin.inc',
     ),
   );
@@ -272,7 +272,7 @@ 
  */
 function boincteam_delete($team_id) {
   $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id), TRUE);
+  $boincteam = boincteam_load(boincteam_lookup_id($team_id), true);
   if ($boincteam->nusers == 1) {
     require_boinc('team');
     $boincuser = boincuser_load();
@@ -288,7 +288,7 @@ 
   else {
     drupal_set_message(t('All members must be removed from @team before the
       team can be deleted.', array('@team' => $boincteam->name)), 'error');
-    drupal_goto(strstr($_GET['q'], '/delete', TRUE));
+    drupal_goto(strstr($_GET['q'], '/delete', true));
   }
 }
 
@@ -317,7 +317,7 @@ 
 /**
  * Get the join date of a user
  */
-function boincteam_get_member_join_date($boincteam_id, $boincuser_id = NULL) {
+function boincteam_get_member_join_date($boincteam_id, $boincuser_id = null) {
   if (!$boincuser_id) {
     global $user;
     $account = user_load($user->uid);
@@ -415,10 +415,10 @@ 
 /**
  * Get a BOINC team object
  */
-function boincteam_load($boincteam_id, $full_object = FALSE) {
+function boincteam_load($boincteam_id, $full_object = false) {
   require_boinc(array('team'));
   $team = BoincTeam::lookup_id($boincteam_id);
-  if ($team AND $full_object) {
+  if ($team and $full_object) {
     $team->nusers = BoincUser::count("teamid={$team->id}");
     $team->nusers_worked = BoincUser::count("teamid={$team->id} and total_credit>0");
     $team->nusers_active = BoincUser::count("teamid={$team->id} and expavg_credit>0.1");
@@ -433,39 +433,39 @@ 
 /**
  * Check if a user is the team founder
  */
-function boincteam_is_founder($nid, $uid = NULL) {
+function boincteam_is_founder($nid, $uid = null) {
   if (!$uid) {
     global $user;
     $uid = $user->uid;
   }
   if (!boincteam_is_member($nid, $uid)) {
-    return FALSE;
+    return false;
   }
   $team_id = boincteam_lookup_id($nid);
   require_boinc('team');
-  return is_team_founder(boincuser_load($uid, TRUE), boincteam_load($team_id));
+  return is_team_founder(boincuser_load($uid, true), boincteam_load($team_id));
 }
 
 /**
  * Check if a user is a team admin
  */
-function boincteam_is_admin($nid, $uid = NULL) {
+function boincteam_is_admin($nid, $uid = null) {
   if (!$uid) {
     global $user;
     $uid = $user->uid;
   }
   if (!boincteam_is_member($nid, $uid)) {
-    return FALSE;
+    return false;
   }
   $team_id = boincteam_lookup_id($nid);
   require_boinc('team');
-  return is_team_admin(boincuser_load($uid, TRUE), boincteam_load($team_id));
+  return is_team_admin(boincuser_load($uid, true), boincteam_load($team_id));
 }
 
 /**
  * Check if a user is a team member
  */
-function boincteam_is_member($nid, $uid = NULL) {
+function boincteam_is_member($nid, $uid = null) {
   if (!$uid) {
     global $user;
     $uid = $user->uid;
@@ -492,9 +492,9 @@ 
           drupal_set_message(
             bts(
               'A foundership transfer request has been made for your team. Please !respond.',
-              array('!respond' => l(bts('respond to the request', array(), NULL, 'boinc:team-founder-change'), $foundership_url)),
-              NULL, 'boinc:team-founder-change'),
-            'warning', FALSE
+              array('!respond' => l(bts('respond to the request', array(), null, 'boinc:team-founder-change'), $foundership_url)),
+              null, 'boinc:team-founder-change'),
+            'warning', false
           );
         }
       }
@@ -511,7 +511,7 @@ 
   
   $boincteam_id = boincteam_lookup_id($team_id);
   $boincteam = boincteam_load($boincteam_id);
-  if ($boincteam->joinable AND $account->team != $team_id) {
+  if ($boincteam->joinable and $account->team != $team_id) {
     require_boinc('team');
     $boincuser = boincuser_load();
     if (user_join_team($boincteam, $boincuser)) {
@@ -603,7 +603,7 @@ 
   $boincteam = boincteam_load($boincteam_id);
   if ($account->team == $team_id) {
     require_boinc('team');
-    $boincuser = boincuser_load($user_id, TRUE);
+    $boincuser = boincuser_load($user_id, true);
     user_quit_team($boincuser);
     drupal_set_message(t('@user has been removed from @team.',
       array(
@@ -725,14 +725,14 @@ 
   $now = time();
   if ($boincteam->ping_user <= 0) {
     if ($boincteam->ping_time < $now - 60 * (24*60*60)) {
-      return TRUE;
+      return true;
     }
-    return FALSE;
+    return false;
   }
   if ($boincteam->ping_time < $now - 90 * (24*60*60)) {
-    return TRUE;
+    return true;
   }
-  return FALSE;
+  return false;
 }
 
 /** 
@@ -753,7 +753,7 @@ 
 /**
  * Check if a user has an active foundership request with a team
  */
-function boincteam_user_requested_foundership($team_id, $user_id = NULL) {
+function boincteam_user_requested_foundership($team_id, $user_id = null) {
   if (!$user_id) {
     global $user;
     $user_id = $user->uid;
@@ -778,27 +778,27 @@ 
  */                                         
 function boincteam_about_admins_panel() {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('About team admins', array(), NULL, 'boinc:team-admins-panel') . '</h2>';
+  $output .= '<h2 class="pane-title">' . bts('About team admins', array(), null, 'boinc:team-admins-panel') . '</h2>';
   $output .= '<div>';
-  $output .= '<p>' . bts('Team admins can:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
+  $output .= '<p>' . bts('Team admins can:', array(), null, 'boinc:team-admins-panel') . '</p>';
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Edit team information', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts("View the team's join / quit history", array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Moderate the team forum', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Remove members from the team', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Disband a team if it has no members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+  $output .= '  <li>' . bts('Edit team information', array(), null, 'boinc:team-admins-panel') . '</li>';
+  $output .= '  <li>' . bts("View the team's join / quit history", array(), null, 'boinc:team-admins-panel') . '</li>';
+  $output .= '  <li>' . bts('Moderate the team forum', array(), null, 'boinc:team-admins-panel') . '</li>';
+  $output .= '  <li>' . bts('Remove members from the team', array(), null, 'boinc:team-admins-panel') . '</li>';
+  $output .= '  <li>' . bts('Disband a team if it has no members', array(), null, 'boinc:team-admins-panel') . '</li>';
   $output .= '</ul>';
   $output .= '</div>';
   $output .= '<div>';
-  $output .= '<p>' . bts('Team admins cannot:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
+  $output .= '<p>' . bts('Team admins cannot:', array(), null, 'boinc:team-admins-panel') . '</p>';
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Change the team founder', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Remove members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Add / Remove team admins', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+  $output .= '  <li>' . bts('Change the team founder', array(), null, 'boinc:team-admins-panel') . '</li>';
+  $output .= '  <li>' . bts('Remove members', array(), null, 'boinc:team-admins-panel') . '</li>';
+  $output .= '  <li>' . bts('Add / Remove team admins', array(), null, 'boinc:team-admins-panel') . '</li>';
   $output .= '</ul>';
   $output .= '</div>';
   $output .= '<p>' . bts('If a team admin quits the team, they cease to be a'
-    . ' team admin. We recommend only selecting people you know and trust', array(), NULL, 'boinc:team-admins-panel')
+    . ' team admin. We recommend only selecting people you know and trust', array(), null, 'boinc:team-admins-panel')
     . '</p>';
   return $output;
 }
@@ -808,26 +808,26 @@ 
  */                                         
 function boincteam_about_founder_panel() {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Changing the team founder', array(), NULL, 'boinc:team-founder-panel')
+  $output .= '<h2 class="pane-title">' . bts('Changing the team founder', array(), null, 'boinc:team-founder-panel')
     . '</h2>';
   $output .= '<div>';
-  $output .= '<p>' . bts('Notes about changes in foundership:', array(), NULL, 'boinc:team-founder-panel') . '</p>';
+  $output .= '<p>' . bts('Notes about changes in foundership:', array(), null, 'boinc:team-founder-panel') . '</p>';
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Any member of the team is eligible', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '  <li>' . bts('Current founder becomes a normal user', array(), NULL, 'boinc:team-founder-panel') . '</li>';
+  $output .= '  <li>' . bts('Any member of the team is eligible', array(), null, 'boinc:team-founder-panel') . '</li>';
+  $output .= '  <li>' . bts('Current founder becomes a normal user', array(), null, 'boinc:team-founder-panel') . '</li>';
   $output .= '</ul>';
   $output .= '</div>';
   $output .= '<div>';
-  $output .= '<p>' . bts('Foundership can be requested by team members:', array(), NULL, 'boinc:team-founder-panel')
+  $output .= '<p>' . bts('Foundership can be requested by team members:', array(), null, 'boinc:team-founder-panel')
     . '</p>';
   $output .= '<ul>';
-  $output .= '  <li>' . bts('One request is allowed at a time', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '  <li>' . bts('It must be 60 days since any previous request', array(), NULL, 'boinc:team-founder-panel')
+  $output .= '  <li>' . bts('One request is allowed at a time', array(), null, 'boinc:team-founder-panel') . '</li>';
+  $output .= '  <li>' . bts('It must be 60 days since any previous request', array(), null, 'boinc:team-founder-panel')
     . '</li>';
-  $output .= '  <li>' . bts('Any active request must be older than 90 days', array(), NULL, 'boinc:team-founder-panel')
+  $output .= '  <li>' . bts('Any active request must be older than 90 days', array(), null, 'boinc:team-founder-panel')
     . '</li>';
   $output .= '  <li>' . bts('Current founder has 60 days to respond to a'
-    . ' request', array(), NULL, 'boinc:team-founder-panel') . '</li>';
+    . ' request', array(), null, 'boinc:team-founder-panel') . '</li>';
   $output .= '</ul>';
   $output .= '</div>';
   return $output;
@@ -841,16 +841,16 @@ 
   $account = user_load($user->uid);
   $unrestricted_role = array_search('verified contributor', user_roles(true));
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create a new team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
+  $output .= '<h2 class="pane-title">' . bts('Create a new team', array(), null, 'boinc:create-team-panel') . '</h2>';
   $output .= '<p>' . bts('If you cannot find a team that is right for you, you'
-    . ' can create a team.', array(), NULL, 'boinc:create-team-panel') . '</p>';
+    . ' can create a team.', array(), null, 'boinc:create-team-panel') . '</p>';
   $output .= '<ul class="tab-list">';
   $output .= '  <li class="first last tab">';
   if (isset($account->roles[$unrestricted_role])) {
-    $output .= l(bts('Create new team', array(), NULL, 'boinc:create-team-panel'), 'community/teams/add');
+    $output .= l(bts('Create new team', array(), null, 'boinc:create-team-panel'), 'community/teams/add');
   } elseif ($account->uid <= 0) {
     $output .= l(
-      bts('Login to create a new team', array(), NULL, 'boinc:create-team-panel'),
+      bts('Login to create a new team', array(), null, 'boinc:create-team-panel'),
       'user/login',
       array('query' => drupal_get_destination())
     );
@@ -859,12 +859,12 @@ 
     $credit_needed = $min_credit_needed - $account->boincuser_total_credit;
     $output .= '[';
     if ($credit_needed == 1) {
-      $output .= bts('You must earn 1 more credit!', array(), NULL, 'boinc:create-team-panel');
+      $output .= bts('You must earn 1 more credit!', array(), null, 'boinc:create-team-panel');
     }
     else {
       $output .= bts('You must earn @count more credits!',
         array('@count' => $credit_needed),
-	NULL, 'boinc:create-team-panel'
+	null, 'boinc:create-team-panel'
       );
     }
     $output .= ']';
@@ -879,7 +879,7 @@ 
  */
 function boincteam_create_team_panel() {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create a team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
+  $output .= '<h2 class="pane-title">' . bts('Create a team', array(), null, 'boinc:create-team-panel') . '</h2>';
   $output .= drupal_get_form('boincteam_create_form');
   
   return $output;
@@ -888,7 +888,7 @@ 
 /**
  * Link to user's team
  */
-function boincteam_dashboard_panel($uid = NULL) {
+function boincteam_dashboard_panel($uid = null) {
   global $user;
   if (!$uid) {
     $uid = $user->uid;
@@ -897,29 +897,29 @@ 
   $account = user_load($uid);
   if ($account->team) {
     $team = boincteam_load(boincteam_lookup_id($account->team));
-    $output .= '<h2 class="pane-title">' . bts('Team', array(), NULL, 'boinc:team-dashboard') . '</h2>';
+    $output .= '<h2 class="pane-title">' . bts('Team', array(), null, 'boinc:team-dashboard') . '</h2>';
     $output .= '<div class="stats">';
-    $output .= '  <label>' . bts('Name', array(), NULL, 'boinc:user-or-team-name') . ': </label>';
+    $output .= '  <label>' . bts('Name', array(), null, 'boinc:user-or-team-name') . ': </label>';
     $output .= '  <span>' . l($team->name, "community/teams/{$account->team}") . '</span>';
     $output .= '</div>' . "\n";
     $output .= '<div class="stats">';
-    $output .= '  <label>' . bts('Member since', array(), NULL, 'boinc:user-info') . ': </label>';
+    $output .= '  <label>' . bts('Member since', array(), null, 'boinc:user-info') . ': </label>';
     $output .= '  <span>' . date('j F Y', boincteam_get_member_join_date($team->id, $account->boincuser_id)) . '</span>';
     $output .= '</div>' . "\n";
     $output .= '<div class="stats">';
-    $output .= '  <label>' . bts('Country', array(), NULL, 'boinc:country-of-origin') . ': </label>';
+    $output .= '  <label>' . bts('Country', array(), null, 'boinc:country-of-origin') . ': </label>';
     $output .= '  <span>' . $team->country . '</span>';
     $output .= '</div>' . "\n";
     $output .= '<div class="stats">';
-    $output .= '  <label>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': </label>';
+    $output .= '  <label>' . bts('Total credit', array(), null, 'boinc:user-or-team-total-credits') . ': </label>';
     $output .= '  <span>' . number_format($team->total_credit, 0) . '</span>';
     $output .= '</div>' . "\n";
   }
   else if ($user->uid == $account->uid) {
-    $output .= '<h2 class="pane-title">' . bts('Team (None)', array(), NULL, 'boinc:team-dashboard') . '</h2>';
+    $output .= '<h2 class="pane-title">' . bts('Team (None)', array(), null, 'boinc:team-dashboard') . '</h2>';
     $output .= '<ul class="tab-list action-list">';
     $output .= '<li class="tab primary">';
-    $output .= l(bts('Join a Team', array(), NULL, 'boinc:team-dashboard'), 'community/teams');
+    $output .= l(bts('Join a Team', array(), null, 'boinc:team-dashboard'), 'community/teams');
     $output .= '</li>';
     $output .= '</ul>';
   }
@@ -944,12 +944,12 @@ 
 function boincteam_join_team_panel($team_id) {
   $team = node_load($team_id);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Join team', array(), NULL, 'boinc:join-team-panel') . '</h2>';
+  $output .= '<h2 class="pane-title">' . bts('Join team', array(), null, 'boinc:join-team-panel') . '</h2>';
   $output .= '<p>' . bts('Click here to become a member of @this_team',
-    array('@this_team' =>$team->title), NULL, 'boinc:join-team-panel') . '</p>';
+    array('@this_team' =>$team->title), null, 'boinc:join-team-panel') . '</p>';
   $output .= '<ul class="tab-list">';
   $output .= '  <li class="first last tab">' . 
-    l(bts('Join this team', array(), NULL, 'boinc:join-team-panel'), "community/teams/{$team_id}/join") . '</li>';
+    l(bts('Join this team', array(), null, 'boinc:join-team-panel'), "community/teams/{$team_id}/join") . '</li>';
   $output .= '</ul>';
   return $output;
 }
@@ -960,12 +960,12 @@ 
 function boincteam_leave_team_panel($team_id) {
   $team = node_load($team_id);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Leave team', array(), NULL, 'boinc:leave-team-panel') . '</h2>';
+  $output .= '<h2 class="pane-title">' . bts('Leave team', array(), null, 'boinc:leave-team-panel') . '</h2>';
   $output .= '<p>' . bts('Click here to revoke your membership with'
-    . ' @this_team', array('@this_team' =>$team->title), NULL, 'boinc:leave-team-panel') . '</p>';
+    . ' @this_team', array('@this_team' =>$team->title), null, 'boinc:leave-team-panel') . '</p>';
   $output .= '<ul class="tab-list">';
   $output .= '  <li class="first last tab">' . 
-    l(bts('Leave this team', array(), NULL, 'boinc:leave-team-panel'), "community/teams/{$team_id}/leave") . '</li>';
+    l(bts('Leave this team', array(), null, 'boinc:leave-team-panel'), "community/teams/{$team_id}/leave") . '</li>';
   $output .= '</ul>';
   return $output;
 }
@@ -975,10 +975,10 @@ 
  */                                         
 function boincteam_manage_admins_panel_header($team_id) {
   $output = '';
-  $output .= '<h4>' . bts('Add team admin', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
+  $output .= '<h4>' . bts('Add team admin', array(), null, 'boinc:team-manage-admins') . '</h4>';
   $output .= drupal_get_form('boincteam_add_admin_form', $team_id);
   $output .= '<div class="clearfix"></div>';
-  $output .= '<h4>' . bts('Current team admins', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
+  $output .= '<h4>' . bts('Current team admins', array(), null, 'boinc:team-manage-admins') . '</h4>';
   
   return $output;
 }
@@ -991,7 +991,7 @@ 
   $team = node_load($team_id);
 
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Manage team', array(), NULL, 'boinc:team-manage') . '</h2>';
+  $output .= '<h2 class="pane-title">' . bts('Manage team', array(), null, 'boinc:team-manage') . '</h2>';
   
   // PM all members
   if (module_exists('privatemsg')) {
@@ -1001,7 +1001,7 @@ 
       l('Send message to team', "community/teams/{$team_id}/message-all-members") . '</li>';
     $output .= '  </ul>';
     $output .= '  <div class="description">';
-    $output .=   bts('Contact all team members using e-mail.', array(), NULL, 'boinc:team-manage');
+    $output .=   bts('Contact all team members using e-mail.', array(), null, 'boinc:team-manage');
     $output .= '  </div>';
     $output .= '</div>';
   }
@@ -1020,12 +1020,12 @@ 
       $output .= '<div class="form-item">';
       $output .= '  <ul class="tab-list action-list">';
       $output .= '    <li class="first tab primary">' .   
-        l(bts('Manage team message board', array(), NULL, 'boinc:team-manage'),
+        l(bts('Manage team message board', array(), null, 'boinc:team-manage'),
           "community/teams/{$team_id}/forum/{$team_forum_link_path}"
         );
       $output .= '    </li>';
       $output .= '  <div class="description">';
-      $output .=   bts('Create or manage message board', array(), NULL, 'boinc:team-manage');
+      $output .=   bts('Create or manage message board', array(), null, 'boinc:team-manage');
       $output .= '  </div>';
       $output .= '</div>';
     }
@@ -1033,7 +1033,7 @@ 
   
   // Team history
   $output .= '<div class="form-item">';
-  $output .= '  <label>' . bts('View change history', array(), NULL, 'boinc:team-manage') . '</label>';
+  $output .= '  <label>' . bts('View change history', array(), null, 'boinc:team-manage') . '</label>';
   $output .= '  <ul class="tab-list">';
   $output .= '    <li class="first tab primary">' . 
     l('HTML', "community/teams/{$team_id}/history") . '</li>';
@@ -1041,7 +1041,7 @@ 
     l('XML', "community/teams/{$team_id}/history/xml") . '</li>';
   $output .= '  </ul>';
   $output .= '  <div class="description">';
-  $output .=   bts('See member activity', array(), NULL, 'boinc:team-manage');
+  $output .=   bts('See member activity', array(), null, 'boinc:team-manage');
   $output .= '  </div>';
   $output .= '</div>';
   
@@ -1050,29 +1050,29 @@ 
   
   // Edit team information
   $output .= '    <li class="first tab primary">' . 
-    l(bts('Edit team info', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/info") . '</li>';
+    l(bts('Edit team info', array(), null, 'boinc:team-manage'), "community/teams/{$team_id}/edit/info") . '</li>';
     
   // Member list
   $output .= '    <li class="tab primary">' . 
-    l(bts('View member list', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/members") . '</li>';
+    l(bts('View member list', array(), null, 'boinc:team-manage'), "community/teams/{$team_id}/members") . '</li>';
 
   // Remove members
   $output .= '    <li class="tab primary">' . 
-    l(bts('Remove members', array(), NULL, 'boinc:team-admins-panel'), "community/teams/{$team_id}/edit/members") . '</li>';
+    l(bts('Remove members', array(), null, 'boinc:team-admins-panel'), "community/teams/{$team_id}/edit/members") . '</li>';
   
   if ($is_founder) {
     
     // Change founder
     $output .= '    <li class="tab primary">' . 
-      l(bts('Change founder', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/founder") . '</li>';
+      l(bts('Change founder', array(), null, 'boinc:team-manage'), "community/teams/{$team_id}/edit/founder") . '</li>';
       
       // Manage admins
     $output .= '    <li class="tab primary">' . 
-      l(bts('Manage team admins', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/admins") . '</li>';
+      l(bts('Manage team admins', array(), null, 'boinc:team-manage'), "community/teams/{$team_id}/edit/admins") . '</li>';
     
     // Delete the team
     $output .= '    <li class="last tab primary">' . 
-      l(bts('Remove team', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/delete") . '</li>';
+      l(bts('Remove team', array(), null, 'boinc:team-manage'), "community/teams/{$team_id}/delete") . '</li>';
   }
   
   $output .= '  </ul>';
@@ -1089,12 +1089,12 @@ 
   $account = user_load($user->uid);
   $team = node_load($account->team);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('My team', array(), NULL, 'boinc:account-team-panel') . '</h2>';
+  $output .= '<h2 class="pane-title">' . bts('My team', array(), null, 'boinc:account-team-panel') . '</h2>';
   $output .= '<p>' . bts('You are a member of @team.', 
-    array('@team' => $team->title), NULL, 'boinc:account-team-panel') . '</p>';
+    array('@team' => $team->title), null, 'boinc:account-team-panel') . '</p>';
   $output .= '<ul class="tab-list">';
   $output .= '  <li class="first last tab">' . 
-    l(bts('View my team', array(), NULL, 'boinc:account-team-panel'), "community/teams/{$account->team}") . '</li>';
+    l(bts('View my team', array(), null, 'boinc:account-team-panel'), "community/teams/{$account->team}") . '</li>';
   $output .= '</ul>';
   return $output;
 }
@@ -1110,7 +1110,7 @@ 
   $boincteam = boincteam_load($boincteam_id);
   $boincuser_id = $account->boincuser_id;
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Request foundership', array(), NULL, 'boinc:team-request-foundership') . '</h2>';
+  $output .= '<h2 class="pane-title">' . bts('Request foundership', array(), null, 'boinc:team-request-foundership') . '</h2>';
   
   if (boincteam_user_requested_foundership($team_id)) {
     $deadline = boincteam_foundership_transfer_ok_time($boincteam);
@@ -1121,29 +1121,29 @@ 
       $output .= '<p>';
       if ($request_age == 1) {
         $output .= bts('1 day has elapsed since your request and'
-          . ' the founder has not responded.', array(), NULL, 'boinc:team-request-foundership');
+          . ' the founder has not responded.', array(), null, 'boinc:team-request-foundership');
       }
       else {
         $output .= bts('@count days have elapsed since your request and'
           . ' the founder has not responded.',
           array('@count' => $request_age),
-          NULL, 'boinc:team-request-foundership');
+          null, 'boinc:team-request-foundership');
       }
       $output .= ' ';
       if ($days_to_respond == 1) {
         $output .= bts('You now have 1 day to assume foundership before'
-          . ' another team member may submit a request.', array(), NULL, 'boinc:team-request-foundership');
+          . ' another team member may submit a request.', array(), null, 'boinc:team-request-foundership');
       }
       else {
         $output .= bts('You now have @count days to assume foundership before'
           . ' another team member may submit a request.',
           array('@count' => $days_to_respond),
-          NULL, 'boinc:team-request-foundership');
+          null, 'boinc:team-request-foundership');
       }
       $output .= '</p>';
       $output .= '<ul class="tab-list">';
       $output .= '  <li class="first last tab">' . 
-        l(bts('Assume foundership', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/assume-foundership") . '</li>';
+        l(bts('Assume foundership', array(), null, 'boinc:team-request-foundership'), "community/teams/{$team_id}/assume-foundership") . '</li>';
       $output .= '</ul>';
     }
     else {
@@ -1151,12 +1151,12 @@ 
       if ($days_to_deadline == 1) {
         $output .= bts('The team founder has 1 day to respond to your'
           . ' transfer request.',
-          NULL, 'boinc:team-request-foundership');
+          null, 'boinc:team-request-foundership');
       }
       else {
         $output .= bts('The team founder has @count days to respond to your'
           . ' transfer request.', array('@count' => $days_to_deadline),
-          NULL, 'boinc:team-request-foundership');
+          null, 'boinc:team-request-foundership');
       }
       $output .= '</p>';
     }
@@ -1171,14 +1171,14 @@ 
     $output .= '<p>';
     $output .= bts('A team foundership change was already requested recently.'
       . ' Only one request is allowed within a period of 90 days.',
-      NULL, 'boinc:team-request-foundership');
+      null, 'boinc:team-request-foundership');
     if ($days_to_deadline == 1) {
-      $output .= ' (' . bts('1 day remaining', array(), NULL, 'boinc:team-request-foundership') . ')';
+      $output .= ' (' . bts('1 day remaining', array(), null, 'boinc:team-request-foundership') . ')';
     }
     else {
       $output .= ' (' . bts('@count days remaining',
         array('@count' => $days_to_deadline),
-        NULL, 'boinc:team-request-foundership') . ')';
+        null, 'boinc:team-request-foundership') . ')';
     }
     $output .= '</p>';
   }
@@ -1186,10 +1186,10 @@ 
     $output .= '<p>' . bts('If the team founder is not active and you want to'
       . ' assume the role of founder, click below to request foundership of'
       . ' @this_team.',
-      array('@this_team' =>$team->title), NULL, 'boinc:team-request-foundership') . '</p>';
+      array('@this_team' =>$team->title), null, 'boinc:team-request-foundership') . '</p>';
     $output .= '<ul class="tab-list">';
     $output .= '  <li class="first last tab">' . 
-      l(bts('Initiate request', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/request-foundership") . '</li>';
+      l(bts('Initiate request', array(), null, 'boinc:team-request-foundership'), "community/teams/{$team_id}/request-foundership") . '</li>';
     $output .= '</ul>';
   }
   return $output;
@@ -1210,7 +1210,7 @@ 
   if ($boincteam->ping_user) {
     if ($boincteam->ping_user < 0) {
       $member = user_load(boincuser_lookup_uid(-$boincteam->ping_user));
-      $output .= '<h2 class="pane-title">' . bts('Obsolete transfer request', array(), NULL, 'boinc:team-request-foundership-response')
+      $output .= '<h2 class="pane-title">' . bts('Obsolete transfer request', array(), null, 'boinc:team-request-foundership-response')
         . '</h2>';
       $output .= '<p>' . bts('Team member @name requested team foundership on'
         . ' @date, but then left the team. This request is now canceled.',
@@ -1218,7 +1218,7 @@ 
           '@name' => $member->boincuser_name,
           '@date' => date('j M Y', $boincteam->ping_time),
         ),
-        NULL, 'boinc:team-request-foundership-response') . '</p>';
+        null, 'boinc:team-request-foundership-response') . '</p>';
       // Automatically cancel the request
       db_set_active('boinc_rw');
       db_query("
@@ -1231,14 +1231,14 @@ 
     }
     else {
       $member = user_load(boincuser_lookup_uid($boincteam->ping_user));
-      $output .= '<h2 class="pane-title">' . bts('Respond to transfer request', array(), NULL, 'boinc:team-request-foundership-response')
+      $output .= '<h2 class="pane-title">' . bts('Respond to transfer request', array(), null, 'boinc:team-request-foundership-response')
         . '</h2>';
       $output .= '<p>' . bts('Team member @name has requested team foundership.'
         . ' This may be because you left the team or have not had contact with'
         . ' the team for a long time.', array(
           '@name' => $member->boincuser_name,
         )
-      , array(), NULL, 'boinc:team-request-foundership-response') . '</p>';
+      , array(), null, 'boinc:team-request-foundership-response') . '</p>';
       $output .= '<p>' . bts("If you don't decline the request by @date, @name"
         . ' will have the option of assuming team foundership. (note: To'
         . ' accept the request, assign foundership to @name using the form'
@@ -1247,10 +1247,10 @@ 
           '@name' => $member->boincuser_name,
           '@date' => date('j M Y', boincteam_foundership_transfer_ok_time($boincteam)),
         ),
-        NULL, 'boinc:team-request-foundership-response') . '</p>';
+        null, 'boinc:team-request-foundership-response') . '</p>';
       $output .= '<ul class="tab-list">';
       $output .= '  <li class="first last tab">' . 
-        l(bts('Deny request', array(), NULL, 'boinc:team-request-foundership-response'), "community/teams/{$team_id}/deny-foundership-request") . '</li>';
+        l(bts('Deny request', array(), null, 'boinc:team-request-foundership-response'), "community/teams/{$team_id}/deny-foundership-request") . '</li>';
       $output .= '</ul>';
     }
   }
@@ -1260,7 +1260,7 @@ 
 function boincteam_search_panel() {
   $output = '';
   if (module_exists('global_search_teams_solr')) {
-    $output .= '<h2 class="pane-title">' . bts('Search teams', array(), NULL, 'boinc:search-team') . '</h2>';
+    $output .= '<h2 class="pane-title">' . bts('Search teams', array(), null, 'boinc:search-team') . '</h2>';
     //$output .= '<p>' . bts('Render a search form here.', array(), NULL, 'boinc:search-team') . '</p>';
     $output .= '<p>' . boincteam_search_view() . '</p>';
   }
@@ -1280,18 +1280,18 @@ 
 function boincteam_topic_overview_panel() {
   $site_name =  variable_get('site_name', 'Drupal-BOINC');
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Teams', array(), NULL, 'boinc:team-general-info') . '</h2>';
+  $output .= '<h2 class="pane-title">' . bts('Teams', array(), null, 'boinc:team-general-info') . '</h2>';
   $output .= '<div class="">';
   $output .= '<p>' . bts('@project participants may form teams. You may belong'
     . ' to only one team. You can join or quit a team at any time. To join a'
     . ' team, visit its team page and click "Join this team". Each team has a'
-    . ' founder who may:', array('@project' => $site_name), NULL, 'boinc:team-general-info') . '</p>';
+    . ' founder who may:', array('@project' => $site_name), null, 'boinc:team-general-info') . '</p>';
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Private Message all team members', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts("edit the team's name and description", array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts('add or remove team admins', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts('remove members from the team', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts('disband a team if it has no members', array(), NULL, 'boinc:team-general-info') . '</li>';
+  $output .= '  <li>' . bts('Private Message all team members', array(), null, 'boinc:team-general-info') . '</li>';
+  $output .= '  <li>' . bts("edit the team's name and description", array(), null, 'boinc:team-general-info') . '</li>';
+  $output .= '  <li>' . bts('add or remove team admins', array(), null, 'boinc:team-general-info') . '</li>';
+  $output .= '  <li>' . bts('remove members from the team', array(), null, 'boinc:team-general-info') . '</li>';
+  $output .= '  <li>' . bts('disband a team if it has no members', array(), null, 'boinc:team-general-info') . '</li>';
   $output .= '</ul>';
   $output .= '</div>';
   return $output;
@@ -1326,7 +1326,7 @@ 
   if ($team->type != "team") {
     return;
   }
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id), TRUE);
+  $boincteam = boincteam_load(boincteam_lookup_id($team_id), true);
   $founder = user_load(get_drupal_id($boincteam->userid));
   $new_members = array();
   if ($boincteam->new_members) {
@@ -1340,30 +1340,30 @@ 
   $output .= '<div>';
   $output .= '<div class="left-column">';
   $output .= '<ul class="stats">';
-  $output .= '  <li>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': ' . number_format($boincteam->total_credit, 0) . '</li>';
-  $output .= '  <li>' . bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC') . ': ' . number_format($boincteam->expavg_credit, 2) . '</li>';
-  $output .= '  <li>' . bts('Country', array(), NULL, 'boinc:country-of-origin') . ': ' . $boincteam->country . '</li>';
-  $output .= '  <li>' . bts('Type', array(), NULL, 'boinc:view-team-info') . ': ' . boincteam_get_type($team_id) . '</li>';
+  $output .= '  <li>' . bts('Total credit', array(), null, 'boinc:user-or-team-total-credits') . ': ' . number_format($boincteam->total_credit, 0) . '</li>';
+  $output .= '  <li>' . bts('Recent average credit', array(), null, 'boinc:user-or-team-RAC') . ': ' . number_format($boincteam->expavg_credit, 2) . '</li>';
+  $output .= '  <li>' . bts('Country', array(), null, 'boinc:country-of-origin') . ': ' . $boincteam->country . '</li>';
+  $output .= '  <li>' . bts('Type', array(), null, 'boinc:view-team-info') . ': ' . boincteam_get_type($team_id) . '</li>';
   $output .= '</ul>';
   $output .= '</div>';
   $output .= '<div class="right-column">';
   $output .= '<ul class="stats">';
-  $output .= '  <li>' . bts('Founder', array(), NULL, 'boinc:view-team-info') . ': ' . l($founder->boincuser_name, "account/{$founder->uid}") . '</li>';
-  $output .= '  <li>' . bts('New members in last day', array(), NULL, 'boinc:view-team-info') . ': ' . implode('&middot;', $new_members) . '</li>';
-  $output .= '  <li>' . bts('Total members', array(), NULL, 'boinc:view-team-info') . ': ' . l($boincteam->nusers, "community/teams/{$team_id}/members") . '</li>';
-  $output .= '  <li>' . bts('Active members', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_active . '</li>';
-  $output .= '  <li>' . bts('Members with credit', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_worked . '</li>';
+  $output .= '  <li>' . bts('Founder', array(), null, 'boinc:view-team-info') . ': ' . l($founder->boincuser_name, "account/{$founder->uid}") . '</li>';
+  $output .= '  <li>' . bts('New members in last day', array(), null, 'boinc:view-team-info') . ': ' . implode('&middot;', $new_members) . '</li>';
+  $output .= '  <li>' . bts('Total members', array(), null, 'boinc:view-team-info') . ': ' . l($boincteam->nusers, "community/teams/{$team_id}/members") . '</li>';
+  $output .= '  <li>' . bts('Active members', array(), null, 'boinc:view-team-info') . ': ' . $boincteam->nusers_active . '</li>';
+  $output .= '  <li>' . bts('Members with credit', array(), null, 'boinc:view-team-info') . ': ' . $boincteam->nusers_worked . '</li>';
   $output .= '</ul>';
   $output .= '</div>';
   $output .= '</div>';
   $output .= '<div class="clearfix"></div>';
   if ($boincteam->url) {
     $output .= '<div class="stats">';
-    $output .= bts('Website', array(), NULL, 'boinc:website-of-user-or-team') . ': ' . l("http://{$boincteam->url}", "http://{$boincteam->url}");
+    $output .= bts('Website', array(), null, 'boinc:website-of-user-or-team') . ': ' . l("http://{$boincteam->url}", "http://{$boincteam->url}");
     $output .= '</div>';
   }
   if ($team->body) {
-    $output .= '<h3>' . bts('Description', array(), NULL, 'boinc:team-description') . '</h3>';
+    $output .= '<h3>' . bts('Description', array(), null, 'boinc:team-description') . '</h3>';
     $output .= check_markup($team->body, $team->format);
     $output .= '</div>';
   }

Indentation +572 added lines, -572 removed lines

@@ -26,82 +26,82 @@ 
  * Implementation of hook_menu()
  */
 function boincteam_menu() {
-  $items = array();
-  $items['community/teams/%/assume-foundership'] = array(
+    $items = array();
+    $items['community/teams/%/assume-foundership'] = array(
     'page callback' => 'boincteam_assume_foundership',
     'page arguments' => array(2),
     'access callback' => 'boincteam_is_member',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/join'] = array(
+    );
+    $items['community/teams/%/join'] = array(
     'page callback' => 'boincteam_join',
     'page arguments' => array(2),
     'access arguments' => array('join boincteam'),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/leave'] = array(
+    );
+    $items['community/teams/%/leave'] = array(
     'page callback' => 'boincteam_leave',
     'page arguments' => array(2),
     'access arguments' => array('join boincteam'),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/delete'] = array(
+    );
+    $items['community/teams/%/delete'] = array(
     'page callback' => 'boincteam_delete',
     'page arguments' => array(2),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/deny-foundership-request'] = array(
+    );
+    $items['community/teams/%/deny-foundership-request'] = array(
     'page callback' => 'boincteam_deny_foundership_request',
     'page arguments' => array(2),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/edit/admins/remove/%'] = array(
+    );
+    $items['community/teams/%/edit/admins/remove/%'] = array(
     'page callback' => 'boincteam_remove_admin',
     'page arguments' => array(2,6),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/edit/founder/set/%'] = array(
+    );
+    $items['community/teams/%/edit/founder/set/%'] = array(
     'page callback' => 'boincteam_set_founder',
     'page arguments' => array(2,6),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/edit/members/remove/%'] = array(
+    );
+    $items['community/teams/%/edit/members/remove/%'] = array(
     'page callback' => 'boincteam_remove_member',
     'page arguments' => array(2,6),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/history/xml'] = array(
+    );
+    $items['community/teams/%/history/xml'] = array(
     'page callback' => 'boincteam_history_xml',
     'page arguments' => array(2),
     'access callback' => 'boincteam_is_admin',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/request-foundership'] = array(
+    );
+    $items['community/teams/%/request-foundership'] = array(
     'page callback' => 'boincteam_request_foundership',
     'page arguments' => array(2),
     'access callback' => 'boincteam_is_member',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/user-name-autocomplete'] = array(
+    );
+    $items['community/teams/%/user-name-autocomplete'] = array(
     'page callback' => '_boincuser_user_name_autocomplete',
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK,
-  );
-  $items['community/teams/%/message-all-members'] = array(
+    );
+    $items['community/teams/%/message-all-members'] = array(
     'title' => bts('Send Message to Team', array(), NULL, 'boinc:team-manage'),
     'description' => bts('Send Message to Team', array(), NULL, 'boinc:team-manage'),
     'page callback' => 'drupal_get_form',
@@ -109,8 +109,8 @@ 
     'access callback' => 'boincteam_is_admin',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/utility-team-delete'] = array(
+    );
+    $items['admin/boinc/utility-team-delete'] = array(
     'title' => 'Utility: Delete SPAM Teams',
     'description' => 'Utililities to help delete BOINC teams created by SPAMMERs.',
     'page callback' => 'drupal_get_form',
@@ -118,9 +118,9 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincteam.admin.inc',
-  );
+    );
    
-  return $items;
+    return $items;
 }
 
 /**
@@ -137,41 +137,41 @@ 
 
   See https://www.drupal.org/node/945102
 */
-  return array(
+    return array(
     'boincteam_utility_team_table' => array(
-      'arguments' => array('form' => NULL),
-      'file' => 'boincteam.admin.inc',
+        'arguments' => array('form' => NULL),
+        'file' => 'boincteam.admin.inc',
     ),
-  );
+    );
 }
 
 /**
 * Implementation of hook_views_api().
 */
 function boincteam_views_api() {
-  return array(
+    return array(
     'api' => 2.0,
     'path' => drupal_get_path('module', 'boincteam')
-  );
+    );
 }
 
 /**
  * Implementation of hook_perm()
  */
 function boincteam_perm() {
-  return array('join boincteam', 'create boincteam', 'manage boincteam');
+    return array('join boincteam', 'create boincteam', 'manage boincteam');
 }
 
 /**
  * Implementation of hook_cron()
  */
 function boincteam_cron() {
-  // Sync teams from BOINC DB every day to catch BOINC-wide team updates
-  $last_sync = variable_get('boincteam_last_sync', 0);
-  if ($last_sync < time() - 24*60*60) {
+    // Sync teams from BOINC DB every day to catch BOINC-wide team updates
+    $last_sync = variable_get('boincteam_last_sync', 0);
+    if ($last_sync < time() - 24*60*60) {
     boincteam_sync();
     variable_set('boincteam_last_sync', time());
-  }
+    }
 }
 
 /**
@@ -185,41 +185,41 @@ 
 * Implementation of hook_views_pre_execute().
 */
 function boincteam_views_pre_execute(&$view) {
-  /* Specific boinc_teams sub-views use the boinc readonly replica
+    /* Specific boinc_teams sub-views use the boinc readonly replica
    * DB. These sub-views defined below by their title. If additional
    * sub-views need to be added, add their title to the list of cases
    * below. If a sub-view needs to be reverted to use the master DB,
    * then remove it from the list of cases.
    */
-  if ($view->name == 'boinc_teams') {
+    if ($view->name == 'boinc_teams') {
     switch ($view->display[$view->current_display]->display_title) {
     case 'Top teams overview pane':
     case 'Top teams pane':
     case 'Page':
       $view->base_database = 'boinc_ro';
     }
-  }
+    }
 }
 
 /**
  * Implementation of hook_cron_queue_info()
  */
 function boincteam_cron_queue_info() {
-  $queues = array();
-  $queues['queue_teamdelete'] = array(
+    $queues = array();
+    $queues['queue_teamdelete'] = array(
     'worker callback' => 'boincteam_delete',
     'time' => 60,
-  );
+    );
 }
 
 /**
  * Implementation of hook_mail_alter()
  */
 function boincteam_mail_alter(&$message) {
-  if (isset($message['params']['boincteam_headers'])) {
+    if (isset($message['params']['boincteam_headers'])) {
     $message['headers']['Bcc'] = $message['params']['boincteam_headers']['Bcc'];
     $message['to'] = '';
-  }
+    }
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -231,49 +231,49 @@ 
  * assume the role of founder
  */
 function boincteam_assume_foundership($team_id) {
-  global $user;
-  $account = user_load($user->uid);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  $boincuser_id = $account->boincuser_id;
+    global $user;
+    $account = user_load($user->uid);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    $boincuser_id = $account->boincuser_id;
   
-  if (boincteam_foundership_transfer_ok($boincteam)) {
+    if (boincteam_foundership_transfer_ok($boincteam)) {
     if ($boincuser_id == $boincteam->ping_user) {
-      db_set_active('boinc_rw');
-      db_query("
+        db_set_active('boinc_rw');
+        db_query("
         UPDATE {team}
         SET userid = '%d', ping_user = '0', ping_time = '0'
         WHERE id = '%d'",
         $boincuser_id, $boincteam_id
-      );
-      db_set_active('default');
-      drupal_set_message(t('You are now the founder of @team', array(
+        );
+        db_set_active('default');
+        drupal_set_message(t('You are now the founder of @team', array(
         '@team' => $team->title
-      )));
-      watchdog('boincteam', 'User @user assumed foundership of team @nid',
+        )));
+        watchdog('boincteam', 'User @user assumed foundership of team @nid',
         array(
-          '@current_user' => $account->uid,
-          '@nid' => $team_id
+            '@current_user' => $account->uid,
+            '@nid' => $team_id
         ), WATCHDOG_NOTICE
-      );
+        );
     }
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('You are not allowed to assume foundership of this
       team.'
     ));
-  }
-  drupal_goto("community/teams/{$team_id}");
+    }
+    drupal_goto("community/teams/{$team_id}");
 }
 
 /**
  * Delete the team, if empty
  */
 function boincteam_delete($team_id) {
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id), TRUE);
-  if ($boincteam->nusers == 1) {
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id), TRUE);
+    if ($boincteam->nusers == 1) {
     require_boinc('team');
     $boincuser = boincuser_load();
     user_quit_team($boincuser);
@@ -282,35 +282,35 @@ 
     $team->uid = 0;
     node_save($team);
     drupal_set_message(t('@team has been removed.',
-      array('@team' => $boincteam->name)));
+        array('@team' => $boincteam->name)));
     drupal_goto('community/teams');
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('All members must be removed from @team before the
       team can be deleted.', array('@team' => $boincteam->name)), 'error');
     drupal_goto(strstr($_GET['q'], '/delete', TRUE));
-  }
+    }
 }
 
 /**
  * Deny a foundership transfer request
  */
 function boincteam_deny_foundership_request($team_id) {
-  $boincteam_id = boincteam_lookup_id($team_id);
-  // Remove the request from the BOINC database
-  db_set_active('boinc_rw');
-  db_query("
+    $boincteam_id = boincteam_lookup_id($team_id);
+    // Remove the request from the BOINC database
+    db_set_active('boinc_rw');
+    db_query("
     UPDATE {team}
     SET ping_user=0
     WHERE id = '%d'",
     $boincteam_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  drupal_set_message(t('The transfer request has been denied. No additional
+    drupal_set_message(t('The transfer request has been denied. No additional
     requests will be allowed until 90 days have passed since this request was
     made.'));
-  drupal_goto("community/teams/{$team_id}/edit/founder");
+    drupal_goto("community/teams/{$team_id}/edit/founder");
 }
   
 
@@ -318,62 +318,62 @@ 
  * Get the join date of a user
  */
 function boincteam_get_member_join_date($boincteam_id, $boincuser_id = NULL) {
-  if (!$boincuser_id) {
+    if (!$boincuser_id) {
     global $user;
     $account = user_load($user->uid);
     $boincuser_id = $account->boincuser_id;
-  }
-  db_set_active('boinc_rw');
-  $timestamp = db_result(db_query("
+    }
+    db_set_active('boinc_rw');
+    $timestamp = db_result(db_query("
     SELECT timestamp FROM {team_delta} WHERE
     userid = %d AND teamid = %d AND joining = 1
     ORDER BY timestamp DESC LIMIT 1",
     $boincuser_id, $boincteam_id
-  ));
-  db_set_active('default');
-  return $timestamp;
+    ));
+    db_set_active('default');
+    return $timestamp;
 }
 
 /**
  * Get the team type for display
  */
 function boincteam_get_type($team_id) {
-  //$vid = boincteam_get_vocabulary_by_name('Teams'); $team->vid = $vid;
-  $team = node_load($team_id);
-  $terms = taxonomy_node_get_terms($team);
-  if ($terms) {
+    //$vid = boincteam_get_vocabulary_by_name('Teams'); $team->vid = $vid;
+    $team = node_load($team_id);
+    $terms = taxonomy_node_get_terms($team);
+    if ($terms) {
     $term = reset($terms);
     return $term->name;
-  } else {
+    } else {
     return null;
-  }
+    }
 }
 
 /**
  * Access a vocabulary of terms by name
  */ 
 function boincteam_get_vocabulary_by_name($name) {
-  $vocabs = taxonomy_get_vocabularies('team');
-  foreach ($vocabs as $vocab) {
+    $vocabs = taxonomy_get_vocabularies('team');
+    foreach ($vocabs as $vocab) {
     if ($vocab->name == $name) return $vocab->vid;
-  }
-  return null;
+    }
+    return null;
 }
 
 /**
  * Output the XML of the team history
  */
 function boincteam_history_xml($team_id) {
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $team_history = array(
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $team_history = array(
     'actions' => array(
-      'action' => array(),
+        'action' => array(),
     ),
-  );
+    );
   
-  db_set_active('boinc_rw');
-  $result = db_query("
+    db_set_active('boinc_rw');
+    $result = db_query("
     SELECT 
       td.userid AS id,
       u.name,
@@ -385,40 +385,40 @@ 
     WHERE td.teamid = %d
     ORDER BY timestamp ASC",
     $boincteam_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  while ($record = db_fetch_array($result)) {
+    while ($record = db_fetch_array($result)) {
     $team_history['actions']['action'][] = $record;
-  }
+    }
   
-  header('Content-type: text/xml');
-  echo xml_to_text(array_to_xml($team_history));
+    header('Content-type: text/xml');
+    echo xml_to_text(array_to_xml($team_history));
 }
 
 /**
  * Convert a BOINC team ID to a Drupal team ID
  */
 function boincteam_lookup_nid($boinc_id) {
-  $drupal_id = db_result(db_query("SELECT nid FROM {boincteam} WHERE team_id='%d'", $boinc_id));
-  return $drupal_id;
+    $drupal_id = db_result(db_query("SELECT nid FROM {boincteam} WHERE team_id='%d'", $boinc_id));
+    return $drupal_id;
 }
 
 /**
  * Convert a Drupal team ID to a BOINC team ID
  */
 function boincteam_lookup_id($nid) {
-  $boinc_id = db_result(db_query("SELECT team_id FROM {boincteam} WHERE nid = '%d'", $nid));
-  return $boinc_id;
+    $boinc_id = db_result(db_query("SELECT team_id FROM {boincteam} WHERE nid = '%d'", $nid));
+    return $boinc_id;
 }
 
 /**
  * Get a BOINC team object
  */
 function boincteam_load($boincteam_id, $full_object = FALSE) {
-  require_boinc(array('team'));
-  $team = BoincTeam::lookup_id($boincteam_id);
-  if ($team AND $full_object) {
+    require_boinc(array('team'));
+    $team = BoincTeam::lookup_id($boincteam_id);
+    if ($team AND $full_object) {
     $team->nusers = BoincUser::count("teamid={$team->id}");
     $team->nusers_worked = BoincUser::count("teamid={$team->id} and total_credit>0");
     $team->nusers_active = BoincUser::count("teamid={$team->id} and expavg_credit>0.1");
@@ -426,314 +426,314 @@ 
     $team->new_members = new_member_list($boincteam_id);
     $team->admins = admin_list($boincteam_id);
     $team->founder = BoincUser::lookup_id($team->userid);
-  }
-  return $team;
+    }
+    return $team;
 }
 
 /**
  * Check if a user is the team founder
  */
 function boincteam_is_founder($nid, $uid = NULL) {
-  if (!$uid) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  if (!boincteam_is_member($nid, $uid)) {
+    }
+    if (!boincteam_is_member($nid, $uid)) {
     return FALSE;
-  }
-  $team_id = boincteam_lookup_id($nid);
-  require_boinc('team');
-  return is_team_founder(boincuser_load($uid, TRUE), boincteam_load($team_id));
+    }
+    $team_id = boincteam_lookup_id($nid);
+    require_boinc('team');
+    return is_team_founder(boincuser_load($uid, TRUE), boincteam_load($team_id));
 }
 
 /**
  * Check if a user is a team admin
  */
 function boincteam_is_admin($nid, $uid = NULL) {
-  if (!$uid) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  if (!boincteam_is_member($nid, $uid)) {
+    }
+    if (!boincteam_is_member($nid, $uid)) {
     return FALSE;
-  }
-  $team_id = boincteam_lookup_id($nid);
-  require_boinc('team');
-  return is_team_admin(boincuser_load($uid, TRUE), boincteam_load($team_id));
+    }
+    $team_id = boincteam_lookup_id($nid);
+    require_boinc('team');
+    return is_team_admin(boincuser_load($uid, TRUE), boincteam_load($team_id));
 }
 
 /**
  * Check if a user is a team member
  */
 function boincteam_is_member($nid, $uid = NULL) {
-  if (!$uid) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  $account = user_load($uid);
-  return ($account->team == $nid);
+    }
+    $account = user_load($uid);
+    return ($account->team == $nid);
 }
 
 /**
  * Display any persistent team messages
  */
 function boincteam_show_messages() {
-  global $user;
-  $uid = $user->uid;
-  $account = user_load($uid);
-  if ($account->team) {
+    global $user;
+    $uid = $user->uid;
+    $account = user_load($uid);
+    if ($account->team) {
     if (boincteam_is_founder($account->team, $account->uid)) {
-      // Set a notice of any pending foundership requests
-      $boincteam_id = boincteam_lookup_id($account->team);
-      $boincteam = boincteam_load($boincteam_id);
-      if ($boincteam->ping_user > 0) {
+        // Set a notice of any pending foundership requests
+        $boincteam_id = boincteam_lookup_id($account->team);
+        $boincteam = boincteam_load($boincteam_id);
+        if ($boincteam->ping_user > 0) {
         $foundership_url = "community/teams/{$account->team}/edit/founder";
         if (substr($_GET['q'], 0, strlen($foundership_url)) != $foundership_url) {
-          drupal_set_message(
+            drupal_set_message(
             bts(
-              'A foundership transfer request has been made for your team. Please !respond.',
-              array('!respond' => l(bts('respond to the request', array(), NULL, 'boinc:team-founder-change'), $foundership_url)),
-              NULL, 'boinc:team-founder-change'),
+                'A foundership transfer request has been made for your team. Please !respond.',
+                array('!respond' => l(bts('respond to the request', array(), NULL, 'boinc:team-founder-change'), $foundership_url)),
+                NULL, 'boinc:team-founder-change'),
             'warning', FALSE
-          );
+            );
+        }
         }
-      }
     }
-  }
+    }
 }
 
 /**
  * Add a user to a team
  */
 function boincteam_join($team_id) {
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
   
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  if ($boincteam->joinable AND $account->team != $team_id) {
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    if ($boincteam->joinable AND $account->team != $team_id) {
     require_boinc('team');
     $boincuser = boincuser_load();
     if (user_join_team($boincteam, $boincuser)) {
-      drupal_set_message(t('You are now a member of @team!',
+        drupal_set_message(t('You are now a member of @team!',
         array('@team' => $boincteam->name)));
-      watchdog('boincteam', 'added user @uid to team @nid',
+        watchdog('boincteam', 'added user @uid to team @nid',
         array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
     }
     else {
-      // @todo - consider another rule/error event here
-      drupal_set_message(t('There was a problem joining @team, please try again
+        // @todo - consider another rule/error event here
+        drupal_set_message(t('There was a problem joining @team, please try again
         later', array('@team' => $boincteam->name)));
-      watchdog('boincteam', 'error adding user @uid to team @nid',
+        watchdog('boincteam', 'error adding user @uid to team @nid',
         array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_ERROR);
     }
-  }
-  drupal_goto("community/teams/{$team_id}");
+    }
+    drupal_goto("community/teams/{$team_id}");
 }
 
 /**
  * Leave a team
  */
 function boincteam_leave($team_id) {
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
   
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  if ($account->team == $team_id) {
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    if ($account->team == $team_id) {
     require_boinc('team');
     $boincuser = boincuser_load();
     user_quit_team($boincuser);
     drupal_set_message(t('You are no longer a member of @team.',
-      array('@team' => $boincteam->name)));
+        array('@team' => $boincteam->name)));
     watchdog('boincteam', 'removed user @uid from team @nid',
-      array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
-  }
-  else {
-      drupal_set_message(t('You are not a member of @team, so you cannot revoke
+        array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
+    }
+    else {
+        drupal_set_message(t('You are not a member of @team, so you cannot revoke
         your membership to it.', array('@team' => $boincteam->name)));
-  }
-  drupal_goto("community/teams/{$team_id}");
+    }
+    drupal_goto("community/teams/{$team_id}");
 }
 
 /**
  * Remove team admin status from a user
  */
 function boincteam_remove_admin($team_id, $user_id) {
-  global $user;
-  $account = user_load($user_id);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincuser_id = $account->boincuser_id;
+    global $user;
+    $account = user_load($user_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincuser_id = $account->boincuser_id;
   
-  if (boincteam_is_admin($team_id, $account->uid)) {
+    if (boincteam_is_admin($team_id, $account->uid)) {
     // Update the team in the BOINC db
     db_set_active('boinc_rw');
     db_query("
       DELETE FROM {team_admin} WHERE
         teamid = '%d' AND userid = '%d'",
-      $boincteam_id,
-      $boincuser_id
+        $boincteam_id,
+        $boincuser_id
     );
     db_set_active('default');
     drupal_set_message(t('@user is no longer an admin of @team.',
-      array(
+        array(
         '@user' => $account->boincuser_name,
         '@team' => $team->title
-      )
+        )
     ));
     watchdog('boincteam', 'User @current_user removed admin status for user
       @uid from team @nid',
-      array(
+        array(
         '@current_user' => $user->uid,
         '@uid' => $account->uid, 
         '@nid' => $team_id
-      ), WATCHDOG_NOTICE);
-  }
-  drupal_goto("community/teams/{$team_id}/edit/admins");
+        ), WATCHDOG_NOTICE);
+    }
+    drupal_goto("community/teams/{$team_id}/edit/admins");
 }
 
 /**
  * Remove a user from a team
  */
 function boincteam_remove_member($team_id, $user_id) {
-  global $user;
-  $account = user_load($user_id);
+    global $user;
+    $account = user_load($user_id);
   
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  if ($account->team == $team_id) {
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    if ($account->team == $team_id) {
     require_boinc('team');
     $boincuser = boincuser_load($user_id, TRUE);
     user_quit_team($boincuser);
     drupal_set_message(t('@user has been removed from @team.',
-      array(
+        array(
         '@user' => $account->boincuser_name,
         '@team' => $boincteam->name
-      )
+        )
     ));
     watchdog('boincteam', 'User @current_user removed user @uid from team @nid',
-      array(
+        array(
         '@current_user' => $user->uid,
         '@uid' => $account->uid, 
         '@nid' => $team_id
-      ), WATCHDOG_NOTICE);
-  }
-  else {
-      drupal_set_message(t('@user is not a member of @team, so you cannot
+        ), WATCHDOG_NOTICE);
+    }
+    else {
+        drupal_set_message(t('@user is not a member of @team, so you cannot
         revoke the membership.', array(
-          '@user' => $account->boincuser_name,
-          '@team' => $boincteam->name
+            '@user' => $account->boincuser_name,
+            '@team' => $boincteam->name
         )
-      ));
-  }
-  drupal_goto("community/teams/{$team_id}/edit/members");
+        ));
+    }
+    drupal_goto("community/teams/{$team_id}/edit/members");
 }
 
 /**
  * Request a foundership transfer
  */
 function boincteam_request_foundership($team_id) {
-  global $user;
-  $account = user_load($user->uid);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  $boincuser_id = $account->boincuser_id;
+    global $user;
+    $account = user_load($user->uid);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    $boincuser_id = $account->boincuser_id;
   
-  if (boincteam_is_founder($team_id, $account->uid)) {
+    if (boincteam_is_founder($team_id, $account->uid)) {
     // Shouldn't even be here...
     drupal_set_message(t('@user is already the team founder.',
-      array(
+        array(
         '@user' => $account->boincuser_name
-      )
+        )
     ), 'warning');
-  }
-  elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
+    }
+    elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
     // It hasn't been long enough since the last transfer request
     drupal_set_message(t('A foundership change was requested during the last 90
       days, so new requests are not allowed. Please try again later.'
     ), 'warning');
-  }
-  elseif (boincteam_is_member($team_id, $account->uid)) {
+    }
+    elseif (boincteam_is_member($team_id, $account->uid)) {
     // Log the transfer request
     db_set_active('boinc_rw');
     db_query("
       UPDATE {team}
       SET ping_user = '%d', ping_time='%d'
       WHERE id = '%d'",
-      $boincuser_id, time(), $boincteam_id
+        $boincuser_id, time(), $boincteam_id
     );
     db_set_active('default');
     drupal_set_message(t('You have requested foundership of @team. The current
       founder has 60 days to respond to this request.',
-      array(
+        array(
         '@team' => $team->title
-      )
+        )
     ));
     watchdog('boincteam', 'User @user requested foundership of team @nid',
-      array(
+        array(
         '@current_user' => $account->uid,
         '@nid' => $team_id
-      ), WATCHDOG_NOTICE);
-  }
-  drupal_goto("community/teams/{$team_id}");
+        ), WATCHDOG_NOTICE);
+    }
+    drupal_goto("community/teams/{$team_id}");
 }
 
 /**
  * Transfer foundership to another team member
  */
 function boincteam_set_founder($team_id, $user_id) {
-  global $user;
-  $account = user_load($user_id);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincuser_id = $account->boincuser_id;
+    global $user;
+    $account = user_load($user_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincuser_id = $account->boincuser_id;
   
-  if (boincteam_is_member($team_id, $account->uid)) {
+    if (boincteam_is_member($team_id, $account->uid)) {
     // Update the team in the BOINC db
     db_set_active('boinc_rw');
     db_query("
       UPDATE {team}
       SET userid = '%d', ping_user=0
       WHERE id = '%d'",
-      $boincuser_id, $boincteam_id
+        $boincuser_id, $boincteam_id
     );
     db_set_active('default');
     drupal_set_message(t('Foundership of @team has been transfered to @user.',
-      array(
+        array(
         '@user' => $account->boincuser_name,
         '@team' => $team->title
-      )
+        )
     ));
     watchdog('boincteam', 'User @current_user transferred foundership of team
       @nid to user @uid',
-      array(
+        array(
         '@current_user' => $user->uid,
         '@uid' => $account->uid, 
         '@nid' => $team_id
-      ), WATCHDOG_NOTICE);
-  }
-  drupal_goto("community/teams/{$team_id}");
+        ), WATCHDOG_NOTICE);
+    }
+    drupal_goto("community/teams/{$team_id}");
 }
 
 /**
  * See if a new foundership transfer request is allowed
  */
 function boincteam_new_foundership_transfer_request_ok($team_id) {
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  $now = time();
-  if ($boincteam->ping_user <= 0) {
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    $now = time();
+    if ($boincteam->ping_user <= 0) {
     if ($boincteam->ping_time < $now - 60 * (24*60*60)) {
-      return TRUE;
+        return TRUE;
     }
     return FALSE;
-  }
-  if ($boincteam->ping_time < $now - 90 * (24*60*60)) {
+    }
+    if ($boincteam->ping_time < $now - 90 * (24*60*60)) {
     return TRUE;
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /** 
@@ -755,18 +755,18 @@ 
  * Check if a user has an active foundership request with a team
  */
 function boincteam_user_requested_foundership($team_id, $user_id = NULL) {
-  if (!$user_id) {
+    if (!$user_id) {
     global $user;
     $user_id = $user->uid;
-  }
-  $account = user_load($user_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
+    }
+    $account = user_load($user_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
   
-  if ($boincteam->ping_user == $account->boincuser_id) {
+    if ($boincteam->ping_user == $account->boincuser_id) {
     // Be sure the request is still active
     return !boincteam_new_foundership_transfer_request_ok($team_id);
-  }
+    }
 }
 
 
@@ -778,125 +778,125 @@ 
  * General info about team admins
  */                                         
 function boincteam_about_admins_panel() {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('About team admins', array(), NULL, 'boinc:team-admins-panel') . '</h2>';
-  $output .= '<div>';
-  $output .= '<p>' . bts('Team admins can:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('Edit team information', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts("View the team's join / quit history", array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Moderate the team forum', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Remove members from the team', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Disband a team if it has no members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '<div>';
-  $output .= '<p>' . bts('Team admins cannot:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('Change the team founder', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Remove members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Add / Remove team admins', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '<p>' . bts('If a team admin quits the team, they cease to be a'
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('About team admins', array(), NULL, 'boinc:team-admins-panel') . '</h2>';
+    $output .= '<div>';
+    $output .= '<p>' . bts('Team admins can:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('Edit team information', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts("View the team's join / quit history", array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts('Moderate the team forum', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts('Remove members from the team', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts('Disband a team if it has no members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    $output .= '<div>';
+    $output .= '<p>' . bts('Team admins cannot:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('Change the team founder', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts('Remove members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts('Add / Remove team admins', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    $output .= '<p>' . bts('If a team admin quits the team, they cease to be a'
     . ' team admin. We recommend only selecting people you know and trust', array(), NULL, 'boinc:team-admins-panel')
     . '</p>';
-  return $output;
+    return $output;
 }
 
 /**
  * General info about changing the team founder
  */                                         
 function boincteam_about_founder_panel() {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Changing the team founder', array(), NULL, 'boinc:team-founder-panel')
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Changing the team founder', array(), NULL, 'boinc:team-founder-panel')
     . '</h2>';
-  $output .= '<div>';
-  $output .= '<p>' . bts('Notes about changes in foundership:', array(), NULL, 'boinc:team-founder-panel') . '</p>';
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('Any member of the team is eligible', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '  <li>' . bts('Current founder becomes a normal user', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '<div>';
-  $output .= '<p>' . bts('Foundership can be requested by team members:', array(), NULL, 'boinc:team-founder-panel')
+    $output .= '<div>';
+    $output .= '<p>' . bts('Notes about changes in foundership:', array(), NULL, 'boinc:team-founder-panel') . '</p>';
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('Any member of the team is eligible', array(), NULL, 'boinc:team-founder-panel') . '</li>';
+    $output .= '  <li>' . bts('Current founder becomes a normal user', array(), NULL, 'boinc:team-founder-panel') . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    $output .= '<div>';
+    $output .= '<p>' . bts('Foundership can be requested by team members:', array(), NULL, 'boinc:team-founder-panel')
     . '</p>';
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('One request is allowed at a time', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '  <li>' . bts('It must be 60 days since any previous request', array(), NULL, 'boinc:team-founder-panel')
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('One request is allowed at a time', array(), NULL, 'boinc:team-founder-panel') . '</li>';
+    $output .= '  <li>' . bts('It must be 60 days since any previous request', array(), NULL, 'boinc:team-founder-panel')
     . '</li>';
-  $output .= '  <li>' . bts('Any active request must be older than 90 days', array(), NULL, 'boinc:team-founder-panel')
+    $output .= '  <li>' . bts('Any active request must be older than 90 days', array(), NULL, 'boinc:team-founder-panel')
     . '</li>';
-  $output .= '  <li>' . bts('Current founder has 60 days to respond to a'
+    $output .= '  <li>' . bts('Current founder has 60 days to respond to a'
     . ' request', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  return $output;
+    $output .= '</ul>';
+    $output .= '</div>';
+    return $output;
 }
 
 /**
  * Link to create a new team
  */
 function boincteam_create_team_link_panel() {
-  global $user;
-  $account = user_load($user->uid);
-  $unrestricted_role = array_search('verified contributor', user_roles(true));
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create a new team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
-  $output .= '<p>' . bts('If you cannot find a team that is right for you, you'
+    global $user;
+    $account = user_load($user->uid);
+    $unrestricted_role = array_search('verified contributor', user_roles(true));
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Create a new team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
+    $output .= '<p>' . bts('If you cannot find a team that is right for you, you'
     . ' can create a team.', array(), NULL, 'boinc:create-team-panel') . '</p>';
-  $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">';
-  if (isset($account->roles[$unrestricted_role])) {
+    $output .= '<ul class="tab-list">';
+    $output .= '  <li class="first last tab">';
+    if (isset($account->roles[$unrestricted_role])) {
     $output .= l(bts('Create new team', array(), NULL, 'boinc:create-team-panel'), 'community/teams/add');
-  } elseif ($account->uid <= 0) {
+    } elseif ($account->uid <= 0) {
     $output .= l(
-      bts('Login to create a new team', array(), NULL, 'boinc:create-team-panel'),
-      'user/login',
-      array('query' => drupal_get_destination())
+        bts('Login to create a new team', array(), NULL, 'boinc:create-team-panel'),
+        'user/login',
+        array('query' => drupal_get_destination())
     );
-  } else {
+    } else {
     $min_credit_needed = variable_get('boinc_comment_min_credit', 0);
     $credit_needed = $min_credit_needed - $account->boincuser_total_credit;
     $output .= '[';
     if ($credit_needed == 1) {
-      $output .= bts('You must earn 1 more credit!', array(), NULL, 'boinc:create-team-panel');
+        $output .= bts('You must earn 1 more credit!', array(), NULL, 'boinc:create-team-panel');
     }
     else {
-      $output .= bts('You must earn @count more credits!',
+        $output .= bts('You must earn @count more credits!',
         array('@count' => $credit_needed),
-	NULL, 'boinc:create-team-panel'
-      );
+    NULL, 'boinc:create-team-panel'
+        );
     }
     $output .= ']';
-  }
-  $output .= '  </li>';
-  $output .= '</ul>';
-  return $output;
+    }
+    $output .= '  </li>';
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * Create team form
  */
 function boincteam_create_team_panel() {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create a team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
-  $output .= drupal_get_form('boincteam_create_form');
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Create a team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
+    $output .= drupal_get_form('boincteam_create_form');
   
-  return $output;
+    return $output;
 }
 
 /**
  * Link to user's team
  */
 function boincteam_dashboard_panel($uid = NULL) {
-  global $user;
-  if (!$uid) {
+    global $user;
+    if (!$uid) {
     $uid = $user->uid;
-  }
-  $output = '';
-  $account = user_load($uid);
-  if ($account->team) {
+    }
+    $output = '';
+    $account = user_load($uid);
+    if ($account->team) {
     $team = boincteam_load(boincteam_lookup_id($account->team));
     $output .= '<h2 class="pane-title">' . bts('Team', array(), NULL, 'boinc:team-dashboard') . '</h2>';
     $output .= '<div class="stats">';
@@ -915,254 +915,254 @@ 
     $output .= '  <label>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': </label>';
     $output .= '  <span>' . number_format($team->total_credit, 0) . '</span>';
     $output .= '</div>' . "\n";
-  }
-  else if ($user->uid == $account->uid) {
+    }
+    else if ($user->uid == $account->uid) {
     $output .= '<h2 class="pane-title">' . bts('Team (None)', array(), NULL, 'boinc:team-dashboard') . '</h2>';
     $output .= '<ul class="tab-list action-list">';
     $output .= '<li class="tab primary">';
     $output .= l(bts('Join a Team', array(), NULL, 'boinc:team-dashboard'), 'community/teams');
     $output .= '</li>';
     $output .= '</ul>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Edit team form
  */
 function boincteam_edit_team_panel($team_id) {
-  $team = node_load($team_id);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . $team->title . '</h2>';
-  $output .= drupal_get_form('boincteam_edit_form', $team_id);
+    $team = node_load($team_id);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . $team->title . '</h2>';
+    $output .= drupal_get_form('boincteam_edit_form', $team_id);
   
-  return $output;
+    return $output;
 }
 
 /**
  * Link to join a team
  */
 function boincteam_join_team_panel($team_id) {
-  $team = node_load($team_id);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Join team', array(), NULL, 'boinc:join-team-panel') . '</h2>';
-  $output .= '<p>' . bts('Click here to become a member of @this_team',
+    $team = node_load($team_id);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Join team', array(), NULL, 'boinc:join-team-panel') . '</h2>';
+    $output .= '<p>' . bts('Click here to become a member of @this_team',
     array('@this_team' =>$team->title), NULL, 'boinc:join-team-panel') . '</p>';
-  $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">' . 
+    $output .= '<ul class="tab-list">';
+    $output .= '  <li class="first last tab">' . 
     l(bts('Join this team', array(), NULL, 'boinc:join-team-panel'), "community/teams/{$team_id}/join") . '</li>';
-  $output .= '</ul>';
-  return $output;
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * Link to leave a team
  */
 function boincteam_leave_team_panel($team_id) {
-  $team = node_load($team_id);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Leave team', array(), NULL, 'boinc:leave-team-panel') . '</h2>';
-  $output .= '<p>' . bts('Click here to revoke your membership with'
+    $team = node_load($team_id);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Leave team', array(), NULL, 'boinc:leave-team-panel') . '</h2>';
+    $output .= '<p>' . bts('Click here to revoke your membership with'
     . ' @this_team', array('@this_team' =>$team->title), NULL, 'boinc:leave-team-panel') . '</p>';
-  $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">' . 
+    $output .= '<ul class="tab-list">';
+    $output .= '  <li class="first last tab">' . 
     l(bts('Leave this team', array(), NULL, 'boinc:leave-team-panel'), "community/teams/{$team_id}/leave") . '</li>';
-  $output .= '</ul>';
-  return $output;
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * General info about team admins
  */                                         
 function boincteam_manage_admins_panel_header($team_id) {
-  $output = '';
-  $output .= '<h4>' . bts('Add team admin', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
-  $output .= drupal_get_form('boincteam_add_admin_form', $team_id);
-  $output .= '<div class="clearfix"></div>';
-  $output .= '<h4>' . bts('Current team admins', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
+    $output = '';
+    $output .= '<h4>' . bts('Add team admin', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
+    $output .= drupal_get_form('boincteam_add_admin_form', $team_id);
+    $output .= '<div class="clearfix"></div>';
+    $output .= '<h4>' . bts('Current team admins', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
   
-  return $output;
+    return $output;
 }
 
 /**
  * Team management tools
  */
 function boincteam_management_panel($team_id) {
-  $is_founder = boincteam_is_founder($team_id);
-  $team = node_load($team_id);
+    $is_founder = boincteam_is_founder($team_id);
+    $team = node_load($team_id);
 
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Manage team', array(), NULL, 'boinc:team-manage') . '</h2>';
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Manage team', array(), NULL, 'boinc:team-manage') . '</h2>';
   
-  // PM all members
-  if (module_exists('privatemsg')) {
+    // PM all members
+    if (module_exists('privatemsg')) {
     $output .= '<div class="form-item">';
     $output .= '  <ul class="tab-list action-list">';
     $output .= '    <li class="first tab primary">' .
-      l('Send message to team', "community/teams/{$team_id}/message-all-members") . '</li>';
+        l('Send message to team', "community/teams/{$team_id}/message-all-members") . '</li>';
     $output .= '  </ul>';
     $output .= '  <div class="description">';
     $output .=   bts('Contact all team members using e-mail.', array(), NULL, 'boinc:team-manage');
     $output .= '  </div>';
     $output .= '</div>';
-  }
+    }
 
-  // Team forum
-  if (module_exists('boincteam_forum')) {
+    // Team forum
+    if (module_exists('boincteam_forum')) {
     if ($is_founder) {
-      // Determine whether to create a forum or edit the existing forum
-      // (multiple forums per team could be supported in the future)
-      $team_forum_link_path = 'add';
-      $team_forums = boincteam_forum_list();
-      if ($team_forums) {
+        // Determine whether to create a forum or edit the existing forum
+        // (multiple forums per team could be supported in the future)
+        $team_forum_link_path = 'add';
+        $team_forums = boincteam_forum_list();
+        if ($team_forums) {
         $team_forum = reset($team_forums);
         $team_forum_link_path = "{$team_forum->tfid}/edit";
-      }
-      $output .= '<div class="form-item">';
-      $output .= '  <ul class="tab-list action-list">';
-      $output .= '    <li class="first tab primary">' .   
+        }
+        $output .= '<div class="form-item">';
+        $output .= '  <ul class="tab-list action-list">';
+        $output .= '    <li class="first tab primary">' .   
         l(bts('Manage team message board', array(), NULL, 'boinc:team-manage'),
-          "community/teams/{$team_id}/forum/{$team_forum_link_path}"
+            "community/teams/{$team_id}/forum/{$team_forum_link_path}"
         );
-      $output .= '    </li>';
-      $output .= '  <div class="description">';
-      $output .=   bts('Create or manage message board', array(), NULL, 'boinc:team-manage');
-      $output .= '  </div>';
-      $output .= '</div>';
+        $output .= '    </li>';
+        $output .= '  <div class="description">';
+        $output .=   bts('Create or manage message board', array(), NULL, 'boinc:team-manage');
+        $output .= '  </div>';
+        $output .= '</div>';
+    }
     }
-  }
   
-  // Team history
-  $output .= '<div class="form-item">';
-  $output .= '  <label>' . bts('View change history', array(), NULL, 'boinc:team-manage') . '</label>';
-  $output .= '  <ul class="tab-list">';
-  $output .= '    <li class="first tab primary">' . 
+    // Team history
+    $output .= '<div class="form-item">';
+    $output .= '  <label>' . bts('View change history', array(), NULL, 'boinc:team-manage') . '</label>';
+    $output .= '  <ul class="tab-list">';
+    $output .= '    <li class="first tab primary">' . 
     l('HTML', "community/teams/{$team_id}/history") . '</li>';
-  $output .= '    <li class="last tab primary">' .
+    $output .= '    <li class="last tab primary">' .
     l('XML', "community/teams/{$team_id}/history/xml") . '</li>';
-  $output .= '  </ul>';
-  $output .= '  <div class="description">';
-  $output .=   bts('See member activity', array(), NULL, 'boinc:team-manage');
-  $output .= '  </div>';
-  $output .= '</div>';
+    $output .= '  </ul>';
+    $output .= '  <div class="description">';
+    $output .=   bts('See member activity', array(), NULL, 'boinc:team-manage');
+    $output .= '  </div>';
+    $output .= '</div>';
   
-  $output .= '<div class="form-item">';
-  $output .= '  <ul class="tab-list action-list">';
+    $output .= '<div class="form-item">';
+    $output .= '  <ul class="tab-list action-list">';
   
-  // Edit team information
-  $output .= '    <li class="first tab primary">' . 
+    // Edit team information
+    $output .= '    <li class="first tab primary">' . 
     l(bts('Edit team info', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/info") . '</li>';
     
-  // Member list
-  $output .= '    <li class="tab primary">' . 
+    // Member list
+    $output .= '    <li class="tab primary">' . 
     l(bts('View member list', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/members") . '</li>';
 
-  // Remove members
-  $output .= '    <li class="tab primary">' . 
+    // Remove members
+    $output .= '    <li class="tab primary">' . 
     l(bts('Remove members', array(), NULL, 'boinc:team-admins-panel'), "community/teams/{$team_id}/edit/members") . '</li>';
   
-  if ($is_founder) {
+    if ($is_founder) {
     
     // Change founder
     $output .= '    <li class="tab primary">' . 
-      l(bts('Change founder', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/founder") . '</li>';
+        l(bts('Change founder', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/founder") . '</li>';
       
-      // Manage admins
+        // Manage admins
     $output .= '    <li class="tab primary">' . 
-      l(bts('Manage team admins', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/admins") . '</li>';
+        l(bts('Manage team admins', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/admins") . '</li>';
     
     // Delete the team
     $output .= '    <li class="last tab primary">' . 
-      l(bts('Remove team', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/delete") . '</li>';
-  }
+        l(bts('Remove team', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/delete") . '</li>';
+    }
   
-  $output .= '  </ul>';
-  $output .= '</div>';
+    $output .= '  </ul>';
+    $output .= '</div>';
   
-  return $output;
+    return $output;
 }
 
 /**
  * Link to user's team
  */
 function boincteam_member_link_panel() {
-  global $user;
-  $account = user_load($user->uid);
-  $team = node_load($account->team);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('My team', array(), NULL, 'boinc:account-team-panel') . '</h2>';
-  $output .= '<p>' . bts('You are a member of @team.', 
+    global $user;
+    $account = user_load($user->uid);
+    $team = node_load($account->team);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('My team', array(), NULL, 'boinc:account-team-panel') . '</h2>';
+    $output .= '<p>' . bts('You are a member of @team.', 
     array('@team' => $team->title), NULL, 'boinc:account-team-panel') . '</p>';
-  $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">' . 
+    $output .= '<ul class="tab-list">';
+    $output .= '  <li class="first last tab">' . 
     l(bts('View my team', array(), NULL, 'boinc:account-team-panel'), "community/teams/{$account->team}") . '</li>';
-  $output .= '</ul>';
-  return $output;
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * Link to request foundership transfer of a team
  */
 function boincteam_request_foundership_panel($team_id) {
-  global $user;
-  $account = user_load($user->uid);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  $boincuser_id = $account->boincuser_id;
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Request foundership', array(), NULL, 'boinc:team-request-foundership') . '</h2>';
+    global $user;
+    $account = user_load($user->uid);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    $boincuser_id = $account->boincuser_id;
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Request foundership', array(), NULL, 'boinc:team-request-foundership') . '</h2>';
   
-  if (boincteam_user_requested_foundership($team_id)) {
+    if (boincteam_user_requested_foundership($team_id)) {
     $deadline = boincteam_foundership_transfer_ok_time($boincteam);
     $days_to_deadline = ceil(($deadline - time()) / (24*60*60));
     $request_age = 60 - $days_to_deadline;
     $days_to_respond = 30 + $days_to_deadline;
     if (time() > $deadline) {
-      $output .= '<p>';
-      if ($request_age == 1) {
+        $output .= '<p>';
+        if ($request_age == 1) {
         $output .= bts('1 day has elapsed since your request and'
-          . ' the founder has not responded.', array(), NULL, 'boinc:team-request-foundership');
-      }
-      else {
+            . ' the founder has not responded.', array(), NULL, 'boinc:team-request-foundership');
+        }
+        else {
         $output .= bts('@count days have elapsed since your request and'
-          . ' the founder has not responded.',
-          array('@count' => $request_age),
-          NULL, 'boinc:team-request-foundership');
-      }
-      $output .= ' ';
-      if ($days_to_respond == 1) {
+            . ' the founder has not responded.',
+            array('@count' => $request_age),
+            NULL, 'boinc:team-request-foundership');
+        }
+        $output .= ' ';
+        if ($days_to_respond == 1) {
         $output .= bts('You now have 1 day to assume foundership before'
-          . ' another team member may submit a request.', array(), NULL, 'boinc:team-request-foundership');
-      }
-      else {
+            . ' another team member may submit a request.', array(), NULL, 'boinc:team-request-foundership');
+        }
+        else {
         $output .= bts('You now have @count days to assume foundership before'
-          . ' another team member may submit a request.',
-          array('@count' => $days_to_respond),
-          NULL, 'boinc:team-request-foundership');
-      }
-      $output .= '</p>';
-      $output .= '<ul class="tab-list">';
-      $output .= '  <li class="first last tab">' . 
+            . ' another team member may submit a request.',
+            array('@count' => $days_to_respond),
+            NULL, 'boinc:team-request-foundership');
+        }
+        $output .= '</p>';
+        $output .= '<ul class="tab-list">';
+        $output .= '  <li class="first last tab">' . 
         l(bts('Assume foundership', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/assume-foundership") . '</li>';
-      $output .= '</ul>';
+        $output .= '</ul>';
     }
     else {
-      $output .= '<p>';
-      if ($days_to_deadline == 1) {
+        $output .= '<p>';
+        if ($days_to_deadline == 1) {
         $output .= bts('The team founder has 1 day to respond to your'
-          . ' transfer request.',
-          NULL, 'boinc:team-request-foundership');
-      }
-      else {
+            . ' transfer request.',
+            NULL, 'boinc:team-request-foundership');
+        }
+        else {
         $output .= bts('The team founder has @count days to respond to your'
-          . ' transfer request.', array('@count' => $days_to_deadline),
-          NULL, 'boinc:team-request-foundership');
-      }
-      $output .= '</p>';
+            . ' transfer request.', array('@count' => $days_to_deadline),
+            NULL, 'boinc:team-request-foundership');
+        }
+        $output .= '</p>';
     }
-  }
-  elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
+    }
+    elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
     // If this user does not have a transfer request pending, but new requests
     // are not allowed, set the deadline to 90 days instead of 60 (as the user
     // who made the request has 30 additional days to assume foundership if 
@@ -1171,131 +1171,131 @@ 
     $days_to_deadline = ceil(($deadline - time()) / (24*60*60)) + 30;
     $output .= '<p>';
     $output .= bts('A team foundership change was already requested recently.'
-      . ' Only one request is allowed within a period of 90 days.',
-      NULL, 'boinc:team-request-foundership');
+        . ' Only one request is allowed within a period of 90 days.',
+        NULL, 'boinc:team-request-foundership');
     if ($days_to_deadline == 1) {
-      $output .= ' (' . bts('1 day remaining', array(), NULL, 'boinc:team-request-foundership') . ')';
+        $output .= ' (' . bts('1 day remaining', array(), NULL, 'boinc:team-request-foundership') . ')';
     }
     else {
-      $output .= ' (' . bts('@count days remaining',
+        $output .= ' (' . bts('@count days remaining',
         array('@count' => $days_to_deadline),
         NULL, 'boinc:team-request-foundership') . ')';
     }
     $output .= '</p>';
-  }
-  else {
+    }
+    else {
     $output .= '<p>' . bts('If the team founder is not active and you want to'
-      . ' assume the role of founder, click below to request foundership of'
-      . ' @this_team.',
-      array('@this_team' =>$team->title), NULL, 'boinc:team-request-foundership') . '</p>';
+        . ' assume the role of founder, click below to request foundership of'
+        . ' @this_team.',
+        array('@this_team' =>$team->title), NULL, 'boinc:team-request-foundership') . '</p>';
     $output .= '<ul class="tab-list">';
     $output .= '  <li class="first last tab">' . 
-      l(bts('Initiate request', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/request-foundership") . '</li>';
+        l(bts('Initiate request', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/request-foundership") . '</li>';
     $output .= '</ul>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Respond to foundership transfer requests for a team
  */
 function boincteam_request_foundership_response_panel($team_id) {
-  global $user;
-  $account = user_load($user->uid);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  $boincuser_id = $account->boincuser_id;
-  $output = '';
+    global $user;
+    $account = user_load($user->uid);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    $boincuser_id = $account->boincuser_id;
+    $output = '';
   
-  if ($boincteam->ping_user) {
+    if ($boincteam->ping_user) {
     if ($boincteam->ping_user < 0) {
-      $member = user_load(boincuser_lookup_uid(-$boincteam->ping_user));
-      $output .= '<h2 class="pane-title">' . bts('Obsolete transfer request', array(), NULL, 'boinc:team-request-foundership-response')
+        $member = user_load(boincuser_lookup_uid(-$boincteam->ping_user));
+        $output .= '<h2 class="pane-title">' . bts('Obsolete transfer request', array(), NULL, 'boinc:team-request-foundership-response')
         . '</h2>';
-      $output .= '<p>' . bts('Team member @name requested team foundership on'
+        $output .= '<p>' . bts('Team member @name requested team foundership on'
         . ' @date, but then left the team. This request is now canceled.',
         array(
-          '@name' => $member->boincuser_name,
-          '@date' => date('j M Y', $boincteam->ping_time),
+            '@name' => $member->boincuser_name,
+            '@date' => date('j M Y', $boincteam->ping_time),
         ),
         NULL, 'boinc:team-request-foundership-response') . '</p>';
-      // Automatically cancel the request
-      db_set_active('boinc_rw');
-      db_query("
+        // Automatically cancel the request
+        db_set_active('boinc_rw');
+        db_query("
         UPDATE {team}
         SET ping_user=0
         WHERE id = '%d'",
         $boincteam_id
-      );
-      db_set_active('default');
+        );
+        db_set_active('default');
     }
     else {
-      $member = user_load(boincuser_lookup_uid($boincteam->ping_user));
-      $output .= '<h2 class="pane-title">' . bts('Respond to transfer request', array(), NULL, 'boinc:team-request-foundership-response')
+        $member = user_load(boincuser_lookup_uid($boincteam->ping_user));
+        $output .= '<h2 class="pane-title">' . bts('Respond to transfer request', array(), NULL, 'boinc:team-request-foundership-response')
         . '</h2>';
-      $output .= '<p>' . bts('Team member @name has requested team foundership.'
+        $output .= '<p>' . bts('Team member @name has requested team foundership.'
         . ' This may be because you left the team or have not had contact with'
         . ' the team for a long time.', array(
-          '@name' => $member->boincuser_name,
+            '@name' => $member->boincuser_name,
         )
-      , array(), NULL, 'boinc:team-request-foundership-response') . '</p>';
-      $output .= '<p>' . bts("If you don't decline the request by @date, @name"
+        , array(), NULL, 'boinc:team-request-foundership-response') . '</p>';
+        $output .= '<p>' . bts("If you don't decline the request by @date, @name"
         . ' will have the option of assuming team foundership. (note: To'
         . ' accept the request, assign foundership to @name using the form'
         . ' below)',
         array(
-          '@name' => $member->boincuser_name,
-          '@date' => date('j M Y', boincteam_foundership_transfer_ok_time($boincteam)),
+            '@name' => $member->boincuser_name,
+            '@date' => date('j M Y', boincteam_foundership_transfer_ok_time($boincteam)),
         ),
         NULL, 'boinc:team-request-foundership-response') . '</p>';
-      $output .= '<ul class="tab-list">';
-      $output .= '  <li class="first last tab">' . 
+        $output .= '<ul class="tab-list">';
+        $output .= '  <li class="first last tab">' . 
         l(bts('Deny request', array(), NULL, 'boinc:team-request-foundership-response'), "community/teams/{$team_id}/deny-foundership-request") . '</li>';
-      $output .= '</ul>';
+        $output .= '</ul>';
     }
-  }
-  return $output;
+    }
+    return $output;
 }
 
 function boincteam_search_panel() {
-  $output = '';
-  if (module_exists('global_search_teams_solr')) {
+    $output = '';
+    if (module_exists('global_search_teams_solr')) {
     $output .= '<h2 class="pane-title">' . bts('Search teams', array(), NULL, 'boinc:search-team') . '</h2>';
     //$output .= '<p>' . bts('Render a search form here.', array(), NULL, 'boinc:search-team') . '</p>';
     $output .= '<p>' . boincteam_search_view() . '</p>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 function boincteam_search_view($type = 'team') {
-  // Get the team search form
-  $search_page = apachesolr_search_page_load('team_search');
-  module_load_include('inc', 'apachesolr_search', 'apachesolr_search.pages');
-  return drupal_get_form('apachesolr_search_custom_page_search_form', $search_page);
+    // Get the team search form
+    $search_page = apachesolr_search_page_load('team_search');
+    module_load_include('inc', 'apachesolr_search', 'apachesolr_search.pages');
+    return drupal_get_form('apachesolr_search_custom_page_search_form', $search_page);
 }
 
 /**
  * General info about the concept of teams
  */                                         
 function boincteam_topic_overview_panel() {
-  $site_name =  variable_get('site_name', 'Drupal-BOINC');
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Teams', array(), NULL, 'boinc:team-general-info') . '</h2>';
-  $output .= '<div class="">';
-  $output .= '<p>' . bts('@project participants may form teams. You may belong'
+    $site_name =  variable_get('site_name', 'Drupal-BOINC');
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Teams', array(), NULL, 'boinc:team-general-info') . '</h2>';
+    $output .= '<div class="">';
+    $output .= '<p>' . bts('@project participants may form teams. You may belong'
     . ' to only one team. You can join or quit a team at any time. To join a'
     . ' team, visit its team page and click "Join this team". Each team has a'
     . ' founder who may:', array('@project' => $site_name), NULL, 'boinc:team-general-info') . '</p>';
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('Private Message all team members', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts("edit the team's name and description", array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts('add or remove team admins', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts('remove members from the team', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts('disband a team if it has no members', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  return $output;
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('Private Message all team members', array(), NULL, 'boinc:team-general-info') . '</li>';
+    $output .= '  <li>' . bts("edit the team's name and description", array(), NULL, 'boinc:team-general-info') . '</li>';
+    $output .= '  <li>' . bts('add or remove team admins', array(), NULL, 'boinc:team-general-info') . '</li>';
+    $output .= '  <li>' . bts('remove members from the team', array(), NULL, 'boinc:team-general-info') . '</li>';
+    $output .= '  <li>' . bts('disband a team if it has no members', array(), NULL, 'boinc:team-general-info') . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    return $output;
 }
 
 /**
@@ -1323,50 +1323,50 @@ 
  * Link to view a team
  */
 function boincteam_view_team_panel($team_id) {
-  $team = node_load($team_id);
-  if ($team->type != "team") {
+    $team = node_load($team_id);
+    if ($team->type != "team") {
     return;
-  }
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id), TRUE);
-  $founder = user_load(get_drupal_id($boincteam->userid));
-  $new_members = array();
-  if ($boincteam->new_members) {
+    }
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id), TRUE);
+    $founder = user_load(get_drupal_id($boincteam->userid));
+    $new_members = array();
+    if ($boincteam->new_members) {
     foreach ($boincteam->new_members as $member) {
-      $account = user_load(get_drupal_id($member->id));
-      $new_members[] = l($account->boincuser_name, "account/{$account->uid}");
+        $account = user_load(get_drupal_id($member->id));
+        $new_members[] = l($account->boincuser_name, "account/{$account->uid}");
     }
-  }
-  $output = '';
-  $output .= '<h2 class="pane-title">' . $boincteam->name . '</h2>';
-  $output .= '<div>';
-  $output .= '<div class="left-column">';
-  $output .= '<ul class="stats">';
-  $output .= '  <li>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': ' . number_format($boincteam->total_credit, 0) . '</li>';
-  $output .= '  <li>' . bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC') . ': ' . number_format($boincteam->expavg_credit, 2) . '</li>';
-  $output .= '  <li>' . bts('Country', array(), NULL, 'boinc:country-of-origin') . ': ' . $boincteam->country . '</li>';
-  $output .= '  <li>' . bts('Type', array(), NULL, 'boinc:view-team-info') . ': ' . boincteam_get_type($team_id) . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '<div class="right-column">';
-  $output .= '<ul class="stats">';
-  $output .= '  <li>' . bts('Founder', array(), NULL, 'boinc:view-team-info') . ': ' . l($founder->boincuser_name, "account/{$founder->uid}") . '</li>';
-  $output .= '  <li>' . bts('New members in last day', array(), NULL, 'boinc:view-team-info') . ': ' . implode('&middot;', $new_members) . '</li>';
-  $output .= '  <li>' . bts('Total members', array(), NULL, 'boinc:view-team-info') . ': ' . l($boincteam->nusers, "community/teams/{$team_id}/members") . '</li>';
-  $output .= '  <li>' . bts('Active members', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_active . '</li>';
-  $output .= '  <li>' . bts('Members with credit', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_worked . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '</div>';
-  $output .= '<div class="clearfix"></div>';
-  if ($boincteam->url) {
+    }
+    $output = '';
+    $output .= '<h2 class="pane-title">' . $boincteam->name . '</h2>';
+    $output .= '<div>';
+    $output .= '<div class="left-column">';
+    $output .= '<ul class="stats">';
+    $output .= '  <li>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': ' . number_format($boincteam->total_credit, 0) . '</li>';
+    $output .= '  <li>' . bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC') . ': ' . number_format($boincteam->expavg_credit, 2) . '</li>';
+    $output .= '  <li>' . bts('Country', array(), NULL, 'boinc:country-of-origin') . ': ' . $boincteam->country . '</li>';
+    $output .= '  <li>' . bts('Type', array(), NULL, 'boinc:view-team-info') . ': ' . boincteam_get_type($team_id) . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    $output .= '<div class="right-column">';
+    $output .= '<ul class="stats">';
+    $output .= '  <li>' . bts('Founder', array(), NULL, 'boinc:view-team-info') . ': ' . l($founder->boincuser_name, "account/{$founder->uid}") . '</li>';
+    $output .= '  <li>' . bts('New members in last day', array(), NULL, 'boinc:view-team-info') . ': ' . implode('&middot;', $new_members) . '</li>';
+    $output .= '  <li>' . bts('Total members', array(), NULL, 'boinc:view-team-info') . ': ' . l($boincteam->nusers, "community/teams/{$team_id}/members") . '</li>';
+    $output .= '  <li>' . bts('Active members', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_active . '</li>';
+    $output .= '  <li>' . bts('Members with credit', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_worked . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    $output .= '</div>';
+    $output .= '<div class="clearfix"></div>';
+    if ($boincteam->url) {
     $output .= '<div class="stats">';
     $output .= bts('Website', array(), NULL, 'boinc:website-of-user-or-team') . ': ' . l("http://{$boincteam->url}", "http://{$boincteam->url}");
     $output .= '</div>';
-  }
-  if ($team->body) {
+    }
+    if ($team->body) {
     $output .= '<h3>' . bts('Description', array(), NULL, 'boinc:team-description') . '</h3>';
     $output .= check_markup($team->body, $team->format);
     $output .= '</div>';
-  }
-  return $output;
+    }
+    return $output;
 }

Braces +17 added lines, -34 removed lines

@@ -258,8 +258,7 @@ 
         ), WATCHDOG_NOTICE
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(t('You are not allowed to assume foundership of this
       team.'
     ));
@@ -284,8 +283,7 @@ 
     drupal_set_message(t('@team has been removed.',
       array('@team' => $boincteam->name)));
     drupal_goto('community/teams');
-  }
-  else {
+  } else {
     drupal_set_message(t('All members must be removed from @team before the
       team can be deleted.', array('@team' => $boincteam->name)), 'error');
     drupal_goto(strstr($_GET['q'], '/delete', TRUE));
@@ -519,8 +517,7 @@ 
         array('@team' => $boincteam->name)));
       watchdog('boincteam', 'added user @uid to team @nid',
         array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
-    }
-    else {
+    } else {
       // @todo - consider another rule/error event here
       drupal_set_message(t('There was a problem joining @team, please try again
         later', array('@team' => $boincteam->name)));
@@ -548,8 +545,7 @@ 
       array('@team' => $boincteam->name)));
     watchdog('boincteam', 'removed user @uid from team @nid',
       array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
-  }
-  else {
+  } else {
       drupal_set_message(t('You are not a member of @team, so you cannot revoke
         your membership to it.', array('@team' => $boincteam->name)));
   }
@@ -618,8 +614,7 @@ 
         '@uid' => $account->uid, 
         '@nid' => $team_id
       ), WATCHDOG_NOTICE);
-  }
-  else {
+  } else {
       drupal_set_message(t('@user is not a member of @team, so you cannot
         revoke the membership.', array(
           '@user' => $account->boincuser_name,
@@ -648,14 +643,12 @@ 
         '@user' => $account->boincuser_name
       )
     ), 'warning');
-  }
-  elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
+  } elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
     // It hasn't been long enough since the last transfer request
     drupal_set_message(t('A foundership change was requested during the last 90
       days, so new requests are not allowed. Please try again later.'
     ), 'warning');
-  }
-  elseif (boincteam_is_member($team_id, $account->uid)) {
+  } elseif (boincteam_is_member($team_id, $account->uid)) {
     // Log the transfer request
     db_set_active('boinc_rw');
     db_query("
@@ -861,8 +854,7 @@ 
     $output .= '[';
     if ($credit_needed == 1) {
       $output .= bts('You must earn 1 more credit!', array(), NULL, 'boinc:create-team-panel');
-    }
-    else {
+    } else {
       $output .= bts('You must earn @count more credits!',
         array('@count' => $credit_needed),
 	NULL, 'boinc:create-team-panel'
@@ -915,8 +907,7 @@ 
     $output .= '  <label>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': </label>';
     $output .= '  <span>' . number_format($team->total_credit, 0) . '</span>';
     $output .= '</div>' . "\n";
-  }
-  else if ($user->uid == $account->uid) {
+  } else if ($user->uid == $account->uid) {
     $output .= '<h2 class="pane-title">' . bts('Team (None)', array(), NULL, 'boinc:team-dashboard') . '</h2>';
     $output .= '<ul class="tab-list action-list">';
     $output .= '<li class="tab primary">';
@@ -1123,8 +1114,7 @@ 
       if ($request_age == 1) {
         $output .= bts('1 day has elapsed since your request and'
           . ' the founder has not responded.', array(), NULL, 'boinc:team-request-foundership');
-      }
-      else {
+      } else {
         $output .= bts('@count days have elapsed since your request and'
           . ' the founder has not responded.',
           array('@count' => $request_age),
@@ -1134,8 +1124,7 @@ 
       if ($days_to_respond == 1) {
         $output .= bts('You now have 1 day to assume foundership before'
           . ' another team member may submit a request.', array(), NULL, 'boinc:team-request-foundership');
-      }
-      else {
+      } else {
         $output .= bts('You now have @count days to assume foundership before'
           . ' another team member may submit a request.',
           array('@count' => $days_to_respond),
@@ -1146,23 +1135,20 @@ 
       $output .= '  <li class="first last tab">' . 
         l(bts('Assume foundership', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/assume-foundership") . '</li>';
       $output .= '</ul>';
-    }
-    else {
+    } else {
       $output .= '<p>';
       if ($days_to_deadline == 1) {
         $output .= bts('The team founder has 1 day to respond to your'
           . ' transfer request.',
           NULL, 'boinc:team-request-foundership');
-      }
-      else {
+      } else {
         $output .= bts('The team founder has @count days to respond to your'
           . ' transfer request.', array('@count' => $days_to_deadline),
           NULL, 'boinc:team-request-foundership');
       }
       $output .= '</p>';
     }
-  }
-  elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
+  } elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
     // If this user does not have a transfer request pending, but new requests
     // are not allowed, set the deadline to 90 days instead of 60 (as the user
     // who made the request has 30 additional days to assume foundership if 
@@ -1175,15 +1161,13 @@ 
       NULL, 'boinc:team-request-foundership');
     if ($days_to_deadline == 1) {
       $output .= ' (' . bts('1 day remaining', array(), NULL, 'boinc:team-request-foundership') . ')';
-    }
-    else {
+    } else {
       $output .= ' (' . bts('@count days remaining',
         array('@count' => $days_to_deadline),
         NULL, 'boinc:team-request-foundership') . ')';
     }
     $output .= '</p>';
-  }
-  else {
+  } else {
     $output .= '<p>' . bts('If the team founder is not active and you want to'
       . ' assume the role of founder, click below to request foundership of'
       . ' @this_team.',
@@ -1229,8 +1213,7 @@ 
         $boincteam_id
       );
       db_set_active('default');
-    }
-    else {
+    } else {
       $member = user_load(boincuser_lookup_uid($boincteam->ping_user));
       $output .= '<h2 class="pane-title">' . bts('Respond to transfer request', array(), NULL, 'boinc:team-request-foundership-response')
         . '</h2>';