BOINC / boinc

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pCache.class.php

Braces +6 added lines, -6 removed lines

@@ -200,8 +200,7 @@ 
             }
 
            if ($Verbose)
-            { return(array("DBPos"=>$DBPos,"PicSize"=>$PicSize,"GeneratedTS"=>$GeneratedTS,"Hits"=>$Hits)); }
-           else
+            { return(array("DBPos"=>$DBPos,"PicSize"=>$PicSize,"GeneratedTS"=>$GeneratedTS,"Hits"=>$Hits)); } else
             { return(TRUE); }
           }
         }
@@ -215,10 +214,11 @@ 
    /* Automatic output method based on the calling interface */
    function autoOutput($ID,$Destination="output.png")
     {
-     if (php_sapi_name() == "cli")
-      $this->saveFromCache($ID,$Destination);
-     else
-      $this->strokeFromCache($ID);
+     if (php_sapi_name() == "cli") {
+           $this->saveFromCache($ID,$Destination);
+     } else {
+           $this->strokeFromCache($ID);
+     }
     }
 
    function strokeFromCache($ID)

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pSurface.class.php

Braces +41 added lines, -36 removed lines

@@ -52,12 +52,13 @@ 
      if ( $X < 0 || $X >$this->GridSizeX ) { return(0); }
      if ( $Y < 0 || $Y >$this->GridSizeY ) { return(0); }
 
-     if ( $this->Points[$X][$Y] == UNKNOWN || $Force )
-      $this->Points[$X][$Y] = $Value;
-     elseif ( $this->Points[$X][$Y] == UNKNOWN )
-      $this->Points[$X][$Y] = $Value;
-     else
-      $this->Points[$X][$Y] = ($this->Points[$X][$Y] + $Value)/2;
+     if ( $this->Points[$X][$Y] == UNKNOWN || $Force ) {
+           $this->Points[$X][$Y] = $Value;
+     } elseif ( $this->Points[$X][$Y] == UNKNOWN ) {
+           $this->Points[$X][$Y] = $Value;
+     } else {
+           $this->Points[$X][$Y] = ($this->Points[$X][$Y] + $Value)/2;
+     }
     }
 
    /* Write the X labels */
