BOINC / boinc

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

Spacing +20 added lines, -20 removed lines

@@ -59,7 +59,7 @@ 
   // In Drupal 7, these operation cases will all exist as their own hooks,
   // so let's approximate that here so that this function can simply be removed
   // upon migration to 7
-  switch($op) {
+  switch ($op) {
   case 'insert':
     boincteam_forum_node_insert($node);
     break;
@@ -84,7 +84,7 @@ 
  * is inserted (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_insert($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $account = user_load($node->uid);
     $team_id = boincteam_forum_lookup_nid($node->tfid);
@@ -107,7 +107,7 @@ 
  * is loaded (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_load($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $node->tfid = db_result(db_query("
       SELECT tfid FROM {boincteam_forum_node}
@@ -125,7 +125,7 @@ 
  * is updated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_update($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     
     break;
@@ -140,7 +140,7 @@ 
  * is validated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_validate($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $account = user_load($node->uid);
     // Get tfid from node, but if empty/null, get it from the database
@@ -167,7 +167,7 @@ 
  * is viewed (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_view($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $team_id = boincteam_forum_lookup_nid($node->tfid);
     $public_forum = boincteam_forum_is_public($node->tfid);
@@ -256,7 +256,7 @@ 
     while ($team_forum = db_fetch_object($result)) {
       
       $team_forum->link = url("community/teams/{$team_id}/forum/{$team_forum->tfid}");
-      $team_forum->zebra = $row % 2 ? 'even' : 'odd';
+      $team_forum->zebra = $row%2 ? 'even' : 'odd';
       $team_forum->new_topics = 0; // TODO: Track user views of team topics
       $team_forum->new_text = '';
       $team_forum->new_url = '';
@@ -324,7 +324,7 @@ 
  */
 function boincteam_forum_create_form_panel() {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create team message board')
+  $output .= '<h2 class="pane-title">'.bts('Create team message board')
     . '</h2>';
   $output .= drupal_get_form('boincteam_forum_create_form');
   
@@ -337,8 +337,8 @@ 
 function boincteam_forum_edit_form_panel($tfid) {
   $team_forum = boincteam_forum_load($tfid);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Edit message board') . ': ' . 
-    $team_forum->title . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Edit message board').': '. 
+    $team_forum->title.'</h2>';
   $output .= drupal_get_form('boincteam_forum_edit_form', $tfid);
   
   return $output;
@@ -354,19 +354,19 @@ 
   );
   $forums = boincteam_forum_list($team_id);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Team forum') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Team forum').'</h2>';
   $output .= '<p>'
     . bts('A discussion forum has been set up for team members.')
     . '</p>';
   $output .= '<ul class="tab-list action-list">';
   foreach ($forums as $forum) {
     if (!$show_public_only OR $forum->public) {
-      $output .= '  <li class="tab primary">' . 
+      $output .= '  <li class="tab primary">'. 
         l(
           //$forum->title,
           bts('Enter forum'),
           "community/teams/{$team_id}/forum/{$forum->tfid}"
-        ) . '</li>';
+        ).'</li>';
       // Since we're only supporting one team forum for now, we've labeled the
       // link in a generic way above and will now just break out of the loop
       break;
@@ -381,20 +381,20 @@ 
  */                                         
 function boincteam_forum_topic_overview_panel($nid = NULL) {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('About message boards') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('About message boards').'</h2>';
   $output .= '<div>';
   if ($nid) {
     $team = node_load($nid);
-    $output .= '<p>' . bts('You may create a message board for use by @team',
-      array('@team' => $team->title)) . ':</p>';
+    $output .= '<p>'.bts('You may create a message board for use by @team',
+      array('@team' => $team->title)).':</p>';
   }
   else {
-    $output .= '<p>' . bts('This is a team-only message board') . ':</p>';
+    $output .= '<p>'.bts('This is a team-only message board').':</p>';
   }
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Only members may post') . '</li>';
-  $output .= '  <li>' . bts('Only members may read (optional)') . '</li>';
-  $output .= '  <li>' . bts('Founder & Team Admins have moderator privileges') .
+  $output .= '  <li>'.bts('Only members may post').'</li>';
+  $output .= '  <li>'.bts('Only members may read (optional)').'</li>';
+  $output .= '  <li>'.bts('Founder & Team Admins have moderator privileges').
     '</li>';
   $output .= '</ul>';
   $output .= '</div>';

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
@@ -672,12 +672,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;
@@ -688,7 +688,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);
 }
 
 /**
@@ -726,26 +726,26 @@ 
  */                                         
 function boincteam_about_admins_panel() {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('About team admins') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('About team admins').'</h2>';
   $output .= '<div>';
-  $output .= '<p>' . bts('Team admins can:') . '</p>';
+  $output .= '<p>'.bts('Team admins can:').'</p>';
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Edit team information') . '</li>';
-  $output .= '  <li>' . bts("View the team's join / quit history") . '</li>';
-  $output .= '  <li>' . bts('Moderate the team forum') . '</li>';
-  $output .= '  <li>' . bts('Remove members from the team') . '</li>';
-  $output .= '  <li>' . bts('Disband a team if it has no members') . '</li>';
+  $output .= '  <li>'.bts('Edit team information').'</li>';
+  $output .= '  <li>'.bts("View the team's join / quit history").'</li>';
+  $output .= '  <li>'.bts('Moderate the team forum').'</li>';
+  $output .= '  <li>'.bts('Remove members from the team').'</li>';
+  $output .= '  <li>'.bts('Disband a team if it has no members').'</li>';
   $output .= '</ul>';
   $output .= '</div>';
   $output .= '<div>';
-  $output .= '<p>' . bts('Team admins cannot:') . '</p>';
+  $output .= '<p>'.bts('Team admins cannot:').'</p>';
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Change the team founder') . '</li>';
-  $output .= '  <li>' . bts('Remove members') . '</li>';
-  $output .= '  <li>' . bts('Add / Remove team admins') . '</li>';
+  $output .= '  <li>'.bts('Change the team founder').'</li>';
+  $output .= '  <li>'.bts('Remove members').'</li>';
+  $output .= '  <li>'.bts('Add / Remove team admins').'</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')
     . '</p>';
   return $output;
@@ -756,26 +756,26 @@ 
  */                                         
 function boincteam_about_founder_panel() {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Changing the team founder')
+  $output .= '<h2 class="pane-title">'.bts('Changing the team founder')
     . '</h2>';
   $output .= '<div>';
-  $output .= '<p>' . bts('Notes about changes in foundership:') . '</p>';
+  $output .= '<p>'.bts('Notes about changes in foundership:').'</p>';
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Any member of the team is eligible') . '</li>';
-  $output .= '  <li>' . bts('Current founder becomes a normal user') . '</li>';
+  $output .= '  <li>'.bts('Any member of the team is eligible').'</li>';
+  $output .= '  <li>'.bts('Current founder becomes a normal user').'</li>';
   $output .= '</ul>';
   $output .= '</div>';
   $output .= '<div>';
-  $output .= '<p>' . bts('Foundership can be requested by team members:')
+  $output .= '<p>'.bts('Foundership can be requested by team members:')
     . '</p>';
   $output .= '<ul>';
-  $output .= '  <li>' . bts('One request is allowed at a time') . '</li>';
-  $output .= '  <li>' . bts('It must be 60 days since any previous request')
+  $output .= '  <li>'.bts('One request is allowed at a time').'</li>';
+  $output .= '  <li>'.bts('It must be 60 days since any previous request')
     . '</li>';
-  $output .= '  <li>' . bts('Any active request must be older than 90 days')
+  $output .= '  <li>'.bts('Any active request must be older than 90 days')
     . '</li>';
-  $output .= '  <li>' . bts('Current founder has 60 days to respond to a'
-    . ' request') . '</li>';
+  $output .= '  <li>'.bts('Current founder has 60 days to respond to a'
+    . ' request').'</li>';
   $output .= '</ul>';
   $output .= '</div>';
   return $output;
@@ -789,9 +789,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') . '</h2>';
-  $output .= '<p>' . bts('If you cannot find a team that is right for you, you'
-    . ' can create a team.') . '</p>';
+  $output .= '<h2 class="pane-title">'.bts('Create a new team').'</h2>';
+  $output .= '<p>'.bts('If you cannot find a team that is right for you, you'
+    . ' can create a team.').'</p>';
   $output .= '<ul class="tab-list">';
   $output .= '  <li class="first last tab">';
   if (isset($account->roles[$unrestricted_role])) {
@@ -826,7 +826,7 @@ 
  */
 function boincteam_create_team_panel() {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create a team') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Create a team').'</h2>';
   $output .= drupal_get_form('boincteam_create_form');
   
   return $output;
@@ -844,23 +844,23 @@ 
   $account = user_load($uid);
   if ($account->team) {
     $team = boincteam_load(boincteam_lookup_id($account->team));
-    $output .= '<h2 class="pane-title">' . bts('Team') . '</h2>';
+    $output .= '<h2 class="pane-title">'.bts('Team').'</h2>';
     $output .= '<div class="stats">';
-    $output .= '  <label>' . bts('Name') . ': </label>';
-    $output .= '  <span>' . l($team->name, "community/teams/{$account->team}") . '</span>';
-    $output .= '</div>' . "\n";
+    $output .= '  <label>'.bts('Name').': </label>';
+    $output .= '  <span>'.l($team->name, "community/teams/{$account->team}").'</span>';
+    $output .= '</div>'."\n";
     $output .= '<div class="stats">';
-    $output .= '  <label>' . bts('Member since') . ': </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').': </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') . ': </label>';
-    $output .= '  <span>' . $team->country . '</span>';
-    $output .= '</div>' . "\n";
+    $output .= '  <label>'.bts('Country').': </label>';
+    $output .= '  <span>'.$team->country.'</span>';
+    $output .= '</div>'."\n";
     $output .= '<div class="stats">';
-    $output .= '  <label>' . bts('Total credit') . ': </label>';
-    $output .= '  <span>' . number_format($team->total_credit, 2) . '</span>';
-    $output .= '</div>' . "\n";
+    $output .= '  <label>'.bts('Total credit').': </label>';
+    $output .= '  <span>'.number_format($team->total_credit, 2).'</span>';
+    $output .= '</div>'."\n";
   }
   return $output;
 }
@@ -871,7 +871,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;
@@ -883,12 +883,12 @@ 
 function boincteam_join_team_panel($team_id) {
   $team = node_load($team_id);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Join team') . '</h2>';
-  $output .= '<p>' . bts('Click here to become a member of @this_team',
-    array('@this_team' =>$team->title)) . '</p>';
+  $output .= '<h2 class="pane-title">'.bts('Join team').'</h2>';
+  $output .= '<p>'.bts('Click here to become a member of @this_team',
+    array('@this_team' =>$team->title)).'</p>';
   $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">' . 
-    l(bts('Join this team'), "community/teams/{$team_id}/join") . '</li>';
+  $output .= '  <li class="first last tab">'. 
+    l(bts('Join this team'), "community/teams/{$team_id}/join").'</li>';
   $output .= '</ul>';
   return $output;
 }
@@ -899,12 +899,12 @@ 
 function boincteam_leave_team_panel($team_id) {
   $team = node_load($team_id);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Leave team') . '</h2>';
-  $output .= '<p>' . bts('Click here to revoke your membership with'
-    . ' @this_team', array('@this_team' =>$team->title)) . '</p>';
+  $output .= '<h2 class="pane-title">'.bts('Leave team').'</h2>';
+  $output .= '<p>'.bts('Click here to revoke your membership with'
+    . ' @this_team', array('@this_team' =>$team->title)).'</p>';
   $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">' . 
-    l(bts('Leave this team'), "community/teams/{$team_id}/leave") . '</li>';
+  $output .= '  <li class="first last tab">'. 
+    l(bts('Leave this team'), "community/teams/{$team_id}/leave").'</li>';
   $output .= '</ul>';
   return $output;
 }
@@ -914,10 +914,10 @@ 
  */                                         
 function boincteam_manage_admins_panel_header($team_id) {
   $output = '';
-  $output .= '<h4>' . bts('Add team admin') . '</h4>';
+  $output .= '<h4>'.bts('Add team admin').'</h4>';
   $output .= drupal_get_form('boincteam_add_admin_form', $team_id);
   $output .= '<div class="clearfix"></div>';
-  $output .= '<h4>' . bts('Current team admins') . '</h4>';
+  $output .= '<h4>'.bts('Current team admins').'</h4>';
   
   return $output;
 }
@@ -929,33 +929,33 @@ 
   $is_founder = boincteam_is_founder($team_id);
   $team = node_load($team_id);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Manage team') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Manage team').'</h2>';
   
   // Member list
   $output .= '<div class="form-item">';
-  $output .= '  <label>' . bts('View member list') . '</label>';
+  $output .= '  <label>'.bts('View member list').'</label>';
   $output .= '  <ul class="tab-list">';
-  $output .= '    <li class="first tab primary">' . 
-    l('HTML', "community/teams/{$team_id}/members") . '</li>';
-  $output .= '    <li class="last tab primary">' .
-    l('text', "community/teams/{$team_id}/members/email") . '</li>';
+  $output .= '    <li class="first tab primary">'. 
+    l('HTML', "community/teams/{$team_id}/members").'</li>';
+  $output .= '    <li class="last tab primary">'.
+    l('text', "community/teams/{$team_id}/members/email").'</li>';
   $output .= '  </ul>';
   $output .= '  <div class="description">';
-  $output .=   bts('Member names and emails');
+  $output .= bts('Member names and emails');
   $output .= '  </div>';
   $output .= '</div>'; 
   
   // Team history
   $output .= '<div class="form-item">';
-  $output .= '  <label>' . bts('View change history') . '</label>';
+  $output .= '  <label>'.bts('View change history').'</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');
+  $output .= bts('See member activity');
   $output .= '  </div>';
   $output .= '</div>';
   
@@ -972,13 +972,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'),
           "community/teams/{$team_id}/forum/{$team_forum_link_path}"
         );
       $output .= '    </li>';
       $output .= '  <div class="description">';
-      $output .=   bts('Create or manage message board');
+      $output .= bts('Create or manage message board');
       $output .= '  </div>';
       $output .= '</div>';
     }
@@ -987,29 +987,29 @@ 
   // Remove members
   $output .= '<div class="form-item">';
   $output .= '  <ul class="tab-list action-list">';
-  $output .= '    <li class="first tab primary">' . 
-    l(bts('Remove members'), "community/teams/{$team_id}/edit/members") . '</li>';
+  $output .= '    <li class="first tab primary">'. 
+    l(bts('Remove members'), "community/teams/{$team_id}/edit/members").'</li>';
   
   if ($is_founder) {
     
     // Change founder
-    $output .= '    <li class="tab primary">' . 
-      l(bts('Change founder'), "community/teams/{$team_id}/edit/founder") . '</li>';
+    $output .= '    <li class="tab primary">'. 
+      l(bts('Change founder'), "community/teams/{$team_id}/edit/founder").'</li>';
       
       // Manage admins
-    $output .= '    <li class="tab primary">' . 
-      l(bts('Manage team admins'), "community/teams/{$team_id}/edit/admins") . '</li>';
+    $output .= '    <li class="tab primary">'. 
+      l(bts('Manage team admins'), "community/teams/{$team_id}/edit/admins").'</li>';
   }
   
   // Edit team information
-  $output .= '    <li class="tab primary">' . 
-    l(bts('Edit team info'), "community/teams/{$team_id}/edit/info") . '</li>';
+  $output .= '    <li class="tab primary">'. 
+    l(bts('Edit team info'), "community/teams/{$team_id}/edit/info").'</li>';
     
   if ($is_founder) {
     
     // Delete the team
-    $output .= '    <li class="last tab primary">' . 
-      l(bts('Remove team'), "community/teams/{$team_id}/delete") . '</li>';
+    $output .= '    <li class="last tab primary">'. 
+      l(bts('Remove team'), "community/teams/{$team_id}/delete").'</li>';
   }
   
   $output .= '  </ul>';
@@ -1026,12 +1026,12 @@ 
   $account = user_load($user->uid);
   $team = node_load($account->team);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('My team') . '</h2>';
-  $output .= '<p>' . bts('You are a member of @team.', 
-    array('@team' => $team->title)) . '</p>';
+  $output .= '<h2 class="pane-title">'.bts('My team').'</h2>';
+  $output .= '<p>'.bts('You are a member of @team.', 
+    array('@team' => $team->title)).'</p>';
   $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">' . 
-    l(bts('View my team'), "community/teams/{$account->team}") . '</li>';
+  $output .= '  <li class="first last tab">'. 
+    l(bts('View my team'), "community/teams/{$account->team}").'</li>';
   $output .= '</ul>';
   return $output;
 }
@@ -1047,11 +1047,11 @@ 
   $boincteam = boincteam_load($boincteam_id);
   $boincuser_id = $account->boincuser_id;
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Request foundership') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('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) {
@@ -1079,8 +1079,8 @@ 
       }
       $output .= '</p>';
       $output .= '<ul class="tab-list">';
-      $output .= '  <li class="first last tab">' . 
-        l(bts('Assume foundership'), "community/teams/{$team_id}/assume-foundership") . '</li>';
+      $output .= '  <li class="first last tab">'. 
+        l(bts('Assume foundership'), "community/teams/{$team_id}/assume-foundership").'</li>';
       $output .= '</ul>';
     }
     else {
@@ -1104,29 +1104,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.'
     );
     if ($days_to_deadline == 1) {
-      $output .= ' (' . bts('1 day remaining') . ')';
+      $output .= ' ('.bts('1 day remaining').')';
     }
     else {
-      $output .= ' (' . bts('@count days remaining',
+      $output .= ' ('.bts('@count days remaining',
         array('@count' => $days_to_deadline)
-      ) . ')';
+      ).')';
     }
     $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)) . '</p>';
+      array('@this_team' =>$team->title)).'</p>';
     $output .= '<ul class="tab-list">';
-    $output .= '  <li class="first last tab">' . 
-      l(bts('Initiate request'), "community/teams/{$team_id}/request-foundership") . '</li>';
+    $output .= '  <li class="first last tab">'. 
+      l(bts('Initiate request'), "community/teams/{$team_id}/request-foundership").'</li>';
     $output .= '</ul>';
   }
   return $output;
@@ -1147,15 +1147,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')
+      $output .= '<h2 class="pane-title">'.bts('Obsolete transfer request')
         . '</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),
         )
