BOINC / boinc

drupal/sites/default/boinc/modules/boincimport/boincimport.pages.inc

Spacing +66 added lines, -66 removed lines

@@ -5,7 +5,7 @@ 
  * Callback admin/boinc/import/settings
  */
 function boincimport_admin_settings() {
-  global $conf ;
+  global $conf;
   global $db_url;
   global $base_url;
   $stage = variable_get('boincimport_config_stage', 0); 
@@ -27,17 +27,17 @@ 
     
   $output = '';
   if (!variable_get('boincimport_tested', 0)) {
-    $form['test']['#collapsed']= FALSE;
+    $form['test']['#collapsed'] = FALSE;
     $output = '<span class="marker">';
     $ready_for_migration = 0;
   }
-  $output .= '<p>' . t('The migration will modify and even destroy some data. You
+  $output .= '<p>'.t('The migration will modify and even destroy some data. You
     must test this module on a copy of your data first, several times if necessary.
     Only use this module on your live data when you are familiar with the procedure
-    and you\'re confident everything will run smoothly.') . '</p><p>' . t('Also, you
+    and you\'re confident everything will run smoothly.').'</p><p>'.t('Also, you
     should make a full backup of your database just prior to performing the
     migration on the live data. It is better to turn off both the BOINC site and the
-    Drupal site during the migration.') . '</p>';
+    Drupal site during the migration.').'</p>';
   if (!variable_get('boincimport_tested', 0)) {
     $output .= '</span>';
   }
@@ -55,7 +55,7 @@ 
   
   // Where is BOINC data?
   $pre = variable_get('boincimport_table_prefix', '');
-  $tables = array($pre .'forum', $pre .'post', $pre .'thread', $pre .'user');
+  $tables = array($pre.'forum', $pre.'post', $pre.'thread', $pre.'user');
   $db = (is_array($db_url) AND isset($db_url['boinc_rw'])) ? 'boinc_rw' : 'default';
   $result = _boincimport_check_tables($tables, $db, 0);
   
@@ -79,8 +79,8 @@ 
     $default_db_url = is_array($db_url) ? end($db_url) : $db_url;
     $url = variable_get('boincimport_db_url', $default_db_url);
     if (!preg_match('{(mysql|pgsql):\/\/(.+):(.*?)@(.+)/(\w+)}i', $url)) {
-      $output = '<p class="marker">'. t('Set the address of the BOINC database
-        according to the following format:') . '<br /><pre>
+      $output = '<p class="marker">'.t('Set the address of the BOINC database
+        according to the following format:').'<br /><pre>
         mysql://boinc_username:boinc_password@localhost/boinc_database
         </pre></p>';
       $ready_for_migration = 0;
@@ -98,13 +98,13 @@ 
     );
   }
 
-  $output = '<p>' . t('Note that due to a limitation within Drupal core, we cannot
+  $output = '<p>'.t('Note that due to a limitation within Drupal core, we cannot
     import messages from one database type to another database type. E.g, we
     cannot import BOINC from a myqsl DB, to a postgresql DB. You need to import
     the data into the same type of database first (import all the BOINC data, as is,
-    from mysql to postgresql).') . '</p><p>' . t('If both BOINC and Drupal are on
+    from mysql to postgresql).').'</p><p>'.t('If both BOINC and Drupal are on
     postgresql, see !this_issue.', array('!this_issue' => l(t('this issue'),
-    'http://drupal.org/node/64877', array('attributes' => array('target' => '_blank'))))) . '</p>';
+    'http://drupal.org/node/64877', array('attributes' => array('target' => '_blank'))))).'</p>';
   $form['boinc_data']['note'] = array('#value' => $output);
   
   // BOINC table prefix
@@ -121,7 +121,7 @@ 
   $output = $result['html'];
   if ($result['result'] != 1) {
     $ready_for_migration = 0;
-    $form['boinc_data']['#collapsed']= FALSE;
+    $form['boinc_data']['#collapsed'] = FALSE;
     $output .= '<span class="marker">';
     $output .= t('Some tables couldn\'t be found. Are the database settings correct?
       Please correct the errors so that the BOINC tables can be accessed.');
@@ -169,15 +169,15 @@ 
     '#collapsible' => TRUE,
     '#collapsed' => TRUE
   );
-  $output = '<p>'. t('Select which !input_format should be used for the imported
+  $output = '<p>'.t('Select which !input_format should be used for the imported
     messages. It is highly-recommended that this value be left as it is, as the
     Full HTML and PHP code formats can be very dangerous!', 
-    array('!input_format' => l(t('input format'), 'admin/settings/filters'))) .'</p>';
+    array('!input_format' => l(t('input format'), 'admin/settings/filters'))).'</p>';
   $form['input']['intro'] = array('#value' => $output);
   
   $formats = db_query('SELECT format, name FROM {filter_formats}');
   while ($format = db_fetch_array($formats)) {
-    $input_formats[$format['format']]= $format['name'];
+    $input_formats[$format['format']] = $format['name'];
   }
   
   // By default, use the format named "Rich text"; fall back to Filtered HTML
@@ -194,10 +194,10 @@ 
   );
   if (!$input_format) {
     $ready_for_migration = 0;
-    $form['input']['#collapsed']= FALSE;
+    $form['input']['#collapsed'] = FALSE;
   }
-  $output = '<p><em>'. t('This setting will be applied to all posts and private
-    messages.') .'</em></p>';
+  $output = '<p><em>'.t('This setting will be applied to all posts and private
+    messages.').'</em></p>';
   $form['input']['result'] = array('#value' => $output);
   
   // BBcode settings
@@ -208,23 +208,23 @@ 
     '#collapsed' => TRUE,
   );
   
-  $output = '<p>' . t('BOINC posts are often formatted in BBcode. During the
-    import process, BBcode can be handled in two diffent ways') . ':</p>';
-  $output .= '<ul><li>' . t('Leave the BBcode as is and use the !bbcode_module
+  $output = '<p>'.t('BOINC posts are often formatted in BBcode. During the
+    import process, BBcode can be handled in two diffent ways').':</p>';
+  $output .= '<ul><li>'.t('Leave the BBcode as is and use the !bbcode_module
     after the migration to filter the imported posts. In this case, the module
     is not required during the migration, but will need to be installed and
     configured later.',
     array('!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode',
-    array('attributes' => array('target' => '_blank'))))) . '</li>';
-  $output .= '<li>' . t('Filter the BBcode now and replace it with plain HTML.
+    array('attributes' => array('target' => '_blank'))))).'</li>';
+  $output .= '<li>'.t('Filter the BBcode now and replace it with plain HTML.
     The BBcode module will be required during the migration process, but can
-    be disabled afterwards.') . '</li></ul>';
-  $output .= '<p>' . t('An appropriate input filter should be chosen, as well,
+    be disabled afterwards.').'</li></ul>';
+  $output .= '<p>'.t('An appropriate input filter should be chosen, as well,
     as it will affect how the post is displayed. For example, if BBcode is
     removed and replaced by HTML, some HTML tags will be stripped by the
     "Filtered HTML" input format unless they are first added to the list of
     allowed tags in that format. See the !input_formats page.',
-    array('!input_formats' => l(t('input formats'), 'admin/settings/filters'))) . '</p>';
+    array('!input_formats' => l(t('input formats'), 'admin/settings/filters'))).'</p>';
     
   $form['bbcode']['intro'] = array('#value' => $output);
   $form['bbcode']['boincimport_bbcode'] = array(
@@ -254,28 +254,28 @@ 
     $result = db_query($sql, $input_format);
     if (!db_result($result)) {
       $form['bbcode']['#collapsed'] = FALSE;
-      $output .= '<p class="marker">'. t('You need to !enable_bbcode_input and
+      $output .= '<p class="marker">'.t('You need to !enable_bbcode_input and
         then !configure_bbcode_options', array(
           '!enable_bbcode_input' =>  l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
-          '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) .'</p>';
+          '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))).'</p>';
     }
-    $output .= '<p>'. t('For best results, !disable_all_options', 
-    array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))) . '.</p>';
+    $output .= '<p>'.t('For best results, !disable_all_options', 
+    array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))).'.</p>';
   } else {
     if ($bbcode_disabled) {
       $form['bbcode']['#collapsed'] = FALSE;
-      $output .= '<p>'. t('The !bbcode_module is recommended, but not required.
+      $output .= '<p>'.t('The !bbcode_module is recommended, but not required.
         You may !enable_bbcode after having installed it.', array(
           '!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode', array('attributes' => array('target' => '_blank'))),
-          '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules'))) .'</p>';
+          '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules'))).'</p>';
     }
