BOINC / boinc

html/user/create_account.php

Spacing +8 added lines, -8 removed lines

@@ -100,12 +100,12 @@ 
         // Consistency checks
         //
         if (!check_termsofuse()) {
-            error_log("Project configuration error! " .
+            error_log("Project configuration error! ".
                 "Terms of use undefined while 'account_creation_rpc_require_consent' enabled!"
             );
         }
         if (!$checkct) {
-            error_log("Project configuration error! " .
+            error_log("Project configuration error! ".
               "'CONSENT_TYPE_ENROLL' disabled while 'account_creation_rpc_require_consent' enabled!"
             );
         }
@@ -114,9 +114,9 @@ 
         //
         if (is_null($consent_flag) or !$source) {
             xml_error(ERR_ACCT_REQUIRE_CONSENT,
-                "This project requires you to consent to its terms of use. " .
-                "Please update your BOINC software " .
-                "or register via the project's website " .
+                "This project requires you to consent to its terms of use. ".
+                "Please update your BOINC software ".
+                "or register via the project's website ".
                 "or contact your account manager's provider."
             );
         }
@@ -152,13 +152,13 @@ 
         // * not agree.
         //   -> no create account RPC at all
         //
-        if ( (!is_null($consent_flag)) and $source) {
+        if ((!is_null($consent_flag)) and $source) {
             // Record the user giving consent in database - if consent_flag is 0,
             // this is an 'anonymous account' and consent_not_required is
             // set to 1.
-            if ($consent_flag==0) {
+            if ($consent_flag == 0) {
                 $rc = consent_to_a_policy($user, $ctid, 0, 1, $source);
-            } else  {
+            } else {
                 $rc = consent_to_a_policy($user, $ctid, 1, 0, $source);
             }
             if (!$rc) {

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;
 }
 

html/inc/text_transform.inc

Spacing +27 added lines, -27 removed lines

@@ -26,13 +26,13 @@ 
 require_once('../inc/sanitize_html.inc');
 
 class output_options {
-    var $bb2html;            // BBCode as HTML? (on)
-    var $images_as_links;    // Images as hyperlinks? (off)
-    var $link_popup;        // Links in new windows? (off)
-    var $nl2br;                // Convert newlines to <br>'s? (on)
-    var $htmlitems;            // Convert special chars to HTML entities? (on)
-    var $htmlscrub;            // Scrub "bad" HTML tags? (off)
-    var $highlight_terms;// Array of terms to be highlighted (off)    
+    var $bb2html; // BBCode as HTML? (on)
+    var $images_as_links; // Images as hyperlinks? (off)
+    var $link_popup; // Links in new windows? (off)
+    var $nl2br; // Convert newlines to <br>'s? (on)
+    var $htmlitems; // Convert special chars to HTML entities? (on)
+    var $htmlscrub; // Scrub "bad" HTML tags? (off)
+    var $highlight_terms; // Array of terms to be highlighted (off)    
 
     // Constructor - set the defaults.
 
@@ -68,7 +68,7 @@ 
         $options = new output_options; // Defaults in the class definition
     }
     if ($options->htmlitems) {
-        $text = htmlspecialchars($text, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE);
+        $text = htmlspecialchars($text, ENT_COMPAT|ENT_HTML401|ENT_SUBSTITUTE);
     }
     if (is_array($options->highlight_terms)) {
         $text = highlight_terms($text, $options->highlight_terms);
@@ -109,7 +109,7 @@ 
     if ($export) {
         $text = preg_replace_callback(
             "@\[pre\](.*?)\[/pre\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 5, -6));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -119,7 +119,7 @@ 
         );
         return preg_replace_callback(
             "@\[code\](.*?)\[/code\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -130,7 +130,7 @@ 
     } else {
         $text = preg_replace_callback(
             "@\[pre\](.*?)\[/pre\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 5, -6));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -140,7 +140,7 @@ 
         );
         return preg_replace_callback(
             "@\[code\](.*?)\[/code\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -151,7 +151,7 @@ 
     }
 }
 
-function bb2html($text, $export=false) {
+function bb2html($text, $export = false) {
     $urlregex = "(?:\"?)(?:(http\:\/\/)?)([^\[\"<\ ]+)(?:\"?)";
     // NOTE:
     // This matches https:// too; I don't understand why.
@@ -171,7 +171,7 @@ 
 
     $httpsregex = "(?:\"?)https\:\/\/([^\[\"<\ ]+)(?:\"?)";
     // List of allowable tags
-    $bbtags = array (
+    $bbtags = array(
         "@\[b\](.*?)\[/b\]@is",
         "@\[i\](.*?)\[/i\]@is",
         "@\[u\](.*?)\[/u\]@is",
@@ -200,7 +200,7 @@ 
     
     // What the above tags are turned in to
     if ($export) {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -227,7 +227,7 @@ 
             "<a href=\"https://github.com/BOINC/boinc-dev-doc/wiki/\\1\">\\1</a>",
         );
     } else {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -259,7 +259,7 @@ 
     $lasttext = "";
     $i = 0;
     // $i<1000 to prevent DoS
-    while ($text != $lasttext && $i<1000) {
+    while ($text != $lasttext && $i < 1000) {
         $lasttext = $text;
         $text = replace_pre_code($text, $export);
         $text = preg_replace($bbtags, $htmltags, $text);
@@ -274,7 +274,7 @@ 
 // for example inside <pre> containers
 // The original \n was retained after the br when it was added
 //
-function remove_br($text){
+function remove_br($text) {
     return str_replace("<br />", "", $text);
 }
 
@@ -282,19 +282,19 @@ 
 //
 function externalize_links($text) {
     // TODO:  Convert this to PCRE
-    $i=0;
-    $linkpos=true;
+    $i = 0;
+    $linkpos = true;
     $out = "";
-    while (true){
+    while (true) {
         //Find a link
         //
-        $linkpos=strpos($text, "<a ", $i);
-        if ($linkpos===false) break;
+        $linkpos = strpos($text, "<a ", $i);
+        if ($linkpos === false) break;
 
         //Replace with target='_new'
         //
-        $out .= substr($text, $i, $linkpos-$i)."<a target=\"_new\" ";
-        $i = $linkpos+3;
+        $out .= substr($text, $i, $linkpos - $i)."<a target=\"_new\" ";
+        $i = $linkpos + 3;
     }
     $out .= substr($text, $i);
     return $out;
@@ -302,7 +302,7 @@ 
 
 // Converts image tags to links to the images.
 
-function image_as_link($text){
+function image_as_link($text) {
     /* This function depends on sanitized HTML */
     // Build some regex (should be a *lot* faster)
     $pattern = '@<img([\S\s]+?)src=([^>]+?)>@si';
@@ -327,5 +327,5 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/inc/forum.inc

Spacing +78 added lines, -78 removed lines

@@ -54,12 +54,12 @@ 
 define('THREAD_SOLVED', 1);
 
 define('AVATAR_WIDTH', 100);
-define('AVATAR_HEIGHT',100);
+define('AVATAR_HEIGHT', 100);
 
 define('ST_NEW_TIME', 1209600); //3600*24*14 - 14 days
 define('ST_NEW', 'New member');
 
-define('MAXIMUM_EDIT_TIME',3600);
+define('MAXIMUM_EDIT_TIME', 3600);
     // allow edits of forums posts up till one hour after posting.
 
 define('MAX_FORUM_LOGGING_TIME', 2419200); //3600*24*28 - 28 days
@@ -77,24 +77,24 @@ 
 define('IMAGE_HIDDEN', 'img/hidden.png');
 define('IMAGE_STICKY_LOCKED', 'img/sticky_locked_post.png');
 define('IMAGE_POST', 'img/post.png');
-define('NEW_IMAGE_HEIGHT','15');
+define('NEW_IMAGE_HEIGHT', '15');
 define('EMPHASIZE_IMAGE', 'img/emphasized_post.png');
-define('EMPHASIZE_IMAGE_HEIGHT','15');
+define('EMPHASIZE_IMAGE_HEIGHT', '15');
 define('FILTER_IMAGE', 'img/filtered_post.png');
-define('FILTER_IMAGE_HEIGHT','15');
+define('FILTER_IMAGE_HEIGHT', '15');
 define('RATE_POSITIVE_IMAGE', 'img/rate_positive.png');
-define('RATE_POSITIVE_IMAGE_HEIGHT','9');
+define('RATE_POSITIVE_IMAGE_HEIGHT', '9');
 define('RATE_NEGATIVE_IMAGE', 'img/rate_negative.png');
-define('RATE_NEGATIVE_IMAGE_HEIGHT','9');
+define('RATE_NEGATIVE_IMAGE_HEIGHT', '9');
 define('REPORT_POST_IMAGE', 'img/report_post.png');
-define('REPORT_POST_IMAGE_HEIGHT','9');
+define('REPORT_POST_IMAGE_HEIGHT', '9');
 
 define('SOLUTION', tra('This answered my question'));
 define('SUFFERER', tra('I also have this question'));
 define('OFF_TOPIC', tra('Off-topic'));
 
-define ('DEFAULT_LOW_RATING_THRESHOLD', -25);
-define ('DEFAULT_HIGH_RATING_THRESHOLD', 5);
+define('DEFAULT_LOW_RATING_THRESHOLD', -25);
+define('DEFAULT_HIGH_RATING_THRESHOLD', 5);
 
 // special user attributes
 //
@@ -164,15 +164,15 @@ 
 
 // Output the forum/thread title.
 //
-function show_forum_title($category, $forum, $thread, $link_thread=false) {
+function show_forum_title($category, $forum, $thread, $link_thread = false) {
     if ($category) {
         $is_helpdesk = $category->is_helpdesk;
     } else {
         $is_helpdesk = false;
     }
 
-    $where = $is_helpdesk?tra("Questions and Answers"):tra("Message boards");
-    $top_url = $is_helpdesk?"forum_help_desk.php":"forum_index.php";
+    $where = $is_helpdesk ?tra("Questions and Answers") : tra("Message boards");
+    $top_url = $is_helpdesk ? "forum_help_desk.php" : "forum_index.php";
 
     if (!$forum && !$thread) {
         echo "<span class=\"title\">$where</span>\n";
@@ -200,7 +200,7 @@ 
     }
 }
 
-function show_team_forum_title($forum, $thread=null, $link_thread=false) {
+function show_team_forum_title($forum, $thread = null, $link_thread = false) {
     $team = BoincTeam::lookup_id($forum->category);
     echo "<span class=title>
         <a href=\"forum_index.php\">".tra("Message boards")."</a> :
@@ -233,12 +233,12 @@ 
 }
 
 function page_link($url, $page_num, $items_per_page, $text) {
-    return " <a href=\"$url&amp;start=" . $page_num*$items_per_page . "\">$text</a> ";
+    return " <a href=\"$url&amp;start=".$page_num*$items_per_page."\">$text</a> ";
 }
 
 // return a string for navigating pages
 //
-function page_links($url, $nitems, $items_per_page, $start){
+function page_links($url, $nitems, $items_per_page, $start) {
     // How many pages to potentially show before and after this one:
     $preshow = 3;
     $postshow = 3;
@@ -246,14 +246,14 @@ 
     $x = "";
     
     if ($nitems <= $items_per_page) return "";
-    $npages = ceil($nitems / $items_per_page);
-    $curpage = ceil($start / $items_per_page);
+    $npages = ceil($nitems/$items_per_page);
+    $curpage = ceil($start/$items_per_page);
 
     // If this is not the first page, display "previous"
     //
-    if ($curpage > 0){
+    if ($curpage > 0) {
         $x .= page_link(
-            $url, $curpage-1, $items_per_page,
+            $url, $curpage - 1, $items_per_page,
             tra("Previous")." &middot; "
         );
     }
@@ -268,8 +268,8 @@ 
     }
     // Display a list of pages surrounding this one
     //
-    for ($i=$curpage-$preshow; $i<=$curpage+$postshow; $i++){
-        $page_str = (string)($i+1);
+    for ($i = $curpage - $preshow; $i <= $curpage + $postshow; $i++) {
+        $page_str = (string)($i + 1);
         if ($i < 0) continue;
         if ($i >= $npages) break;
 
@@ -278,20 +278,20 @@ 
         } else {
             $x .= page_link($url, $i, $items_per_page, $page_str);
         }
-        if ($i == $npages-1) break;
-        if ($i == $curpage+$postshow) break;
+        if ($i == $npages - 1) break;
+        if ($i == $curpage + $postshow) break;
         $x .= " &middot; ";
     }
 
-    if ($curpage + $postshow < $npages-1) {
+    if ($curpage + $postshow < $npages - 1) {
         $x .= " . . . ";
-        $x .= page_link($url, $npages-1, $items_per_page, $npages);
+        $x .= page_link($url, $npages - 1, $items_per_page, $npages);
     }
     // If there is a next page
     //
-    if ($curpage < $npages-1){
+    if ($curpage < $npages - 1) {
         $x .= page_link(
-            $url, $curpage+1, $items_per_page,
+            $url, $curpage + 1, $items_per_page,
             " &middot; ".tra("Next")
         );
     }
@@ -312,7 +312,7 @@ 
 function cleanup_title($title) {
     $x = sanitize_tags(bb2html($title));
     $x = trim($x);
-    if (strlen($x)==0) return "(no title)";
+    if (strlen($x) == 0) return "(no title)";
     else return $x;
 }
 
@@ -374,7 +374,7 @@ 
             $i = 0;
             foreach ($posts as $post) {
                 if ($post->id == $postid) {
-                    $start = $i - ($i % $num_to_show);
+                    $start = $i - ($i%$num_to_show);
                     $jump_to_post = $post;
                     break;
                 }
@@ -401,7 +401,7 @@ 
             // if jump to post, figure out what page to show
             //
             if ($jump_to_post) {
-                $start = $ibest - ($ibest % $num_to_show);
+                $start = $ibest - ($ibest%$num_to_show);
             } else {
                 $start = $default_start;
             }
@@ -509,8 +509,8 @@ 
 // Generates a table row with two cells: author and message
 //
 function show_post(
-    $post, $thread, $forum, $logged_in_user, $start=0,
-    $latest_viewed=0, $controls=FORUM_CONTROLS, $filter=true
+    $post, $thread, $forum, $logged_in_user, $start = 0,
+    $latest_viewed = 0, $controls = FORUM_CONTROLS, $filter = true
 ) {
     global $country_to_iso3166_2;
 
@@ -518,7 +518,7 @@ 
 
     // If the user no longer exists, skip the post
     //
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -539,9 +539,9 @@ 
     // check whether the poster is on the list of people to ignore
     //
     $ignore_poster = false;
-    if ($logged_in_user){
+    if ($logged_in_user) {
         $tokens = url_tokens($logged_in_user->authenticator);
-        if (is_ignoring($logged_in_user, $user)){
+        if (is_ignoring($logged_in_user, $user)) {
             $ignore_poster = true;
         }
     }
@@ -555,8 +555,8 @@ 
             if (is_moderator($logged_in_user, $forum)) {
                 $can_edit = true;
             } else if (can_reply($thread, $forum, $logged_in_user)) {
-                $time_limit = $post->timestamp+MAXIMUM_EDIT_TIME;
-                $can_edit = time()<$time_limit;
+                $time_limit = $post->timestamp + MAXIMUM_EDIT_TIME;
+                $can_edit = time() < $time_limit;
             } else {
                 $can_edit = false;
             }
@@ -566,24 +566,24 @@ 
     // Print the special user lines, if any
     //
     global $special_user_bitfield;
-    $fstatus="";
+    $fstatus = "";
     $keys = array_keys($special_user_bitfield);
     $is_posted_by_special = false;
-    for ($i=0; $i<sizeof($special_user_bitfield);$i++) {
+    for ($i = 0; $i < sizeof($special_user_bitfield); $i++) {
         if ($user->prefs && $user->prefs->privilege($keys[$i])) {
-            $fstatus.="<nobr>".$special_user_bitfield[$keys[$i]]."<nobr><br>";
+            $fstatus .= "<nobr>".$special_user_bitfield[$keys[$i]]."<nobr><br>";
             $is_posted_by_special = true;
         }
     }
     
     // Highlight special users if set in prefs;
     //
-    if ($logged_in_user && $logged_in_user->prefs){
+    if ($logged_in_user && $logged_in_user->prefs) {
         $highlight = $logged_in_user->prefs->highlight_special && $is_posted_by_special;
     } else {
         $highlight = $is_posted_by_special;
     }
-    $class = $highlight?' style="border-left: 5px solid LightGreen" ':'';
+    $class = $highlight ? ' style="border-left: 5px solid LightGreen" ' : '';
 
     // row and start of author col
     //
@@ -595,12 +595,12 @@ 
 
     echo user_links($user, 0, 30);
     echo "<br>";
-    if ($user->create_time > time()-ST_NEW_TIME) $fstatus.=ST_NEW."<br>";
+    if ($user->create_time > time() - ST_NEW_TIME) $fstatus .= ST_NEW."<br>";
     echo "<span class=\"small\">";
     if ($fstatus) echo "$fstatus";
 
-    if (!$filter || !$ignore_poster){
-        if ($user->prefs && $user->prefs->avatar!="" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars==false))) {
+    if (!$filter || !$ignore_poster) {
+        if ($user->prefs && $user->prefs->avatar != "" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars == false))) {
             echo "<img width=\"".AVATAR_WIDTH."\" height=\"".AVATAR_HEIGHT."\" src=\"".avatar_url($user->prefs->avatar)."\" alt=\"Avatar\"><br>";
         }
     }
@@ -608,14 +608,14 @@ 
     
     $url = "pm.php?action=new&amp;userid=".$user->id;
     $name = $user->name;
-    show_button_small($url, tra("Send message"), tra("Send %1 a private message",$name));
+    show_button_small($url, tra("Send message"), tra("Send %1 a private message", $name));
     echo '<br>'.tra("Joined: %1", gmdate('j M y', $user->create_time)), "<br>";
 
     if (!isset($user->nposts)) {
         $user->nposts = BoincPost::count("user=$user->id");
     }
     
-    if (function_exists('project_forum_user_info')){
+    if (function_exists('project_forum_user_info')) {
         project_forum_user_info($user);
     } else {
         echo tra("Posts: %1", $user->nposts)."<br>";
@@ -624,8 +624,8 @@ 
         //
         //echo "ID: ".$user->id."<br>";
         if (!NO_COMPUTING) {
-            echo tra("Credit: %1", number_format($user->total_credit)) ."<br>";
-            echo tra("RAC: %1",    number_format($user->expavg_credit))."<br>";
+            echo tra("Credit: %1", number_format($user->total_credit))."<br>";
+            echo tra("RAC: %1", number_format($user->expavg_credit))."<br>";
         }
 
         // to use this feature:
@@ -654,7 +654,7 @@ 
         echo "<form action=\"forum_rate.php?post=", $post->id, "\" method=\"post\">";
     }
 
-    if ($logged_in_user && $post->timestamp > $latest_viewed){
+    if ($logged_in_user && $post->timestamp > $latest_viewed) {
         show_image(NEW_IMAGE, tra("You haven't read this message yet"), tra("Unread"), NEW_IMAGE_HEIGHT);
     }
 
@@ -674,8 +674,8 @@ 
     if ($post->modified) {
         echo "<br>".tra("Last modified: %1", pretty_time_Str($post->modified));
     }
-    if ($ignore_poster && $filter){
-        echo "<br>" .tra(
+    if ($ignore_poster && $filter) {
+        echo "<br>".tra(
             "This post is hidden because the sender is on your 'ignore' list.  Click %1 here %2 to view hidden posts",
             "<a href=\"?id=".$thread->id."&amp;filter=false&amp;start=$start#".$post->id."\">",
             "</a>"
@@ -688,7 +688,7 @@ 
         <p>
     ";
 
-    if (!$filter || !$ignore_poster){
+    if (!$filter || !$ignore_poster) {
         $posttext = $post->content;
 
         // If the creator of this post has a signature and
@@ -696,7 +696,7 @@ 
         // user has signatures enabled: show it
         //
         $posttext = output_transform($posttext, $options);
-        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)){
+        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)) {
             $sig = output_transform($user->prefs->signature, $options);
             $posttext .= "<hr>$sig\n";
         }
@@ -730,10 +730,10 @@ 
         }
         if (($controls == FORUM_CONTROLS) && (can_reply($thread, $forum, $logged_in_user))) {
             echo "&nbsp;&nbsp;&nbsp;&nbsp;";
-            $url = "forum_reply.php?thread=" . $thread->id . "&amp;post=" . $post->id . "&amp;no_quote=1#input";
+            $url = "forum_reply.php?thread=".$thread->id."&amp;post=".$post->id."&amp;no_quote=1#input";
             // "Reply" is used as a verb
             show_button($url, tra("Reply"), tra("Post a reply to this message"));
-            $url = "forum_reply.php?thread=" . $thread->id . "&amp;post=" . $post->id . "#input";
+            $url = "forum_reply.php?thread=".$thread->id."&amp;post=".$post->id."#input";
             // "Quote" is used as a verb
             show_button($url, tra("Quote"), tra("Post a reply by quoting this message"));
         }
@@ -755,7 +755,7 @@ 
     $content = output_transform($post->content, $options);
     $when = time_diff_str($post->timestamp, time());
     $user = BoincUser::lookup_id($post->user);
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -810,9 +810,9 @@ 
 
 function post_rules() {
     if (function_exists("project_forum_post_rules")) {
-      $project_rules=project_forum_post_rules();
+      $project_rules = project_forum_post_rules();
     } else {
-      $project_rules="";
+      $project_rules = "";
     }
     return sprintf("
         <ul>
@@ -841,7 +841,7 @@ 
     );
 }
 
-function post_warning($forum=null) {
+function post_warning($forum = null) {
     $x = "<br><br>
         <table><tr><td align=left>
     ";
@@ -901,7 +901,7 @@ 
     $content = substr($content, 0, 64000);
     $content = BoincDb::escape_string($content);
     $now = time();
-    $sig = $signature?1:0;
+    $sig = $signature ? 1 : 0;
     $id = BoincPost::insert("(thread, user, timestamp, content, modified, parent_post, score, votes, signature, hidden) values ($thread->id, $user->id, $now, '$content', 0, $parent_id, 0, 0, $sig, 0)");
     if (!$id) {
         $forum_error = "Failed to add post to DB.";
@@ -921,7 +921,7 @@ 
 //
 function update_thread_timestamp($thread) {
     $posts = BoincPost::enum("thread=$thread->id and hidden=0 order by timestamp desc limit 1");
-    if (count($posts)>0) {
+    if (count($posts) > 0) {
         $post = $posts[0];
         $thread->update("timestamp=$post->timestamp");
     }
@@ -929,7 +929,7 @@ 
 
 function update_forum_timestamp($forum) {
     $threads = BoincThread::enum("forum=$forum->id and hidden=0 order by timestamp desc limit 1");
-    if (count($threads)>0) {
+    if (count($threads) > 0) {
         $thread = $threads[0];
         $forum->update("timestamp=$thread->timestamp");
     }
@@ -952,7 +952,7 @@ 
     if (is_news_forum($forum) && !$export) {
         $status = 1;
     }
-    $id  = BoincThread::insert("(forum, owner, status, title, timestamp, views, replies, activity, sufferers, score, votes, create_time, hidden, sticky, locked) values ($forum->id, $user->id, $status, '$title', $now, 0, -1, 0, 0, 0, 0, $now, 0, 0, 0)");
+    $id = BoincThread::insert("(forum, owner, status, title, timestamp, views, replies, activity, sufferers, score, votes, create_time, hidden, sticky, locked) values ($forum->id, $user->id, $status, '$title', $now, 0, -1, 0, 0, 0, 0, $now, 0, 0, 0)");
     if (!$id) {
         $forum_error = "Failed to add thread to DB.";
         return null;
@@ -1080,22 +1080,22 @@ 
 // $sticky - bool (not directly passed to SQL)
 //
 function get_forum_threads(
-    $forumID, $start=-1, $nRec=-1, $sort_style=MODIFIED_NEW,
+    $forumID, $start = -1, $nRec = -1, $sort_style = MODIFIED_NEW,
     $show_hidden = 0, $sticky = 1
 ) {
     //if (! (is_numeric($forumID) && is_numeric($min) && is_numeric($nRec))) {
     //    return NULL;  // Something is wrong here.
     //}
         
-    $sql = 'forum = ' . $forumID ;
+    $sql = 'forum = '.$forumID;
     $stickysql = "";
-    if ($sticky){
+    if ($sticky) {
         $stickysql = "sticky DESC, ";
     }
     if (!$show_hidden) {
         $sql .= ' AND hidden = 0';
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case MODIFIED_NEW:
         $sql .= ' ORDER BY '.$stickysql.'timestamp DESC';
         break;
@@ -1148,7 +1148,7 @@ 
     if (!$show_hidden) {
         $sql .= ' AND hidden = 0';
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case CREATE_TIME_NEW:
         $sql .= ' ORDER BY timestamp desc';
         break;
@@ -1170,7 +1170,7 @@ 
 //
 function show_post_moderation_links(
     $config, $logged_in_user, $post, $forum, $tokens
-){
+) {
     $moderators_allowed_to_ban = parse_bool($config, "moderators_allowed_to_ban"); 
     $moderators_vote_to_ban = parse_bool($config, "moderators_vote_to_ban");
 
@@ -1257,14 +1257,14 @@ 
     // We do not tell the (ab)user how much this is -
     // no need to make it easy for them to break the system.
     //
-    if ($user->total_credit<$forum->post_min_total_credit || $user->expavg_credit<$forum->post_min_expavg_credit) {
+    if ($user->total_credit < $forum->post_min_total_credit || $user->expavg_credit < $forum->post_min_expavg_credit) {
         error_page(tra("To create a new thread in %1 you must have a certain level of average credit. This is to protect against abuse of the system.", $forum->title));
     }
 
     // If the user is posting faster than forum regulations allow
     // Tell the user to wait a while before creating any more posts
     //
-    if (time()-$user->prefs->last_post <$forum->post_min_interval) {
+    if (time() - $user->prefs->last_post < $forum->post_min_interval) {
         error_page(tra("You cannot create threads right now. Please wait before trying again. This is to protect against abuse of the system."));
     }
 }
@@ -1292,7 +1292,7 @@ 
 
 function is_moderator($user, $forum) {
     if (!$user) return false;
-    $type = $forum?$forum->parent_type:0;
+    $type = $forum ? $forum->parent_type : 0;
     switch ($type) {
     case 0:
         if ($user->prefs->privilege(S_MODERATOR)) return true;
@@ -1330,7 +1330,7 @@ 
     $owner = BoincUser::lookup_id($thread->owner);
     if (!$owner) return;
     echo "<tr><td>\n";
-    switch($thread_forum->parent_type) {
+    switch ($thread_forum->parent_type) {
     case 0:
         $category = BoincCategory::lookup_id($thread_forum->category);
         show_forum_title($category, $thread_forum, $thread, true);
@@ -1340,7 +1340,7 @@ 
         break;
     }
     echo '
-        </td><td class="numbers">'.($thread->replies+1).'</td>
+        </td><td class="numbers">'.($thread->replies + 1).'</td>
         <td>'.user_links($owner).'</td>
         <td class="numbers">'.$thread->views.'</td>
         <td class="lastpost">'.time_diff_str($thread->timestamp, time()).'</td>
@@ -1374,13 +1374,13 @@ 
 
 function subscribed_post_web_line($notify) {
     $thread = BoincThread::lookup_id($notify->opaque);
-    return tra("New posts in the thread %1","<a href=forum_thread.php?id=$thread->id>$thread->title</a>");
+    return tra("New posts in the thread %1", "<a href=forum_thread.php?id=$thread->id>$thread->title</a>");
 }
 
 function subscribe_rss($notify, &$title, &$msg, &$url) {
     $thread = BoincThread::lookup_id($notify->opaque);
     $title = tra("New posts in subscribed thread");
-    $msg = tra("There are new posts in the thread '%1'",$thread->title);
+    $msg = tra("There are new posts in the thread '%1'", $thread->title);
     $url = secure_url_base()."forum_thread.php?id=$thread->id";
 }
 

html/user/submit_test.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     $f->mode = "local_staged";
     $f->source = "input";
 
-    for ($i=10; $i<20; $i++) {
+    for ($i = 10; $i < 20; $i++) {
         $job = new StdClass;
         $job->input_files = array($f);
         $job->rsc_fpops_est = $i*1e9;

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");
@@ -508,15 +508,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(
@@ -604,7 +604,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);
 }
@@ -811,7 +811,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>
@@ -855,7 +855,7 @@ 
     } else {
         $results = BoincResult::enum("workunitid=$job_id");
         foreach ($results as $r) {
-            switch($r->outcome) {
+            switch ($r->outcome) {
             case 1:
             case 3:
             case 6:
@@ -970,8 +970,8 @@ 
     }
 
     list($user, $user_submit) = authenticate_user($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");
@@ -983,7 +983,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>
     ";
@@ -1050,9 +1050,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/keywords.inc

Spacing +60 added lines, -60 removed lines

@@ -24,71 +24,71 @@
 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_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);
 
 $job_keywords = array();