-      ) . '</p>';
+      ).'</p>';
       // Automatically cancel the request
       db_set_active('boinc');
       db_query("
@@ -1168,15 +1168,15 @@ 
     }
     else {
       $member = user_load(boincuser_lookup_uid($boincteam->ping_user));
-      $output .= '<h2 class="pane-title">' . bts('Respond to transfer request')
+      $output .= '<h2 class="pane-title">'.bts('Respond to transfer request')
         . '</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,
         )
-      ) . '</p>';
-      $output .= '<p>' . bts("If you don't decline the request by @date, @name"
+      ).'</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)',
@@ -1184,10 +1184,10 @@ 
           '@name' => $member->boincuser_name,
           '@date' => date('j M Y', boincteam_foundership_transfer_ok_time($boincteam)),
         )
-      ) . '</p>';
+      ).'</p>';
       $output .= '<ul class="tab-list">';
-      $output .= '  <li class="first last tab">' . 
-        l(bts('Deny request'), "community/teams/{$team_id}/deny-foundership-request") . '</li>';
+      $output .= '  <li class="first last tab">'. 
+        l(bts('Deny request'), "community/teams/{$team_id}/deny-foundership-request").'</li>';
       $output .= '</ul>';
     }
   }
@@ -1197,9 +1197,9 @@ 
 function boincteam_search_panel() {
   $output = '';
   if (module_exists('global_search_teams_solr')) {
-    $output .= '<h2 class="pane-title">' . bts('Search teams') . '</h2>';
+    $output .= '<h2 class="pane-title">'.bts('Search teams').'</h2>';
     //$output .= '<p>' . bts('Render a search form here.') . '</p>';
-    $output .= '<p>' . boincteam_search_view() . '</p>';
+    $output .= '<p>'.boincteam_search_view().'</p>';
   }
   return $output;
 }
