BOINC / boinc

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

Spacing +88 added lines, -88 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), NULL, 'boinc:account-preferences-project')
+        '#description' => $description.bts(' Default value: @default', array('@default' => $default), NULL, 'boinc:account-preferences-project')
       );
     }
     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), NULL, 'boinc:account-preferences-project')
+        '#description' => $description.bts(' Default value: @default', array('@default' =>$default), NULL, 'boinc:account-preferences-project')
       );
     }
     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'];
     }
   }
 
@@ -1129,11 +1129,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;
 }
@@ -1310,7 +1310,7 @@ 
 
   function text_to_xml($text) {
     $xml = new DomDocument();
-    if ( !($xml->loadXML($text)) ) return false;
+    if (!($xml->loadXML($text))) return false;
     return $xml;
   }
 
@@ -1327,7 +1327,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;
@@ -1344,7 +1344,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;
@@ -1367,14 +1367,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;
                       }
                   }
@@ -1414,30 +1414,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', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user has no computers that have been'
-      . ' active in the last 30 days.', array(), NULL, 'boinc:host-list') . '</p>';
+      $output .= '<h2>'.bts('No active computers', array(), NULL, 'boinc:host-list').'</h2>';
+      $output .= '<p>'.bts('This user has no computers that have been'
+      . ' active in the last 30 days.', array(), NULL, 'boinc:host-list').'</p>';
       break;
 
     case 'preferences':
-      $output .=  '<h2>' . bts('No computers', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('There are no computers assigned to this'
-      . ' preference set.', array(), NULL, 'boinc:host-list') . '</p>';
+      $output .= '<h2>'.bts('No computers', array(), NULL, 'boinc:host-list').'</h2>';
+      $output .= '<p>'.bts('There are no computers assigned to this'
+      . ' preference set.', array(), NULL, 'boinc:host-list').'</p>';
       break;
 
     default:
-      $output .=  '<h2>' . bts('Computers pending', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user does not yet have any associated'
+      $output .= '<h2>'.bts('Computers pending', array(), NULL, 'boinc:host-list').'</h2>';
+      $output .= '<p>'.bts('This user does not yet have any associated'
       . ' computers. Computers will be displayed when they have earned their'
-      . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
+      . ' first credits.', array(), NULL, 'boinc:host-list').'</p>';
     }
   }
   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>';
+    $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>';
   }
   return $output;
 }
@@ -1449,11 +1449,11 @@ 
 
   //
   $output = '';
-  switch($context) {
+  switch ($context) {
   default:
-    $output .=  '<h2>' . bts('No @type tasks', array('@type' => $context), NULL, 'boinc:task-list')
+    $output .= '<h2>'.bts('No @type tasks', array('@type' => $context), NULL, 'boinc:task-list')
     . '</h2>';
-    $output .=  '<p>' . bts('There are no tasks of this type on record', array(), NULL, 'boinc:task-list')
+    $output .= '<p>'.bts('There are no tasks of this type on record', array(), NULL, 'boinc:task-list')
     . '</p>';
   }
   return $output;
@@ -1475,10 +1475,10 @@ 
       $output .= l(bts('Delete', array(), NULL, 'boinc:form-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),
-              NULL, 'boinc:account-host-delete') . '\')'
+              NULL, 'boinc:account-host-delete').'\')'
           )
         )
       );
@@ -1568,8 +1568,8 @@ 
       "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location')
     );
     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_ro');
     $venue = db_result(db_query(
@@ -1593,10 +1593,10 @@ 
     // 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>';
       }
     }
   }
@@ -1632,15 +1632,15 @@ 
  */
 function boincwork_tasktable($category = 0, $queryid = 1, $tselect = NULL, $app_id = 0, $tablerows = 20) {
   // Check type parameter, if not (0,2) then return an error.
-  if ( ($category!=0) AND ($category!=1) AND ($category!=2) ) {
+  if (($category != 0) AND ($category != 1) AND ($category != 2)) {
     watchdog('boincwork', 'task table called with invalid category = %category', array('%category' => $category), WATCHDOG_WARNING);
     return '';
   }
 
-  require_boinc( array('util', 'result') );
+  require_boinc(array('util', 'result'));
 
   global $language;
-  $locality=$language->language;
+  $locality = $language->language;
   $nf = new NumberFormatter($locality, NumberFormatter::DECIMAL);
   $nf->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, 0);
   $nf->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, 0);
@@ -1688,13 +1688,13 @@ 
       ."ON r.appid=a.id ";
 
   // Use userid, hostid, or workunitid
