BOINC / boinc

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

Braces +9 added lines, -18 removed lines

@@ -279,8 +279,7 @@ 
         'href' => 'account/prefs/privacy/ignore_user/remove/'. $author->uid,
         'query' => 'destination=messages/view/' . $thread_id,
       );
-    }
-    else {
+    } else {
       $vars['message_actions']['ignore_user'] = array(
         'title' => bts('Ignore User', array(), NULL, 'boinc:ignore-user-add'),
         'href' => 'account/prefs/privacy/ignore_user/add/'. $author->uid,
@@ -387,8 +386,7 @@ 
             }
             if (!$special) {
               $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
-            }
-            else {
+            } else {
               // The "very special" case where we merge two prefs
               $second_pref = $special_map[$name];
               $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref];
@@ -396,8 +394,7 @@ 
               $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
                 " {$second_value} {$second_pref_setting['#field_suffix']} </td>";
             }
-          }
-          else  {
+          } else {
             $output .= '<td>---</td>';
           }
         }
@@ -923,22 +920,19 @@ 
         drupal_set_message(t('Host @id has been removed from your account.',
           array('@id' => $host_id)));
         drupal_goto('account/computers');
-      }
-      else {
+      } else {
         drupal_set_message(t('Host @id could not be deleted. Not sure why...',
           array('@id' => $host_id)), 'error'
         );
       }