@@ -1215,20 +1215,20 @@ 
  * General info about the concept of teams
  */                                         
 function boincteam_topic_overview_panel() {
-  $site_name =  variable_get('site_name', bts('Project'));
+  $site_name = variable_get('site_name', bts('Project'));
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Teams') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Teams').'</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)) . '</p>';
+    . ' founder who may:', array('@project' => $site_name)).'</p>';
   $output .= '<ul>';
-  $output .= '  <li>' . bts("access team members' email addresses") . '</li>';
-  $output .= '  <li>' . bts("edit the team's name and description") . '</li>';
-  $output .= '  <li>' . bts('add or remove team admins') . '</li>';
-  $output .= '  <li>' . bts('remove members from the team') . '</li>';
-  $output .= '  <li>' . bts('disband a team if it has no members') . '</li>';
+  $output .= '  <li>'.bts("access team members' email addresses").'</li>';
+  $output .= '  <li>'.bts("edit the team's name and description").'</li>';
+  $output .= '  <li>'.bts('add or remove team admins').'</li>';
+  $output .= '  <li>'.bts('remove members from the team').'</li>';
+  $output .= '  <li>'.bts('disband a team if it has no members').'</li>';
   $output .= '</ul>';
   $output .= '</div>';
   return $output;
@@ -1273,34 +1273,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 credits') . ': ' . number_format($boincteam->total_credit, 2) . '</li>';
-  $output .= '  <li>' . bts('Recent avg credits') . ': ' . number_format($boincteam->expavg_credit, 2) . '</li>';
-  $output .= '  <li>' . bts('Country') . ': ' . $boincteam->country . '</li>';
-  $output .= '  <li>' . bts('Type') . ': ' . boincteam_get_type($team_id) . '</li>';
+  $output .= '  <li>'.bts('Total credits').': '.number_format($boincteam->total_credit, 2).'</li>';
+  $output .= '  <li>'.bts('Recent avg credits').': '.number_format($boincteam->expavg_credit, 2).'</li>';
+  $output .= '  <li>'.bts('Country').': '.$boincteam->country.'</li>';
+  $output .= '  <li>'.bts('Type').': '.boincteam_get_type($team_id).'</li>';
   $output .= '</ul>';
   $output .= '</div>';
   $output .= '<div class="right-column">';
   $output .= '<ul class="stats">';