-    $output .= '<p>' . t('Don\'t forget to !enable_bbcode_input and then !configure_bbcode_options.', array(
+    $output .= '<p>'.t('Don\'t forget to !enable_bbcode_input and then !configure_bbcode_options.', array(
       '!enable_bbcode_input' =>  l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
-      '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) . '</p>';
-    $output .= '<p>' . t('You may want to enable it for other input formats, too.') . '</p>';
+      '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))).'</p>';
+    $output .= '<p>'.t('You may want to enable it for other input formats, too.').'</p>';
   }
-  $output .= '<p><em>'. t('This setting will be applied to all posts, private
-    messages and the users\' signature.') .'</em></p>';
+  $output .= '<p><em>'.t('This setting will be applied to all posts, private
+    messages and the users\' signature.').'</em></p>';
     
   $form['bbcode']['result'] = array('#value' => $output);
   
@@ -287,7 +287,7 @@ 
     '#collapsed' => TRUE,
   );
   if (!variable_get('boincimport_base_url_boinc', 0)) {
-    $form['url_transforms']['#collapsed']= FALSE;
+    $form['url_transforms']['#collapsed'] = FALSE;
     $output = '<span class="marker">';
     $ready_for_migration = 0;
   }
@@ -320,11 +320,11 @@ 
   );
   variable_set('boincimport_ready', $ready_for_migration);
   if ($ready_for_migration) {
-    $output = '<p>'. t('Check the settings above one more time. If everything
-      is ok, !proceed.', array('!proceed' => l(t('you can now proceed with the migration'), 'admin/boinc/import/process'))) .'</p>';
+    $output = '<p>'.t('Check the settings above one more time. If everything
+      is ok, !proceed.', array('!proceed' => l(t('you can now proceed with the migration'), 'admin/boinc/import/process'))).'</p>';
   } else {
-    $output = '<p class="marker">'. t('You are not ready for the migration yet.
-      Please check the settings above.') .'</p>';
+    $output = '<p class="marker">'.t('You are not ready for the migration yet.
+      Please check the settings above.').'</p>';
   }
   
   $form['migration']['info'] = array('#value' => $output);
@@ -335,23 +335,23 @@ 
  * Callback admin/boinc/import/post_configuration
  */
 function boincimport_post_configuration() {
-  $output = '<p>'. t('This page will help to tie up any loose ends following
+  $output = '<p>'.t('This page will help to tie up any loose ends following
     the BOINC data import process. Before continuing, it may be best to have
-    already:') .'</p>';
+    already:').'</p>';
   $output .= '<ul>';
-  $output .= '<li>'. t('Imported users, teams, and forums using the BOINC
-    import module') .'</li>';
-  $output .= '<li>'. t('Imported any additional data using add on modules if
-    available.') .'</li>';
+  $output .= '<li>'.t('Imported users, teams, and forums using the BOINC
+    import module').'</li>';
+  $output .= '<li>'.t('Imported any additional data using add on modules if
+    available.').'</li>';
   $output .= '</ul>';
   //User Set up
-  $output .= '<h2>'. t('User settings') .'</h2>';  
-  $output .= '<p>'. t('Make sure your !user_settings are correct. Specifically,
+  $output .= '<h2>'.t('User settings').'</h2>';  
+  $output .= '<p>'.t('Make sure your !user_settings are correct. Specifically,
     you can enable or disable signatures there. ', array(
       '!user_settings' => l(t('user settings'), 'admin/user/settings')
-    )) .'</p>'; 
-  $output .= '<p>' . t('Note that avatar/picture support is not tied to user
-    settings Picture support at this time.') . '</p>';
+    )).'</p>'; 
+  $output .= '<p>'.t('Note that avatar/picture support is not tied to user
+    settings Picture support at this time.').'</p>';
   /*$output .= '<p>' . t('In order to activate avatar/picture support, you need to
     enable pictures on this page and also:') . '</p>';
   $output .= '<ul>';
@@ -366,15 +366,15 @@ 
   $output .= '</ul>'; */
   
   // Forum Set up
-  $output .= '<h2>'. t('Forum settings') .'</h2>';
-  $output .= '<p>'. t('Check any additional changes to make on the
+  $output .= '<h2>'.t('Forum settings').'</h2>';
+  $output .= '<p>'.t('Check any additional changes to make on the
     !forum_settings page.', array(
       '!forum_settings' =>  l(t('forum settings'), 'admin/content/forum/settings')
-    )) .'</p>';
-  $output .= '<p>'. t('It also may be a good idea to look at the !forum_list to
+    )).'</p>';
+  $output .= '<p>'.t('It also may be a good idea to look at the !forum_list to
     verify that all necessary containers and forums are in place.', array(
       '!forum_list' =>  l(t('forum list'), 'admin/content/forum')
-    )) .'</p>';
+    )).'</p>';
   /*$output .= '<p>'. t('If need be, set up the private forums as explained in the
     !documentation.', array(
       '!documentation' => l(t('documentation'), 'http://drupal.org/node/58969', array('attributes' => array('target' => '_blank')))
@@ -390,17 +390,17 @@ 
   // BBcode
   $bbcode = variable_get('boincimport_bbcode', 0);
   if ($bbcode) {
-    $output .= '<h2>'. t('Remove BBcode module') .'</h2>';
-    $output .= '<p>'. t('The BBcode has been cleaned from the posts. You shouldn\'t
-      need the bbcode module anymore. You can disable it.') .'</p>';
+    $output .= '<h2>'.t('Remove BBcode module').'</h2>';
+    $output .= '<p>'.t('The BBcode has been cleaned from the posts. You shouldn\'t
+      need the bbcode module anymore. You can disable it.').'</p>';
   } else {
-    $output .= '<h2>'. t('Configure BBcode module') .'</h2>';
-    $output .= '<p>'. t('Most likely, there are many BOINC forum postings
+    $output .= '<h2>'.t('Configure BBcode module').'</h2>';
+    $output .= '<p>'.t('Most likely, there are many BOINC forum postings
       formatted in BBcode. It would be a good idea to verify that BBcode is
       being formatted correctly in the imported posts. Have a look around
       !the_forum.', array(
         '!the_forum' =>  l(t('the forum'), 'community')
-      )) . '</p>';
+      )).'</p>';
   }
 
   return $output;
@@ -445,11 +445,11 @@ 
   $output .= '</ol>';
 
   // process will die() if the link to the BOINC database is wrong:
-  $output .= '<p>'. t('If the BOINC data is in another database, but you made a
+  $output .= '<p>'.t('If the BOINC data is in another database, but you made a
     mistake while setting up the data base url, you may be unable to access the
     setting page due to some limitations of the core of Drupal. !reset_db_url.', array(
       '!reset_db_url' => l(t('Click here to reset the database url'), 'admin/boinc/import/reset')
-    )) .'</p>';
+    )).'</p>';
 
   return $output;
 }

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

Spacing +77 added lines, -77 removed lines

@@ -105,8 +105,8 @@ 
   $boinc_db_url = (is_array($db_url)) ? (isset($db_url['boinc_rw']) ? $db_url['boinc_rw'] : $db_url['default']) : $db_url;
   variable_set('boincimport_db_url', $boinc_db_url);
   variable_set('boincimport_ready', 0);
-  return '<p>'. t('The BOINC database URL has been reset. You may now <a href="@configlink">go back to the configuration page</a>.',
-      array('@configlink' => url('admin/boinc/import/settings'))) .'</p>';
+  return '<p>'.t('The BOINC database URL has been reset. You may now <a href="@configlink">go back to the configuration page</a>.',
+      array('@configlink' => url('admin/boinc/import/settings'))).'</p>';
 }
 
 /**
@@ -114,18 +114,18 @@ 
  */
 function boincimport_unlock() {
   variable_del('boincimport_process_locked');
-  return '<p>'. t('The BOINC data import process has been unlocked. You may
+  return '<p>'.t('The BOINC data import process has been unlocked. You may
     now !proceed_with_import.', array(
       '!proceed_with_import' => l(t('proceed with the import'),
         'admin/boinc/import/process')
-    )) .'</p>';
+    )).'</p>';
 }
 
 /**
  * Callback admin/boinc/import/cleanup
  */
 function boincimport_cleanup() {
-  return boincimport_process_cleanup() .'<p>'. t('Drupal database cleaned.') .'</p>';
+  return boincimport_process_cleanup().'<p>'.t('Drupal database cleaned.').'</p>';
 }
 
 /**
@@ -138,7 +138,7 @@ 
  * fails, the process will die() which is a bit too much since we only
  * want to test. Therefore, the test part of the code is not used, now.
  */
-function _boincimport_db_connect($test= 0) {
+function _boincimport_db_connect($test = 0) {
   global $db_url;
   $db_ready = variable_get('boincimport_db_configured', 1);
   if (!$db_ready) {
@@ -148,7 +148,7 @@ 
       $db_url2['default'] = $db_url;
     }
     $db_url2['boinc_rw'] = variable_get('boincimport_db_url', $db_url);
-    $GLOBALS['db_url'] =& $db_url2;
+    $GLOBALS['db_url'] = & $db_url2;
     if ($test) {
       if (!db_connect($db_url2['boinc_rw'])) {
         return 0;
@@ -171,10 +171,10 @@ 
   $result = module_exists($module);
   $out['result'] = $result;
   if ($result == 1) {
-    $out['html'] .= '<li>'. t('Module %module is enabled. OK!', array('%module' => $module)) .'</li>';
+    $out['html'] .= '<li>'.t('Module %module is enabled. OK!', array('%module' => $module)).'</li>';
   }
   else {
-    $out['html'] .= '<li><span class="marker">'. t('Module %module is disabled.', array('%module' => $module)) .'</span></li>';
+    $out['html'] .= '<li><span class="marker">'.t('Module %module is disabled.', array('%module' => $module)).'</span></li>';
   }
   $out['html'] .= '</ul>';
   return $out;
@@ -187,32 +187,32 @@ 
  *   $out['html'] = formatted html.
  *   $out['result'] = boolean.
  */
-function _boincimport_check_tables($tables = array(), $db = 'default' , $prefix = 1) {
+function _boincimport_check_tables($tables = array(), $db = 'default', $prefix = 1) {
   _boincimport_db_connect();
 
   $out['html'] = '<ul>';
-  $out['result']= 1;
+  $out['result'] = 1;
   foreach ($tables as $table) {
     if ($prefix) {
-      $table = db_prefix_tables('{'. $table .'}');
+      $table = db_prefix_tables('{'.$table.'}');
     }  
 
     db_set_active($db);
     if ($GLOBALS['db_type'] == 'pgsql') {
       // adapt from db_table_exists in database.pgsql.inc
-      $result = (bool) db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
+      $result = (bool)db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
     }
     else {
       // adapt from db_table_exists in database.mysql.inc
-      $result = (bool) db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
+      $result = (bool)db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
     }
     db_set_active('default');
     if ($result) {
-      $out['html'] .= '<li>'. t('Table %table: OK!', array('%table' => $table)) .'</li>';
+      $out['html'] .= '<li>'.t('Table %table: OK!', array('%table' => $table)).'</li>';
     }
     else {
-      $out['html'] .= '<li><span class="marker">'. t('Table <strong>%table</strong> does not exist!', array('%table' => $table)) .'</span></li>';
-      $out['result']= 0;
+      $out['html'] .= '<li><span class="marker">'.t('Table <strong>%table</strong> does not exist!', array('%table' => $table)).'</span></li>';
+      $out['result'] = 0;
     }
   }
   $out['html'] .= '</ul>';
@@ -226,7 +226,7 @@ 
   boinc_get_path();
   
   if (!variable_get('boincimport_ready', 0)) {
-    return '<p>'. t('You cannot import the data now. Please <a href="@settings">complete the setup first</a>', array('@settings' => url('admin/boinc/import/settings'))) .'</p>';
+    return '<p>'.t('You cannot import the data now. Please <a href="@settings">complete the setup first</a>', array('@settings' => url('admin/boinc/import/settings'))).'</p>';
   }
 
   $output = 'BOINC import process form';
@@ -236,7 +236,7 @@ 
 
 function boincimport_process_form() {
   $form = array();
-  _boincimport_db_connect() ;
+  _boincimport_db_connect();
   // Causes problems with form api redirect
   //ini_set('display_errors', TRUE);
 
@@ -411,7 +411,7 @@ 
       }
       else {
         drupal_set_message('Congratulations.  Import Finished');
-        drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
+        drupal_set_message('Please visit the '.l('Post migration configuration', 'admin/boinc/import/post_configuration').' page');
         watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO); 
         unset($_SESSION['boincimport_stage_selected']);
       }
@@ -632,7 +632,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -661,7 +661,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -845,7 +845,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -872,7 +872,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -1018,7 +1018,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1046,7 +1046,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -1202,7 +1202,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1231,7 +1231,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -1381,7 +1381,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1408,7 +1408,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -1709,7 +1709,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1787,7 +1787,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -1800,34 +1800,34 @@ 
   $forum_perms = array();
   $role_map = array_flip(user_roles());
   $forum_perms[$role_map['anonymous user']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => 0,
   );
   $forum_perms[$role_map['authenticated user']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => 0,
   );
   $forum_perms[$role_map['community member']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
-    'create' => (int) $open,
+    'create' => (int)$open,
   );
   $forum_perms[$role_map['verified contributor']] = array(
-    'view' => (int) !$hidden,
+    'view' => (int)!$hidden,
     'update' => 0,
     'delete' => 0,
-    'create' => (int) !$hidden,
+    'create' => (int)!$hidden,
   );
   $forum_perms[$role_map['moderator']] = array(
-    'view' => (int) !$hidden,
-    'update' => (int) !$hidden,
+    'view' => (int)!$hidden,
+    'update' => (int)!$hidden,
     'delete' => 0,
-    'create' => (int) !$hidden,
+    'create' => (int)!$hidden,
   );
   $forum_perms[$role_map['administrator']] = array(
     'view' => 1,
@@ -1892,7 +1892,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -1962,7 +1962,7 @@ 
   $batch_size = 100;
   
   // Create batches to process
-  for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $topic_count; $offset += $batch_size) {
     $topics_per_batch = $batch_size;
     if ($offset + $batch_size > $topic_count) {
       $topics_per_batch = $topic_count - $offset;
@@ -2079,7 +2079,7 @@ 
         'type' => $node_type,
         'title' => $topic->title,
         'uid' => $uid,
-        'status' => ($topic->hidden) ? 0 : 1,  // published or not
+        'status' => ($topic->hidden) ? 0 : 1, // published or not
         'promote' => $promote,
         'created' => $topic->create_time,
         'changed' => $topic->timestamp,
@@ -2093,7 +2093,7 @@ 
       $node['tid'] = $tid;
       
       // Save the topic node
-      $node = (object) $node; // node_save requires an object form
+      $node = (object)$node; // node_save requires an object form
       node_save($node);
       taxonomy_node_save($node, array($tid));
       $success = ($node->nid) ? TRUE : FALSE;
@@ -2156,7 +2156,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -2194,7 +2194,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -2270,7 +2270,7 @@ 
   $batch_size = 100;
   
   // Create batches to process
-  for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $topic_count; $offset += $batch_size) {
     $topics_per_batch = $batch_size;
     if ($offset + $batch_size > $topic_count) {
       $topics_per_batch = $topic_count - $offset;
@@ -2484,7 +2484,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -2502,10 +2502,10 @@ 
     $empty_posts = count($results['posts']['empty']);
     $failed_posts = count($results['posts']['failure']);
     $message = t(
-      'Successfully imported @post_count posts in @topic_count topics ' .
-      '(@skipped topics either had no replies or all replies were already imported, ' .
-      '@duplicates posts were skipped as already imported, ' .
-      '@empty_posts had no content, ' .
+      'Successfully imported @post_count posts in @topic_count topics '.
+      '(@skipped topics either had no replies or all replies were already imported, '.
+      '@duplicates posts were skipped as already imported, '.
+      '@empty_posts had no content, '.
       'and @error_posts encountered errors during import)',
       array(
         '@post_count' => $posts_imported,
@@ -2528,7 +2528,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -2698,7 +2698,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -2725,7 +2725,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -2907,7 +2907,7 @@ 
         'type' => $node_type,
         'title' => $topic->title,
         'uid' => $uid,
-        'status' => ($topic->hidden) ? 0 : 1,  // published or not
+        'status' => ($topic->hidden) ? 0 : 1, // published or not
         'promote' => $promote,
         'created' => $topic->create_time,
         'changed' => $topic->timestamp,
@@ -2921,7 +2921,7 @@ 
       );
       
       // Save the team topic node
-      $node = (object) $node; // node_save requires an object form
+      $node = (object)$node; // node_save requires an object form
       node_save($node);
 
       if ($node->nid) {
@@ -2967,7 +2967,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -2994,7 +2994,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -3249,7 +3249,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -3276,7 +3276,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -3398,7 +3398,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -3427,7 +3427,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -3503,7 +3503,7 @@ 
   $batch_size = 100;
   
   // Create node batches to process
-  for ($offset = 0; $offset < $node_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $node_count; $offset += $batch_size) {
     $nodes_per_batch = $batch_size;
     if ($offset + $batch_size > $node_count) {
       $nodes_per_batch = $node_count - $offset;
@@ -3515,7 +3515,7 @@ 
     );
   }
   // Add comment batches
-  for ($offset = 0; $offset < $comment_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $comment_count; $offset += $batch_size) {
     $comments_per_batch = $batch_size;
     if ($offset + $batch_size > $comment_count) {
       $comments_per_batch = $comment_count - $offset;
@@ -3527,7 +3527,7 @@ 
     );
   }
   // And don't forget to process private messages
-  for ($offset = 0; $offset < $pm_count; $offset+=$batch_size) {
+  for ($offset = 0; $offset < $pm_count; $offset += $batch_size) {
     $messages_per_batch = $batch_size;
     if ($offset + $batch_size > $pm_count) {
       $messages_per_batch = $pm_count - $offset;
@@ -3616,7 +3616,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -3680,7 +3680,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -3743,7 +3743,7 @@ 
       $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+      $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
     }
   }
 }
@@ -3812,7 +3812,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
   }
   drupal_set_message($message);
   
@@ -3881,18 +3881,18 @@ 
     $max = db_result(db_query('SELECT MAX(thread) FROM {comments} WHERE nid = %d', $edit['nid']));
     // Strip the "/" from the end of the thread.
     $max = rtrim($max, '/');
-    $thread = int2vancode(vancode2int($max)+1) .'/';
+    $thread = int2vancode(vancode2int($max) + 1).'/';
   } else {
     // This is comment with a parent comment: we increase the part of the thread
     // value at the proper depth.
     $parent = db_fetch_object(db_query('SELECT * FROM {comments} WHERE cid = %d', $edit['pid']));
     // Strip the "/" from the end of the parent thread.
-    $parent->thread = (string) rtrim((string) $parent->thread, '/');
+    $parent->thread = (string)rtrim((string)$parent->thread, '/');
     // Get the max value in _this_ thread.
     $max = db_result(db_query("SELECT MAX(thread) FROM {comments} WHERE thread LIKE '%s.%%' AND nid = %d", $parent->thread, $edit['nid']));
     if ($max == '') {
       // First child of this parent.
-      $thread = $parent->thread .'.'. int2vancode(1) .'/';
+      $thread = $parent->thread.'.'.int2vancode(1).'/';
     } else {
       // Strip the "/" at the end of the thread.
       $max = rtrim($max, '/');
@@ -3901,14 +3901,14 @@ 
       $parent_depth = count(explode('.', $parent->thread));
       $last = $parts[$parent_depth];
       // Finally, build the thread field for this new comment.
-      $thread = $parent->thread .'.'. int2vancode(vancode2int($last) + 1) .'/';
+      $thread = $parent->thread.'.'.int2vancode(vancode2int($last) + 1).'/';
     }
   }
 
   $status = 0; // 1 - not published, 0 - published
   $format = variable_get('boincimport_input_format', 0);
   $score = 0; // 0 default value, comments get higher score depending on the author's roles
-  $users = serialize(array(0 => 1));  // default value for everybody!!
+  $users = serialize(array(0 => 1)); // default value for everybody!!
   
   if ($edit['uid'] === $user->uid) { // '===' because we want to modify anonymous users too
     $edit['name'] = $user->name;
@@ -3942,7 +3942,7 @@ 
   // BBcode to normal html
   if (variable_get('boincimport_bbcode', 0)) {
     $input_format = variable_get('boincimport_input_format', 0);
-    $text = bbcode_filter('process', 0 , $input_format, $text);
+    $text = bbcode_filter('process', 0, $input_format, $text);
   }
   return $text;
 }

html/user/forum_edit.php

Spacing +9 added lines, -9 removed lines

@@ -44,7 +44,7 @@ 
 
 $post_owner = BoincUser::lookup_id($post->user);
 if (($logged_in_user->id != $post_owner->id) || (can_reply($thread, $forum, $logged_in_user) == false)) {
-    error_page (tra("You are not authorized to edit this post."));
+    error_page(tra("You are not authorized to edit this post."));
 }
 
 $thread_owner = BoincUser::lookup_id($thread->owner);
@@ -53,13 +53,13 @@ 
 // (ie. not a response to another post)
 // allow the user to modify the thread title
 //
-$can_edit_title = ($post->parent_post==0 && $thread_owner->id==$logged_in_user->id && !is_banished($logged_in_user));
+$can_edit_title = ($post->parent_post == 0 && $thread_owner->id == $logged_in_user->id && !is_banished($logged_in_user));
 
 $content = post_str("content", true);
 $title = post_str("title", true);
 $preview = post_str("preview", true);
 
-if (post_str('submit',true) && (!$preview)) {
+if (post_str('submit', true) && (!$preview)) {
     if (POST_MAX_LINKS
         && link_count($content) > POST_MAX_LINKS
         && !is_moderator($logged_in_user, $forum)
@@ -68,7 +68,7 @@ 
     }
     check_tokens($logged_in_user->authenticator);
     
-    $add_signature = (post_str('add_signature', true) == "1")?1:0;
+    $add_signature = (post_str('add_signature', true) == "1") ? 1 : 0;
     $content = substr($content, 0, 64000);
     $content = trim($content);
     if (strlen($content)) {
@@ -76,7 +76,7 @@ 
         $now = time();
         $post->update("signature=$add_signature, content='$content', modified=$now");
     
-        if ($can_edit_title){
+        if ($can_edit_title) {
             $title = trim($title);
             $title = sanitize_tags($title);
             $title = BoincDb::escape_string($title);
@@ -89,7 +89,7 @@ 
     }
 }
 
-page_head(tra("Edit post"),'','','', $bbcode_js);
+page_head(tra("Edit post"), '', '', '', $bbcode_js);
 
 show_forum_header($logged_in_user);
 switch ($forum->parent_type) {
@@ -144,9 +144,9 @@ 
 }
 
 if ($post->signature) {
-    $enable_signature="checked=\"true\"";
+    $enable_signature = "checked=\"true\"";
 } else {
-    $enable_signature="";
+    $enable_signature = "";
 }
 row2("", "<input id=\"add_signature\" name=\"add_signature\" value=\"1\" ".$enable_signature." type=\"checkbox\">
     <label for=\"add_signature\">".tra("Add my signature to this post")."</label>");
@@ -159,5 +159,5 @@ 
 
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/ops/errorwus.php

Spacing +2 added lines, -2 removed lines

@@ -176,8 +176,8 @@
 echo "<tr><th>WU ID</th><th>WU name</th><th>App ID</th><th>Quorum</th><th>Unsent</th><th>In Progress</th><th>Success</th>";
 echo "<th>Download Errors</th><th>Compute Errors</th><th>Validate Errors</th><th>Error mask</th></tr>\n";
 
-$hidden=0;
-foreach($row_array as $row) {
+$hidden = 0;
+foreach ($row_array as $row) {
     if ($hide_canceled == 'on' && (($row->error_mask & WU_ERROR_CANCELLED) == WU_ERROR_CANCELLED)) {
         $hidden++;
         continue;

html/inc/geoip.inc

Spacing +96 added lines, -96 removed lines

@@ -138,25 +138,25 @@ 
 "VU", "WF", "WS", "YE", "YT", "CS", "ZA", "ZM", "ZR", "ZW", "A1", "A2", "O1"
 );
     var $GEOIP_COUNTRY_CODES3 = array(
-"","AP","EU","AND","ARE","AFG","ATG","AIA","ALB","ARM","ANT","AGO","AQ","ARG",
-"ASM","AUT","AUS","ABW","AZE","BIH","BRB","BGD","BEL","BFA","BGR","BHR","BDI",
-"BEN","BMU","BRN","BOL","BRA","BHS","BTN","BV","BWA","BLR","BLZ","CAN","CC",
-"COD","CAF","COG","CHE","CIV","COK","CHL","CMR","CHN","COL","CRI","CUB","CPV",
-"CX","CYP","CZE","DEU","DJI","DNK","DMA","DOM","DZA","ECU","EST","EGY","ESH",
-"ERI","ESP","ETH","FIN","FJI","FLK","FSM","FRO","FRA","FX","GAB","GBR","GRD",
-"GEO","GUF","GHA","GIB","GRL","GMB","GIN","GLP","GNQ","GRC","GS","GTM","GUM",
-"GNB","GUY","HKG","HM","HND","HRV","HTI","HUN","IDN","IRL","ISR","IND","IO",
-"IRQ","IRN","ISL","ITA","JAM","JOR","JPN","KEN","KGZ","KHM","KIR","COM","KNA",
-"PRK","KOR","KWT","CYM","KAZ","LAO","LBN","LCA","LIE","LKA","LBR","LSO","LTU",
-"LUX","LVA","LBY","MAR","MCO","MDA","MDG","MHL","MKD","MLI","MMR","MNG","MAC",
-"MNP","MTQ","MRT","MSR","MLT","MUS","MDV","MWI","MEX","MYS","MOZ","NAM","NCL",
-"NER","NFK","NGA","NIC","NLD","NOR","NPL","NRU","NIU","NZL","OMN","PAN","PER",
-"PYF","PNG","PHL","PAK","POL","SPM","PCN","PRI","PSE","PRT","PLW","PRY","QAT",
-"REU","ROU","RUS","RWA","SAU","SLB","SYC","SDN","SWE","SGP","SHN","SVN","SJM",
-"SVK","SLE","SMR","SEN","SOM","SUR","STP","SLV","SYR","SWZ","TCA","TCD","TF",
-"TGO","THA","TJK","TKL","TLS","TKM","TUN","TON","TUR","TTO","TUV","TWN","TZA",
-"UKR","UGA","UM","USA","URY","UZB","VAT","VCT","VEN","VGB","VIR","VNM","VUT",
-        "WLF","WSM","YEM","YT","SCG","ZAF","ZMB","ZR","ZWE","A1","A2","O1"
+"", "AP", "EU", "AND", "ARE", "AFG", "ATG", "AIA", "ALB", "ARM", "ANT", "AGO", "AQ", "ARG",
+"ASM", "AUT", "AUS", "ABW", "AZE", "BIH", "BRB", "BGD", "BEL", "BFA", "BGR", "BHR", "BDI",
+"BEN", "BMU", "BRN", "BOL", "BRA", "BHS", "BTN", "BV", "BWA", "BLR", "BLZ", "CAN", "CC",
+"COD", "CAF", "COG", "CHE", "CIV", "COK", "CHL", "CMR", "CHN", "COL", "CRI", "CUB", "CPV",
+"CX", "CYP", "CZE", "DEU", "DJI", "DNK", "DMA", "DOM", "DZA", "ECU", "EST", "EGY", "ESH",
+"ERI", "ESP", "ETH", "FIN", "FJI", "FLK", "FSM", "FRO", "FRA", "FX", "GAB", "GBR", "GRD",
+"GEO", "GUF", "GHA", "GIB", "GRL", "GMB", "GIN", "GLP", "GNQ", "GRC", "GS", "GTM", "GUM",
+"GNB", "GUY", "HKG", "HM", "HND", "HRV", "HTI", "HUN", "IDN", "IRL", "ISR", "IND", "IO",
+"IRQ", "IRN", "ISL", "ITA", "JAM", "JOR", "JPN", "KEN", "KGZ", "KHM", "KIR", "COM", "KNA",
+"PRK", "KOR", "KWT", "CYM", "KAZ", "LAO", "LBN", "LCA", "LIE", "LKA", "LBR", "LSO", "LTU",
+"LUX", "LVA", "LBY", "MAR", "MCO", "MDA", "MDG", "MHL", "MKD", "MLI", "MMR", "MNG", "MAC",
+"MNP", "MTQ", "MRT", "MSR", "MLT", "MUS", "MDV", "MWI", "MEX", "MYS", "MOZ", "NAM", "NCL",
+"NER", "NFK", "NGA", "NIC", "NLD", "NOR", "NPL", "NRU", "NIU", "NZL", "OMN", "PAN", "PER",
+"PYF", "PNG", "PHL", "PAK", "POL", "SPM", "PCN", "PRI", "PSE", "PRT", "PLW", "PRY", "QAT",
+"REU", "ROU", "RUS", "RWA", "SAU", "SLB", "SYC", "SDN", "SWE", "SGP", "SHN", "SVN", "SJM",
+"SVK", "SLE", "SMR", "SEN", "SOM", "SUR", "STP", "SLV", "SYR", "SWZ", "TCA", "TCD", "TF",
+"TGO", "THA", "TJK", "TKL", "TLS", "TKM", "TUN", "TON", "TUR", "TTO", "TUV", "TWN", "TZA",
+"UKR", "UGA", "UM", "USA", "URY", "UZB", "VAT", "VCT", "VEN", "VGB", "VIR", "VNM", "VUT",
+        "WLF", "WSM", "YEM", "YT", "SCG", "ZAF", "ZMB", "ZR", "ZWE", "A1", "A2", "O1"
     );
     var $GEOIP_COUNTRY_NAMES = array(
 "", "Asia/Pacific Region", "Europe", "Andorra", "United Arab Emirates",
@@ -208,10 +208,10 @@ 
 Grenadines", "Venezuela", "Virgin Islands, British", "Virgin Islands, U.S.",
 "Vietnam", "Vanuatu", "Wallis and Futuna", "Samoa", "Yemen", "Mayotte",
 "Serbia and Montenegro", "South Africa", "Zambia", "Zaire", "Zimbabwe",
-"Anonymous Proxy","Satellite Provider","Other"
+"Anonymous Proxy", "Satellite Provider", "Other"
 );
 }
-function geoip_load_shared_mem ($file) {
+function geoip_load_shared_mem($file) {
 
   $fp = fopen($file, "rb");
   if (!$fp) {
@@ -220,42 +220,42 @@ 
   }
   $s_array = fstat($fp);
   $size = $s_array['size'];
-  if ($shmid = @shmop_open (GEOIP_SHM_KEY, "w", 0, 0)) {
-    shmop_delete ($shmid);
-    shmop_close ($shmid);
+  if ($shmid = @shmop_open(GEOIP_SHM_KEY, "w", 0, 0)) {
+    shmop_delete($shmid);
+    shmop_close($shmid);
   }
-  $shmid = shmop_open (GEOIP_SHM_KEY, "c", 0644, $size);
-  shmop_write ($shmid, fread($fp, $size), 0);
-  shmop_close ($shmid);
+  $shmid = shmop_open(GEOIP_SHM_KEY, "c", 0644, $size);
+  shmop_write($shmid, fread($fp, $size), 0);
+  shmop_close($shmid);
 }
 
-function _setup_segments($gi){
+function _setup_segments($gi) {
   $gi->databaseType = GEOIP_COUNTRY_EDITION;
   $gi->record_length = STANDARD_RECORD_LENGTH;
   if ($gi->flags & GEOIP_SHARED_MEMORY) {
-    $offset = @shmop_size ($gi->shmid) - 3;
+    $offset = @shmop_size($gi->shmid) - 3;
     for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
-        $delim = @shmop_read ($gi->shmid, $offset, 3);
+        $delim = @shmop_read($gi->shmid, $offset, 3);
         $offset += 3;
         if ($delim == (chr(255).chr(255).chr(255))) {
-            $gi->databaseType = ord(@shmop_read ($gi->shmid, $offset, 1));
+            $gi->databaseType = ord(@shmop_read($gi->shmid, $offset, 1));
             $offset++;
 
-            if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
+            if ($gi->databaseType == GEOIP_REGION_EDITION_REV0) {
                 $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
-            } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
+            } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
                 $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
-	    } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0)||
+	    } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0) ||
                      ($gi->databaseType == GEOIP_CITY_EDITION_REV1) 
                     || ($gi->databaseType == GEOIP_ORG_EDITION)
 		    || ($gi->databaseType == GEOIP_ISP_EDITION)
-		    || ($gi->databaseType == GEOIP_ASNUM_EDITION)){
+		    || ($gi->databaseType == GEOIP_ASNUM_EDITION)) {
                 $gi->databaseSegments = 0;
-                $buf = @shmop_read ($gi->shmid, $offset, SEGMENT_RECORD_LENGTH);
-                for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
-                    $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
+                $buf = @shmop_read($gi->shmid, $offset, SEGMENT_RECORD_LENGTH);
+                for ($j = 0; $j < SEGMENT_RECORD_LENGTH; $j++) {
+                    $gi->databaseSegments += (ord($buf[$j]) << ($j*8));
                 }
-	            if (($gi->databaseType == GEOIP_ORG_EDITION)||
+	            if (($gi->databaseType == GEOIP_ORG_EDITION) ||
 			($gi->databaseType == GEOIP_ISP_EDITION)) {
 	                $gi->record_length = ORG_RECORD_LENGTH;
                 }
@@ -265,32 +265,32 @@ 
             $offset -= 4;
         }
     }
-    if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
-        ($gi->databaseType == GEOIP_PROXY_EDITION)||
-        ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
+    if (($gi->databaseType == GEOIP_COUNTRY_EDITION) ||
+        ($gi->databaseType == GEOIP_PROXY_EDITION) ||
+        ($gi->databaseType == GEOIP_NETSPEED_EDITION)) {
         $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
     }
   } else {
     $filepos = ftell($gi->filehandle);
     fseek($gi->filehandle, -3, SEEK_END);
     for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
-        $delim = fread($gi->filehandle,3);
-        if ($delim == (chr(255).chr(255).chr(255))){
-        $gi->databaseType = ord(fread($gi->filehandle,1));
-        if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
+        $delim = fread($gi->filehandle, 3);
+        if ($delim == (chr(255).chr(255).chr(255))) {
+        $gi->databaseType = ord(fread($gi->filehandle, 1));
+        if ($gi->databaseType == GEOIP_REGION_EDITION_REV0) {
             $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
         }
-        else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
+        else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
 	    $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
-                }  else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0) ||
+                } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0) ||
                  ($gi->databaseType == GEOIP_CITY_EDITION_REV1) || 
                  ($gi->databaseType == GEOIP_ORG_EDITION) || 
 		 ($gi->databaseType == GEOIP_ISP_EDITION) || 
-                 ($gi->databaseType == GEOIP_ASNUM_EDITION)){
+                 ($gi->databaseType == GEOIP_ASNUM_EDITION)) {
             $gi->databaseSegments = 0;
-            $buf = fread($gi->filehandle,SEGMENT_RECORD_LENGTH);
-            for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
-            $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
+            $buf = fread($gi->filehandle, SEGMENT_RECORD_LENGTH);
+            for ($j = 0; $j < SEGMENT_RECORD_LENGTH; $j++) {
+            $gi->databaseSegments += (ord($buf[$j]) << ($j*8));
             }
 	    if ($gi->databaseType == GEOIP_ORG_EDITION) {
 	    $gi->record_length = ORG_RECORD_LENGTH;
@@ -301,12 +301,12 @@ 
         fseek($gi->filehandle, -4, SEEK_CUR);
         }
     }
-    if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
-        ($gi->databaseType == GEOIP_PROXY_EDITION)||
-        ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
+    if (($gi->databaseType == GEOIP_COUNTRY_EDITION) ||
+        ($gi->databaseType == GEOIP_PROXY_EDITION) ||
+        ($gi->databaseType == GEOIP_NETSPEED_EDITION)) {
          $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
     }
-    fseek($gi->filehandle,$filepos,SEEK_SET);
+    fseek($gi->filehandle, $filepos, SEEK_SET);
   }
   return $gi;
 }
@@ -315,9 +315,9 @@ 
   $gi = new GeoIP;
   $gi->flags = $flags;
   if ($gi->flags & GEOIP_SHARED_MEMORY) {
-    $gi->shmid = @shmop_open (GEOIP_SHM_KEY, "a", 0, 0);
+    $gi->shmid = @shmop_open(GEOIP_SHM_KEY, "a", 0, 0);
     } else {
-    $gi->filehandle = fopen($filename,"rb");
+    $gi->filehandle = fopen($filename, "rb");
     if ($gi->flags & GEOIP_MEMORY_CACHE) {
         $s_array = fstat($gi->filehandle);
         $gi->memory_buffer = fread($gi->filehandle, $s_array[size]);
@@ -345,7 +345,7 @@ 
 }
 
 function geoip_country_code_by_name($gi, $name) {
-  $country_id = geoip_country_id_by_name($gi,$name);
+  $country_id = geoip_country_id_by_name($gi, $name);
   if ($country_id !== false) {
         return $gi->GEOIP_COUNTRY_CODES[$country_id];
   }
@@ -353,7 +353,7 @@ 
 }
 
 function geoip_country_name_by_name($gi, $name) {
-  $country_id = geoip_country_id_by_name($gi,$name);
+  $country_id = geoip_country_id_by_name($gi, $name);
   if ($country_id !== false) {
         return $gi->GEOIP_COUNTRY_NAMES[$country_id];
   }
@@ -366,7 +366,7 @@ 
 }
 
 function geoip_country_code_by_addr($gi, $addr) {
-  $country_id = geoip_country_id_by_addr($gi,$addr);
+  $country_id = geoip_country_id_by_addr($gi, $addr);
   if ($country_id !== false) {
     return $gi->GEOIP_COUNTRY_CODES[$country_id];
   }
@@ -374,7 +374,7 @@ 
 }
 
 function geoip_country_name_by_addr($gi, $addr) {
-  $country_id = geoip_country_id_by_addr($gi,$addr);
+  $country_id = geoip_country_id_by_addr($gi, $addr);
   if ($country_id !== false) {
         return $gi->GEOIP_COUNTRY_NAMES[$country_id];
   }
@@ -386,24 +386,24 @@ 
   for ($depth = 31; $depth >= 0; --$depth) {
     if ($gi->flags & GEOIP_MEMORY_CACHE) {
       $buf = substr($gi->memory_buffer,
-                            2 * $gi->record_length * $offset,
-                            2 * $gi->record_length);
+                            2*$gi->record_length*$offset,
+                            2*$gi->record_length);
         } elseif ($gi->flags & GEOIP_SHARED_MEMORY) {
-      $buf = @shmop_read ($gi->shmid, 
-                            2 * $gi->record_length * $offset,
-                            2 * $gi->record_length );
+      $buf = @shmop_read($gi->shmid, 
+                            2*$gi->record_length*$offset,
+                            2*$gi->record_length);
         } else {
-      fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0
+      fseek($gi->filehandle, 2*$gi->record_length*$offset, SEEK_SET) == 0
         or die("fseek failed");
-      $buf = fread($gi->filehandle, 2 * $gi->record_length);
+      $buf = fread($gi->filehandle, 2*$gi->record_length);
     }
-    $x = array(0,0);
+    $x = array(0, 0);
     for ($i = 0; $i < 2; ++$i) {
       for ($j = 0; $j < $gi->record_length; ++$j) {
-        $x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8);
+        $x[$i] += ord($buf[$gi->record_length*$i + $j]) << ($j*8);
       }
     }
-    if ($ipnum & (1 << $depth)) {
+    if ($ipnum&(1 << $depth)) {
       if ($x[1] >= $gi->databaseSegments) {
         return $x[1];
       }
@@ -419,23 +419,23 @@ 
   return false;
 }
 
-function _get_org($gi,$ipnum){
-  $seek_org = _geoip_seek_country($gi,$ipnum);
+function _get_org($gi, $ipnum) {
+  $seek_org = _geoip_seek_country($gi, $ipnum);
   if ($seek_org == $gi->databaseSegments) {
     return NULL;
   }
-  $record_pointer = $seek_org + (2 * $gi->record_length - 1) * $gi->databaseSegments;
+  $record_pointer = $seek_org + (2*$gi->record_length - 1)*$gi->databaseSegments;
   if ($gi->flags & GEOIP_SHARED_MEMORY) {
-    $org_buf = @shmop_read ($gi->shmid, $record_pointer, MAX_ORG_RECORD_LENGTH);
+    $org_buf = @shmop_read($gi->shmid, $record_pointer, MAX_ORG_RECORD_LENGTH);
     } else {
     fseek($gi->filehandle, $record_pointer, SEEK_SET);
-    $org_buf = fread($gi->filehandle,MAX_ORG_RECORD_LENGTH);
+    $org_buf = fread($gi->filehandle, MAX_ORG_RECORD_LENGTH);
   }
   $org_buf = substr($org_buf, 0, strpos($org_buf, 0));
   return $org_buf;
 }
 
-function geoip_org_by_addr ($gi,$addr) {
+function geoip_org_by_addr($gi, $addr) {
   if ($addr == NULL) {
     return 0;
   }
@@ -443,38 +443,38 @@ 
   return _get_org($gi, $ipnum);
 }
 
-function _get_region($gi,$ipnum){
-  if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
-    $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV0;
-    if ($seek_region >= 1000){
+function _get_region($gi, $ipnum) {
+  if ($gi->databaseType == GEOIP_REGION_EDITION_REV0) {
+    $seek_region = _geoip_seek_country($gi, $ipnum) - GEOIP_STATE_BEGIN_REV0;
+    if ($seek_region >= 1000) {
       $country_code = "US";
-      $region = chr(($seek_region - 1000)/26 + 65) . chr(($seek_region - 1000)%26 + 65);
+      $region = chr(($seek_region - 1000)/26 + 65).chr(($seek_region - 1000)%26 + 65);
     } else {
             $country_code = $gi->GEOIP_COUNTRY_CODES[$seek_region];
       $region = "";
     }
-  return array ($country_code,$region);
-    }  else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
-    $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV1;
+  return array($country_code, $region);
+    } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
+    $seek_region = _geoip_seek_country($gi, $ipnum) - GEOIP_STATE_BEGIN_REV1;
     //print $seek_region;
-    if ($seek_region < US_OFFSET){
+    if ($seek_region < US_OFFSET) {
       $country_code = "";
       $region = "";  
         } else if ($seek_region < CANADA_OFFSET) {
       $country_code = "US";
-      $region = chr(($seek_region - US_OFFSET)/26 + 65) . chr(($seek_region - US_OFFSET)%26 + 65);
+      $region = chr(($seek_region - US_OFFSET)/26 + 65).chr(($seek_region - US_OFFSET)%26 + 65);
         } else if ($seek_region < WORLD_OFFSET) {
       $country_code = "CA";
-      $region = chr(($seek_region - CANADA_OFFSET)/26 + 65) . chr(($seek_region - CANADA_OFFSET)%26 + 65);
+      $region = chr(($seek_region - CANADA_OFFSET)/26 + 65).chr(($seek_region - CANADA_OFFSET)%26 + 65);
     } else {
-            $country_code = $gi->GEOIP_COUNTRY_CODES[($seek_region - WORLD_OFFSET) / FIPS_RANGE];
+            $country_code = $gi->GEOIP_COUNTRY_CODES[($seek_region - WORLD_OFFSET)/FIPS_RANGE];
       $region = "";
     }
-  return array ($country_code,$region);
+  return array($country_code, $region);
   }
 }
 
-function geoip_region_by_addr ($gi,$addr) {
+function geoip_region_by_addr($gi, $addr) {
   if ($addr == NULL) {
     return 0;
   }
@@ -482,12 +482,12 @@ 
   return _get_region($gi, $ipnum);
 }
 
-function getdnsattributes ($l,$ip){
+function getdnsattributes($l, $ip) {
   $r = new Net_DNS_Resolver();
   $r->nameservers = array("ws1.maxmind.com");
-  $p = $r->search($l."." . $ip .".s.maxmind.com","TXT","IN");
-  $str = is_object($p->answer[0])?$p->answer[0]->string():'';
-  ereg("\"(.*)\"",$str,$regs);
+  $p = $r->search($l.".".$ip.".s.maxmind.com", "TXT", "IN");
+  $str = is_object($p->answer[0]) ? $p->answer[0]->string() : '';
+  ereg("\"(.*)\"", $str, $regs);
   $str = $regs[1];
   return $str;
 }

html/user/bolt_sched.php

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
 }
 
 function default_mode($item) {
-    return $item->is_exercise()?BOLT_MODE_SHOW:BOLT_MODE_LESSON;
+    return $item->is_exercise() ?BOLT_MODE_SHOW:BOLT_MODE_LESSON;
 }
 
 // A page is being shown to the user; make a record of it
@@ -170,7 +170,7 @@ 
 
 // show an item (lesson, exercise, answer page)
 //
-function show_item($iter, $view_id, $prev_view_id, $mode, $repeat=null) {
+function show_item($iter, $view_id, $prev_view_id, $mode, $repeat = null) {
     global $user;
     global $course;
     global $bolt_ex;
@@ -462,7 +462,7 @@ 
     $bolt_ex->score = 0;
     $bolt_query_string = $item->query_string;
     srand($view_id);
-    ob_start();     // buffer output to avoid showing exercise text
+    ob_start(); // buffer output to avoid showing exercise text
     require($item->filename);
     ob_end_clean();
 

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

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
   db_set_active('boinc_rw');
   $boincteam = db_fetch_object(db_query('SELECT * FROM team WHERE id=%d', array($team_id)));
   $boincteam_members = db_query('SELECT id FROM user WHERE teamid=%d', array($team_id));
-  $boincteam_admin = (int) db_result(db_query('SELECT userid FROM team_admin WHERE teamid=%d', array($team_id)));
+  $boincteam_admin = (int)db_result(db_query('SELECT userid FROM team_admin WHERE teamid=%d', array($team_id)));
   db_set_active('default');
   
   $team_exists = db_query('SELECT team_id FROM {boincteam} WHERE team_id = %d', $boincteam->id);
@@ -44,10 +44,10 @@ 
       'teaser' => $teaser,
       'uid' => boincuser_lookup_uid($boincteam->userid),
       'path' => null,
-      'status' => 1,  // published or not - always publish
+      'status' => 1, // published or not - always publish
       'promote' => 0,
       'created' => $boincteam->create_time,
-      'comment' => 0,  // comments disabled
+      'comment' => 0, // comments disabled
       'moderate' => 0,
       'sticky' => 0,
       'format' => $input_format
@@ -63,7 +63,7 @@ 
       exit;
     }
     
-    $node = (object) $node; // node_save requires an object form
+    $node = (object)$node; // node_save requires an object form
     
     $node->taxonomy[] = taxonomy_get_term($team_type_tid);
     
@@ -81,7 +81,7 @@ 
   db_set_active('default');
   if ($boincteam_member_ids) {
     $team_members = db_query('SELECT uid FROM {boincuser} WHERE boinc_id IN(%s)', implode(',', $boincteam_member_ids));
-    $team_admin = (int) db_result(db_query('SELECT uid FROM {boincuser} WHERE boinc_id=%d', $boincteam_admin));
+    $team_admin = (int)db_result(db_query('SELECT uid FROM {boincuser} WHERE boinc_id=%d', $boincteam_admin));
     
     while ($drupal_user = db_fetch_object($team_members)) {
       // Add action to take on member accounts?

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

Spacing +88 added lines, -88 removed lines

@@ -167,7 +167,7 @@ 
   
   if ($preset) {
     // Load preset from configuration
-    $preset_prefs = (array) $preset_prefs['general_preferences'];
+    $preset_prefs = (array)$preset_prefs['general_preferences'];
     if (isset($preset_prefs['preset'])) {
       if (!is_numeric(key($preset_prefs['preset']))) {
         $preset_prefs['preset'] = array($preset_prefs['preset']);
@@ -188,7 +188,7 @@ 
 function boincwork_get_project_specific_config() {
   $raw_config_data = variable_get('boinc_project_specific_prefs_config', '');
   
-  $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
+  $xsd = './'.drupal_get_path('module', 'boincwork').'/includes/projectprefs.xsd';
   libxml_use_internal_errors(true);
   
   $xml = new DomDocument();
@@ -196,8 +196,8 @@ 
   if (!$xml->schemaValidate($xsd)) {
     $errors = libxml_get_errors();
     $lines = explode("\r", $raw_config_data);
-    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
-      ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
+    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}".
+      ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), 'error');
     return NULL;
   }
   
@@ -392,13 +392,13 @@ 
       
       // Use appropriate datatype
       if (isset($element['@attributes']['datatype'])) {
-        switch($element['@attributes']['datatype']) {
+        switch ($element['@attributes']['datatype']) {
         case 'integer':
-          $value = (int) $value;
+          $value = (int)$value;
           break;
           
         case 'float':
-          $value = number_format((float) $value, 2);
+          $value = number_format((float)$value, 2);
           break;
         
         default:
@@ -420,7 +420,7 @@ 
         '#type' => 'textfield',
         '#default_value' => $value,
         '#size' => 5,
-        '#description' => $description . bts(' Default value: @default', array('@default' => $default), NULL, 'boinc:account-preferences-project')
+        '#description' => $description.bts(' Default value: @default', array('@default' => $default), NULL, 'boinc:account-preferences-project')
       );
     }
     break;
@@ -484,7 +484,7 @@ 
       $name = $element['@attributes']['name'];
       $default = null;
       $options = array();
-      foreach($element['items']['item'] as $item) {
+      foreach ($element['items']['item'] as $item) {
         if (is_array($item)) {
           $value = $item['@value'];
           if ($default === NULL AND
@@ -526,7 +526,7 @@ 
         '#options' => $options,
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $value,
-        '#description' => $description . bts(' Default value: @default', array('@default' =>$default), NULL, 'boinc:account-preferences-project')
+        '#description' => $description.bts(' Default value: @default', array('@default' =>$default), NULL, 'boinc:account-preferences-project')
       );
     }
     break;
@@ -591,7 +591,7 @@ 
     }
     foreach ($elements as $key => $element) {
       $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $name = str_replace(' ','_',strtolower($title));
+      $name = str_replace(' ', '_', strtolower($title));
       $name = "group_{$name}";
       
       // Translate elements as appropriate
@@ -743,13 +743,13 @@ 
   if ($type == 'project') {
     if ($boincuser->project_prefs) {
       $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+      $main_prefs = (array)$main_prefs['project_preferences'];
     }
   }
   else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+      $main_prefs = (array)$main_prefs['global_preferences'];
     }
   }
   
@@ -801,13 +801,13 @@ 
   if ($type == 'project') {
     if ($boincuser->project_prefs) {
       $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+      $main_prefs = (array)$main_prefs['project_preferences'];
     }
   }
   else {
     if ($boincuser->global_prefs) {
       $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+      $main_prefs = (array)$main_prefs['global_preferences'];
     }
   }
   
@@ -1001,11 +1001,11 @@ 
   $magnitude = 0;
   $precision = 0;
   if ($digits > $max_digits) {
-    $magnitude = floor(($digits - ($max_digits - 3)) / 3);
-    $precision = $max_digits - ($digits - ($magnitude * 3) + 1);
-    $number = round($number / pow(1000, $magnitude), $precision);
+    $magnitude = floor(($digits - ($max_digits - 3))/3);
+    $precision = $max_digits - ($digits - ($magnitude*3) + 1);
+    $number = round($number/pow(1000, $magnitude), $precision);
   }
-  $number = number_format($number, $precision) . (($magnitude) ? "{$suffix[$magnitude]}" : '');
+  $number = number_format($number, $precision).(($magnitude) ? "{$suffix[$magnitude]}" : '');
   
   return $number;
 }
@@ -1183,7 +1183,7 @@ 
   
   function text_to_xml($text) {
     $xml = new DomDocument();
-    if ( !($xml->loadXML($text)) ) return false;
+    if (!($xml->loadXML($text))) return false;
     return $xml;
   }
   
@@ -1200,7 +1200,7 @@ 
       while (!is_null($node)) {
           switch ($node->nodeType) {
           case XML_TEXT_NODE:
-              if (trim($node->nodeValue)  != '') $result = $node->nodeValue;
+              if (trim($node->nodeValue) != '') $result = $node->nodeValue;
               break;
           case XML_ELEMENT_NODE:
               $node_name = $node->nodeName;
@@ -1217,7 +1217,7 @@ 
               if ($sibling) {
                   $result[$node_name][$index] = '';
                   if ($node->childNodes) {
-                      $result[$node_name][$index] = xml_to_array($node) ;
+                      $result[$node_name][$index] = xml_to_array($node);
                   }
                   if ($node->hasAttributes()) {
                       $attributes = $node->attributes;
@@ -1240,14 +1240,14 @@ 
               } else {
                   $result[$node_name] = '';
                   if ($node->childNodes) {
-                      $result[$node_name] = xml_to_array($node) ;
+                      $result[$node_name] = xml_to_array($node);
                   }
                   if ($node->hasAttributes()) {
                       $attributes = $node->attributes;
                       if ($result[$node_name] !== '' AND !is_array($result[$node_name])) {
                           $result[$node_name] = array('@value' => $result[$node_name]);
                       }
-                      foreach($attributes as $key => $attribute) {
+                      foreach ($attributes as $key => $attribute) {
                           $result[$node_name]['@attributes'][$attribute->name] = $attribute->value;
                       }
                   }
@@ -1287,30 +1287,30 @@ 
   // Determine if hosts are associated at all or just hidden
   $output = '';
   if ($boincuser->show_hosts) {
-    switch($context) {
+    switch ($context) {
     case 'active':
-      $output .=  '<h2>' . bts('No active computers', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user has no computers that have been'
-      . ' active in the last 30 days.', array(), NULL, 'boinc:host-list') . '</p>';
+      $output .= '<h2>'.bts('No active computers', array(), NULL, 'boinc:host-list').'</h2>';
+      $output .= '<p>'.bts('This user has no computers that have been'
+      . ' active in the last 30 days.', array(), NULL, 'boinc:host-list').'</p>';
       break;
       
     case 'preferences':
-      $output .=  '<h2>' . bts('No computers', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('There are no computers assigned to this'
-      . ' preference set.', array(), NULL, 'boinc:host-list') . '</p>';
+      $output .= '<h2>'.bts('No computers', array(), NULL, 'boinc:host-list').'</h2>';
+      $output .= '<p>'.bts('There are no computers assigned to this'
+      . ' preference set.', array(), NULL, 'boinc:host-list').'</p>';
       break;
     
     default:
-      $output .=  '<h2>' . bts('Computers pending', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user does not yet have any associated'
+      $output .= '<h2>'.bts('Computers pending', array(), NULL, 'boinc:host-list').'</h2>';
+      $output .= '<p>'.bts('This user does not yet have any associated'
       . ' computers. Computers will be displayed when they have earned their'
-      . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
+      . ' first credits.', array(), NULL, 'boinc:host-list').'</p>';
     }
   }
   else {
-    $output .=  '<h2>' . bts('Computers hidden', array(), NULL, 'boinc:host-list') . '</h2>';
-    $output .=  '<p>' . bts('This user has chosen not to show information'
-    . ' about their computers.', array(), NULL, 'boinc:host-list') . '</p>';
+    $output .= '<h2>'.bts('Computers hidden', array(), NULL, 'boinc:host-list').'</h2>';
+    $output .= '<p>'.bts('This user has chosen not to show information'
+    . ' about their computers.', array(), NULL, 'boinc:host-list').'</p>';
   }
   return $output;
 }
@@ -1322,11 +1322,11 @@ 
   
   // 
   $output = '';
-  switch($context) {
+  switch ($context) {
   default:
-    $output .=  '<h2>' . bts('No @type tasks', array('@type' => $context), NULL, 'boinc:task-list')
+    $output .= '<h2>'.bts('No @type tasks', array('@type' => $context), NULL, 'boinc:task-list')
     . '</h2>';
-    $output .=  '<p>' . bts('There are no tasks of this type on record', array(), NULL, 'boinc:task-list')
+    $output .= '<p>'.bts('There are no tasks of this type on record', array(), NULL, 'boinc:task-list')
     . '</p>';
   }
   return $output;
@@ -1348,10 +1348,10 @@ 
       $output .= l(bts('Delete', array(), NULL, 'boinc:form-delete'), "host/{$host_id}/delete",
         array(
           'attributes' => array(
-            'onclick' => 'return confirm(\'' . bts('This will delete host @id'
+            'onclick' => 'return confirm(\''.bts('This will delete host @id'
               . ' from your account forever. Are you sure this is OK?',
               array('@id' => $host_id),
-              NULL, 'boinc:account-host-delete') . '\')'
+              NULL, 'boinc:account-host-delete').'\')'
           )
         )
       );
@@ -1441,8 +1441,8 @@ 
       "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location')
     );
     variable_set('jump_use_js_venues-Array', 1);
-    drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-    drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
+    drupal_add_js(drupal_get_path('module', 'jump').'/jump.js');
+    drupal_add_js(drupal_get_path('theme', 'boinc').'/js/prefs.js', 'theme');
     // Get current venue
     db_set_active('boinc_ro');
     $venue = db_result(db_query(
@@ -1466,10 +1466,10 @@ 
     // Add a wrapper to deadline text
     if (!$received_time) {
       if (time() < $deadline) {
-        $output = '<span class="on-time">' . $output . '</span>';
+        $output = '<span class="on-time">'.$output.'</span>';
       }
       else {
-        $output = '<span class="past-due">' . $output . '</span>';
+        $output = '<span class="past-due">'.$output.'</span>';
       }
     }
   }
@@ -1505,15 +1505,15 @@ 
  */
 function boincwork_tasktable($category = 0, $queryid = 1, $tselect = NULL, $app_id = 0, $tablerows = 20) {
   // Check type parameter, if not (0,2) then return an error.
-  if ( ($category!=0) AND ($category!=1) AND ($category!=2) ) {
+  if (($category != 0) AND ($category != 1) AND ($category != 2)) {
     watchdog('boincwork', 'task table called with invalid category = %category', array('%category' => $category), WATCHDOG_WARNING);
     return '';
   }
 
-  require_boinc( array('util', 'result') );
+  require_boinc(array('util', 'result'));
 
   global $language;
-  $locality=$language->language;
+  $locality = $language->language;
   $nf = new NumberFormatter($locality, NumberFormatter::DECIMAL);
   $nf->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, 0);
   $nf->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, 0);
@@ -1561,13 +1561,13 @@ 
       ."ON r.appid=a.id ";
 
   // Use userid, hostid, or workunitid
-  if ($category==0) {
+  if ($category == 0) {
     $sqlall .= " WHERE r.userid='%s' ";
   }
-  elseif ($category==1) {
+  elseif ($category == 1) {
     $sqlall .= " WHERE r.workunitid='%s' ";
   }
-  elseif ($category==2) {
+  elseif ($category == 2) {
     $sqlall .= " WHERE r.hostid='%s' ";
   }
   $sqlall .= " ORDER BY user_friendly_name";
@@ -1578,7 +1578,7 @@ 
   if ($dbres_all) {
     while ($result = db_fetch_object($dbres_all)) {
       $mystate = state_num($result);
-      if ( ($result->appid==$app_id) OR ($app_id==0) OR ($app_id==-1) ) {
+      if (($result->appid == $app_id) OR ($app_id == 0) OR ($app_id == -1)) {
         $taskstates[STATE_ALL]++;
         switch ($mystate) {
         case STATE_IN_PROGRESS:
@@ -1601,7 +1601,7 @@ 
 
       //map holds a map between app ids and user friendly names for all applications.
       $application_map[$result->appid] = $result->user_friendly_name;
-      if ( ($mystate == $tselect) OR ($tselect==STATE_ALL) ) {
+      if (($mystate == $tselect) OR ($tselect == STATE_ALL)) {
         //count of appids in the results.
         $application_select_count[$result->appid]++;
       }// if mystate
@@ -1614,14 +1614,14 @@ 
   // Entry for all applications.
   $allcount = $application_select_count ? array_sum($application_select_count) : 0;
   $applications[-1] = bts('Application', array(), NULL, 'boinc:task-table');
-  $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table') . ' (' . $allcount . ')';
+  $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table').' ('.$allcount.')';
   // Create application filter from application_map and application_select_count.
-  foreach($application_map as $akey => $aname) {
+  foreach ($application_map as $akey => $aname) {
     $acount = 0;
-    if ( $application_select_count and array_key_exists($akey, $application_select_count) ) {
+    if ($application_select_count and array_key_exists($akey, $application_select_count)) {
       $acount = $application_select_count[$akey];
     }
-    $applications[$akey] = $aname . ' ('. $acount . ')';
+    $applications[$akey] = $aname.' ('.$acount.')';
   }
   // Header array for (sub) results table.
   $resultheader = array(
@@ -1700,13 +1700,13 @@ 
   $sqlwhere = array();
 
   // Use userid, hostid, or workunitid
-  if ($category==0) {
+  if ($category == 0) {
     $sqlwhere[] = "r.userid = '%s'";
   }
-  elseif ($category==1) {
+  elseif ($category == 1) {
     $sqlwhere[] = "r.workunitid = '%s'";
   }
-  elseif ($category==2) {
+  elseif ($category == 2) {
     $sqlwhere[] = "r.hostid = '%s'";
   }
 
@@ -1730,14 +1730,14 @@ 
   default:
   }
 
-  if (is_numeric($app_id) AND $app_id>0 ) {
+  if (is_numeric($app_id) AND $app_id > 0) {
     $sqlwhere[] = "r.appid = '%s'";
-    if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
-    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid, $app_id);
+    if ($sqlwhere)  $sqlsub .= " WHERE ".implode(' AND ', $sqlwhere);
+    $dbres_sub = pager_query($sqlsub.tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid, $app_id);
   }
   else {
-    if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
-    $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid);
+    if ($sqlwhere)  $sqlsub .= " WHERE ".implode(' AND ', $sqlwhere);
+    $dbres_sub = pager_query($sqlsub.tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid);
   }
   db_set_active('default');
 
@@ -1747,7 +1747,7 @@ 
       // state_num() function changes $result object, clone $result
       // object for use in state_num()
       // check if state matches selection
-      if ( (state_num(clone $result) == $tselect) OR ($tselect==STATE_ALL) ) {
+      if ((state_num(clone $result) == $tselect) OR ($tselect == STATE_ALL)) {
         // create pretty result row
         $prettyresult = array(
           array(
@@ -1763,7 +1763,7 @@ 
           $nf->format($result->cpu_time),
           $nf->format($result->granted_credit),
           array(
-            'data' => $result->user_friendly_name . " " . pretty_application_version($result->app_version_id,$result->version_number, $result->plan_class, $result->platform),
+            'data' => $result->user_friendly_name." ".pretty_application_version($result->app_version_id, $result->version_number, $result->plan_class, $result->platform),
             'class' => 'task-app',
           ),
         );
@@ -1776,54 +1776,54 @@ 
   // Begin result navigation
 
   // Set pathprefix based on type
-  if ($category==0) {
+  if ($category == 0) {
     $pathprefix = 'account/tasks';
   }
-  elseif ($category==1) {
-    $pathprefix = 'workunit/' . $queryid . '/tasks';
+  elseif ($category == 1) {
+    $pathprefix = 'workunit/'.$queryid.'/tasks';
   }
-  elseif ($category==2) {
-    $pathprefix = 'host/' . $queryid . '/tasks';
+  elseif ($category == 2) {
+    $pathprefix = 'host/'.$queryid.'/tasks';
   }
   // Need an "All" tab as well, maps to app_id of zero.
   $application_map[0] = bts('All', array(), NULL, 'boinc:task-table');
   $stitems = array();
   foreach ($taskstates as $state => $numstates) {
-    $mypath = $pathprefix . '/' . $state . '/' . $app_id;
-    if ($state==STATE_ALL) {
-      $ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+    $mypath = $pathprefix.'/'.$state.'/'.$app_id;
+    if ($state == STATE_ALL) {
+      $ltext = '<span class="tab task-app-name">'.bts('All', array(), NULL, 'boinc:task-table').' ('.$numstates.')</span>';
     }
     else {
-      $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+      $ltext = '<span class="tab">'.bts($state_hnames[$state], array(), NULL, 'boinc:task-table').' ('.$numstates.')</span>';
     }
     $myitem = array(
-      'data' => l($ltext, $mypath, array('html' => TRUE) ),
+      'data' => l($ltext, $mypath, array('html' => TRUE)),
     );
-    if ($state==$tselect) {
+    if ($state == $tselect) {
       $myitem['class'] = 'active';
     }
     $stitems[] = $myitem;
   }
   // Add reset button
-  $mypath = $pathprefix . '/0/0';
-  $ltext = '<span class="tab">' . bts('Reset', array(), NULL, 'boinc:task-table') . '</span>';
-  $stitems[] = array( 'data' => l($ltext, $mypath, array('html' => TRUE) ) );
+  $mypath = $pathprefix.'/0/0';
+  $ltext = '<span class="tab">'.bts('Reset', array(), NULL, 'boinc:task-table').'</span>';
+  $stitems[] = array('data' => l($ltext, $mypath, array('html' => TRUE)));
 
-  $output .= theme_item_list($stitems, NULL, 'ul' . ' class="tabs secondary clearfix"');
+  $output .= theme_item_list($stitems, NULL, 'ul'.' class="tabs secondary clearfix"');
 
   // Application select-drop down form
   // Hack to place Application form into header
   // App ID of zero maps to "-1" for drop-down box.
-  if ($app_id==0) {
-    $app_id=-1;
+  if ($app_id == 0) {
+    $app_id = -1;
   }
   $resultheader[] = drupal_get_form('boincwork_selectapp_form', $applications, $app_id);
 
   // Begin table of results
-  if ( is_array($resultheader) AND is_array($resultdata) ) {
+  if (is_array($resultheader) AND is_array($resultdata)) {
 
     // Take advantage of the fact that $category is the same as the row/column we want to remove.
-    if ( ($category==1) OR ($category==2) ) {
+    if (($category == 1) OR ($category == 2)) {
       unset($resultheader[$category]);
       delete_col($resultdata, $category);
     }
@@ -1840,7 +1840,7 @@ 
  * Function to delete a column from an array.
  */
 function delete_col(&$array, $offset) {
-  return array_walk($array, function (&$v) use ($offset) {
+  return array_walk($array, function(&$v) use ($offset) {
      array_splice($v, $offset, 1);
   });
 }

html/inc/bootstrap.inc

Spacing +15 added lines, -15 removed lines

@@ -138,12 +138,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;
@@ -218,7 +218,7 @@ 
 // output a panel.
 // $content_func is a function that generates the panel contents
 //
-function panel($title, $content_func, $class="panel-primary") {
+function panel($title, $content_func, $class = "panel-primary") {
     echo sprintf('<div class="panel %s">
         ', $class
     );
@@ -244,7 +244,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">
     ';
@@ -259,7 +259,7 @@ 
             </div>
         ';
     }
-    $right_width = 12-$left_width;
+    $right_width = 12 - $left_width;
     echo '
         <div class="row">
         <div class="col-sm-'.$left_width.'">
@@ -277,7 +277,7 @@ 
     ';
 }
 
-function form_start($action, $method='get') {
+function form_start($action, $method = 'get') {
     echo sprintf(
         '<div class="container">
         <form class="form-horizontal" method="%s" action="%s">'
@@ -301,7 +301,7 @@ 
 define('FORM_LEFT_OFFSET', 'col-sm-offset-4');
 define('FORM_RIGHT_CLASS', 'col-sm-8');
 
-function form_input_text($label, $name, $value='', $type='text', $attrs='', $extra='') {
+function form_input_text($label, $name, $value = '', $type = 'text', $attrs = '', $extra = '') {
     echo sprintf('
         <div class="form-group">
             <label class="control-label %s">%s</label>
@@ -328,7 +328,7 @@ 
     );
 }
 
-function form_input_textarea($label, $name, $value='') {
+function form_input_textarea($label, $name, $value = '') {
     echo sprintf('
         <div class="form-group">
             <label class="control-label %s" for="%s">%s</label>
@@ -377,7 +377,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++;
@@ -387,7 +387,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 class="control-label %s">%s</label>
@@ -404,7 +404,7 @@ 
         }
         echo 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]
         );
     }
     echo '</div>
@@ -423,7 +423,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]
@@ -456,7 +456,7 @@ 
 ';
 }
 
-function form_submit($text, $attrs='') {
+function form_submit($text, $attrs = '') {
     form_general(
         "",
         sprintf('<button %s type="submit" class="btn btn-success">%s</button>',
@@ -465,11 +465,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
     );
 }