@@ -84,24 +85,24 @@ 
        $YPos  = $this->pChartObject->GraphAreaY1 - $Padding;
        if ($Angle == 0 ) { $Settings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
        if ($Angle != 0 ) { $Settings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-      }
-     elseif ( $Position == LABEL_POSITION_BOTTOM )
+      } elseif ( $Position == LABEL_POSITION_BOTTOM )
       {
        $YPos  = $this->pChartObject->GraphAreaY2 + $Padding;
        if ($Angle == 0 ) { $Settings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
        if ($Angle != 0 ) { $Settings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
-      }
-     else
-      return(-1);
+      } else {
+           return(-1);
+     }
 
      for($X=0;$X<=$this->GridSizeX;$X++)
       {
        $XPos = floor($X0+$X*$XSize + $XSize/2);
 
-       if( $Labels == NULL || !isset($Labels[$X]) )
-        $Value = $X+$CountOffset;
-       else
-        $Value = $Labels[$X];
+       if( $Labels == NULL || !isset($Labels[$X]) ) {
+               $Value = $X+$CountOffset;
+       } else {
+               $Value = $Labels[$X];
+       }
 
        $this->pChartObject->drawText($XPos,$YPos,$Value,$Settings);
       }
@@ -127,20 +128,20 @@ 
 
      $Settings = array("Angle"=>$Angle,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
      if ( $Position == LABEL_POSITION_LEFT )
-      { $XPos  = $this->pChartObject->GraphAreaX1 - $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
-     elseif ( $Position == LABEL_POSITION_RIGHT )
-      { $XPos  = $this->pChartObject->GraphAreaX2 + $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-     else
-      return(-1);
+      { $XPos  = $this->pChartObject->GraphAreaX1 - $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLERIGHT; } elseif ( $Position == LABEL_POSITION_RIGHT )
+      { $XPos  = $this->pChartObject->GraphAreaX2 + $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLELEFT; } else {
+           return(-1);
+     }
 
      for($Y=0;$Y<=$this->GridSizeY;$Y++)
       {
        $YPos = floor($Y0+$Y*$YSize + $YSize/2);
 
-       if( $Labels == NULL || !isset($Labels[$Y]) )
-        $Value = $Y+$CountOffset;
-       else
-        $Value = $Labels[$Y];
+       if( $Labels == NULL || !isset($Labels[$Y]) ) {
+               $Value = $Y+$CountOffset;
+       } else {
+               $Value = $Labels[$Y];
+       }
 
        $this->pChartObject->drawText($XPos,$YPos,$Value,$Settings);
       }
@@ -176,14 +177,18 @@ 
            $X2 = floor($X0+$X*$XSize+$XSize);
            $Y2 = floor($Y0+$Y*$YSize+$YSize);
 
-           if ( $X > 0 && $this->Points[$X-1][$Y] != UNKNOWN && $this->Points[$X-1][$Y] != IGNORED && $this->Points[$X-1][$Y] < $Threshold)
-            $this->pChartObject->drawLine($X1,$Y1,$X1,$Y2,$Color);
-           if ( $Y > 0 && $this->Points[$X][$Y-1] != UNKNOWN && $this->Points[$X][$Y-1] != IGNORED && $this->Points[$X][$Y-1] < $Threshold)
-            $this->pChartObject->drawLine($X1,$Y1,$X2,$Y1,$Color);
-           if ( $X < $this->GridSizeX && $this->Points[$X+1][$Y] != UNKNOWN && $this->Points[$X+1][$Y] != IGNORED && $this->Points[$X+1][$Y] < $Threshold)
-            $this->pChartObject->drawLine($X2,$Y1,$X2,$Y2,$Color);
-           if ( $Y < $this->GridSizeY && $this->Points[$X][$Y+1] != UNKNOWN && $this->Points[$X][$Y+1] != IGNORED && $this->Points[$X][$Y+1] < $Threshold)
-            $this->pChartObject->drawLine($X1,$Y2,$X2,$Y2,$Color);
+           if ( $X > 0 && $this->Points[$X-1][$Y] != UNKNOWN && $this->Points[$X-1][$Y] != IGNORED && $this->Points[$X-1][$Y] < $Threshold) {
+                       $this->pChartObject->drawLine($X1,$Y1,$X1,$Y2,$Color);
+           }
+           if ( $Y > 0 && $this->Points[$X][$Y-1] != UNKNOWN && $this->Points[$X][$Y-1] != IGNORED && $this->Points[$X][$Y-1] < $Threshold) {
+                       $this->pChartObject->drawLine($X1,$Y1,$X2,$Y1,$Color);
+           }
+           if ( $X < $this->GridSizeX && $this->Points[$X+1][$Y] != UNKNOWN && $this->Points[$X+1][$Y] != IGNORED && $this->Points[$X+1][$Y] < $Threshold) {
+                       $this->pChartObject->drawLine($X2,$Y1,$X2,$Y2,$Color);
+           }
+           if ( $Y < $this->GridSizeY && $this->Points[$X][$Y+1] != UNKNOWN && $this->Points[$X][$Y+1] != IGNORED && $this->Points[$X][$Y+1] < $Threshold) {
+                       $this->pChartObject->drawLine($X1,$Y2,$X2,$Y2,$Color);
+           }
           }
         }
       }
@@ -232,8 +237,7 @@ 
              if ( isset($Palette[$Value]) && isset($Palette[$Value]["G"]) ) { $G = $Palette[$Value]["G"]; } else { $G = 0; }
              if ( isset($Palette[$Value]) && isset($Palette[$Value]["B"]) ) { $B = $Palette[$Value]["B"]; } else { $B = 0; }
              if ( isset($Palette[$Value]) && isset($Palette[$Value]["Alpha"]) ) { $Alpha = $Palette[$Value]["Alpha"]; } else { $Alpha = 1000; }
-            }
-           else
+            } else
             {
              $R = (($ShadeR2-$ShadeR1)/100)*$Value + $ShadeR1;
              $G = (($ShadeG2-$ShadeG1)/100)*$Value + $ShadeG1;
@@ -259,8 +263,9 @@ 
       {
        for($Y=0;$Y<=$this->GridSizeY;$Y++)
         {
-         if ( $this->Points[$X][$Y] == UNKNOWN )
-          $Missing[] = $X.",".$Y;
+         if ( $this->Points[$X][$Y] == UNKNOWN ) {
+                   $Missing[] = $X.",".$Y;
+         }
         }
       }
      shuffle($Missing);

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

Braces +22 added lines, -19 removed lines

@@ -117,15 +117,16 @@ 
   
   if ($myCache->isInCache($cache_name)) {
     $myCache->strokeFromCache($cache_name);
-  }
-  else {
+  } else {
     // Construct query string
     $get = array(
       'cpid' => $cpid,
       'projectid' => $project_id
     );
     $args = array();
-    foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
+    foreach ($get as $arg => $value) {
+        $args[] = "{$arg}=" . rawurlencode($value);
+    }
     $query = '?' . implode('&', $args);
     
     // Load XML from RPC
@@ -147,9 +148,10 @@ 
         $credit[$i] = isset($stats_xml->total_credit_history_last_91_days->$day) ? (int) $stats_xml->total_credit_history_last_91_days->$day : 0;
         $dataset[$i] = ($i) ? ($credit[$i] - $credit[$i-1]) : 0;
       }
-    }
-    else {
-      for ($i = 0; $i <= $dataset_size; $i++) $dataset[] = 0;
+    } else {
+      for ($i = 0; $i <= $dataset_size; $i++) {
+          $dataset[] = 0;
+      }
     }
     
     $MyData->addPoints($dataset, 'series1');