-  $output .= '  <li>' . bts('Founder') . ': ' . l($founder->boincuser_name, "account/{$founder->uid}") . '</li>';
-  $output .= '  <li>' . bts('New members in last day') . ': ' . implode('&middot;', $new_members) . '</li>';
-  $output .= '  <li>' . bts('Total members') . ': ' . l($boincteam->nusers, "community/teams/{$team_id}/members") . '</li>';
-  $output .= '  <li>' . bts('Active members') . ': ' . $boincteam->nusers_active . '</li>';
-  $output .= '  <li>' . bts('Members with credit') . ': ' . $boincteam->nusers_worked . '</li>';
+  $output .= '  <li>'.bts('Founder').': '.l($founder->boincuser_name, "account/{$founder->uid}").'</li>';
+  $output .= '  <li>'.bts('New members in last day').': '.implode('&middot;', $new_members).'</li>';
+  $output .= '  <li>'.bts('Total members').': '.l($boincteam->nusers, "community/teams/{$team_id}/members").'</li>';
+  $output .= '  <li>'.bts('Active members').': '.$boincteam->nusers_active.'</li>';
+  $output .= '  <li>'.bts('Members with credit').': '.$boincteam->nusers_worked.'</li>';
   $output .= '</ul>';
   $output .= '</div>';
   $output .= '</div>';
   $output .= '<div class="clearfix"></div>';
   if ($boincteam->url) {
     $output .= '<div class="stats">';
-    $output .= bts('Web site') . ': ' . l("http://{$boincteam->url}", "http://{$boincteam->url}");
+    $output .= bts('Web site').': '.l("http://{$boincteam->url}", "http://{$boincteam->url}");
     $output .= '</div>';
   }
   if ($team->body) {
-    $output .= '<h3>' . bts('Description') . '</h3>';
+    $output .= '<h3>'.bts('Description').'</h3>';
     $output .= check_markup($team->body, $team->format);
     $output .= '</div>';
   }

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +40 added lines, -40 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.'),
   );
   $form['prefs']['advanced']['processor']['hour_label'] = array(
-    '#value' => '<div class="form-item"><label>' . bts('Compute only between:') . '</label></div>'
+    '#value' => '<div class="form-item"><label>'.bts('Compute only between:').'</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') . '</span>'
+    '#value' => '<span>'.bts('and').'</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.') . '</div></div>'
+    '#value' => '<div class="form-item slim"><div class="description">'.bts('Compute only during a particular period each day.').'</div></div>'
   );
   $form['prefs']['advanced']['processor']['leave_apps_in_memory'] = array(
     '#title' => bts('Leave non-GPU tasks in memory while suspended?'),
@@ -454,7 +454,7 @@ 
     '#description' => bts('Limit the upload rate of file transfers.')
   );
   $form['prefs']['advanced']['network']['hour_label'] = array(
-    '#value' => '<div class="form-item"><label>' . bts('Transfer files only between') . '</label></div>'
+    '#value' => '<div class="form-item"><label>'.bts('Transfer files only between').'</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') . '</span>'
+    '#value' => '<span>'.bts('and').'</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.') . '</div></div>'
+    '#value' => '<div class="form-item slim"><div class="description">'.bts('Transfer files only during a particular period each day.').'</div></div>'
   ); 
   $form['prefs']['advanced']['network']['daily_xfer_limit_mb'] = array(
     '#title' => bts('Limit usage to'),
@@ -530,23 +530,23 @@ 
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel'), drupal_get_path_alias("account/prefs/computing/edit")) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('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'), "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)) . '\')'
+            'onclick' => 'return confirm(\''.bts('This will remove all of your settings from the @name preference set. Are you sure?',
+              array('@name' => $venue)).'\')'
           )
         )