-    }
-    else {
+    } else {
       drupal_set_message(t('Host @id cannot be deleted because it still has
         tasks associated with it. These tasks should be processed within the
         next few days, after which the host can be deleted.', 
         array('@id' => $host_id)), 'warning'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(t('You are not the owner of host @id, so you cannot
       delete it.', 
       array('@id' => $host_id)), 'error'
@@ -986,15 +980,13 @@ 
         bts('The location for this host has been updated.', array(), NULL, 'boinc:account-host-details')
         . bts('This will take effect next time the host contacts the project.', array(), NULL, 'boinc:account-host-details')
       );
-    }
-    else {
+    } else {
       drupal_set_message(
         bts('Unable to save changes to this host for some reason!', array(), NULL, 'boinc:account-host-details'),
         'error'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(
       bts('You are not allowed to make changes to this host.', array(), NULL, 'boinc:account-host-details'),
       'warning'
@@ -1129,8 +1121,7 @@ 
       $venue = $active_venue;
       //unset($_SESSION['prefs venue']);
     }
-  }
-  else {
+  } else {
     // Set the active venue to keep it selected between computing and project
     // preference pages
     $_SESSION['prefs venue'] = $venue;

html/inc/util.inc

Braces +7 added lines, -6 removed lines

@@ -207,7 +207,7 @@ 
 // with an existing web framework can more easily do so.
 // To do so, define page_head() in the project include file.
 //
-if (!function_exists("page_head")){
+if (!function_exists("page_head")) {
 function page_head(
     $title,
         // page title. Put in <title>, used as title for browser tab.
@@ -293,7 +293,8 @@ 
     echo '<div class="container-fluid">
     ';
 
-    switch($title) {    //kludge
+    switch($title) {
+//kludge
     case tra("Log in"):
     case tra("Create an account"):
     case tra("Server status page"):
@@ -309,7 +310,7 @@ 
 
 // See the comments for page_head()
 //
-if (!function_exists("page_tail")){
+if (!function_exists("page_tail")) {
 function page_tail(
     $show_date=false,
         // true for pages that are generated periodically rather than on the fly
@@ -330,7 +331,7 @@ 
 }
 }
 
-function display_cvs_versions(){
+function display_cvs_versions() {
     global $cvs_version_tracker;
     echo "\n<!-- SVN VERSIONS -->\n";
     for ($i=0;$i<sizeof($cvs_version_tracker);$i++) {
@@ -816,7 +817,7 @@ 
     return $str;
 }
 
-function strip_bbcode($string){
+function strip_bbcode($string) {
     return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
 }
 
@@ -1047,7 +1048,7 @@ 
 // Otherwise return 0.
 // Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
 //
-function boinc_client_version(){
+function boinc_client_version() {
     if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
     $x = $_SERVER['HTTP_USER_AGENT'];
     $e =  "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";

drupal/sites/default/boinc/modules/boincimport/includes/import_team.php

Braces +4 added lines, -3 removed lines

@@ -57,8 +57,7 @@ 
     if (module_exists('pathauto')) {
       module_load_include('inc', 'pathauto', 'pathauto');
       $node['path'] = pathauto_cleanstring($boincteam->name);
-    }
-    else {
+    } else {
       echo 'Pathauto module is required!';
       exit;
     }
@@ -77,7 +76,9 @@ 
   // Determine team membership
   db_set_active('boinc_rw');
   $boincteam_member_ids = array();
-  while ($boincuser = db_fetch_object($boincteam_members)) $boincteam_member_ids[] = $boincuser->id;
+  while ($boincuser = db_fetch_object($boincteam_members)) {
+      $boincteam_member_ids[] = $boincuser->id;
+  }
   db_set_active('default');
   if ($boincteam_member_ids) {
     $team_members = db_query('SELECT uid FROM {boincuser} WHERE boinc_id IN(%s)', implode(',', $boincteam_member_ids));

drupal/sites/default/settings.php

Braces +1 added lines, -2 removed lines

@@ -126,8 +126,7 @@
 
 if (isset($boinc_ro_dbtype) && isset($boinc_ro_dbuser) && isset($boinc_ro_dbpass) && isset($boinc_ro_dbserver) && isset($boinc_ro_dbname)) {
   $db_url['boinc_ro'] = "{$boinc_ro_dbtype}://{$boinc_ro_dbuser}:".urlencode($boinc_ro_dbpass)."@{$boinc_ro_dbserver}/{$boinc_ro_dbname}";
-}
-else {
+} else {
   $db_url['boinc_ro'] = $db_url['boinc_rw'];
 }
 

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

Braces +41 added lines, -72 removed lines

@@ -332,8 +332,7 @@ 
         $name = $element['@attributes']['name'];
         if (isset($element['@attributes']['entitytype']) AND $element['@attributes']['entitytype'] == 'attribute') {
           $defaults['@attributes'][$name] = $values[$name];
-        }
-        else {
+        } else {
           $defaults[$name] = $values[$name];
         }
       }
@@ -384,8 +383,7 @@ 
       if (isset($user_pref[$name])) {
         if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
           $value = $user_pref[$name]['@value'];
-        }
-        else {
+        } else {
           $value = $user_pref[$name];
         }
       }
@@ -447,8 +445,7 @@ 
       if (isset($user_pref[$name])) {
         if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
           $value = $user_pref[$name]['@value'];
-        }
-        else {
+        } else {
           $value = $user_pref[$name];
         }
       }
@@ -492,8 +489,7 @@ 
               isset($item['@attributes']['selected'])) {
             $default = ($item['@attributes']['selected'] == 'true') ? $item['@value'] : null;
           }
-        }
-        else {
+        } else {
           $value = $item;
         }
         $options[$value] = $value;
@@ -696,8 +692,7 @@ 
       );
       if ($top_level) {
         $uncategorized[$key] = $prefs_element;
-      }
-      else {
+      } else {
         $prefs_table[$key] = $prefs_element;
       }
       break;
@@ -711,8 +706,7 @@ 
       'name' => bts('Other settings', array(), NULL, 'boinc:account-preferences'),
       'elements' => $uncategorized,
     );
-  }
-  elseif ($uncategorized) {
+  } elseif ($uncategorized) {
     // If nothing is categorized, output all prefs under a general "settings"
     $prefs_table['settings'] = array(
       'name' => bts('Settings', array(), NULL, 'boinc:account-preferences'),
@@ -745,8 +739,7 @@ 
       $main_prefs = load_configuration($boincuser->project_prefs);
       $main_prefs = (array) $main_prefs['project_preferences'];
     }
-  }
-  else {
+  } else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
       $main_prefs = (array) $main_prefs['global_preferences'];
@@ -762,8 +755,7 @@ 
     if (count($main_prefs) < 3)
         $main_prefs['@attributes'] = array('cleared' => 1);
     return $main_prefs;
-  }
-  else {
+  } else {
     if (isset($main_prefs['venue'])) {
       if (!is_numeric(key($main_prefs['venue']))) {
         $main_prefs['venue'] = array($main_prefs['venue']);
@@ -803,8 +795,7 @@ 
       $main_prefs = load_configuration($boincuser->project_prefs);
       $main_prefs = (array) $main_prefs['project_preferences'];
     }
-  }
-  else {
+  } else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
       $main_prefs = (array) $main_prefs['global_preferences'];
@@ -817,8 +808,7 @@ 
   if (!$venue OR $venue == 'generic') {
     //$main_prefs = $prefs;
     $main_prefs = $prefs + $main_prefs;
-  }
-  else {
+  } else {
     if (isset($main_prefs['venue'])) {
       if (!is_numeric(key($main_prefs['venue']))) {
         $main_prefs['venue'] = array($main_prefs['venue']);
@@ -827,8 +817,7 @@ 
         if (isset($prefs_venue['@attributes']['name']) AND $prefs_venue['@attributes']['name'] == $venue) {
           if ($prefs) {
             $main_prefs['venue'][$key] = $prefs;
-          }
-          else {
+          } else {
             // If prefs is null, clear out this preference set
             unset($main_prefs['venue'][$key]);
             if (count($main_prefs['venue']) == 0) {
@@ -875,8 +864,7 @@ 
     db_set_active('boinc_rw');
     $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_rw');
@@ -963,8 +951,7 @@ 
         NULL, 'boinc:ignore-user-add'),
       'status');
     drupal_goto();
-  }
-  else {
+  } else {
     drupal_not_found();
   }// endif iuid
 }
@@ -1027,15 +1014,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'])) {
@@ -1118,8 +1103,7 @@ 
   //  load_configuration(): Convert structured text/xml to array
   //------------------------------------------------------------------------------------------------
   
-  function load_configuration($text)
-  {
+  function load_configuration($text) {
       if (preg_match('/^\<\?xml .*\?\>$/i', $text)) return null;
       if ($xml = text_to_xml($text)) return xml_to_array($xml);
       return false;
@@ -1129,8 +1113,7 @@ 
   //  save_configuration(): Convert array to structured text/xml
   //------------------------------------------------------------------------------------------------
   
-  function save_configuration($array)
-  {
+  function save_configuration($array) {
       if ($xml = array_to_xml($array)) return xml_to_text($xml, false, true);
       return false;
   }
@@ -1162,26 +1145,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
         );
@@ -1267,8 +1246,7 @@ 
   //  xml_to_text(): Convert an XML DOM object to string format
   //------------------------------------------------------------------------------------------------
   
-  function xml_to_text($xml, $include_xml_declaration = true, $add_carriage_returns = false)
-  {
+  function xml_to_text($xml, $include_xml_declaration = true, $add_carriage_returns = false) {
       $xml->formatOutput = true;
       $text = $xml->saveXML();
       if (!$include_xml_declaration) {
@@ -1311,10 +1289,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) {
@@ -1409,8 +1391,7 @@ 
       . ' computers. Computers will be displayed when they have earned their'
       . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
     }
-  }
-  else {
+  } else {
     $output .=  '<h2>' . bts('Computers hidden', array(), NULL, 'boinc:host-list') . '</h2>';
     $output .=  '<p>' . bts('This user has chosen not to show information'
     . ' about their computers.', array(), NULL, 'boinc:host-list') . '</p>';
@@ -1570,8 +1551,7 @@ 
     if (!$received_time) {
       if (time() < $deadline) {
         $output = '<span class="on-time">' . $output . '</span>';
-      }
-      else {
+      } else {
         $output = '<span class="past-due">' . $output . '</span>';
       }
     }
@@ -1666,11 +1646,9 @@ 
   // Use userid, hostid, or workunitid
   if ($category==0) {
     $sqlall .= " WHERE r.userid='%s' ";
-  }
-  elseif ($category==1) {
+  } elseif ($category==1) {
     $sqlall .= " WHERE r.workunitid='%s' ";
-  }
-  elseif ($category==2) {
+  } elseif ($category==2) {
     $sqlall .= " WHERE r.hostid='%s' ";
   }
   $sqlall .= " ORDER BY user_friendly_name";
@@ -1710,8 +1688,7 @@ 
       }// if mystate
 
     }// while
-  }
-  else {
+  } else {
   }
   
   // Entry for all applications.
@@ -1805,11 +1782,9 @@ 
   // Use userid, hostid, or workunitid
   if ($category==0) {
     $sqlwhere[] = "r.userid = '%s'";
-  }
-  elseif ($category==1) {
+  } elseif ($category==1) {
     $sqlwhere[] = "r.workunitid = '%s'";
-  }
-  elseif ($category==2) {
+  } elseif ($category==2) {
     $sqlwhere[] = "r.hostid = '%s'";
   }
 
@@ -1837,8 +1812,7 @@ 
     $sqlwhere[] = "r.appid = '%s'";
     if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
     $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid, $app_id);
-  }
-  else {
+  } else {
     if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
     $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid);
   }
@@ -1873,19 +1847,16 @@ 
         $resultdata[] = array_values($prettyresult);
       }
     }// while
-  }
-  else {
+  } else {
   }
   // Begin result navigation
 
   // Set pathprefix based on type
   if ($category==0) {
     $pathprefix = 'account/tasks';
-  }
-  elseif ($category==1) {
+  } elseif ($category==1) {
     $pathprefix = 'workunit/' . $queryid . '/tasks';
-  }
-  elseif ($category==2) {
+  } elseif ($category==2) {
     $pathprefix = 'host/' . $queryid . '/tasks';
   }
   // Need an "All" tab as well, maps to app_id of zero.
@@ -1895,8 +1866,7 @@ 
     $mypath = $pathprefix . '/' . $state . '/' . $app_id;
     if ($state==STATE_ALL) {
       $ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
-    }
-    else {
+    } else {
       $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
     }
     $myitem = array(
@@ -1984,8 +1954,7 @@ 
       // that is not handled by the above case statements.
       if ($appverid < 0) {
         return "Unknown Anonymous platform";
-      }
-      else {
+      } else {
         $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
         $prettyc = ($plan_class) ? "($av->plan_class)" : '';
         return "v$prettyv $prettyc $plfm";

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

Braces +3 added lines, -6 removed lines

@@ -105,8 +105,7 @@ 
       $drupalnid = boincteam_lookup_nid($result->id);
       if ($drupalnid) {
         $tlink = l($result->name, '/community/teams/' . $drupalnid);
-      }
-      else {
+      } else {
         $tlink = '';
       }
       // only keys no values
@@ -181,8 +180,7 @@ 
         drupal_render($form['link'][$key]),
       );
     }
-  }
-  else {
+  } else {
     $rows[] = array(array('data' => '<div class="error">No teams found</div>', 'colspan' => 5));
   }
   $output .= theme('table', $header, $rows);
@@ -230,8 +228,7 @@ 
   if ($success) {
     $message = 'Info: Delete SPAM Teams utility- ' . count($results) . ' team(s) deleted.';
     drupal_set_message($message, 'info');
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);

html/inc/random_compat/random_bytes_com_dotnet.inc

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
      *
      * @return string
      */
-    function random_bytes($bytes)
-    {
+    function random_bytes($bytes) {
         try {
             $bytes = RandomCompat_intval($bytes);
         } catch (TypeError $ex) {

html/inc/random_compat/random_bytes_dev_urandom.inc

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
      *
      * @return string
      */
-    function random_bytes($bytes)
-    {
+    function random_bytes($bytes) {
         static $fp = null;
         /**
          * This block should only be run once

html/inc/random_compat/random_int.inc

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
      *
      * @return int
      */
-    function random_int($min, $max)
-    {
+    function random_int($min, $max) {
         /**
          * Type and input logic checks
          *