@@ -253,8 +255,7 @@ 
   
   if ($myCache->isInCache($cache_name)) {
     $myCache->strokeFromCache($cache_name);
-  }
-  else {
+  } else {
     // Initialize dataset
     $dataset = array();
     if ($stats_xml) {
@@ -264,9 +265,10 @@ 
         $credit[$i] = isset($stats_xml->$day) ? (int) $stats_xml->$day : 0;
         $dataset[$i] = ($i) ? ($credit[$i] - $credit[$i-1]) : 0;
       }
-    }
-    else {
-      for ($i = 0; $i <= 30; $i++) $dataset[] = 0;
+    } else {
+      for ($i = 0; $i <= 30; $i++) {
+          $dataset[] = 0;
+      }
     }
     
     $MyData->addPoints($dataset, 'series1');
@@ -341,8 +343,7 @@ 
           directory must be writeable by the web server.',
           array('@parent_dir' => dirname($cache_dir)), WATCHDOG_ERROR);
         return FALSE;
-      }
-      else {
+      } else {
         // Create the cache dir
         if (!mkdir($cache_dir, 0775)) {
           watchdog('boincstats', 'Failed to create @cache_dir directory. Check
@@ -351,8 +352,7 @@ 
           return FALSE;
         }
       }
-    }
-    else {
+    } else {
       watchdog('boincstats', 'Cache directory at @cache_dir is not writeable.
         Please allow webserver write access.',
         array('@cache_dir' => $cache_dir), WATCHDOG_ERROR);
@@ -378,7 +378,9 @@ 
     'projectid' => $project_id
   );
   $args = array();
-  foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
+  foreach ($get as $arg => $value) {
+      $args[] = "{$arg}=" . rawurlencode($value);
+  }
   $query = '?' . implode('&', $args);
   
   // Load XML from RPC
@@ -412,7 +414,9 @@ 
     for ($i = 61; $i <= 91; $i++) {
       $day = "day_{$i}";
       $daily_totals[$i] = isset($stats_xml->$day) ? (int) $stats_xml->$day : 0;
-      if ($i == 61) continue;
+      if ($i == 61) {
+          continue;
+      }
       $daily_values[$i] = ($i) ? ($daily_totals[$i] - $daily_totals[$i-1]) : 0;
     }
   }
@@ -481,8 +485,7 @@ 
       drupal_set_message(t('The BOINC stats system is not configured. Please
         !configure_it', array('!configure_it' => l(t('configure it now'),
           'admin/boinc/stats'))), 'error', FALSE);