-      ) . '</li>';
+      ).'</li>';
   }
   $form['prefs']['view control'] = array(
-    '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view') . ')', 'account/prefs/computing/combined') . '</li>'
+    '#value' => '<li class="first alt tab">'.l('('.bts('Show comparison view').')', 'account/prefs/computing/combined').'</li>'
   );
   $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
@@ -852,9 +852,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.') . '</p>'
+      . ' identities with the newest one.').'</p>'
       . '<p>'
       . bts('Check the computers that are the same as @name'
       . ' (created on @date at @time with computer ID @id)',
@@ -864,7 +864,7 @@ 
           '@time' => date('H:i:s T', $current_host->create_time),
           '@id' => $current_host->id,
         )
-      ) . '</p>',
+      ).'</p>',
   );
   
   $options = array();
@@ -898,7 +898,7 @@ 
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel'), "host/{$host_id}") . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel'), "host/{$host_id}").'</li>'
   );
   
   return $form;
@@ -943,7 +943,7 @@ 
       if (count($merged) == 2) {
         $oxford_comma = '';
       }
-      $list = implode(', ', $list) . $oxford_comma . ' ' . $conjunction . ' ' . $last;
+      $list = implode(', ', $list).$oxford_comma.' '.$conjunction.' '.$last;
     }
     else {
       $list = $last;
@@ -1182,23 +1182,23 @@ 
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel'), $_GET['q']) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('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'), "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)) . '\')'
+            'onclick' => 'return confirm(\''.bts('This will remove all of your settings from the @name preference set. Are you sure?',
+              array('@name' => $venue)).'\')'
           )
         )
