BOINC / boinc

drupal/sites/all/themes/zen/template.php

Spacing +34 added lines, -34 removed lines

@@ -22,7 +22,7 @@ 
  */
 function zen_theme(&$existing, $type, $theme, $path) {
   // When #341140 is fixed, replace _zen_path() with drupal_get_path().
-  include_once './' . _zen_path() . '/zen-internals/template.theme-registry.inc';
+  include_once './'._zen_path().'/zen-internals/template.theme-registry.inc';
   return _zen_theme($existing, $type, $theme, $path);
 }
 
@@ -57,7 +57,7 @@ 
       elseif (theme_get_setting('zen_breadcrumb_trailing')) {
         $trailing_separator = $breadcrumb_separator;
       }
-      return '<div class="breadcrumb">' . implode($breadcrumb_separator, $breadcrumb) . "$trailing_separator$title</div>";
+      return '<div class="breadcrumb">'.implode($breadcrumb_separator, $breadcrumb)."$trailing_separator$title</div>";
     }
   }
   // Otherwise, return an empty string.
@@ -106,14 +106,14 @@ 
           'level' => 'h2',
         );
       }
-      $output .= '<' . $heading['level'];
+      $output .= '<'.$heading['level'];
       if (!empty($heading['class'])) {
         $output .= drupal_attributes(array('class' => $heading['class']));
       }
-      $output .= '>' . check_plain($heading['text']) . '</' . $heading['level'] . '>';
+      $output .= '>'.check_plain($heading['text']).'</'.$heading['level'].'>';
     }
 
-    $output .= '<ul'. drupal_attributes($attributes) .'>';
+    $output .= '<ul'.drupal_attributes($attributes).'>';
 
     $num_links = count($links);
     $i = 1;
@@ -132,7 +132,7 @@ 
           && (empty($link['language']) || $link['language']->language == $language->language)) {
         $class .= ' active';
       }
-      $output .= '<li'. drupal_attributes(array('class' => $class)) .'>';
+      $output .= '<li'.drupal_attributes(array('class' => $class)).'>';
 
       if (isset($link['href'])) {
         // Pass in $link as $options, they share the same keys.
@@ -147,7 +147,7 @@ 
         if (isset($link['attributes'])) {
           $span_attributes = drupal_attributes($link['attributes']);
         }
-        $output .= '<span'. $span_attributes .'>'. $link['title'] .'</span>';
+        $output .= '<span'.$span_attributes.'>'.$link['title'].'</span>';
       }
 
       $i++;
@@ -170,7 +170,7 @@ 
 
   // If an item is a LOCAL TASK, render it as a tab
   if ($link['type'] & MENU_IS_LOCAL_TASK) {
-    $link['title'] = '<span class="tab">' . check_plain($link['title']) . '</span>';
+    $link['title'] = '<span class="tab">'.check_plain($link['title']).'</span>';
     $link['localized_options']['html'] = TRUE;
   }
 
@@ -195,10 +195,10 @@ 
   }
 
   if ($primary) {
-    $output .= '<ul class="tabs primary clearfix">' . $primary . '</ul>';
+    $output .= '<ul class="tabs primary clearfix">'.$primary.'</ul>';
   }
   if ($secondary) {
-    $output .= '<ul class="tabs secondary clearfix">' . $secondary . '</ul>';
+    $output .= '<ul class="tabs secondary clearfix">'.$secondary.'</ul>';
   }
 
   return $output;
@@ -253,7 +253,7 @@ 
     $elements['#region'] = $region;
 
     // Set the theme hook suggestions.
-    $hook = array('region_' . $region);
+    $hook = array('region_'.$region);
     if (strpos($region, 'sidebar_') === 0) {
       $hook[] = 'region_sidebar';
     }
@@ -295,7 +295,7 @@ 
     // Views (and possibly other modules) have templates with a $classes
     // variable that isn't a string, so we leave those variables alone.
     if (is_string($vars[$key])) {
-      $vars['classes_array'] = explode(' ', $hook . ' ' . $vars[$key]);
+      $vars['classes_array'] = explode(' ', $hook.' '.$vars[$key]);
       unset($vars[$key]);
     }
   }