-  if ($category==0) {
+  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";
@@ -1705,7 +1705,7 @@ 
   if ($dbres_all) {
     while ($result = db_fetch_object($dbres_all)) {
       $mystate = state_num($result);
-      if ( ($result->appid==$app_id) OR ($app_id==0) OR ($app_id==-1) ) {
+      if (($result->appid == $app_id) OR ($app_id == 0) OR ($app_id == -1)) {
         $taskstates[STATE_ALL]++;
         switch ($mystate) {
         case STATE_IN_PROGRESS:
@@ -1728,7 +1728,7 @@ 
 
       //map holds a map between app ids and user friendly names for all applications.
       $application_map[$result->appid] = $result->user_friendly_name;
-      if ( ($mystate == $tselect) OR ($tselect==STATE_ALL) ) {
+      if (($mystate == $tselect) OR ($tselect == STATE_ALL)) {
         //count of appids in the results.
         $application_select_count[$result->appid]++;
       }// if mystate
@@ -1741,14 +1741,14 @@ 
   // Entry for all applications.
   $allcount = $application_select_count ? array_sum($application_select_count) : 0;
   $applications[-1] = bts('Application', array(), NULL, 'boinc:task-table');
-  $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table') . ' (' . $allcount . ')';
+  $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table').' ('.$allcount.')';
   // Create application filter from application_map and application_select_count.
-  foreach($application_map as $akey => $aname) {
+  foreach ($application_map as $akey => $aname) {
     $acount = 0;
-    if ( $application_select_count and array_key_exists($akey, $application_select_count) ) {
+    if ($application_select_count and array_key_exists($akey, $application_select_count)) {
       $acount = $application_select_count[$akey];
     }
-    $applications[$akey] = $aname . ' ('. $acount . ')';
+    $applications[$akey] = $aname.' ('.$acount.')';
   }
   // Header array for (sub) results table.
   $resultheader = array(
@@ -1827,13 +1827,13 @@ 
   $sqlwhere = array();
 
   // Use userid, hostid, or workunitid
-  if ($category==0) {
+  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'";
   }
 
@@ -1857,14 +1857,14 @@ 
   default:
   }
 
-  if (is_numeric($app_id) AND $app_id>0 ) {
+  if (is_numeric($app_id) AND $app_id > 0) {
     $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);
+    if ($sqlwhere)  $sqlsub .= " WHERE ".implode(' AND ', $sqlwhere);
+    $dbres_sub = pager_query($sqlsub.tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid, $app_id);
   }
   else {
-    if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
-    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid);
+    if ($sqlwhere)  $sqlsub .= " WHERE ".implode(' AND ', $sqlwhere);
+    $dbres_sub = pager_query($sqlsub.tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid);
   }
   db_set_active('default');
 
@@ -1874,7 +1874,7 @@ 
       // state_num() function changes $result object, clone $result
       // object for use in state_num()
       // check if state matches selection
-      if ( (state_num(clone $result) == $tselect) OR ($tselect==STATE_ALL) ) {
+      if ((state_num(clone $result) == $tselect) OR ($tselect == STATE_ALL)) {
         // create pretty result row
         $prettyresult = array(
           array(
@@ -1890,7 +1890,7 @@ 
           $nf->format($result->cpu_time),
           $nf->format($result->granted_credit),
           array(
-            'data' => $result->user_friendly_name . " " . pretty_application_version($result->app_version_id,$result->version_number, $result->plan_class, $result->platform),
+            'data' => $result->user_friendly_name." ".pretty_application_version($result->app_version_id, $result->version_number, $result->plan_class, $result->platform),
             'class' => 'task-app',
           ),
         );
@@ -1903,54 +1903,54 @@ 
   // Begin result navigation
 
   // Set pathprefix based on type
-  if ($category==0) {
+  if ($category == 0) {
     $pathprefix = 'account/tasks';
   }
-  elseif ($category==1) {
-    $pathprefix = 'workunit/' . $queryid . '/tasks';
+  elseif ($category == 1) {
+    $pathprefix = 'workunit/'.$queryid.'/tasks';
   }
-  elseif ($category==2) {
-    $pathprefix = 'host/' . $queryid . '/tasks';
+  elseif ($category == 2) {
+    $pathprefix = 'host/'.$queryid.'/tasks';
   }
   // Need an "All" tab as well, maps to app_id of zero.
   $application_map[0] = bts('All', array(), NULL, 'boinc:task-table');
   $stitems = array();
   foreach ($taskstates as $state => $numstates) {
-    $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>';
+    $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 {
-      $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+      $ltext = '<span class="tab">'.bts($state_hnames[$state], array(), NULL, 'boinc:task-table').' ('.$numstates.')</span>';
     }
     $myitem = array(
-      'data' => l($ltext, $mypath, array('html' => TRUE) ),
+      'data' => l($ltext, $mypath, array('html' => TRUE)),
     );
-    if ($state==$tselect) {
+    if ($state == $tselect) {
       $myitem['class'] = 'active';
     }
     $stitems[] = $myitem;
   }
   // Add reset button
-  $mypath = $pathprefix . '/0/0';
-  $ltext = '<span class="tab">' . bts('Reset', array(), NULL, 'boinc:task-table') . '</span>';
-  $stitems[] = array( 'data' => l($ltext, $mypath, array('html' => TRUE) ) );
+  $mypath = $pathprefix.'/0/0';
+  $ltext = '<span class="tab">'.bts('Reset', array(), NULL, 'boinc:task-table').'</span>';
+  $stitems[] = array('data' => l($ltext, $mypath, array('html' => TRUE)));
 
-  $output .= theme_item_list($stitems, NULL, 'ul' . ' class="tabs secondary clearfix"');
+  $output .= theme_item_list($stitems, NULL, 'ul'.' class="tabs secondary clearfix"');
 
   // Application select-drop down form
   // Hack to place Application form into header
   // App ID of zero maps to "-1" for drop-down box.
-  if ($app_id==0) {
-    $app_id=-1;
+  if ($app_id == 0) {
+    $app_id = -1;
   }
   $resultheader[] = drupal_get_form('boincwork_selectapp_form', $applications, $app_id);
 
   // Begin table of results
-  if ( is_array($resultheader) AND is_array($resultdata) ) {
+  if (is_array($resultheader) AND is_array($resultdata)) {
 
     // Take advantage of the fact that $category is the same as the row/column we want to remove.
-    if ( ($category==1) OR ($category==2) ) {
+    if (($category == 1) OR ($category == 2)) {
       unset($resultheader[$category]);
       delete_col($resultdata, $category);
     }
@@ -1967,7 +1967,7 @@ 
  * Function to delete a column from an array.
  */
 function delete_col(&$array, $offset) {
-  return array_walk($array, function (&$v) use ($offset) {
+  return array_walk($array, function(&$v) use ($offset) {
      array_splice($v, $offset, 1);
   });
 }

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

Spacing +46 added lines, -46 removed lines

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

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

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', array(), NULL, 'boinc:team-forum')
+  $output .= '<h2 class="pane-title">'.bts('Create team message board', array(), NULL, 'boinc:team-forum')
     . '</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', array(), NULL, 'boinc:team-forum') . ': ' .
-    $team_forum->title . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Edit message board', array(), NULL, 'boinc:team-forum').': '.
+    $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', array(), NULL, 'boinc:team-forum') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Team forum', array(), NULL, 'boinc:team-forum').'</h2>';
   $output .= '<p>'
     . bts('A discussion forum has been set up for team members.', array(), NULL, 'boinc:team-forum')
     . '</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', array(), NULL, 'boinc:team-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', array(), NULL, 'boinc:team-forum') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('About message boards', array(), NULL, 'boinc:team-forum').'</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), NULL, 'boinc:team-forum') . ':</p>';
+    $output .= '<p>'.bts('You may create a message board for use by @team',
+      array('@team' => $team->title), NULL, 'boinc:team-forum').':</p>';
   }
   else {
-    $output .= '<p>' . bts('This is a team-only message board', array(), NULL, 'boinc:team-forum') . ':</p>';
+    $output .= '<p>'.bts('This is a team-only message board', array(), NULL, 'boinc:team-forum').':</p>';
   }
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Only members may post', array(), NULL, 'boinc:team-forum') . '</li>';
-  $output .= '  <li>' . bts('Only members may read (optional)', array(), NULL, 'boinc:team-forum') . '</li>';
-  $output .= '  <li>' . bts('Founder & Team Admins have moderator privileges', array(), NULL, 'boinc:team-forum') .
+  $output .= '  <li>'.bts('Only members may post', array(), NULL, 'boinc:team-forum').'</li>';
+  $output .= '  <li>'.bts('Only members may read (optional)', array(), NULL, 'boinc:team-forum').'</li>';
+  $output .= '  <li>'.bts('Founder & Team Admins have moderator privileges', array(), NULL, 'boinc:team-forum').
     '</li>';
   $output .= '</ul>';
   $output .= '</div>';

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

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
         $node = node_load($nid);
         if ($node->comment !== 0 AND user_access('post comments', $user)) {
           $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
-          $block['content'] = '<h2>' . bts('Post new comment', array(), NULL, 'boinc:forum-post-new-comment') . '</h2>';
+          $block['content'] = '<h2>'.bts('Post new comment', array(), NULL, 'boinc:forum-post-new-comment').'</h2>';
           $block['content'] .= drupal_get_form('comment_form', array('nid' => $nid));
         }
       }

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

Spacing +34 added lines, -34 removed lines

@@ -311,8 +311,8 @@ 
         // RFC2616 mandates that the decimal part is no more than three digits,
         // so we multiply the qvalue by 1000 to avoid floating point comparisons.
         $langcode = strtolower($match[1]);
-        $qvalue = isset($match[2]) ? (float) $match[2] : 1;
-        $browser_langcodes[$langcode] = (int) ($qvalue * 1000);
+        $qvalue = isset($match[2]) ? (float)$match[2] : 1;
+        $browser_langcodes[$langcode] = (int)($qvalue*1000);
       }
     }
 
@@ -377,7 +377,7 @@ 
     global $base_url;
     global $base_path;
     $site_name = variable_get('site_name', 'Drupal-BOINC');
-    $site_url = $base_url . $base_path;
+    $site_url = $base_url.$base_path;
     $settings = array(
       'from' => '',
       'subject' => "Content at {$site_name} is awaiting moderation",
@@ -437,11 +437,11 @@ 
         $user_info .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
       }
       elseif (is_string($user_image)) {
-        $user_info .= '<img src="' . $user_image . '"/>';
+        $user_info .= '<img src="'.$user_image.'"/>';
       }
       $user_info .= '  </div>';
     }
-    $user_info .= '  <div class="name">' . theme('username', $account) . '</div>';
+    $user_info .= '  <div class="name">'.theme('username', $account).'</div>';
     if ($account->uid) {
       //$user_info .= '  <div class="join-date">Joined: ' . date('j M y', $account->created) . '</div>';
       //$user_info .= '  <div class="post-count">Posts: ' . $account->post_count . '</div>';
@@ -505,7 +505,7 @@ 
     $form['buttons']['preview']['#suffix'] = '</li>';
     $form['buttons']['preview']['#weight'] = 1003;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_url) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_url).'</li>',
       '#weight' => 1004,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -525,7 +525,7 @@ 
     $node = node_load($form['nid']['#value']);
     $community_role = array_search('community member', user_roles(true));
     $unrestricted_role = array_search('verified contributor', user_roles(true));
-    if ( (isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role])) ) {
+    if ((isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role]))) {
       if ($node->type == 'forum') {
         if (module_exists('captcha')) {
           $form['comment_captcha'] = array(
@@ -570,7 +570,7 @@ 
     $form['buttons']['preview_changes']['#suffix'] = '</li>';
     $form['buttons']['preview_changes']['#weight'] = 1004;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "community/forum/{$forum_id}") . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "community/forum/{$forum_id}").'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -581,7 +581,7 @@ 
     // Add captcha for role='community member'
     $community_role = array_search('community member', user_roles(true));
     $unrestricted_role = array_search('verified contributor', user_roles(true));
-    if ( (isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role])) ) {
+    if ((isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role]))) {
       if (module_exists('captcha')) {
         $form['comment_captcha'] = array(
           '#type' => 'captcha',
@@ -673,8 +673,8 @@ 
 function boinccore_link($type, $object, $teaser = FALSE) {
   // Add custom links with this hook
 
-  if ($type=='node') {
-    if ( ($object->type=='forum') OR ($object->type=='team_forum') ) {
+  if ($type == 'node') {
+    if (($object->type == 'forum') OR ($object->type == 'team_forum')) {
       // Add topic moderator controls
       if (user_access('edit any forum topic')) {
         $node_control = "node_control/{$object->nid}";
@@ -735,7 +735,7 @@ 
       }// if user_access('edit any forum topic')
     }
   }
-  else if ($type=='comment') {
+  else if ($type == 'comment') {
     $node = node_load($object->nid);
     $nid = $object->nid;
     $cid = $object->cid;
@@ -757,7 +757,7 @@ 
     if (user_access('administer comments')) {
       $comment_control = "comment_control/{$cid}";
       // Add link to convert comment into a new topic
-      $reply_count = db_result(db_query(' SELECT COUNT(*) FROM comments WHERE pid = %d', $cid ));
+      $reply_count = db_result(db_query(' SELECT COUNT(*) FROM comments WHERE pid = %d', $cid));
       if ($reply_count == 0) {
         $links['convert'] = array(
             'title' => bts('Convert', array(), NULL, 'boinc:forum-convert-comment-to-topic'),
@@ -802,7 +802,7 @@ 
   */
   $message['headers']['Content-Transfer-Encoding'] = 'Quoted-Printable';
   if (is_array($message['body'])) {
-    $message['body'] = array_map( "quoted_printable_encode", $message['body'] );
+    $message['body'] = array_map("quoted_printable_encode", $message['body']);
   } else {
     $message['body'] = quoted_printable_encode($message['body']);
   }
@@ -853,7 +853,7 @@ 
   // If hiding a forum topic (node) and not an administrator, go to
   // the forum page. Otherwise the user will reach an access-denied
   // page.
-  if (($action=="hide") and (!user_access('administer forums'))) {
+  if (($action == "hide") and (!user_access('administer forums'))) {
     drupal_goto("community/forum/{$node->tid}");
   }
   drupal_goto("node/{$nid}");
@@ -895,8 +895,8 @@ 
     $node->created = $comment->timestamp;
     $node->changed = $node->created;
     $node->promote = 0; // Display on front page?
-    $node->sticky = 0;  // Display top of page?
-    $node->status = 1;   // Published?
+    $node->sticky = 0; // Display top of page?
+    $node->status = 1; // Published?
     $node->comment = 2;
     //$node->language = 'en';
     $node->uid = $comment->uid;
@@ -981,16 +981,16 @@ 
     $xml->loadXML($global_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
       $lines = explode("\r", $global_prefs);
-      watchdog('am_set_info', "XML validation error in global_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
-        ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
+      watchdog('am_set_info', "XML validation error in global_prefs: {$errors[0]->message} at line {$errors[0]->line}".
+        ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
     }
   }
   elseif ($project_prefs) {
     $xml->loadXML($project_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
       $lines = explode("\r", $project_prefs);
-      watchdog('am_set_info', "XML validation error in project_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
-        ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
+      watchdog('am_set_info', "XML validation error in project_prefs: {$errors[0]->message} at line {$errors[0]->line}".
+        ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
     }
   }
   if (!$errors) {
@@ -1033,8 +1033,8 @@ 
     $xml = array(
       'error' => array(
         'error_num' => -112,
-        'error_msg' => "{$errors[0]->message} at line {$errors[0]->line}" .
-        ': <br/>' . htmlentities($lines[$errors[0]->line - 1])
+        'error_msg' => "{$errors[0]->message} at line {$errors[0]->line}".
+        ': <br/>'.htmlentities($lines[$errors[0]->line - 1])
       ),
     );
   }
@@ -1142,10 +1142,10 @@ 
           'teaser' => $teaser,
           'uid' => $team_owner_uid,
           'path' => null,
-          'status' => 1,  // published or not - always publish
+          'status' => 1, // published or not - always publish
           'promote' => 0,
           'created' => $created_time,
-          'comment' => 0,  // comments disabled
+          'comment' => 0, // comments disabled
           'moderate' => 0,
           'sticky' => 0,
           'format' => $input_format
@@ -1156,7 +1156,7 @@ 
           module_load_include('inc', 'pathauto', 'pathauto');
           $node['path'] = pathauto_cleanstring($values['name']);
 
-          $node = (object) $node; // node_save requires an object form
+          $node = (object)$node; // node_save requires an object form
           $team_categories = taxonomy_get_term_by_name($values['type']);
           $node->taxonomy[] = $team_categories[0];
 
@@ -1315,7 +1315,7 @@ 
       while ($member = db_fetch_object($result)) {
         $team_members[$member->boinc_id]['country'] = $member->field_country_value;
         $team_members[$member->boinc_id]['url'] = $member->field_url_value;
-        $team_members[$member->boinc_id]['has_profile'] = isset($member->nid) ? 1:  0;
+        $team_members[$member->boinc_id]['has_profile'] = isset($member->nid) ? 1 : 0;
         $xml['users']['user'][] = $team_members[$member->boinc_id];
       }
     } // end if credit_only
@@ -1365,7 +1365,7 @@ 
             if ($profile_nid = content_profile_profile_exists($profile, $account->uid)) {
               $profile_node = node_load($profile_nid);
               if ($profile_node) {
-                $avatar_image = get_cck_image_object(file_directory_path() . '/' . $image_path, 'field_image', 'profile', TRUE);
+                $avatar_image = get_cck_image_object(file_directory_path().'/'.$image_path, 'field_image', 'profile', TRUE);
                 if ($avatar_image) {
                   $profile_node->field_image[0] = $avatar_image;
                   node_save($profile_node);
@@ -1479,7 +1479,7 @@ 
         WHERE (n.status = 1) AND (c.uid = '%d')
         ORDER BY timestamp DESC
         LIMIT %d",
-        $uid, (int) $count
+        $uid, (int)$count
       );
       $xml = array(
         'rpc_response' => array(
@@ -1522,7 +1522,7 @@ 
         WHERE (n.status = 1) AND (n.uid = '%d')
         ORDER BY changed DESC
         LIMIT %d",
-        $uid, (int) $count
+        $uid, (int)$count
       );
       $xml = array(
         'rpc_response' => array(
@@ -1691,7 +1691,7 @@ 
           );
         }
         // Determine which page to display in order to show the given comment
-        $page = floor($comment_offset / $comments_per_page);
+        $page = floor($comment_offset/$comments_per_page);
         if ($page) {
           $params = array('page' => $page);
         }
@@ -2083,7 +2083,7 @@ 
  * Overview of moderation queues
  */
 function boinccore_moderation_overview_panel() {
-  $output = '<h2 class="pane-title">' . bts('Moderation', array(), NULL, 'boinc:moderate-profiles') . '</h2>';
+  $output = '<h2 class="pane-title">'.bts('Moderation', array(), NULL, 'boinc:moderate-profiles').'</h2>';
   $output .= '<ul class="tab-list action-list">';
   if (module_exists('user_profiles')) {
     $profile_count = db_result(db_query("
@@ -2094,7 +2094,7 @@ 
     $output .= '<li class="tab primary">';
     $output .= l(bts('Unvetted profiles', array(), NULL, 'boinc:moderate-profiles'), 'moderate/profiles');
     $output .= '<div class="item-count-wrapper">';
-    $output .= '<span class="item-count">' . $profile_count . '</span>';
+    $output .= '<span class="item-count">'.$profile_count.'</span>';
     $output .= '</div>';
     $output .= '</li>';
   }
@@ -2112,7 +2112,7 @@ 
   require_boinc('boinc_db');
 
   $num_deleted = BoincToken::delete_expired();
-  if ($num_deleted>0) {
+  if ($num_deleted > 0) {
     watchdog('boinccore', "Deleted ${num_deleted} tokens from table token", WATCHDOG_NOTICE);
   }
 }

drupal/sites/default/boinc/themes/boinc/template.php

Spacing +45 added lines, -45 removed lines

@@ -82,7 +82,7 @@ 
  */
 function boinc_links__system_main_menu($links, $menu, $element) {
   $html = '';
-  $html .= '<ul id="' . $menu['id'] . '" class="' . $menu['class'] . '">' . "\n";
+  $html .= '<ul id="'.$menu['id'].'" class="'.$menu['class'].'">'."\n";
   $item_count = count($links);
   $i = 1;
   foreach ($links as $key => $link) {
@@ -90,7 +90,7 @@ 
     if (strpos($key, 'active-trail')) $classes[] = 'active';
     if ($i == 1) $classes[] = 'first';
     if ($i == $item_count) $classes[] = 'last';
-    $html .= '<li class="' . implode(' ', $classes) .'">';
+    $html .= '<li class="'.implode(' ', $classes).'">';
     if ($link['title'] == 'Home') {
       $link['title'] = bts('Home', array(), NULL, 'boinc:menu-link');
     }
@@ -99,7 +99,7 @@ 
       if ($link['href'] == 'dashboard') {
         $item_count = privatemsg_unread_count();
         if ($item_count) {
-          $link['title'] .= '</a> <a href="' . url('messages') . '" class="compound secondary"><div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
+          $link['title'] .= '</a> <a href="'.url('messages').'" class="compound secondary"><div class="item-count-wrapper"><span class="item-count">'.$item_count.'</span></div>';
           $link['html'] = TRUE;
           $link['attributes']['class'] = 'compound';
         }
@@ -109,7 +109,7 @@ 
     if ($link['href'] == 'moderate') {
       $item_count = boincuser_moderation_queue_count();
       if ($item_count) {
-        $link['title'] .= ' <div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
+        $link['title'] .= ' <div class="item-count-wrapper"><span class="item-count">'.$item_count.'</span></div>';
         $link['html'] = TRUE;
       }
     }
@@ -117,7 +117,7 @@ 
     $html .= '</li>';
     $i++;
   }
-  $html .= '</ul>' . "\n";
+  $html .= '</ul>'."\n";
   return $html;
 }
 
@@ -132,7 +132,7 @@ 
     return '';
   }
   else {
-    return '<li '. ($active ? 'class="active" ' : '') .'>'. $link ."</li>\n";
+    return '<li '.($active ? 'class="active" ' : '').'>'.$link."</li>\n";
   }
 }
 
@@ -197,7 +197,7 @@ 
   if (empty($locality)) {
     $locality = "en";
   }
-  $vars['flag_path'] = base_path() . path_to_theme() . "/images/flags/{$locality}.png";
+  $vars['flag_path'] = base_path().path_to_theme()."/images/flags/{$locality}.png";
 
   $server_status_url = variable_get('boinc_server_status_url', '');
   if (!$server_status_url) {
@@ -219,16 +219,16 @@ 
   if (arg(0) == 'search') {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='account') AND (is_numeric(arg(1))) AND (empty(arg(2))) ) {
+  else if ((arg(0) == 'account') AND (is_numeric(arg(1))) AND (empty(arg(2)))) {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='account') AND (arg(1)=='profile') ) {
+  else if ((arg(0) == 'account') AND (arg(1) == 'profile')) {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='dashboard') ) {
+  else if ((arg(0) == 'dashboard')) {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='community') AND ( (arg(1)=='teams') OR (arg(1)=='stats') ) ) {
+  else if ((arg(0) == 'community') AND ((arg(1) == 'teams') OR (arg(1) == 'stats'))) {
     unset($vars['title']);
   }
 
@@ -244,7 +244,7 @@ 
               $tab = str_replace('li class="', 'li class="first ', $tab);
           }
           if ($key == $last_key) {
-              $tab = str_replace('li class="', 'li class="last ', $tab) . '</ul>';
+              $tab = str_replace('li class="', 'li class="last ', $tab).'</ul>';
           }
       }
       elseif (strpos($tab, 'li ')) {
@@ -252,7 +252,7 @@ 
               $tab = str_replace('li ', 'li class="first" ', $tab);
           }
           if ($key == $last_key) {
-              $tab = str_replace('li ', 'li class="last" ', $tab) . '</ul>';
+              $tab = str_replace('li ', 'li class="last" ', $tab).'</ul>';
           }
       }
   }
@@ -289,7 +289,7 @@ 
 
   // Optionally, run node-type-specific preprocess functions, like
   // boinc_preprocess_node_page() or boinc_preprocess_node_story().
-  $function = __FUNCTION__ . '_' . $vars['node']->type;
+  $function = __FUNCTION__.'_'.$vars['node']->type;
   if (function_exists($function)) {
     $function($vars, $hook);
   }
@@ -340,7 +340,7 @@ 
   $vars['node']->comment = 0;
 
   $vars['first_page'] = (!isset($_GET['page']) OR ($_GET['page'] < 1));
-  $page_count = max(ceil($vars['comment_count'] / $comments_per_page), 1);
+  $page_count = max(ceil($vars['comment_count']/$comments_per_page), 1);
   $vars['last_page'] = ($page_count == 1 OR ($page_count > 1 AND $_GET['page'] == $page_count - 1));
 
   $links = $vars['links'];
@@ -452,7 +452,7 @@ 
   case 'boinc_host':
       $view = views_get_current_view();
       if (!($view->result)) {
-        $vars['footer'] = '<h3>' . bts ('Host not found in database.', array(), NULL, 'boinc:host-details') . '</h3>';
+        $vars['footer'] = '<h3>'.bts('Host not found in database.', array(), NULL, 'boinc:host-details').'</h3>';
       }
     break;
   case 'boinc_host_list':
@@ -471,10 +471,10 @@ 
 
     if ($result) {
       // Display the stderr output in the footer
-      $vars['footer'] = '<h3>' . bts('Stderr output', array(), NULL, 'boinc:task-details-errorlog') .'</h3>';
-      $vars['footer'] .= '<pre>' . htmlspecialchars($result->result_stderr_out) . '</pre>';
+      $vars['footer'] = '<h3>'.bts('Stderr output', array(), NULL, 'boinc:task-details-errorlog').'</h3>';
+      $vars['footer'] .= '<pre>'.htmlspecialchars($result->result_stderr_out).'</pre>';
     } else {
-      $vars['footer'] = '<h3>' . bts ('Task not found in database.', array(), NULL, 'boinc:task-details') . '</h3>';
+      $vars['footer'] = '<h3>'.bts('Task not found in database.', array(), NULL, 'boinc:task-details').'</h3>';
     }
     break;
   case 'boinc_teams':
@@ -487,7 +487,7 @@ 
     ob_start();
     // Get the workunit ID from the URL
     $result_id = arg(1);
-    require_boinc(array('util','boinc_db'));
+    require_boinc(array('util', 'boinc_db'));
     $wu = BoincWorkunit::lookup_id($result_id);
     if ($wu) {
       // Output from admin defined BOINC project-specific function
@@ -495,7 +495,7 @@ 
       // Output of project_workunit() gets caught in the buffer
       $vars['footer'] = ob_get_clean();
     } else {
-      $vars['footer'] = '<h3>' . bts ('Workunit not found in database.', array(), NULL, 'boinc:workunit-details') . '</h3>';
+      $vars['footer'] = '<h3>'.bts('Workunit not found in database.', array(), NULL, 'boinc:workunit-details').'</h3>';
     }
   default:
   }
@@ -517,7 +517,7 @@ 
       $author_picture .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
     }
     elseif (is_string($user_image)) {
-      $author_picture .= '<img src="' . $user_image . '"/>';
+      $author_picture .= '<img src="'.$user_image.'"/>';
     }
   }
   $author_picture .= '</div>';
@@ -556,14 +556,14 @@ 
   case 'profile':
   case 'user':
     $node = $variables['result']['node'];
-    $variables['url'] = url('account/' . $node->is_uid);
+    $variables['url'] = url('account/'.$node->is_uid);
     $variables['title'] = $node->tos_name;
     $variables['user_image'] = boincuser_get_user_profile_image($node->is_uid);
     $variables['account'] = user_load($node->is_uid);
     break;
   case 'team':
     $node = $variables['result']['node'];
-    $variables['url'] = url('/community/teams/' . $node->entity_id);;
+    $variables['url'] = url('/community/teams/'.$node->entity_id); ;
     break;
   case 'forum':
     $node = $variables['result']['node'];
@@ -581,7 +581,7 @@ 
     // Parent forum topic title
     $variables['parent_title'] = $drupalnode->title;
     // Link to the parent forum topic
-    $variables['parent_topic'] = l($drupalnode->title, drupal_get_path_alias('node/' . $nid) );
+    $variables['parent_topic'] = l($drupalnode->title, drupal_get_path_alias('node/'.$nid));
     // Get the taxonomy for the node, creates a link to the parent forum
     $taxonomy = reset($drupalnode->taxonomy);
     if ($vocab = taxonomy_vocabulary_load($taxonomy->vid)) {
@@ -599,7 +599,7 @@ 
   if (!arg(2)) {
     $message = '';
   }
-  return '<p>' . $message . '</p>';
+  return '<p>'.$message.'</p>';
 }
 
 /**
@@ -615,11 +615,11 @@ 
 
     // Shorten the name when it is too long or it will break many tables.
     if (drupal_strlen($name) > 20) {
-      $name = drupal_substr($name, 0, 15) . '...';
+      $name = drupal_substr($name, 0, 15).'...';
     }
 
     if (user_access('access user profiles')) {
-      $output = l($name, 'account/' . $object->uid, array('attributes' => array('title' => bts('View user profile.', array(), NULL, 'boinc:users-table'))));
+      $output = l($name, 'account/'.$object->uid, array('attributes' => array('title' => bts('View user profile.', array(), NULL, 'boinc:users-table'))));
     }
     else {
       $output = check_plain($name);
@@ -637,7 +637,7 @@ 
       $output = check_plain($object->name);
     }
 
-    $output .= ' (' . bts('not verified', array(), NULL, 'boinc:user-not-found') . ')';
+    $output .= ' ('.bts('not verified', array(), NULL, 'boinc:user-not-found').')';
   }
   else {
     $output = check_plain(variable_get('anonymous', bts('Anonymous', array(), NULL, 'boinc:anonymous-user')));
@@ -650,7 +650,7 @@ 
  * Remove the link under text areas that reads:
  * "More information about formatting options"
  */
-function boinc_filter_tips_more_info () {
+function boinc_filter_tips_more_info() {
   return '';
 }
 
@@ -692,8 +692,8 @@ 
 The !site team', array(
         '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
         '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
-        '!link' => url('account/'. $sender->uid, array('absolute' => TRUE)),
+        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message').': '.$flag->friend_message : '',
+        '!link' => url('account/'.$sender->uid, array('absolute' => TRUE)),
         ), array(), NULL, 'boinc:friend-request-email');
       break;
 
@@ -711,7 +711,7 @@ 
 The !site team', array(
         '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
         '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
+        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message').': '.$flag->friend_message : '',
         '!link' => url('goto/friend-requests', array('absolute' => TRUE)),
         ),
       array(), NULL, 'boinc:friend-request-email');
@@ -724,13 +724,13 @@ 
  * Edit action links
  */
 function phptemplate_links($links, $attributes = array('class' => 'links')) {
-  if ($links){
+  if ($links) {
     // Remove flag-subscriptions link. It will be placed elsewhere.
     if (isset($links['flag-subscriptions'])) {
       unset($links['flag-subscriptions']);
     }
     // Reorder the links however you need them.
-    $links = reorder_links($links, array('comment_edit','quote','comment_add','comment_reply','flag-abuse_comment','flag-abuse_node'), array('comment_delete'));
+    $links = reorder_links($links, array('comment_edit', 'quote', 'comment_add', 'comment_reply', 'flag-abuse_comment', 'flag-abuse_node'), array('comment_delete'));
     // Use the built-in theme_links() function to format the $links array.
     return theme_links($links, $attributes);
   }
@@ -813,7 +813,7 @@ 
   // are the class attribute for the <li> tags.
   $dom = new DOMDocument;
   $dom->loadHTML(mb_convert_encoding($links, 'HTML-ENTITIES', 'UTF-8'));
-  foreach($dom->getElementsByTagName('li') as $node) {
+  foreach ($dom->getElementsByTagName('li') as $node) {
     $key = $node->getAttribute("class");
     $alllinks[$key] = $dom->saveHTML($node);
   }
@@ -826,7 +826,7 @@ 
     "hide", "unhide",
     "comment_delete",
   );
-  foreach(array_keys($alllinks) as $key1) {
+  foreach (array_keys($alllinks) as $key1) {
     // Select string up to first space, if present.
     $class1 = strtok($key1, ' ');
     if (in_array($class1, $selected_classes)) {
@@ -855,7 +855,7 @@ 
     $dom->loadHTML(mb_convert_encoding($alink, 'HTML-ENTITIES', 'UTF-8'));
 
     $myli = $dom->getElementsByTagName('li');
-    if ($myli->length>0) {
+    if ($myli->length > 0) {
       $newclasses = trim(($myli[0]->getAttribute("class"))." first");
       $myli[0]->setAttribute("class", $newclasses);
       $alink = $dom->saveHTML($myli[0]);
@@ -872,13 +872,13 @@ 
 
   $output = '<ul class="menu"><li class="first">';
   if ($user->uid) {
-    $output .= '<a href="' . url('logout') . '">' . bts('Logout', array(), NULL, 'boinc:menu-link') . '</a>';
+    $output .= '<a href="'.url('logout').'">'.bts('Logout', array(), NULL, 'boinc:menu-link').'</a>';
   } else {
-    $output .= '<a href="' . url('user/login', array('query' => drupal_get_destination()) ) . '">' . bts('Login', array(), NULL, 'boinc:menu-link') . '</a>';
+    $output .= '<a href="'.url('user/login', array('query' => drupal_get_destination())).'">'.bts('Login', array(), NULL, 'boinc:menu-link').'</a>';
   }
   $output .= '</li>';
   if (module_exists('global_search') OR module_exists('global_search_solr')) {
-    $output .= '<li class="last"> <a class="search" href="' . url('search/site') . '">' . bts('search', array(), NULL, 'boinc:menu-link') .'</a> </l1>';
+    $output .= '<li class="last"> <a class="search" href="'.url('search/site').'">'.bts('search', array(), NULL, 'boinc:menu-link').'</a> </l1>';
   }
   $output .= '</ul>';
   return $output;
@@ -905,8 +905,8 @@ 
     if ($ignored[$object->uid] == 0) {
       $links['ignore_user'] = array(
         'title' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
-        'href' => 'account/prefs/privacy/ignore_user/add/'. $object->uid,
-        'query' => 'destination='. $_GET['q'],
+        'href' => 'account/prefs/privacy/ignore_user/add/'.$object->uid,
+        'query' => 'destination='.$_GET['q'],
         'attributes' => array(
           'class' => 'ignore-user',
           'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),
@@ -921,8 +921,8 @@ 
     if ($ignored[$object->uid] == 0) {
       $links['ignore_user'] = array(
         'title' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
-        'href' => 'account/prefs/privacy/ignore_user/add/'. $object->uid,
-        'query' => 'destination='. $_GET['q'],
+        'href' => 'account/prefs/privacy/ignore_user/add/'.$object->uid,
+        'query' => 'destination='.$_GET['q'],
         'attributes' => array(
           'class' => 'ignore-user',
           'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),

html/ops/bbcode_convert_response1.php

Spacing +4 added lines, -4 removed lines

@@ -42,15 +42,15 @@
     $start_id = 0; //Set this to something else if you like
     $profiles = _mysql_query("select * from profile where userid>$start_id order by userid");
     echo _mysql_error();
-    $i=0;
-    while ($profile = _mysql_fetch_object($profiles)){
+    $i = 0;
+    while ($profile = _mysql_fetch_object($profiles)) {
         $i++;
         if ($i%100 == 0) {                      //For every 100 profiles
-            echo $profile->userid.". "; flush();   // print out where we are
+            echo $profile->userid.". "; flush(); // print out where we are
             //usleep(200000);
         }
 
-        if ($profile->userid > $start_id){
+        if ($profile->userid > $start_id) {
             fix_profile($profile);
         }
     }

html/ops/check_account_ownership_keys.php

Spacing +4 added lines, -4 removed lines

@@ -23,15 +23,15 @@
 admin_page_head("Account Ownership Keys");
 
 if (!file_exists($account_ownership_private_key_file_path)) {
-  echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
+  echo "<p>The account ownership private key '".$account_ownership_private_key_file_name."' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
 } else {
-  echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' exists.</p>";
+  echo "<p>The account ownership private key '".$account_ownership_private_key_file_name."' exists.</p>";
 }
 
 if (!file_exists($account_ownership_public_key_file_path)) {
-  echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
+  echo "<p>The account ownership public key '".$account_ownership_public_key_file_name."' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
 } else {
-  echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' exists.</p>";
+  echo "<p>The account ownership public key '".$account_ownership_public_key_file_name."' exists.</p>";
 }
 
 echo "<p>For more info see the related wiki page: <a href=\"https://github.com/BOINC/boinc/wiki/ProofOfOwnership\">ProofOfOwnership</a></p>";