-      ) . '</li>';
+      ).'</li>';
   }
   $form['prefs']['view control'] = array(
-    '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view') . ')', 'account/prefs/project/combined') . '</li>'
+    '#value' => '<li class="first alt tab">'.l('('.bts('Show comparison view').')', 'account/prefs/project/combined').'</li>'
   );
   $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
@@ -1241,7 +1241,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']);
   }
 }
@@ -1467,7 +1467,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',
@@ -1492,20 +1492,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)),
+    '#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)),
     '#description' => bts('Your Gravatar will not be shown if you upload a user picture.'),
   );
   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)),
+      '#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)),
       '#description' => bts('Gravatar will not be shown if an avatar is uploaded.'),
       '#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') . '</a></legend>';
+  $form['gravatar']['#prefix'] = '<fieldset class="collapsible"><legend><a href="#">'.bts('Avatar settings').'</a></legend>';
   // Upload an avatar (pulled from profile_node_form):
   if (!empty($profile_form['field_image'])) {
     $form['field_image'] = $profile_form['field_image'];
@@ -1540,7 +1540,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') . '</span>'
+    '#value' => '<span>'.bts('comments per page').'</span>'
   );
   $form['forums']['comments_order'] = array(
     '#type' => 'select',
@@ -1610,7 +1610,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel'), $_GET['q']) . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel'), $_GET['q']).'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -1666,10 +1666,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'];
       }
     }
   }
@@ -1747,7 +1747,7 @@ 
     '#suffix' => '</li>'
   );
   $form['prefs']['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel'), $_GET['q']) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel'), $_GET['q']).'</li>'
   );
   $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'

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

Spacing +48 added lines, -48 removed lines