@@ -319,37 +319,37 @@ 
 function zen_preprocess_page(&$vars, $hook) {
   // If the user is silly and enables Zen as the theme, add some styles.
   if ($GLOBALS['theme'] == 'zen') {
-    include_once './' . _zen_path() . '/zen-internals/template.zen.inc';
+    include_once './'._zen_path().'/zen-internals/template.zen.inc';
     _zen_preprocess_page($vars, $hook);
   }
   // Add conditional stylesheets.
   elseif (!module_exists('conditional_styles')) {
     $language = $GLOBALS['language']->direction == LANGUAGE_RTL ? '_rtl' : '';
-    $vars['conditional_styles'] = variable_get('conditional_styles_' . $GLOBALS['theme'] . $language, '');
+    $vars['conditional_styles'] = variable_get('conditional_styles_'.$GLOBALS['theme'].$language, '');
     $vars['styles'] .= $vars['conditional_styles'];
   }
 
   // Classes for body element. Allows advanced theming based on context
   // (home page, node of certain type, etc.)
   // Remove the mostly useless page-ARG0 class.
-  if ($index = array_search(preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', 'page-'. drupal_strtolower(arg(0))), $vars['classes_array'])) {
+  if ($index = array_search(preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', 'page-'.drupal_strtolower(arg(0))), $vars['classes_array'])) {
     unset($vars['classes_array'][$index]);
   }
   if (!$vars['is_front']) {
     // Add unique class for each page.
     $path = drupal_get_path_alias($_GET['q']);
-    $vars['classes_array'][] = drupal_html_class('page-' . $path);
+    $vars['classes_array'][] = drupal_html_class('page-'.$path);
     // Add unique class for each website section.
-    list($section, ) = explode('/', $path, 2);
+    list($section,) = explode('/', $path, 2);
     if (arg(0) == 'node') {
       if (arg(1) == 'add') {
         $section = 'node-add';
       }
       elseif (is_numeric(arg(1)) && (arg(2) == 'edit' || arg(2) == 'delete')) {
-        $section = 'node-' . arg(2);
+        $section = 'node-'.arg(2);
       }
     }
-    $vars['classes_array'][] = drupal_html_class('section-' . $section);
+    $vars['classes_array'][] = drupal_html_class('section-'.$section);
   }
   if (theme_get_setting('zen_wireframes')) {
     $vars['classes_array'][] = 'with-wireframes'; // Optionally add the wireframes style.
@@ -376,7 +376,7 @@ 
     }
     else {
       $vars['classes_array'][] = 'one-sidebar';
-      $vars['classes_array'][] = 'sidebar-' . $vars['layout'];
+      $vars['classes_array'][] = 'sidebar-'.$vars['layout'];
     }
   }
   // Store the menu item since it has some useful information.
@@ -406,13 +406,13 @@ 
 function zen_preprocess_maintenance_page(&$vars, $hook) {
   // If Zen is the maintenance theme, add some styles.
   if ($GLOBALS['theme'] == 'zen') {
-    include_once './' . _zen_path() . '/zen-internals/template.zen.inc';
+    include_once './'._zen_path().'/zen-internals/template.zen.inc';
     _zen_preprocess_page($vars, $hook);
   }
   // Add conditional stylesheets.
   elseif (!module_exists('conditional_styles')) {
     $language = $GLOBALS['language']->direction == LANGUAGE_RTL ? '_rtl' : '';
-    $vars['conditional_styles'] = variable_get('conditional_styles_' . $GLOBALS['theme'] . $language, '');
+    $vars['conditional_styles'] = variable_get('conditional_styles_'.$GLOBALS['theme'].$language, '');
     $vars['styles'] .= $vars['conditional_styles'];
   }
 }
@@ -459,11 +459,11 @@ 
   $vars['user_picture'] = $vars['picture'];
 
   // Create the Drupal 7 $display_submitted variable.
-  $vars['display_submitted'] = theme_get_setting('toggle_node_info_' . $vars['node']->type);
+  $vars['display_submitted'] = theme_get_setting('toggle_node_info_'.$vars['node']->type);
 
   // Special classes for nodes.
   // Class for node type: "node-type-page", "node-type-story", "node-type-my-custom-type", etc.
-  $vars['classes_array'][] = drupal_html_class('node-type-' . $vars['type']);
+  $vars['classes_array'][] = drupal_html_class('node-type-'.$vars['type']);
   if ($vars['promote']) {
     $vars['classes_array'][] = 'node-promoted';
   }
@@ -486,7 +486,7 @@ 
   if (isset($vars['preview'])) {
     $vars['classes_array'][] = 'node-preview';
   }
-  $vars['classes_array'][] = 'build-mode-' . $vars['build_mode'] ;
+  $vars['classes_array'][] = 'build-mode-'.$vars['build_mode'];
 }
 
 /**
@@ -498,7 +498,7 @@ 
  *   The name of the template being rendered ("comment" in this case.)
  */
 function zen_preprocess_comment(&$vars, $hook) {
-  include_once './' . _zen_path() . '/zen-internals/template.comment.inc';
+  include_once './'._zen_path().'/zen-internals/template.comment.inc';
   _zen_preprocess_comment($vars, $hook);
 }
 
@@ -516,7 +516,7 @@ 
   $vars['region'] = $vars['elements']['#region'];
 
   // Setup the default classes.
-  $vars['classes_array'] = array('region', 'region-' . str_replace('_', '-', $vars['region']));
+  $vars['classes_array'] = array('region', 'region-'.str_replace('_', '-', $vars['region']));
 
   // Sidebar regions get a couple extra classes.
   if (strpos($vars['region'], 'sidebar_') === 0) {
@@ -542,7 +542,7 @@ 
   $vars['title'] = $block->subject;
 
   // Special classes for blocks.
-  $vars['classes_array'][] = 'block-' . $block->module;
+  $vars['classes_array'][] = 'block-'.$block->module;
   // Classes describing the position of the block within the region.
   if ($vars['block_id'] == 1) {
     $vars['classes_array'][] = 'first';
@@ -550,17 +550,17 @@ 
   if (!function_exists('context_blocks') && count(block_list($vars['block']->region)) == $vars['block_id']) {
     $vars['classes_array'][] = 'last';
   }
-  $vars['classes_array'][] = 'region-' . $vars['block_zebra'];
+  $vars['classes_array'][] = 'region-'.$vars['block_zebra'];
   $vars['classes_array'][] = $vars['zebra'];
-  $vars['classes_array'][] = 'region-count-' . $vars['block_id'];
-  $vars['classes_array'][] = 'count-' . $vars['id'];
+  $vars['classes_array'][] = 'region-count-'.$vars['block_id'];
+  $vars['classes_array'][] = 'count-'.$vars['id'];
 
   // Create the block ID.
-  $vars['block_html_id'] = 'block-' . $block->module . '-' . $block->delta;
+  $vars['block_html_id'] = 'block-'.$block->module.'-'.$block->delta;
 
   $vars['edit_links_array'] = array();
   if (theme_get_setting('zen_block_editing') && user_access('administer blocks')) {
-    include_once './' . _zen_path() . '/zen-internals/template.block-editing.inc';
+    include_once './'._zen_path().'/zen-internals/template.block-editing.inc';
     zen_preprocess_block_editing($vars, $hook);
     $vars['classes_array'][] = 'with-block-editing';
   }
@@ -590,7 +590,7 @@ 
  *   The name of the template being rendered ("block" in this case.)
  */
 function zen_process_block(&$vars, $hook) {
-  $vars['edit_links'] = !empty($vars['edit_links_array']) ? '<div class="edit">' . implode(' ', $vars['edit_links_array']) . '</div>' : '';
+  $vars['edit_links'] = !empty($vars['edit_links_array']) ? '<div class="edit">'.implode(' ', $vars['edit_links_array']).'</div>' : '';
 }
 
 if (!function_exists('drupal_html_class')) {

html/inc/bootstrap.inc

Spacing +17 added lines, -17 removed lines

@@ -141,12 +141,12 @@ 
         // prefix for links; needed for pages not in top dir
     $user,
         // logged-in user, if any
-    $fixed=false,
+    $fixed = false,
         // if true, navbar is fixed at top of page.
         // NOTE: if you do this, you must set a global var $fixed_navbar
         // to true at compile time
         // (it needs to be set when page_head() is called).
-    $inverse=false
+    $inverse = false
         // white on black?
 ) {
     global $master_url;
@@ -214,7 +214,7 @@ 
 // output a panel.
 // $content_func is a function that generates the panel contents
 //
-function panel($title, $content_func, $class="panel-primary", $body_class="") {
+function panel($title, $content_func, $class = "panel-primary", $body_class = "") {
     echo sprintf('<div class="panel %s">
         ', $class
     );
@@ -240,7 +240,7 @@ 
 // are functions that generate the top, left, and right content
 // $left_width is the width of left column in 1/12 units.
 //
-function grid($top_func, $left_func, $right_func, $left_width=6) {
+function grid($top_func, $left_func, $right_func, $left_width = 6) {
     echo '
         <div class="container-fluid">
     ';
@@ -255,7 +255,7 @@ 
             </div>
         ';
     }
-    $right_width = 12-$left_width;
+    $right_width = 12 - $left_width;
     echo '
         <div class="row">
         <div class="col-sm-'.$left_width.'">
@@ -279,7 +279,7 @@ 
 //      use extra = "name=x"
 //      call forum_focus(x, foo) after defining the field
 //
-function form_start($action, $method='get', $extra='') {
+function form_start($action, $method = 'get', $extra = '') {
     echo sprintf(
         '<div class="container-fluid">
         <form class="form-horizontal" method="%s" action="%s" %s>'
@@ -311,7 +311,7 @@ 
 // just the input field
 //
 function form_input_text_field(
-    $name, $value='', $type='text', $attrs='', $extra=''
+    $name, $value = '', $type = 'text', $attrs = '', $extra = ''
 ) {
     return sprintf(
         '<input %s type="%s" class="form-control" name="%s" value="%s">%s',
@@ -322,7 +322,7 @@ 
 // the whole row
 //
 function form_input_text(
-    $label, $name, $value='', $type='text', $attrs='', $extra=''
+    $label, $name, $value = '', $type = 'text', $attrs = '', $extra = ''
 ) {
     echo sprintf('
         <div class="form-group">
@@ -350,7 +350,7 @@ 
     );
 }
 
-function form_input_textarea($label, $name, $value='', $nrows=4) {
+function form_input_textarea($label, $name, $value = '', $nrows = 4) {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s" for="%s">%s</label>
@@ -400,7 +400,7 @@ 
     );
     $n = 0;
     foreach ($items as $i) {
-        $s = ($flags && $flags[$n])?'selected':'';
+        $s = ($flags && $flags[$n]) ? 'selected' : '';
         echo '<option '.$s.' value="'.$i[0].'">'.$i[1].'</option>
         ';
         $n++;
@@ -410,12 +410,12 @@ 
 
 // return a list of string for checkbox items
 //
-function checkbox_item_strings($items, $attrs='') {
+function checkbox_item_strings($items, $attrs = '') {
     $x = [];
     foreach ($items as $i) {
         $x[] = sprintf('<input %s type="checkbox" name="%s" %s> %s
             ',
-            $attrs, $i[0], $i[2]?"checked":"", $i[1]
+            $attrs, $i[0], $i[2] ? "checked" : "", $i[1]
         );
     }
     return $x;
@@ -423,7 +423,7 @@ 
 
 // $items is list of (name, label, checked)
 //
-function form_checkboxes($label, $items, $attrs='') {
+function form_checkboxes($label, $items, $attrs = '') {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s">%s</label>
@@ -449,7 +449,7 @@ 
         FORM_LEFT_CLASS, $label, FORM_RIGHT_CLASS
     );
     foreach ($items as $i) {
-        $checked = ($selected == $i[0])?"checked":"";
+        $checked = ($selected == $i[0]) ? "checked" : "";
         echo sprintf('<input type="radio" name="%s" value="%s" %s> %s <br>
             ',
             $name, $i[0], $checked, $i[1]
@@ -482,7 +482,7 @@ 
 ';
 }
 
-function form_submit($text, $attrs='') {
+function form_submit($text, $attrs = '') {
     form_general(
         "",
         sprintf('<button %s type="submit" class="btn btn-success">%s</button>',
@@ -491,11 +491,11 @@ 
     );
 }
 
-function form_checkbox($label, $name, $checked=false) {
+function form_checkbox($label, $name, $checked = false) {
     echo sprintf('
         <div class="form-group">
             <input type="checkbox" name="%s" %s> &nbsp; <span class="lead">%s</span>
         </div>
-        ', $name, $checked?"checked":"", $label
+        ', $name, $checked ? "checked" : "", $label
     );
 }

html/inc/keywords.inc

Spacing +61 added lines, -61 removed lines

@@ -24,72 +24,72 @@
 define('KW_CATEGORY_SCIENCE', 0);
 define('KW_CATEGORY_LOC', 1);
 
-define('KW_ASTRONOMY',      1);
-define('KW_SETI',           2);
-define('KW_PULSARS',        3);
-define('KW_GW',             4);
-define('KW_COSMOLOGY',      5);
-define('KW_PHYSICS',        6);
+define('KW_ASTRONOMY', 1);
+define('KW_SETI', 2);
+define('KW_PULSARS', 3);
+define('KW_GW', 4);
+define('KW_COSMOLOGY', 5);
+define('KW_PHYSICS', 6);
 define('KW_PARTICLE_PHYSICS', 7);
-define('KW_NANOSCIENCE',    8);
-define('KW_BIOMED',         9);
+define('KW_NANOSCIENCE', 8);
+define('KW_BIOMED', 9);
 define('KW_DRUG_DISCOVERY', 10);
-define('KW_PROTEINS',       11);
-define('KW_GENETICS',       12);
-define('KW_DISEASE',        13);
-define('KW_CANCER',         14);
-define('KW_MATH_CS',        15);
-define('KW_AI',             16);
-define('KW_OCEANIA',        17);
-define('KW_AUSTRALIA',      18);
+define('KW_PROTEINS', 11);
+define('KW_GENETICS', 12);
+define('KW_DISEASE', 13);
+define('KW_CANCER', 14);
+define('KW_MATH_CS', 15);
+define('KW_AI', 16);
+define('KW_OCEANIA', 17);
+define('KW_AUSTRALIA', 18);
 
-define('KW_EUROPE',         20);
-define('KW_GERMANY',        21);
-define('KW_ASIA',           22);
-define('KW_AMERICAS',       23);
-define('KW_US',             24);
-define('KW_UCB',            25);
-define('KW_AEI',            26);
-define('KW_CERN',           27);
-define('KW_UW',             28);
-define('KW_EARTH_SCI',      29);
-define('KW_SPAIN',          30);
-define('KW_SAN_JORGE',      31);
-define('KW_NUMBER_THEORY',  32);
-define('KW_CRYPTO',         33);
-define('KW_ENV_RESEARCH',   34);
-define('KW_CLIMATE',        35);
-define('KW_CZECH',          36);
+define('KW_EUROPE', 20);
+define('KW_GERMANY', 21);
+define('KW_ASIA', 22);
+define('KW_AMERICAS', 23);
+define('KW_US', 24);
+define('KW_UCB', 25);
+define('KW_AEI', 26);
+define('KW_CERN', 27);
+define('KW_UW', 28);
+define('KW_EARTH_SCI', 29);
+define('KW_SPAIN', 30);
+define('KW_SAN_JORGE', 31);
+define('KW_NUMBER_THEORY', 32);
+define('KW_CRYPTO', 33);
+define('KW_ENV_RESEARCH', 34);
+define('KW_CLIMATE', 35);
+define('KW_CZECH', 36);
 define('KW_CHARLES_PRAGUE', 37);
-define('KW_RECHENKRAFT',    38);
-define('KW_RHEINMAIN',      39);
-define('KW_HUNGARY',        40);
-define('KW_IRELAND',        41);
-define('KW_UC_DUBLIN',      42);
-define('KW_POLAND',         43);
-define('KW_RUSSIA',         44);
+define('KW_RECHENKRAFT', 38);
+define('KW_RHEINMAIN', 39);
+define('KW_HUNGARY', 40);
+define('KW_IRELAND', 41);
+define('KW_UC_DUBLIN', 42);
+define('KW_POLAND', 43);
+define('KW_RUSSIA', 44);
 define('KW_SW_STATE_RUSSIA', 45);
-define('KW_RAS',            46);
-define('KW_PRBB',           47);
-define('KW_UK',             48);
-define('KW_OXFORD',         49);
-define('KW_CHINA',          50);
-define('KW_U_DAYTON',       51);
-define('KW_WRIGHT_STATE',   52);
-define('KW_USC',            53);
-define('KW_FULLERTON',      54);
-define('KW_ARIZONA_STATE',  55);
-define('KW_U_ILLINOIS',     56);
-define('KW_U_WARSAW',       57);
-define('KW_RPI',            58);
-define('KW_INTERNATIONAL',  59);
-define('KW_UND',            60);
-define('KW_HOLLAND',        61);
-define('KW_CHEMISTRY',      62);
-define('KW_GAMES',          63);
-define('KW_VIRUS',          64);
-define('KW_FRANCE',         65);
-define('KW_CANADA',         66);
+define('KW_RAS', 46);
+define('KW_PRBB', 47);
+define('KW_UK', 48);
+define('KW_OXFORD', 49);
+define('KW_CHINA', 50);
+define('KW_U_DAYTON', 51);
+define('KW_WRIGHT_STATE', 52);
+define('KW_USC', 53);
+define('KW_FULLERTON', 54);
+define('KW_ARIZONA_STATE', 55);
+define('KW_U_ILLINOIS', 56);
+define('KW_U_WARSAW', 57);
+define('KW_RPI', 58);
+define('KW_INTERNATIONAL', 59);
+define('KW_UND', 60);
+define('KW_HOLLAND', 61);
+define('KW_CHEMISTRY', 62);
+define('KW_GAMES', 63);
+define('KW_VIRUS', 64);
+define('KW_FRANCE', 65);
+define('KW_CANADA', 66);
 
 $job_keywords = array();
 

html/user/submit_rpc_handler.php

Spacing +31 added lines, -31 removed lines

@@ -61,7 +61,7 @@ 
     if ($template) {
         $t = (double)$template->workunit->rsc_fpops_est;
     }
-    foreach($r->batch->job as $job) {
+    foreach ($r->batch->job as $job) {
         $y = (double)$job->rsc_fpops_est;
         if ($y) {
             $x += $y;
@@ -87,7 +87,7 @@ 
 function est_elapsed_time($r, $template) {
     // crude estimate: batch FLOPs / project FLOPS
     //
-    return batch_flop_count($r, $template) / project_flops();
+    return batch_flop_count($r, $template)/project_flops();
 }
 
 // if batch-level input template filename was given, read it;
@@ -97,9 +97,9 @@ 
 //
 function read_input_template($app, $r) {
     if ((isset($r->batch)) && (isset($r->batch->workunit_template_file)) && ($r->batch->workunit_template_file)) {
-        $path = project_dir() . "/templates/".$r->batch->workunit_template_file;
+        $path = project_dir()."/templates/".$r->batch->workunit_template_file;
     } else {
-        $path = project_dir() . "/templates/$app->name"."_in";
+        $path = project_dir()."/templates/$app->name"."_in";
     }
     if (file_exists($path)) {
         $x = simplexml_load_file($path);
@@ -144,7 +144,7 @@ 
 function validate_batch($jobs, $template) {
     $i = 0;
     $n = count($template->file_info);
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         $m = count($job->input_files);
         if ($n != $m) {
             log_write("wrong # of input files for job $i: need $n, got $m");
@@ -205,7 +205,7 @@ 
 // stage all the files
 //
 function stage_files(&$jobs) {
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         foreach ($job->input_files as $file) {
             if ($file->mode != "remote") {
                 $file->name = stage_file($file);
@@ -218,7 +218,7 @@ 
 //
 function submit_jobs(
     $jobs, $job_params, $app, $batch_id, $priority, $app_version_num,
-    $input_template_filename,        // batch-level; can also specify per job
+    $input_template_filename, // batch-level; can also specify per job
     $output_template_filename
 ) {
     global $input_templates, $output_templates;
@@ -227,7 +227,7 @@ 
     // one line per job
     //
     $x = "";
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         if ($job->name) {
             $x .= " --wu_name $job->name";
         }
@@ -262,8 +262,8 @@ 
         $x .= "\n";
     }
 
-    $errfile = "/tmp/create_work_" . getmypid() . ".err";
-    $cmd = "cd " . project_dir() . "; ./bin/create_work --appname $app->name --batch $batch_id";
+    $errfile = "/tmp/create_work_".getmypid().".err";
+    $cmd = "cd ".project_dir()."; ./bin/create_work --appname $app->name --batch $batch_id";
     if ($priority !== null) {
         $cmd .= " --priority $priority";
     }
@@ -363,7 +363,7 @@ 
 //
 function xml_get_jobs($r) {
     $jobs = array();
-    foreach($r->batch->job as $j) {
+    foreach ($r->batch->job as $j) {
         $job = new StdClass;
         $job->input_files = array();
         $job->command_line = (string)$j->command_line;
@@ -414,16 +414,16 @@ 
 //
 function logical_end_time($r, $jobs, $user, $app) {
     $total_flops = 0;
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         //print_r($job);
         if ($job->rsc_fpops_est) {
             $total_flops += $job->rsc_fpops_est;
         } else if ($job->input_template && $job->input_template->workunit->rsc_fpops_est) {
-            $total_flops += (double) $job->input_template->workunit->rsc_fpops_est;
+            $total_flops += (double)$job->input_template->workunit->rsc_fpops_est;
         } else if ($r->batch->job_params->rsc_fpops_est) {
-            $total_flops += (double) $r->batch->job_params->rsc_fpops_est;
+            $total_flops += (double)$r->batch->job_params->rsc_fpops_est;
         } else {
-            $x = (double) $template->workunit->rsc_fpops_est;
+            $x = (double)$template->workunit->rsc_fpops_est;
             if ($x) {
                 $total_flops += $x;
             } else {
@@ -431,7 +431,7 @@ 
             }
         }
     }
-    $cmd = "cd " . project_dir() . "/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name";
+    $cmd = "cd ".project_dir()."/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name";
     $x = exec($cmd);
     if (!is_numeric($x) || (double)$x == 0) {
         xml_error(-1, "$cmd returned $x");
@@ -509,15 +509,15 @@ 
     }
     
     $job_params = new StdClass;
-    $job_params->rsc_disk_bound = (double) $r->batch->job_params->rsc_disk_bound;
-    $job_params->rsc_fpops_est = (double) $r->batch->job_params->rsc_fpops_est;
-    $job_params->rsc_fpops_bound = (double) $r->batch->job_params->rsc_fpops_bound;
-    $job_params->rsc_memory_bound = (double) $r->batch->job_params->rsc_memory_bound;
-    $job_params->delay_bound = (double) $r->batch->job_params->delay_bound;
+    $job_params->rsc_disk_bound = (double)$r->batch->job_params->rsc_disk_bound;
+    $job_params->rsc_fpops_est = (double)$r->batch->job_params->rsc_fpops_est;
+    $job_params->rsc_fpops_bound = (double)$r->batch->job_params->rsc_fpops_bound;
+    $job_params->rsc_memory_bound = (double)$r->batch->job_params->rsc_memory_bound;
+    $job_params->delay_bound = (double)$r->batch->job_params->delay_bound;
         // could add quorum-related stuff
 
-    $input_template_filename = (string) $r->batch->input_template_filename;
-    $output_template_filename = (string) $r->batch->output_template_filename;
+    $input_template_filename = (string)$r->batch->input_template_filename;
+    $output_template_filename = (string)$r->batch->output_template_filename;
         // possibly empty
     
     submit_jobs(
@@ -606,7 +606,7 @@ 
 }
 
 function n_outfiles($wu) {
-    $path = project_dir() . "/$wu->output_template_filename";
+    $path = project_dir()."/$wu->output_template_filename";
     $r = simplexml_load_file($path);
     return count($r->file_info);
 }
@@ -813,7 +813,7 @@ 
 ";
         if ($result->server_state == 5) {   // over?
             $paths = get_outfile_paths($result);
-            foreach($paths as $path) {
+            foreach ($paths as $path) {
                 if (is_file($path)) {
                     $size = filesize($path);
                     echo "        <outfile>
@@ -857,7 +857,7 @@ 
     } else {
         $results = BoincResult::enum("workunitid=$job_id");
         foreach ($results as $r) {
-            switch($r->outcome) {
+            switch ($r->outcome) {
             case 1:
             case 3:
             case 6:
@@ -972,8 +972,8 @@ 
     }
 
     list($user, $user_submit) = check_remote_submit_permissions($r, $app);
-    $in = file_get_contents(project_dir() . "/templates/".$app->name."_in");
-    $out = file_get_contents(project_dir() . "/templates/".$app->name."_out");
+    $in = file_get_contents(project_dir()."/templates/".$app->name."_in");
+    $out = file_get_contents(project_dir()."/templates/".$app->name."_out");
     if ($in === false || $out === false) {
         log_write("template file missing");
         xml_error(-1, "template file missing");
@@ -985,7 +985,7 @@ 
 
 function ping($r) {
     xml_start_tag("ping");
-    BoincDb::get();     // errors out if DB down or web disabled
+    BoincDb::get(); // errors out if DB down or web disabled
     echo "<success>1</success>
         </ping>
     ";
@@ -1052,9 +1052,9 @@ 
 $request_log = parse_config(get_config(), "<remote_submit_request_log>");
 if ($request_log) {
     $log_dir = parse_config(get_config(), "<log_dir>");
-    $request_log = $log_dir . "/" . $request_log;
+    $request_log = $log_dir."/".$request_log;
     if ($file = fopen($request_log, "a")) {
-        fwrite($file, "\n<submit_rpc_handler date=\"" . date(DATE_ATOM) . "\">\n" . $_POST['request'] . "\n</submit_rpc_handler>\n");
+        fwrite($file, "\n<submit_rpc_handler date=\"".date(DATE_ATOM)."\">\n".$_POST['request']."\n</submit_rpc_handler>\n");
         fclose($file);
     }
 }

html/inc/util_basic.inc

Spacing +5 added lines, -5 removed lines

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

html/inc/util.inc

Spacing +76 added lines, -76 removed lines

@@ -37,17 +37,17 @@ 
 //
 $config = get_config();
 global $master_url;
-$master_url = parse_config($config , "<master_url>");
+$master_url = parse_config($config, "<master_url>");
 $recaptcha_public_key = parse_config($config, "<recaptcha_public_key>");
 $recaptcha_private_key = parse_config($config, "<recaptcha_private_key>");
 
 // the following default to on
 //
 $x = parse_config($config, "<user_country>");
-define('USER_COUNTRY', ($x===null)?1:(int)$x);
+define('USER_COUNTRY', ($x === null) ? 1 : (int)$x);
 
 $x = parse_config($config, "<user_url>");
-define('USER_URL', ($x===null)?1:(int)$x);
+define('USER_URL', ($x === null) ? 1 : (int)$x);
 
 // don't allow /... at the end of URL
 //
@@ -141,10 +141,10 @@ 
 }
 
 function url_base() {
-    return is_https()?secure_url_base():URL_BASE;
+    return is_https() ?secure_url_base() : URL_BASE;
 }
 
-function send_cookie($name, $value, $permanent, $ops=false) {
+function send_cookie($name, $value, $permanent, $ops = false) {
     global $master_url;
 
     // the following allows independent login for projects on the same server
@@ -155,11 +155,11 @@ 
         $path = substr($path, 0, -1);
         $path .= "_ops/";
     }
-    $expire = $permanent?time()+3600*24*365:0;
+    $expire = $permanent ?time() + 3600*24*365 : 0;
     setcookie($name, $value, $expire, $path);
 }
 
-function clear_cookie($name, $ops=false) {
+function clear_cookie($name, $ops = false) {
     global $master_url;
     $url = parse_url($master_url);
     $path = $url['path'];
@@ -167,13 +167,13 @@ 
         $path = substr($path, 0, -1);
         $path .= "_ops/";
     }
-    setcookie($name, '', time()-3600, $path);
+    setcookie($name, '', time() - 3600, $path);
 }
 
 $g_logged_in_user = null;
 $got_logged_in_user = false;
 
-function get_logged_in_user($must_be_logged_in=true) {
+function get_logged_in_user($must_be_logged_in = true) {
     global $g_logged_in_user, $got_logged_in_user;
     if ($got_logged_in_user) {
         // this could have been called earlier with $must_be_logged_in false
@@ -199,7 +199,7 @@ 
             $next_url = $_SERVER['REQUEST_URI'];
             $n = strrpos($next_url, "/");
             if ($n) {
-                $next_url = substr($next_url, $n+1);
+                $next_url = substr($next_url, $n + 1);
             }
         }
         $next_url = urlencode($next_url);
@@ -210,7 +210,7 @@ 
     return $g_logged_in_user;
 }
 
-function show_login_info($prefix="") {
+function show_login_info($prefix = "") {
     $user = get_logged_in_user(false);
     if ($user) {
         $url_tokens = url_tokens($user->authenticator);
@@ -220,7 +220,7 @@ 
     }
 }
 
-$cache_control_extra="";
+$cache_control_extra = "";
 $is_login_page = false;
 
 // Call this to start pages.
@@ -232,11 +232,11 @@ 
 // with an existing web framework can more easily do so.
 // To do so, define page_head() in the project include file.
 //
-if (!function_exists("page_head")){
+if (!function_exists("page_head")) {
 function page_head(
     $title,
         // page title. Put in <title>, used as title for browser tab.
-    $body_attrs=null,
+    $body_attrs = null,
         // <body XXXX>
         // e.g. Javascript to put focus in an input field
         // (onload="document.form.foo.focus()")
@@ -245,10 +245,10 @@ 
         // if set, include schedulers.txt.
         // also pass to project_banner() in case you want a different
         // header for your main page.
-    $url_prefix="",
+    $url_prefix = "",
         // prepend this to links.
         // Use for web pages not in the top directory
-    $head_extra=null
+    $head_extra = null
         // extra stuff to put in <head>. E.g.:
         // reCAPTCHA code (create_profile.php)
         // bbcode javascript (forums)
@@ -270,7 +270,7 @@ 
         header("Content-type: text/html; charset=utf-8");
         header("Expires: Mon, 26 Jul 1997 05:00:00 UTC");
             // Date in the past
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " UTC");
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s")." UTC");
             // always modified
         header("Cache-Control: $cache_control_extra no-cache, must-revalidate, post-check=0, pre-check=0");
             // for HTTP/1.1
@@ -291,11 +291,11 @@ 
     if ($head_extra) {
         echo "\n$head_extra\n";
     }
-    if ($is_main && (!defined('NO_COMPUTING')||!NO_COMPUTING)) {
+    if ($is_main && (!defined('NO_COMPUTING') || !NO_COMPUTING)) {
         readfile("schedulers.txt");
     }
 
-    $t = $title?$title:PROJECT;
+    $t = $title ? $title : PROJECT;
     echo "<title>$t</title>\n";
     echo '
         <meta charset="utf-8">
@@ -352,7 +352,7 @@ 
     echo '<div class="container-fluid">
     ';
 
-    switch($title) {    //kludge
+    switch ($title) {    //kludge
     case tra("Log in"):
     case tra("Create an account"):
     case tra("Server status page"):
@@ -367,13 +367,13 @@ 
 
 // See the comments for page_head()
 //
-if (!function_exists("page_tail")){
+if (!function_exists("page_tail")) {
 function page_tail(
-    $show_date=false,
+    $show_date = false,
         // true for pages that are generated periodically rather than on the fly
-    $url_prefix="",
+    $url_prefix = "",
         // use for pages not at top level
-    $is_main=false
+    $is_main = false
         // passed to project_footer;
 ) {
     echo "<br>\n";
@@ -388,10 +388,10 @@ 
 }
 }
 
-function display_cvs_versions(){
+function display_cvs_versions() {
     global $cvs_version_tracker;
     echo "\n<!-- SVN VERSIONS -->\n";
-    for ($i=0;$i<sizeof($cvs_version_tracker);$i++) {
+    for ($i = 0; $i < sizeof($cvs_version_tracker); $i++) {
         echo "<!-- ".$cvs_version_tracker[$i]." -->\n";
     }
 }
@@ -416,23 +416,23 @@ 
 // takes argument in second and returns a human formatted time string
 // in the form D days + h Hours + m Min + s sec.
 
-function time_diff($x, $res=3) {
+function time_diff($x, $res = 3) {
     $days    = (int)($x/86400);
-    $hours   = (int)(($x-$days*86400)/3600);
-    $minutes = (int)(($x-$days*86400-$hours*3600)/60);
-    $seconds = (int)($x % 60);
+    $hours   = (int)(($x - $days*86400)/3600);
+    $minutes = (int)(($x - $days*86400 - $hours*3600)/60);
+    $seconds = (int)($x%60);
 
     $datestring = "";
     if ($days) {
         $datestring .= "$days ".tra("days")." ";
     }
-    if ($res>0 && ($hours || strlen($datestring))) {
+    if ($res > 0 && ($hours || strlen($datestring))) {
         $datestring .= "$hours ".tra("hours")." ";
     }
-    if ($res>1 && ($minutes || strlen($datestring))) {
+    if ($res > 1 && ($minutes || strlen($datestring))) {
         $datestring .= "$minutes ".tra("min")." ";
     }
-    if ($res>2 && ($seconds)) {
+    if ($res > 2 && ($seconds)) {
         $datestring .= "$seconds ".tra("sec")." ";
     }
 
@@ -447,7 +447,7 @@ 
 
 function time_str($x) {
     if ($x == 0) return "---";
-    return gmdate('j M Y, G:i:s', $x) . " UTC";
+    return gmdate('j M Y, G:i:s', $x)." UTC";
 }
 
 function local_time_str($x) {
@@ -459,14 +459,14 @@ 
     return time_str($x);
 }
 
-function start_table_str($class="", $style="") {
-    $s = $style?'style="'.$style.'"':'';
+function start_table_str($class = "", $style = "") {
+    $s = $style ? 'style="'.$style.'"' : '';
     return '<div class="table">
       <table '.$s.' width="100%" class="table table-condensed '.$class.'" >
     ';
 }
 
-function start_table($class="", $style="") {
+function start_table($class = "", $style = "") {
     echo start_table_str($class, $style);
 }
 
@@ -511,7 +511,7 @@ 
     echo "</tr>\n";
 }
 
-function row1($x, $ncols=2, $class="heading") {
+function row1($x, $ncols = 2, $class = "heading") {
     if ($class == "heading") {
         echo "<tr><th class=\"bg-primary\" colspan=\"$ncols\">$x</th></tr>\n";
     } else {
@@ -523,10 +523,10 @@ 
 define('VALUE_ATTRS', 'style="padding-left:12px"');
 define('VALUE_ATTRS_ERR', 'class="danger" style="padding-left:12px"');
 
-function row2($x, $y, $show_error=false, $lwidth='40%') {
-    if ($x==="") $x="<br>";
-    if ($y==="") $y="<br>";
-    $attrs = $show_error?VALUE_ATTRS_ERR:VALUE_ATTRS;
+function row2($x, $y, $show_error = false, $lwidth = '40%') {
+    if ($x === "") $x = "<br>";
+    if ($y === "") $y = "<br>";
+    $attrs = $show_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
     echo "<tr>
         <td width=\"$lwidth\" ".NAME_ATTRS.">$x</td>
         <td $attrs >$y</td>
@@ -534,7 +534,7 @@ 
     ";
 }
 
-function row2_init($x, $y, $lwidth='40%') {
+function row2_init($x, $y, $lwidth = '40%') {
     echo '<tr>
         <td class="text-right " width="'.$lwidth.'"  style="padding-right: 20px;">'.$x.'</td>
         <td '.VALUE_ATTRS.'>'.$y.'
@@ -557,20 +557,20 @@ 
     echo "</tr>\n";
 }
 
-define ('ALIGN_RIGHT', 'style="text-align:right;"');
+define('ALIGN_RIGHT', 'style="text-align:right;"');
 
-function row_heading_array($x, $attrs=null, $class='bg-primary') {
+function row_heading_array($x, $attrs = null, $class = 'bg-primary') {
     echo "<tr>";
     $i = 0;
     foreach ($x as $h) {
-        $a = $attrs?$attrs[$i]:"";
+        $a = $attrs ? $attrs[$i] : "";
         echo "<th $a class=\"$class\">$h</th>";
         $i++;
     }
     echo "</tr>\n";
 }
 
-function row_heading($x, $class='bg-primary') {
+function row_heading($x, $class = 'bg-primary') {
     echo sprintf('<tr><th class="%s" colspan=99>%s</th></tr>
         ', $class, $x
     );
@@ -630,7 +630,7 @@ 
 // If $ellipsis is true, then an ellipsis is added to any sentence which
 // is cut short.
 
-function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis=false) {
+function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis = false) {
     $words = explode($delimiter, $sentence);
     $total_chars = 0;
     $trunc = false;
@@ -713,8 +713,8 @@ 
 
 // returns null if the arg is optional and missing
 //
-function get_int($name, $optional=false) {
-    $x=null;
+function get_int($name, $optional = false) {
+    $x = null;
     if (isset($_GET[$name])) $x = $_GET[$name];
     if (!is_numeric($x)) {
         if ($optional) {
@@ -733,7 +733,7 @@ 
 
 // returns null if the arg is optional and missing
 //
-function post_num($name, $optional=false) {
+function post_num($name, $optional = false) {
     $x = null;
     if (isset($_POST[$name])) $x = $_POST[$name];
     if (!is_numeric($x)) {
@@ -748,7 +748,7 @@ 
 
 // returns null if the arg is optional and missing
 //
-function post_int($name, $optional=false) {
+function post_int($name, $optional = false) {
     $x = post_num($name, $optional);
     if (is_null($x)) return null;
     $y = (int)$x;
@@ -766,7 +766,7 @@ 
     }
 }
 
-function get_str($name, $optional=false) {
+function get_str($name, $optional = false) {
     if (isset($_GET[$name])) {
         $x = $_GET[$name];
     } else {
@@ -778,7 +778,7 @@ 
     return undo_magic_quotes($x);
 }
 
-function post_str($name, $optional=false) {
+function post_str($name, $optional = false) {
     if (isset($_POST[$name])) {
         $x = $_POST[$name];
     } else {
@@ -790,7 +790,7 @@ 
     return undo_magic_quotes($x);
 }
 
-function post_arr($name, $optional=false) {
+function post_arr($name, $optional = false) {
     if (isset($_POST[$name]) && is_array($_POST[$name])) {
         $x = $_POST[$name];
     } else {
@@ -806,7 +806,7 @@ 
     // the mb_* functions are not included by default
     // return (mb_detect_encoding($passwd) -= 'ASCII');
 
-    for ($i=0; $i<strlen($str); $i++) {
+    for ($i = 0; $i < strlen($str); $i++) {
         $c = ord(substr($str, $i));
         if ($c < 32 || $c > 127) return false;
     }
@@ -830,7 +830,7 @@ 
     $number = str_replace(',', '.', $number); // replace the german decimal separator
     // if no value was entered and this is ok
     //
-    if ($number=='' && !$low) return true;
+    if ($number == '' && !$low) return true;
 
     // the supplied value contains alphabetic characters
     //
@@ -847,7 +847,7 @@ 
 
 // Generate a "select" element from an array of values
 //
-function select_from_array($name, $array, $selection=null, $width=240) {
+function select_from_array($name, $array, $selection = null, $width = 240) {
     $out = '<select style="color:#000;"class="form-control input-sm" style="width:'.$width.'px" name="'.$name.'">"';
 
     foreach ($array as $key => $value) {
@@ -872,8 +872,8 @@ 
     return $str;
 }
 
-function strip_bbcode($string){
-    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
+function strip_bbcode($string) {
+    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/", "", $string);
 }
 
 function current_url() {
@@ -901,7 +901,7 @@ 
 // @param class The optional CSS class of the button. Defaults to a standard button
 //
 
-function button_text($url, $text, $desc=null, $class="btn-success btn-sm") {
+function button_text($url, $text, $desc = null, $class = "btn-success btn-sm") {
     if (!$desc) {
         $desc = $text;
     }
@@ -910,19 +910,19 @@ 
     );
 }
 
-function show_button($url, $text, $desc=null, $class="btn-success btn-sm") {
+function show_button($url, $text, $desc = null, $class = "btn-success btn-sm") {
     echo button_text($url, $text, $desc, $class);
 }
 
 // for places with a bunch of buttons, like forum posts
 //
-function show_button_small($url, $text, $desc=null) {
+function show_button_small($url, $text, $desc = null) {
     echo button_text($url, $text, $desc, "btn-primary btn-xs");
 }
 
 // used for showing icons
 //
-function show_image($src, $title, $alt, $height=null) {
+function show_image($src, $title, $alt, $height = null) {
     $h = "";
     if ($height) {
         $h = "height=\"$height\"";
@@ -959,7 +959,7 @@ 
 // tries instead to connect to <replica_db_host> if tag exists.
 // DEPRECATED - use boinc_db.inc
 //
-function db_init($try_replica=false) {
+function db_init($try_replica = false) {
     check_web_stopped();
     $retval = db_init_aux($try_replica);
     if ($retval == 1) {
@@ -1030,7 +1030,7 @@ 
 function sanitize_numeric($x) {
     if (is_numeric($x)) {
         return $x;
-    } else if (trim($x) == '' ) {
+    } else if (trim($x) == '') {
         return '';
     } else {
         return "not numeric";
@@ -1053,9 +1053,9 @@ 
     return $c/(200/24);
 }
 
-function do_download($path,$name="") {
-    if (strcmp($name,"") == 0) {
-        $name=basename($path);
+function do_download($path, $name = "") {
+    if (strcmp($name, "") == 0) {
+        $name = basename($path);
     }
     header('Content-Description: File Transfer');
     header('Content-Type: application/octet-stream');
@@ -1064,7 +1064,7 @@ 
     header('Expires: 0');
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
-    header('Content-Length: ' . filesize($path));
+    header('Content-Length: '.filesize($path));
     flush();
     readfile($path);
 }
@@ -1113,10 +1113,10 @@ 
 // Otherwise return 0.
 // Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
 //
-function boinc_client_version(){
+function boinc_client_version() {
     if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
     $x = $_SERVER['HTTP_USER_AGENT'];
-    $e =  "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
+    $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
     if (preg_match($e, $x, $matches)) {
         return $matches[1]*10000 + $matches[2]*100 + $matches[3];
     }
@@ -1145,7 +1145,7 @@ 
     $rem_name = $name."_remaining";
     return "<textarea name=\"$name\" class=\"form-control\" rows=3 id=\"$name\" onkeydown=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\"
         onkeyup=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\">".$text."</textarea>
-        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen-strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
+        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen - strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
     ;
 }
 
@@ -1175,7 +1175,7 @@ 
 // use the following around text with long lines,
 // to limit the width and make it more readable.
 //
-function text_start($width=640) {
+function text_start($width = 640) {
     echo sprintf("<div style=\"max-width: %dpx;\">\n", $width);
 }
 function text_end() {
@@ -1192,7 +1192,7 @@ 
 }
 
 function cert_filename() {
-    return defined("CERT_FILENAME")?CERT_FILENAME:"cert1.php";
+    return defined("CERT_FILENAME") ?CERT_FILENAME:"cert1.php";
 }
 
 // if user hasn't validated their email addr, tell them to
@@ -1209,6 +1209,6 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

html/user/server_status.php

Spacing +9 added lines, -9 removed lines

@@ -180,7 +180,7 @@ 
             $avg = round($app->info->avg, 2);
             $min = round($app->info->min, 2);
             $max = round($app->info->max, 2);
-            $x = $max?"$avg ($min - $max)":"---";
+            $x = $max ? "$avg ($min - $max)" : "---";
             $u = $app->info->users;
         } else {
             $x = '---';
@@ -273,7 +273,7 @@ 
         $cmd = trim($cmd);
         $x = explode(" ", $cmd);
         $prog = $x[0];
-        $pidname = $prog . '.pid';
+        $pidname = $prog.'.pid';
     }
     $path = "../../pid_$host/$pidname";
     if (is_file($path)) {
@@ -314,12 +314,12 @@ 
     }
     $master_host = $u["host"];
     if ($config->www_host) {
-        $web_host = trim((string) $config->www_host);
+        $web_host = trim((string)$config->www_host);
     } else {
         $web_host = $main_host;
     }
     if ($config->sched_host) {
-        $sched_host = trim((string) $config->sched_host);
+        $sched_host = trim((string)$config->sched_host);
     } else {
         $sched_host = $main_host;
     }
@@ -329,7 +329,7 @@ 
 
     // the upload and download servers are sort of daemons too
     //
-    $url = trim((string) $config->download_url);
+    $url = trim((string)$config->download_url);
     $u = parse_url($url);
     $h = $u["host"];
     if ($h == $master_host) {
@@ -341,14 +341,14 @@ 
     } else {
         $have_remote = true;
     }
-    $url = trim((string) $config->upload_url);
+    $url = trim((string)$config->upload_url);
     $u = parse_url($url);
     $h = $u["host"];
     if ($h == $master_host) {
         $y = new StdClass;
         $y->cmd = "Upload server";
         $y->host = $h;
-        $y->status = !file_exists("../../stop_upload");;
+        $y->status = !file_exists("../../stop_upload"); ;
         $local_daemons[] = $y;
     } else {
         $have_remote = true;
@@ -360,7 +360,7 @@ 
         $y = new StdClass;
         $y->cmd = "Scheduler";
         $y->host = $sched_host;
-        $y->status = !file_exists("../../stop_sched");;
+        $y->status = !file_exists("../../stop_sched"); ;
         $local_daemons[] = $y;
     } else {
         $have_remote = true;
@@ -376,7 +376,7 @@ 
             $disabled_daemons[] = $x;
             continue;
         }
-        $host = $d->host?(string)$d->host:$main_host;
+        $host = $d->host ? (string)$d->host : $main_host;
         if ($host != $web_host) {
             $have_remote = true;
             continue;

html/user/forum_post.php

Spacing +12 added lines, -12 removed lines

@@ -56,10 +56,10 @@ 
 $preview = post_str("preview", true);
 $warning = null;
 
-if ($content && $title && (!$preview)){
-    if (post_str('add_signature', true) == "add_it"){
-        $add_signature = true;    // set a flag and concatenate later
-    }  else {
+if ($content && $title && (!$preview)) {
+    if (post_str('add_signature', true) == "add_it") {
+        $add_signature = true; // set a flag and concatenate later
+    } else {
         $add_signature = false;
     }
     check_tokens($logged_in_user->authenticator);
@@ -71,14 +71,14 @@ 
             $title, $content, $logged_in_user, $forum, $add_signature, $export
         );
         if ($thread) {
-            header('Location: forum_thread.php?id=' . $thread->id);
+            header('Location: forum_thread.php?id='.$thread->id);
         } else {
             error_page("Can't create thread.  $forum_error");
         }
     }
 }
 
-page_head(tra("Create new thread"),'','','', $bbcode_js);
+page_head(tra("Create new thread"), '', '', '', $bbcode_js);
 show_forum_header($logged_in_user);
 
 if ($warning) {
@@ -119,12 +119,12 @@ 
     $submit_help = "<br /><font color=\"red\">".tra("Remember to add a title")."</font>";
 }
 
-if ($force_title && $title){
+if ($force_title && $title) {
     row2(tra("Title"), htmlspecialchars($title)."<input type=\"hidden\" name=\"title\" value=\"".htmlspecialchars($title)."\">");
 } else {
     row2(tra("Title").$submit_help,
         sprintf('<input type="text" class="form-control" name="title" value="%s">',
-            $title?htmlspecialchars($title):''
+            $title ?htmlspecialchars($title) : ''
         )
     );
 }
@@ -134,14 +134,14 @@ 
 echo $bbcode_html;
 end_table();
 echo sprintf('<textarea class="form-control" name="content" rows="12" cols="80">%s</textarea>',
-    $content?htmlspecialchars($content):''
+    $content ?htmlspecialchars($content) : ''
 );
 echo "</td></tr>";
 
 if (!$logged_in_user->prefs->no_signature_by_default) {
-    $enable_signature="checked=\"true\"";
+    $enable_signature = "checked=\"true\"";
 } else {
-    $enable_signature="";
+    $enable_signature = "";
 }
 
 if (is_news_forum($forum)) {
@@ -157,5 +157,5 @@ 
 
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";
+$cvs_version_tracker[] = "\$Id$";
 ?>

html/inc/prefs.inc

Spacing +16 added lines, -16 removed lines

@@ -108,7 +108,7 @@ 
         new NUM_SPEC(tra("% of the CPUs"), 1, 100, 100)
     ),
     new PREF_NUM(
-        tra("Use at most") ."<br><font size=-2>Requires BOINC 7.20.3+</font>",
+        tra("Use at most")."<br><font size=-2>Requires BOINC 7.20.3+</font>",
         // xgettext:no-php-format
         tra("Suspend/resume computing every few seconds to reduce CPU temperature and energy usage. Example: 75% means compute for 3 seconds, wait for 1 second, and repeat."),
         "niu_cpu_usage_limit",
@@ -295,9 +295,9 @@ 
     $dp->disk_max_used_pct = parse_config($config, "<default_disk_max_used_pct>");
     $dp->disk_min_free_gb = parse_config($config, "<default_disk_min_free_gb>");
     // set some defaults if not found
-    if (!$dp->disk_max_used_gb) $dp->disk_max_used_gb = 0;  // no limit
+    if (!$dp->disk_max_used_gb) $dp->disk_max_used_gb = 0; // no limit
     if (!$dp->disk_max_used_pct) $dp->disk_max_used_pct = 90; // 90 percent
-    if (!$dp->disk_min_free_gb) $dp->disk_min_free_gb = 1;   // 1 GB
+    if (!$dp->disk_min_free_gb) $dp->disk_min_free_gb = 1; // 1 GB
     // set mininimum free space scheduler allows 
     // - depends on which scheduler is running
     $dp->new_sched_flag = 1;
@@ -323,7 +323,7 @@ 
     global $text;
     global $venue_name;
 
-    switch($name) {
+    switch ($name) {
     case "venue":
         if (array_key_exists("name", $attrs)) {
             $venue_name = $attrs["name"];
@@ -373,7 +373,7 @@ 
             return;
         }
     }
-    switch($name) {
+    switch ($name) {
     case "venue":
         $top_parse_result->$venue_name = $parse_result;
         $parse_result = $top_parse_result;
@@ -533,7 +533,7 @@ 
     }
 }
 
-function print_prefs_display_global($user, $columns=false) {
+function print_prefs_display_global($user, $columns = false) {
     $global_prefs = prefs_parse_global($user->global_prefs);
 
     echo tra("These settings apply to all computers using this account except")
@@ -543,7 +543,7 @@ 
         .tra("Android devices")
         ."</ul>
     ";
-    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=global&cols=". (int)!$columns .">".tra("(Switch view)")."</a></font>";
+    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=global&cols=".(int)!$columns.">".tra("(Switch view)")."</a></font>";
     if ($columns) {
         echo "<h3>".tra("Combined preferences").$switch_link."</h3>";
         start_table();
@@ -580,9 +580,9 @@ 
 // otherwise false
 //
 function print_prefs_form(
-    $action, $subset, $venue, $user, $prefs, $cols, $error=false,
-    $project_error=false
-){
+    $action, $subset, $venue, $user, $prefs, $cols, $error = false,
+    $project_error = false
+) {
     if ($action == "add") {
         $script = "add_venue.php";
         $submit_value = tra("Add preferences");
@@ -622,7 +622,7 @@ 
 //
 // Functions to display preference subsets as forms
 //
-function prefs_form_global($user, $prefs, $error=false) {
+function prefs_form_global($user, $prefs, $error = false) {
     global $in_use_prefs;
     global $not_in_use_prefs;
     global $job_prefs;
@@ -659,9 +659,9 @@ 
 //
 function prefs_form_radio_buttons($name, $yesno) {
     $rb = tra("yes")." <input type=radio name=$name value=yes "
-        .($yesno?"checked":"")
+        .($yesno ? "checked" : "")
         ."> ".tra("no")." <input type=radio name=$name value=no "
-        .($yesno?"":"checked")
+        .($yesno ? "" : "checked")
         .">\n";
     return $rb;
 }
@@ -680,12 +680,12 @@ 
 }
 function venue_show($user) {
     $venue = $user->venue;
-    if ($venue =='') $venue = '---';
+    if ($venue == '') $venue = '---';
     tooltip_row2(VENUE_TOOLTIP, VENUE_DESC, $venue);
 }
 
 function venue_form($user) {
-    $n=$h=$w=$s=$m='';
+    $n = $h = $w = $s = $m = '';
     if ($user->venue == '') $n = 'selected';
     if ($user->venue == 'home') $h = 'selected';
     if ($user->venue == 'work') $w = 'selected';
@@ -743,7 +743,7 @@ 
 //
 // convert prefs from structure to XML
 //
-function global_prefs_make_xml($prefs, $primary=true) {
+function global_prefs_make_xml($prefs, $primary = true) {
     global $in_use_prefs;
     global $not_in_use_prefs;
     global $job_prefs;