-    }
-    else {
+    } else {
       drupal_set_message(t('There is a problem with the site. Please contact
         the system administrator.'), 'error', FALSE);
     }

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

Braces +10 added lines, -20 removed lines

@@ -135,8 +135,7 @@ 
   
   if (!$name) {
     form_set_error('name', bts('Team name is required.'));
-  }
-  else {
+  } else {
     require_boinc('boinc_db');
     if (BoincTeam::lookup_name($name)) {
       form_set_error('name', bts('A team named "@name" already exists.',
@@ -177,8 +176,7 @@ 
   if ($boinc_team) {
     $boinc_user = BoincUser::lookup_id($account->boincuser_id);
     user_join_team($boinc_team, $boinc_user);
-  }
-  else {
+  } else {
     drupal_set_message(t('Teams cannot be created at this time. Please 
       contact the @project administrators!', array('@project' => PROJECT)));
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
@@ -212,8 +210,7 @@ 
   if (module_exists('pathauto')) {
     module_load_include('inc', 'pathauto', 'pathauto');
     $node['path'] = pathauto_cleanstring($values['name']);
-  }
-  else {
+  } else {
     drupal_set_message(t('Teams cannot be created at this time. Please 
       contact the @project administrators!', array('@project' => PROJECT)));
     watchdog('BOINC team', 'BOINC teams require the Pathauto module. Teams
@@ -381,8 +378,7 @@ 
     $form['form control tabs'] = array(
       '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
     );
-  }
-  else {
+  } else {
     $form['description'] = array(
       '#prefix' => '<div class="form-item"><label>' . bts('Description') . ':</label></div><div class="form-item">',
       '#value' => $default['description'],
@@ -412,12 +408,10 @@ 
   
   if ($form_state['storage']['is_boinc_wide']) {
     form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.'));
-  }
-  else {
+  } else {
     if (!$name) {
       form_set_error('name', bts('Team name is required.'));
-    }
-    else {
+    } else {
       $team = node_load($form_state['storage']['team_id']);
       if ($name != $team->title) {
         // If changing the name ("title" in Drupal terms), check that the new name is available
@@ -558,29 +552,25 @@ 
   
   if (!$values['email']) {
     form_set_error('email', bts('Email address is required.'));
-  }
-  else {
+  } else {
     $account = user_load(array('mail' => $values['email']));
     if ((!$account) OR ($account->team != $team_id)) {
       form_set_error('email', bts('There is no user on your team with that email address.'));
-    }
-    elseif (boincteam_is_founder($team_id, $account->uid)) {
+    } elseif (boincteam_is_founder($team_id, $account->uid)) {
       form_set_error('email', bts('@user is the founder of @team!',
         array(
           '@user' => $account->boincuser_name,
           '@team' => $team->title,
         )
       ));
-    }
-    elseif (boincteam_is_admin($team_id, $account->uid)) {
+    } elseif (boincteam_is_admin($team_id, $account->uid)) {
       form_set_error('email', bts('@user is already an admin of @team.',
         array(
           '@user' => $account->boincuser_name,
           '@team' => $team->title,
         )
       ));
-    }
-    else {
+    } else {
       $form_state['storage']['boincuser_id'] = $account->boincuser_id;
       $form_state['storage']['boincuser_name'] = $account->boincuser_name;
     }

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

Braces +2 added lines, -4 removed lines

@@ -44,8 +44,7 @@ 
         $nid = $existing_teams[$boinc_team->id];
         $success = boincteam_import($boinc_team, $nid);
       }
-    }
-    else {
+    } else {
       // Import new teams created by RPC or ops/team_import.php
       $success = boincteam_import($boinc_team);
     }
@@ -77,8 +76,7 @@ 
     $node->body = $boincteam->description;
     $node->teaser = $teaser;
     $node->uid = boincuser_lookup_uid($boincteam->userid);
-  }
-  else {
+  } else {
     // Construct the team as a new node
     $node = array(
       'type' => 'team',

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

Braces +1 added lines, -2 removed lines

@@ -387,8 +387,7 @@
     $team = node_load($nid);
     $output .= '<p>' . bts('You may create a message board for use by @team',
       array('@team' => $team->title)) . ':</p>';
-  }
-  else {
+  } else {
     $output .= '<p>' . bts('This is a team-only message board') . ':</p>';
   }
   $output .= '<ul>';

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

Braces +19 added lines, -33 removed lines

@@ -179,8 +179,7 @@ 
         ), WATCHDOG_NOTICE
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(t('You are not allowed to assume foundership of this
       team.'
     ));
@@ -205,8 +204,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));
@@ -276,7 +274,9 @@ 
 function boincteam_get_vocabulary_by_name($name) {
   $vocabs = taxonomy_get_vocabularies('team');
   foreach ($vocabs as $vocab) {
-    if ($vocab->name == $name) return $vocab->vid;
+    if ($vocab->name == $name) {
+        return $vocab->vid;
+    }
   }
   return null;
 }
@@ -440,8 +440,7 @@ 
         array('@team' => $boincteam->name)));
       watchdog('boincteam', 'added user @uid to team @nid',
         array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
-    }
-    else {
+    } else {
       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',
@@ -468,8 +467,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)));
   }
@@ -565,8 +563,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,
@@ -595,14 +592,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');
     db_query("
@@ -808,8 +803,7 @@ 
     $output .= '[';
     if ($credit_needed == 1) {
       $output .= bts('You must earn 1 more credit!');
-    }
-    else {
+    } else {
       $output .= bts('You must earn @count more credits!',
         array('@count' => $credit_needed)
       );
@@ -1059,8 +1053,7 @@ 
       if ($request_age == 1) {
         $output .= bts('1 day has elapsed since your request and'
           . ' the founder has not responded.');
-      }
-      else {
+      } else {
         $output .= bts('@count days have elapsed since your request and'
           . ' the founder has not responded.',
           array('@count' => $request_age)
@@ -1070,8 +1063,7 @@ 
       if ($days_to_respond == 1) {
         $output .= bts('You now have 1 day to assume foundership before'
           . ' another team member may submit a request.');
-      }
-      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)
@@ -1082,23 +1074,20 @@ 
       $output .= '  <li class="first last tab">' . 
         l(bts('Assume 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.'
         );
-      }
-      else {
+      } else {
         $output .= bts('The team founder has @count days to respond to your'
           . ' transfer request.', array('@count' => $days_to_deadline)
         );
       }
       $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 
@@ -1111,15 +1100,13 @@ 
     );
     if ($days_to_deadline == 1) {
       $output .= ' (' . bts('1 day remaining') . ')';
-    }
-    else {
+    } else {
       $output .= ' (' . bts('@count days remaining',
         array('@count' => $days_to_deadline)
       ) . ')';
     }
     $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.',
@@ -1165,8 +1152,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')
         . '</h2>';

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

Braces +104 added lines, -62 removed lines

@@ -127,8 +127,7 @@ 
         if (isset($prefs[$name]['@value'])) {
           $default[$name] = $prefs[$name]['@value'];
         }
-      }
-      else {
+      } else {
         $default[$name] = $prefs[$name];
       }
     }
@@ -567,34 +566,80 @@ 
   // 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']}")));
-  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']}")));
-  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']}")));
-  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']}")));
-  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']}")));
-  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']}")));
-  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']}")));
-  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']}")));
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
 
   // 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']}")));
-  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']}")));
-  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']}")));
-  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']}")));
-  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']}")));
-  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']}")));
-  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']}")));
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
 
   // 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']}")));
-  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']}")));
-  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']}")));
-  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']}")));
-  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']}")));
-  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']}")));
-  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']}")));
-  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']}")));
-}
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
+  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']}")));
+  }
+  }
 
 /**
   * Handle post-validation submission of general preferences form.
@@ -655,8 +700,7 @@ 
   // Save the preset selection (or lack thereof)
   if (!$preset OR $preset == 'custom') {
     $prefs['preset'] = 'custom';
-  }
-  else {
+  } else {
     $prefs['preset'] = $preset;
   }
   
@@ -671,8 +715,7 @@ 
   if (!$result) {
     watchdog('boincwork', 'Error updating global prefs for user @id: @message', array('@id' => $account->id, '@message' => mysql_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 +970,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 +986,7 @@ 
         $oxford_comma = '';
       }
       $list = implode(', ', $list) . $oxford_comma . ' ' . $conjunction . ' ' . $last;
-    }
-    else {
+    } else {
       $list = $last;
     }
     if (count($merged) == 1) {
@@ -956,8 +997,7 @@ 
           '@id' => $current_host_id
         )
       ));
-    }
-    else {
+    } else {
       drupal_set_message(bts(
         'Computers @old_ids have been merged successfully into @id.',
         array(
@@ -1017,11 +1057,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;
   }
   
@@ -1041,8 +1079,7 @@ 
         if (isset($prefs[$name]['@value'])) {
           $default[$name] = $prefs[$name]['@value'];
         }
-      }
-      else {
+      } else {
         $default[$name] = $prefs[$name];
       }
     }
@@ -1222,16 +1259,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);
     }
   }
@@ -1273,7 +1307,9 @@ 
         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++;
+        if ($form_state['values']['applications'][$app]) {
+            $apps_selected++;
+        }
       }
       if ($apps_selected < $validation_rules['apps']['minimum selected']) {
         form_set_error(
@@ -1311,10 +1347,18 @@ 
   // Resource preferences
   $prefs['resource_share'] = $edit['resource']['resource_share'];
   if ($app_types->count > 1) {
-    if ($app_types->cpu) $prefs['no_cpu'] = ($edit['resource']['no_cpu']) ? 0 : 1;
-    if ($app_types->cuda) $prefs['no_cuda'] = ($edit['resource']['no_cuda']) ? 0 : 1;
-    if ($app_types->ati) $prefs['no_ati'] = ($edit['resource']['no_ati']) ? 0 : 1;
-    if ($app_types->intel_gpu) $prefs['no_intel_gpu'] = ($edit['resource']['no_intel_gpu']) ? 0 : 1;
+    if ($app_types->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
@@ -1346,8 +1390,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();
   }
@@ -1355,8 +1398,7 @@ 
   if (!$result) {
     watchdog('boincwork', 'Error updating project prefs for user @id: @message', array('@id' => $user->id, '@message' => mysql_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.
@@ -1509,8 +1551,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">'
@@ -1643,7 +1684,9 @@ 
   pm_email_notify_user('submit', $edit, $user);
   
   // Avatar settings
-  if (!$edit['field_image']) $edit['field_image'] = array();
+  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!
@@ -1667,8 +1710,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'];
       }
     }

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

Braces +62 added lines, -55 removed lines

@@ -332,8 +332,7 @@ 
         $name = $element['@attributes']['name'];
         if (isset($element['@attributes']['entitytype']) AND $element['@attributes']['entitytype'] == 'attribute') {
           $defaults['@attributes'][$name] = $values[$name];
-        }
-        else {
+        } else {
           $defaults[$name] = $values[$name];
         }
       }
@@ -384,8 +383,7 @@ 
       if (isset($user_pref[$name])) {
         if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
           $value = $user_pref[$name]['@value'];
-        }
-        else {
+        } else {
           $value = $user_pref[$name];
         }
       }
@@ -447,8 +445,7 @@ 
       if (isset($user_pref[$name])) {
         if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
           $value = $user_pref[$name]['@value'];
-        }
-        else {
+        } else {
           $value = $user_pref[$name];
         }
       }
@@ -492,8 +489,7 @@ 
               isset($item['@attributes']['selected'])) {
             $default = ($item['@attributes']['selected'] == 'true') ? $item['@value'] : null;
           }
-        }
-        else {
+        } else {
           $value = $item;
         }
         $options[$value] = $value;
@@ -552,7 +548,9 @@ 
       $user_prefs['app_id'] = array($user_prefs['app_id']);
     }
     foreach ($user_prefs['app_id'] as $app) {
-      if (!$app) continue;
+      if (!$app) {
+          continue;
+      }
       if (is_array($app) AND isset($app['@value'])) {
         $app = $app['@value'];
       }
@@ -696,8 +694,7 @@ 
       );
       if ($top_level) {
         $uncategorized[$key] = $prefs_element;
-      }
-      else {
+      } else {
         $prefs_table[$key] = $prefs_element;
       }
       break;
@@ -711,8 +708,7 @@ 
       'name' => bts('Other settings'),
       'elements' => $uncategorized,
     );
-  }
-  elseif ($uncategorized) {
+  } elseif ($uncategorized) {
     // If nothing is categorized, output all prefs under a general "settings"
     $prefs_table['settings'] = array(
       'name' => bts('Settings'),
@@ -745,8 +741,7 @@ 
       $main_prefs = load_configuration($boincuser->project_prefs);
       $main_prefs = (array) $main_prefs['project_preferences'];
     }
-  }
-  else {
+  } else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
       $main_prefs = (array) $main_prefs['global_preferences'];
@@ -759,11 +754,11 @@ 
     // Use the length of the $main_prefs array as a condition as to
     // whether the preferences have already been set. This is
     // HARDCODED here.
-    if (count($main_prefs) < 3)
-        $main_prefs['@attributes'] = array('cleared' => 1);
+    if (count($main_prefs) < 3) {
+            $main_prefs['@attributes'] = array('cleared' => 1);
+    }
     return $main_prefs;
-  }
-  else {
+  } else {
     if (isset($main_prefs['venue'])) {
       if (!is_numeric(key($main_prefs['venue']))) {
         $main_prefs['venue'] = array($main_prefs['venue']);
@@ -803,8 +798,7 @@ 
       $main_prefs = load_configuration($boincuser->project_prefs);
       $main_prefs = (array) $main_prefs['project_preferences'];
     }
-  }
-  else {
+  } else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
       $main_prefs = (array) $main_prefs['global_preferences'];
@@ -817,8 +811,7 @@ 
   if (!$venue OR $venue == 'generic') {
     //$main_prefs = $prefs;
     $main_prefs = $prefs + $main_prefs;
-  }
-  else {
+  } else {
     if (isset($main_prefs['venue'])) {
       if (!is_numeric(key($main_prefs['venue']))) {
         $main_prefs['venue'] = array($main_prefs['venue']);
@@ -827,8 +820,7 @@ 
         if (isset($prefs_venue['@attributes']['name']) AND $prefs_venue['@attributes']['name'] == $venue) {
           if ($prefs) {
             $main_prefs['venue'][$key] = $prefs;
-          }
-          else {
+          } else {
             // If prefs is null, clear out this preference set
             unset($main_prefs['venue'][$key]);
             if (count($main_prefs['venue']) == 0) {
@@ -870,8 +862,7 @@ 
     db_set_active('boinc');
     $result = db_query("UPDATE user SET project_prefs = '{$boincuser->project_prefs}' WHERE id = '{$boincuser->id}'");
     db_set_active('default');
-  }
-  else {
+  } else {
     $main_prefs = array('global_preferences' => $main_prefs);
     $boincuser->global_prefs = save_configuration($main_prefs);
     db_set_active('boinc');
@@ -919,15 +910,13 @@ 
       // Process nested form elements
       $parents[] = $field;
       boincwork_validate_form($rules, $values[$field], $parents);
-    }
-    else {
+    } else {
       if ($parents) {
         // form_set_error() identifies nested form elements with '][' as a
         // delimiter between each parent and child element
         $parents[] = $field;
         $form_field = implode('][', $parents);
-      }
-      else {
+      } else {
         $form_field = $field;
       }
       if (isset($rules['datatype']) AND !boincwork_validate_datatype($values[$field], $rules['datatype'])) {
@@ -990,7 +979,9 @@ 
     7 => 'Z',
     8 => 'Y'
   );
-  if (!is_numeric($number)) $number = 0;
+  if (!is_numeric($number)) {
+      $number = 0;
+  }
   
   $digits = floor(log($number, 10)) + 1;
   $magnitude = 0;
@@ -1012,8 +1003,12 @@ 
   
   function load_configuration($text)
   {
-      if (preg_match('/^\<\?xml .*\?\>$/i', $text)) return null;
-      if ($xml = text_to_xml($text)) return xml_to_array($xml);
+      if (preg_match('/^\<\?xml .*\?\>$/i', $text)) {
+          return null;
+      }
+      if ($xml = text_to_xml($text)) {
+          return xml_to_array($xml);
+      }
       return false;
   }
   
@@ -1023,7 +1018,9 @@ 
   
   function save_configuration($array)
   {
-      if ($xml = array_to_xml($array)) return xml_to_text($xml, false, true);
+      if ($xml = array_to_xml($array)) {
+          return xml_to_text($xml, false, true);
+      }
       return false;
   }
   
@@ -1034,7 +1031,9 @@ 
   
   function array_to_xml($array, $dom = false, $parent_node = false) {
     $is_root = false;
-    if (!$dom) $dom = new DomDocument('1.0');
+    if (!$dom) {
+        $dom = new DomDocument('1.0');
+    }
     if (!$parent_node) {
       $parent_node = $dom;
       $is_root = true;
@@ -1054,26 +1053,22 @@ 
               $ordered_array[$item['@position']] = array(
                 $name => $item
               );
-            }
-            else {
+            } else {
               $unordered_array[] = array(
                 $name => $item
               );
             }
           }
-        }
-        elseif (isset($value['@position'])) {
+        } elseif (isset($value['@position'])) {
           $ordered_array[$value['@position']] = array(
             $name => $value
           );
-        }
-        else {
+        } else {
           $unordered_array[] = array(
             $name => $value
           );
         }
-      }
-      else {
+      } else {
         $unordered_array[] = array(
           $name => $value
         );
@@ -1087,12 +1082,16 @@ 
     foreach ($primed_array as $item) {
       list($name, $value) = each($item);
       if (strcmp($name, '@attributes') == 0) {
-        if (!is_array($value)) continue;
+        if (!is_array($value)) {
+            continue;
+        }
         foreach ($value as $attributeName => $attributeValue) {
           $parent_node->setAttribute($attributeName, $attributeValue);
         }
       } elseif (strcmp($name, '@value') == 0) {
-        if (isset($value)) $parent_node->nodeValue = $value;
+        if (isset($value)) {
+            $parent_node->nodeValue = $value;
+        }
       } elseif (strcmp($name, '@position') == 0) {
         continue;
       } else {
@@ -1114,7 +1113,9 @@ 
             $parent_node->appendChild(array_to_xml($value, $dom, $current_node));
           }
         } else {
-          if (isset($value)) $current_item->nodeValue = $value;
+          if (isset($value)) {
+              $current_item->nodeValue = $value;
+          }
           $parent_node->appendChild($current_item);
         }
       }
@@ -1178,7 +1179,9 @@ 
   
   function text_to_xml($text) {
     $xml = new DomDocument();
-    if ( !($xml->loadXML($text)) ) return false;
+    if ( !($xml->loadXML($text)) ) {
+        return false;
+    }
     return $xml;
   }
   
@@ -1195,7 +1198,9 @@ 
       while (!is_null($node)) {
           switch ($node->nodeType) {
           case XML_TEXT_NODE:
-              if (trim($node->nodeValue)  != '') $result = $node->nodeValue;
+              if (trim($node->nodeValue)  != '') {
+                  $result = $node->nodeValue;
+              }
               break;
           case XML_ELEMENT_NODE:
               $node_name = $node->nodeName;
@@ -1203,10 +1208,14 @@ 
               $sibling = $node->nextSibling;
               
               // Determine if this node forms a set with siblings (share a node name)
-              while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->nextSibling;
+              while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) {
+                  $sibling = $sibling->nextSibling;
+              }
               if (!$sibling) {
                   $sibling = $node->previousSibling;
-                  while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->previousSibling;
+                  while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) {
+                      $sibling = $sibling->previousSibling;
+                  }
               }
               
               if ($sibling) {
@@ -1301,8 +1310,7 @@ 
       . ' computers. Computers will be displayed when they have earned their'
       . ' first credits.') . '</p>';
     }
-  }
-  else {
+  } else {
     $output .=  '<h2>' . bts('Computers hidden') . '</h2>';
     $output .=  '<p>' . bts('This user has chosen not to show information'
     . ' about their computers.') . '</p>';
@@ -1462,8 +1470,7 @@ 
     if (!$received_time) {
       if (time() < $deadline) {
         $output = '<span class="on-time">' . $output . '</span>';
-      }
-      else {
+      } else {
         $output = '<span class="past-due">' . $output . '</span>';
       }
     }