@@ -167,7 +167,7 @@ 
   
   if ($preset) {
     // Load preset from configuration
-    $preset_prefs = (array) $preset_prefs['general_preferences'];
+    $preset_prefs = (array)$preset_prefs['general_preferences'];
     if (isset($preset_prefs['preset'])) {
       if (!is_numeric(key($preset_prefs['preset']))) {
         $preset_prefs['preset'] = array($preset_prefs['preset']);
@@ -188,7 +188,7 @@ 
 function boincwork_get_project_specific_config() {
   $raw_config_data = variable_get('boinc_project_specific_prefs_config', '');
   
-  $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
+  $xsd = './'.drupal_get_path('module', 'boincwork').'/includes/projectprefs.xsd';
   libxml_use_internal_errors(true);
   
   $xml = new DomDocument();
@@ -196,8 +196,8 @@ 
   if (!$xml->schemaValidate($xsd)) {
     $errors = libxml_get_errors();
     $lines = explode("\r", $raw_config_data);
-    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
-      ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
+    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}".
+      ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), 'error');
     return NULL;
   }
   
@@ -392,13 +392,13 @@ 
       
       // Use appropriate datatype
       if (isset($element['@attributes']['datatype'])) {
-        switch($element['@attributes']['datatype']) {
+        switch ($element['@attributes']['datatype']) {
         case 'integer':
-          $value = (int) $value;
+          $value = (int)$value;
           break;
           
         case 'float':
-          $value = number_format((float) $value, 2);
+          $value = number_format((float)$value, 2);
           break;
         
         default:
@@ -420,7 +420,7 @@ 
         '#type' => 'textfield',
         '#default_value' => $value,
         '#size' => 5,
-        '#description' => $description . bts(' Default value: @default', array('@default' => $default))
+        '#description' => $description.bts(' Default value: @default', array('@default' => $default))
       );
     }
     break;
@@ -484,7 +484,7 @@ 
       $name = $element['@attributes']['name'];
       $default = null;
       $options = array();
-      foreach($element['items']['item'] as $item) {
+      foreach ($element['items']['item'] as $item) {
         if (is_array($item)) {
           $value = $item['@value'];
           if ($default === NULL AND
@@ -526,7 +526,7 @@ 
         '#options' => $options,
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $value,
-        '#description' => $description . bts(' Default value: @default', array('@default' =>$default))
+        '#description' => $description.bts(' Default value: @default', array('@default' =>$default))
       );
     }
     break;
@@ -591,7 +591,7 @@ 
     }
     foreach ($elements as $key => $element) {
       $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $name = str_replace(' ','_',strtolower($title));
+      $name = str_replace(' ', '_', strtolower($title));
       $name = "group_{$name}";
       
       // Translate elements as appropriate
@@ -743,13 +743,13 @@ 
   if ($type == 'project') {
     if ($boincuser->project_prefs) {
       $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+      $main_prefs = (array)$main_prefs['project_preferences'];
     }
   }
   else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+      $main_prefs = (array)$main_prefs['global_preferences'];
     }
   }
   
@@ -801,13 +801,13 @@ 
   if ($type == 'project') {
     if ($boincuser->project_prefs) {
       $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+      $main_prefs = (array)$main_prefs['project_preferences'];
     }
   }
   else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+      $main_prefs = (array)$main_prefs['global_preferences'];
     }
   }
   
@@ -996,11 +996,11 @@ 
   $magnitude = 0;
   $precision = 0;
   if ($digits > $max_digits) {
-    $magnitude = floor(($digits - ($max_digits - 3)) / 3);
-    $precision = $max_digits - ($digits - ($magnitude * 3) + 1);
-    $number = round($number / pow(1000, $magnitude), $precision);
+    $magnitude = floor(($digits - ($max_digits - 3))/3);
+    $precision = $max_digits - ($digits - ($magnitude*3) + 1);
+    $number = round($number/pow(1000, $magnitude), $precision);
   }
-  $number = number_format($number, $precision) . (($magnitude) ? "{$suffix[$magnitude]}" : '');
+  $number = number_format($number, $precision).(($magnitude) ? "{$suffix[$magnitude]}" : '');
   
   return $number;
 }
@@ -1178,7 +1178,7 @@ 
   
   function text_to_xml($text) {
     $xml = new DomDocument();
-    if ( !($xml->loadXML($text)) ) return false;
+    if (!($xml->loadXML($text))) return false;
     return $xml;
   }
   
@@ -1195,7 +1195,7 @@ 
       while (!is_null($node)) {
           switch ($node->nodeType) {
           case XML_TEXT_NODE:
-              if (trim($node->nodeValue)  != '') $result = $node->nodeValue;
+              if (trim($node->nodeValue) != '') $result = $node->nodeValue;
               break;
           case XML_ELEMENT_NODE:
               $node_name = $node->nodeName;
@@ -1212,7 +1212,7 @@ 
               if ($sibling) {
                   $result[$node_name][$index] = '';
                   if ($node->childNodes) {
-                      $result[$node_name][$index] = xml_to_array($node) ;
+                      $result[$node_name][$index] = xml_to_array($node);
                   }
                   if ($node->hasAttributes()) {
                       $attributes = $node->attributes;
@@ -1235,14 +1235,14 @@ 
               } else {
                   $result[$node_name] = '';
                   if ($node->childNodes) {
-                      $result[$node_name] = xml_to_array($node) ;
+                      $result[$node_name] = xml_to_array($node);
                   }
                   if ($node->hasAttributes()) {
                       $attributes = $node->attributes;
                       if ($result[$node_name] !== '' AND !is_array($result[$node_name])) {
                           $result[$node_name] = array('@value' => $result[$node_name]);
                       }
-                      foreach($attributes as $key => $attribute) {
+                      foreach ($attributes as $key => $attribute) {
                           $result[$node_name]['@attributes'][$attribute->name] = $attribute->value;
                       }
                   }
@@ -1282,30 +1282,30 @@ 
   // Determine if hosts are associated at all or just hidden
   $output = '';
   if ($boincuser->show_hosts) {
-    switch($context) {
+    switch ($context) {
     case 'active':
-      $output .=  '<h2>' . bts('No active computers') . '</h2>';
-      $output .=  '<p>' . bts('This user has no computers that have been'
-      . ' active in the last 30 days.') . '</p>';
+      $output .= '<h2>'.bts('No active computers').'</h2>';
+      $output .= '<p>'.bts('This user has no computers that have been'
+      . ' active in the last 30 days.').'</p>';
       break;
       
     case 'preferences':
-      $output .=  '<h2>' . bts('No computers') . '</h2>';
-      $output .=  '<p>' . bts('There are no computers assigned to this'
-      . ' preference set.') . '</p>';
+      $output .= '<h2>'.bts('No computers').'</h2>';
+      $output .= '<p>'.bts('There are no computers assigned to this'
+      . ' preference set.').'</p>';
       break;
     
     default:
-      $output .=  '<h2>' . bts('Computers pending') . '</h2>';
-      $output .=  '<p>' . bts('This user does not yet have any associated'
+      $output .= '<h2>'.bts('Computers pending').'</h2>';
+      $output .= '<p>'.bts('This user does not yet have any associated'
       . ' computers. Computers will be displayed when they have earned their'
-      . ' first credits.') . '</p>';
+      . ' first credits.').'</p>';
     }
   }
   else {
-    $output .=  '<h2>' . bts('Computers hidden') . '</h2>';
-    $output .=  '<p>' . bts('This user has chosen not to show information'
-    . ' about their computers.') . '</p>';
+    $output .= '<h2>'.bts('Computers hidden').'</h2>';
+    $output .= '<p>'.bts('This user has chosen not to show information'
+    . ' about their computers.').'</p>';
   }
   return $output;
 }
@@ -1317,11 +1317,11 @@ 
   
   // 
   $output = '';
-  switch($context) {
+  switch ($context) {
   default:
-    $output .=  '<h2>' . bts('No @type tasks', array('@type' => $context))
+    $output .= '<h2>'.bts('No @type tasks', array('@type' => $context))
     . '</h2>';
-    $output .=  '<p>' . bts('There are no tasks of this type on record')
+    $output .= '<p>'.bts('There are no tasks of this type on record')
     . '</p>';
   }
   return $output;
@@ -1343,10 +1343,10 @@ 
       $output .= l(bts('Delete'), "host/{$host_id}/delete",
         array(
           'attributes' => array(
-            'onclick' => 'return confirm(\'' . bts('This will delete host @id'
+            'onclick' => 'return confirm(\''.bts('This will delete host @id'
               . ' from your account forever. Are you sure this is OK?',
               array('@id' => $host_id)
-            ) . '\')'
+            ).'\')'
           )
         )
       );
@@ -1410,7 +1410,7 @@ 
   $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
   $log = '';
   if ($timestamp) {
-    $output = gmdate('j M Y | G:i:s', $timestamp) . ' UTC';
+    $output = gmdate('j M Y | G:i:s', $timestamp).' UTC';
   }
   if ($root_log_dir AND $host_id) {
     $subdir = substr($host_id, 0, -3) OR $subdir = 0;
@@ -1436,8 +1436,8 @@ 
       "{$path}/school" => bts('School')
     );
     variable_set('jump_use_js_venues-Array', 1);
-    drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-    drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
+    drupal_add_js(drupal_get_path('module', 'jump').'/jump.js');
+    drupal_add_js(drupal_get_path('theme', 'boinc').'/js/prefs.js', 'theme');
     // Get current venue
     db_set_active('boinc');
     $venue = db_result(db_query(
@@ -1457,14 +1457,14 @@ 
   $output = '---';
   if ($received_time OR $deadline) {
     $timestamp = ($received_time) ? $received_time : $deadline;
-    $output = gmdate('j M Y, G:i:s', $timestamp) . ' UTC';
+    $output = gmdate('j M Y, G:i:s', $timestamp).' UTC';
     // Add a wrapper to deadline text
     if (!$received_time) {
       if (time() < $deadline) {
-        $output = '<span class="on-time">' . $output . '</span>';
+        $output = '<span class="on-time">'.$output.'</span>';
       }
       else {
-        $output = '<span class="past-due">' . $output . '</span>';
+        $output = '<span class="past-due">'.$output.'</span>';
       }
     }
   }

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

Spacing +30 added lines, -30 removed lines

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

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

Spacing +2 added lines, -2 removed lines

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

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

Spacing +2 added lines, -2 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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