BOINC / boinc

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

Braces +3 added lines, -6 removed lines

@@ -44,8 +44,7 @@ 
         $nid = $existing_teams[$boinc_team->id];
         $success = boincteam_import($boinc_team, $nid);
       }
-    }
-    else {
+    } else {
       // Import new teams created by RPC or ops/team_import.php
       $success = boincteam_import($boinc_team);
     }
@@ -77,8 +76,7 @@ 
     $node->body = $boincteam->description;
     $node->teaser = $teaser;
     $node->uid = boincuser_lookup_uid($boincteam->userid);
-  }
-  else {
+  } else {
     // Construct the team as a new node
     $node = array(
       'type' => 'team',
@@ -132,8 +130,7 @@ 
   }
   if ($boincid) {
     return $ids;
-  }
-  else {
+  } else {
     return array_map('boincuser_lookup_uid', $ids);
   }
 }

Spacing +5 added lines, -5 removed lines

@@ -87,15 +87,15 @@ 
       '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
     );
-    $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);
@@ -125,7 +125,7 @@ 
  *   flag send_email=1, meaning their notification privacy will be
  *   respected. This is useful the list of users are to be contacted.
  */
-function _boincteam_userids($boincteamid, $boincid=TRUE, $respectprivacy=TRUE) {
+function _boincteam_userids($boincteamid, $boincid = TRUE, $respectprivacy = TRUE) {
   $sql = 'SELECT user.id as id FROM {user} user WHERE user.teamid=%s';
   if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';
@@ -157,7 +157,7 @@ 
  *   flag send_email=1, meaning their notification privacy will be
  *   respected. This is useful the list of users are to be contacted.
  */
-function _boincteam_emails($boincteamid, $respectprivacy=TRUE) {
+function _boincteam_emails($boincteamid, $respectprivacy = TRUE) {
   $sql = 'SELECT user.email_addr as email_addr FROM {user} user WHERE user.teamid=%s';
   if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';

Indentation +73 added lines, -73 removed lines

@@ -15,41 +15,41 @@ 
  */
 function boincteam_sync() {
 
-  // Get the list of teams to import
-  db_set_active('boinc_rw');
-  $boinc_teams = db_query('
+    // Get the list of teams to import
+    db_set_active('boinc_rw');
+    $boinc_teams = db_query('
     SELECT id, name, description, userid, create_time, seti_id
     FROM team
     WHERE mod_time > FROM_UNIXTIME(%d)',
     variable_get('boincteam_last_sync', 0)
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
 
-  $existing_teams = array();
+    $existing_teams = array();
 
-  // Get the list of teams already in Drupal to be sure we're not importing
-  // any twice
-  $result = db_query('
+    // Get the list of teams already in Drupal to be sure we're not importing
+    // any twice
+    $result = db_query('
     SELECT nid, team_id FROM {boincteam}'
-  );
-  while ($row = db_fetch_object($result)) {
+    );
+    while ($row = db_fetch_object($result)) {
     $existing_teams[$row->team_id] = $row->nid;
-  }
+    }
 
-  while ($boinc_team = db_fetch_object($boinc_teams)) {
+    while ($boinc_team = db_fetch_object($boinc_teams)) {
     $success = NULL;
     if (isset($existing_teams[$boinc_team->id])) {
-      if ($boinc_team->seti_id > 0) {
+        if ($boinc_team->seti_id > 0) {
         // Sync BOINC-wide teams
         $nid = $existing_teams[$boinc_team->id];
         $success = boincteam_import($boinc_team, $nid);
-      }
+        }
     }
     else {
-      // Import new teams created by RPC or ops/team_import.php
-      $success = boincteam_import($boinc_team);
+        // Import new teams created by RPC or ops/team_import.php
+        $success = boincteam_import($boinc_team);
+    }
     }
-  }
 }
 
 
@@ -58,58 +58,58 @@ 
  */
 function boincteam_import($boincteam, $nid = NULL) {
 
-  $input_format = variable_get('boincimport_input_format', 0);
-  $team_type_map = variable_get('boincimport_team_types', array());
+    $input_format = variable_get('boincimport_input_format', 0);
+    $team_type_map = variable_get('boincimport_team_types', array());
 
-  // Save the team type affiliation
-  $team_type_tid = $team_type_map[$boincteam->type];
+    // Save the team type affiliation
+    $team_type_tid = $team_type_map[$boincteam->type];
 
-  $boincteam->description = html_entity_decode($boincteam->description, ENT_QUOTES, 'utf-8');
-  // Be sure the text is filtered for the default input format
-  $boincteam->description = check_markup($boincteam->description, $input_format);
+    $boincteam->description = html_entity_decode($boincteam->description, ENT_QUOTES, 'utf-8');
+    // Be sure the text is filtered for the default input format
+    $boincteam->description = check_markup($boincteam->description, $input_format);
 
-  $teaser = node_teaser($boincteam->description);
+    $teaser = node_teaser($boincteam->description);
 
-  if ($nid) {
+    if ($nid) {
     // Update an existing node
     $node = node_load($nid);
     $node->title = $boincteam->name;
     $node->body = $boincteam->description;
     $node->teaser = $teaser;
     $node->uid = boincuser_lookup_uid($boincteam->userid);
-  }
-  else {
+    }
+    else {
     // Construct the team as a new node
     $node = array(
-      'type' => 'team',
-      'title' => $boincteam->name,
-      'body' => $boincteam->description,
-      'teaser' => $teaser,
-      'uid' => boincuser_lookup_uid($boincteam->userid),
-      'path' => null,
-      'status' => 1,  // published or not - always publish
-      'promote' => 0,
-      'created' => $boincteam->create_time,
-      'comment' => 0,  // comments disabled
-      'moderate' => 0,
-      'sticky' => 0,
-      'format' => $input_format
+        'type' => 'team',
+        'title' => $boincteam->name,
+        'body' => $boincteam->description,
+        'teaser' => $teaser,
+        'uid' => boincuser_lookup_uid($boincteam->userid),
+        'path' => null,
+        'status' => 1,  // published or not - always publish
+        'promote' => 0,
+        'created' => $boincteam->create_time,
+        'comment' => 0,  // comments disabled
+        'moderate' => 0,
+        'sticky' => 0,
+        'format' => $input_format
     );
     $node = (object) $node; // node_save requires an object form
-  }
+    }
 
-  $node->taxonomy[] = taxonomy_get_term($team_type_tid);
+    $node->taxonomy[] = taxonomy_get_term($team_type_tid);
 
-  // Save the team node
-  node_save($node);
-  $success = ($node->nid) ? TRUE : FALSE;
+    // Save the team node
+    node_save($node);
+    $success = ($node->nid) ? TRUE : FALSE;
 
-  if (!$nid) {
+    if (!$nid) {
     // Save the team IDs to a BOINC <--> Drupal reference table, if needed
     db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boincteam->id, $node->nid);
-  }
+    }
 
-  return $success;
+    return $success;
 }
 
 /**
@@ -126,25 +126,25 @@ 
  *   respected. This is useful the list of users are to be contacted.
  */
 function _boincteam_userids($boincteamid, $boincid=TRUE, $respectprivacy=TRUE) {
-  $sql = 'SELECT user.id as id FROM {user} user WHERE user.teamid=%s';
-  if ($respectprivacy) {
+    $sql = 'SELECT user.id as id FROM {user} user WHERE user.teamid=%s';
+    if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';
-  }
+    }
 
-  db_set_active('boinc_ro');
-  $dbres = db_query($sql, $boincteamid);
-  db_set_active('default');
+    db_set_active('boinc_ro');
+    $dbres = db_query($sql, $boincteamid);
+    db_set_active('default');
 
-  $ids = array();
-  while (($result = db_fetch_object($dbres)) != FALSE) {
+    $ids = array();
+    while (($result = db_fetch_object($dbres)) != FALSE) {
     $ids[] = $result->id;
-  }
-  if ($boincid) {
+    }
+    if ($boincid) {
     return $ids;
-  }
-  else {
+    }
+    else {
     return array_map('boincuser_lookup_uid', $ids);
-  }
+    }
 }
 
 /**
@@ -158,18 +158,18 @@ 
  *   respected. This is useful the list of users are to be contacted.
  */
 function _boincteam_emails($boincteamid, $respectprivacy=TRUE) {
-  $sql = 'SELECT user.email_addr as email_addr FROM {user} user WHERE user.teamid=%s';
-  if ($respectprivacy) {
+    $sql = 'SELECT user.email_addr as email_addr FROM {user} user WHERE user.teamid=%s';
+    if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';
-  }
+    }
 
-  db_set_active('boinc_ro');
-  $dbres = db_query($sql, $boincteamid);
-  db_set_active('default');
+    db_set_active('boinc_ro');
+    $dbres = db_query($sql, $boincteamid);
+    db_set_active('default');
 
-  $emails = array();
-  while (($result = db_fetch_object($dbres)) != FALSE) {
+    $emails = array();
+    while (($result = db_fetch_object($dbres)) != FALSE) {
     $emails[] = $result->email_addr;
-  }
-  return $emails;
+    }
+    return $emails;
 }

Upper-Lower-Casing +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
   }
 
   while ($boinc_team = db_fetch_object($boinc_teams)) {
-    $success = NULL;
+    $success = null;
     if (isset($existing_teams[$boinc_team->id])) {
       if ($boinc_team->seti_id > 0) {
         // Sync BOINC-wide teams
@@ -56,7 +56,7 @@ 
 /**
  * Import a given BOINC team object into Drupal
  */
-function boincteam_import($boincteam, $nid = NULL) {
+function boincteam_import($boincteam, $nid = null) {
 
   $input_format = variable_get('boincimport_input_format', 0);
   $team_type_map = variable_get('boincimport_team_types', array());
@@ -102,7 +102,7 @@ 
 
   // Save the team node
   node_save($node);
-  $success = ($node->nid) ? TRUE : FALSE;
+  $success = ($node->nid) ? true : false;
 
   if (!$nid) {
     // Save the team IDs to a BOINC <--> Drupal reference table, if needed
@@ -125,7 +125,7 @@ 
  *   flag send_email=1, meaning their notification privacy will be
  *   respected. This is useful the list of users are to be contacted.
  */
-function _boincteam_userids($boincteamid, $boincid=TRUE, $respectprivacy=TRUE) {
+function _boincteam_userids($boincteamid, $boincid=true, $respectprivacy=true) {
   $sql = 'SELECT user.id as id FROM {user} user WHERE user.teamid=%s';
   if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';
@@ -136,7 +136,7 @@ 
   db_set_active('default');
 
   $ids = array();
-  while (($result = db_fetch_object($dbres)) != FALSE) {
+  while (($result = db_fetch_object($dbres)) != false) {
     $ids[] = $result->id;
   }
   if ($boincid) {
@@ -157,7 +157,7 @@ 
  *   flag send_email=1, meaning their notification privacy will be
  *   respected. This is useful the list of users are to be contacted.
  */
-function _boincteam_emails($boincteamid, $respectprivacy=TRUE) {
+function _boincteam_emails($boincteamid, $respectprivacy=true) {
   $sql = 'SELECT user.email_addr as email_addr FROM {user} user WHERE user.teamid=%s';
   if ($respectprivacy) {
     $sql .= ' AND user.send_email=1';
@@ -168,7 +168,7 @@ 
   db_set_active('default');
 
   $emails = array();
-  while (($result = db_fetch_object($dbres)) != FALSE) {
+  while (($result = db_fetch_object($dbres)) != false) {
     $emails[] = $result->email_addr;
   }
   return $emails;

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

Upper-Lower-Casing +25 added lines, -25 removed lines

@@ -21,13 +21,13 @@ 
   $form['test'] = array(
     '#type' => 'fieldset',
     '#title' => t('Test on copy first'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#collapsible' => true,
+    '#collapsed' => true,
   );
     
   $output = '';
   if (!variable_get('boincimport_tested', 0)) {
-    $form['test']['#collapsed']= FALSE;
+    $form['test']['#collapsed']= false;
     $output = '<span class="marker">';
     $ready_for_migration = 0;
   }
@@ -56,15 +56,15 @@ 
   // Where is BOINC data?
   $pre = variable_get('boincimport_table_prefix', '');
   $tables = array($pre .'forum', $pre .'post', $pre .'thread', $pre .'user');
-  $db = (is_array($db_url) AND isset($db_url['boinc_rw'])) ? 'boinc_rw' : 'default';
+  $db = (is_array($db_url) and isset($db_url['boinc_rw'])) ? 'boinc_rw' : 'default';
   $result = _boincimport_check_tables($tables, $db, 0);
   
   $config_path = conf_path();
   $form['boinc_data'] = array(
     '#type' => 'fieldset',
     '#title' => t('Location of BOINC data'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#collapsible' => true,
+    '#collapsed' => true,
   );
   $form['boinc_data']['boincimport_db_configured'] = array(
     '#type' => 'checkbox',
@@ -73,7 +73,7 @@ 
     '#return_value' => 1,
     '#default_value' => variable_get('boincimport_db_configured', 1),
     '#description' => '',
-    '#disabled' => ($result['result']) ? TRUE : FALSE
+    '#disabled' => ($result['result']) ? true : false
   );
   if (variable_get('boincimport_db_configured', 1) != 1) {
     $default_db_url = is_array($db_url) ? end($db_url) : $db_url;
@@ -84,7 +84,7 @@ 
         mysql://boinc_username:boinc_password@localhost/boinc_database
         </pre></p>';
       $ready_for_migration = 0;
-      $form['boinc_data']['#collapsed'] = FALSE;
+      $form['boinc_data']['#collapsed'] = false;
       $form['boinc_data']['db_connect_string_note'] = array('#value' => $output);
     }
 
@@ -115,13 +115,13 @@ 
     '#size' => 20,
     '#maxlength' => 255,
     '#description' => t('What prefix is used for your BOINC tables?'),
-    '#disabled' => ($result['result']) ? TRUE : FALSE
+    '#disabled' => ($result['result']) ? true : false
   );
   
   $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.');
@@ -134,8 +134,8 @@ 
   $form['users'] = array(
     '#type' => 'fieldset',
     '#title' => t('User import'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#collapsible' => true,
+    '#collapsed' => true,
   );
 
   // User import batch size
@@ -166,8 +166,8 @@ 
   $form['input'] = array(
     '#type' => 'fieldset',
     '#title' => t('Input format settings'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE
+    '#collapsible' => true,
+    '#collapsed' => true
   );
   $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
@@ -194,7 +194,7 @@ 
   );
   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>';
@@ -204,8 +204,8 @@ 
   $form['bbcode'] = array(
     '#type' => 'fieldset',
     '#title' => t('BBcode settings'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#collapsible' => true,
+    '#collapsed' => true,
   );
   
   $output = '<p>' . t('BOINC posts are often formatted in BBcode. During the
@@ -242,7 +242,7 @@ 
   if (variable_get('boincimport_bbcode', 0)) {
     if ($bbcode_disabled) {
       $ready_for_migration = 0;
-      $form['bbcode']['#collapsed'] = FALSE;
+      $form['bbcode']['#collapsed'] = false;
       $output .= '<p><span class="marker">';
       $output .= t('The !bbcode_module is required to transform BBcode into HTML.
         You first need to !enable_bbcode', array(
@@ -253,7 +253,7 @@ 
     $sql = "SELECT COUNT(*) FROM {filters} WHERE module = 'bbcode' AND format = %d";
     $result = db_query($sql, $input_format);
     if (!db_result($result)) {
-      $form['bbcode']['#collapsed'] = FALSE;
+      $form['bbcode']['#collapsed'] = false;
       $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}"),
@@ -263,7 +263,7 @@ 
     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;
+      $form['bbcode']['#collapsed'] = false;
       $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'))),
@@ -283,11 +283,11 @@ 
   $form['url_transforms'] = array(
     '#type' => 'fieldset',
     '#title' => t('URL transforms'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#collapsible' => true,
+    '#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;
   }
@@ -315,8 +315,8 @@ 
   $form['migration'] = array(
     '#type' => 'fieldset',
     '#title' => 'Migration',
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE,
+    '#collapsible' => true,
+    '#collapsed' => false,
   );
   variable_set('boincimport_ready', $ready_for_migration);
   if ($ready_for_migration) {

Indentation +185 added lines, -185 removed lines

@@ -5,45 +5,45 @@ 
  * Callback admin/boinc/import/settings
  */
 function boincimport_admin_settings() {
-  global $conf ;
-  global $db_url;
-  global $base_url;
-  $stage = variable_get('boincimport_config_stage', 0);
+    global $conf ;
+    global $db_url;
+    global $base_url;
+    $stage = variable_get('boincimport_config_stage', 0);
 
-  // Start with a quick sanity check on the BOINC environment
-  boinc_get_path();
+    // Start with a quick sanity check on the BOINC environment
+    boinc_get_path();
 
-  //We'll be checking that the setup is complete.
-  //If it is not complete, the migration will not go ahead.
-  $ready_for_migration = 1;
+    //We'll be checking that the setup is complete.
+    //If it is not complete, the migration will not go ahead.
+    $ready_for_migration = 1;
 
-  // Checking that the migration has been tested on a copy first.
-  $form['test'] = array(
+    // Checking that the migration has been tested on a copy first.
+    $form['test'] = array(
     '#type' => 'fieldset',
     '#title' => t('Test on copy first'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
+    );
 
-  $output = '';
-  if (!variable_get('boincimport_tested', 0)) {
+    $output = '';
+    if (!variable_get('boincimport_tested', 0)) {
     $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
     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>';
-  if (!variable_get('boincimport_tested', 0)) {
+    if (!variable_get('boincimport_tested', 0)) {
     $output .= '</span>';
-  }
-  $form['test']['intro'] = array('#value' => $output);
+    }
+    $form['test']['intro'] = array('#value' => $output);
 
-  $form['test']['boincimport_tested'] = array(
+    $form['test']['boincimport_tested'] = array(
     '#type' => 'checkbox',
     '#title' => t('I am running a trial migration on a disposable copy of the database
       OR I have already done so and I am running this on my live site, confident that
@@ -51,64 +51,64 @@ 
     '#return_value' => 1,
     '#default_value' => variable_get('boincimport_tested', 0),
     '#description' => '',
-  );
+    );
 
-  // Where is BOINC data?
-  $pre = variable_get('boincimport_table_prefix', '');
-  $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);
+    // Where is BOINC data?
+    $pre = variable_get('boincimport_table_prefix', '');
+    $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);
 
-  $config_path = conf_path();
-  $form['boinc_data'] = array(
+    $config_path = conf_path();
+    $form['boinc_data'] = array(
     '#type' => 'fieldset',
     '#title' => t('Location of BOINC data'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
-  $form['boinc_data']['boincimport_db_configured'] = array(
+    );
+    $form['boinc_data']['boincimport_db_configured'] = array(
     '#type' => 'checkbox',
     '#title' => t('There is a \'boinc\' database connection string configured in %file',
-      array('%file' => "{$config_path}/settings.php")),
+        array('%file' => "{$config_path}/settings.php")),
     '#return_value' => 1,
     '#default_value' => variable_get('boincimport_db_configured', 1),
     '#description' => '',
     '#disabled' => ($result['result']) ? TRUE : FALSE
-  );
-  if (variable_get('boincimport_db_configured', 1) != 1) {
+    );
+    if (variable_get('boincimport_db_configured', 1) != 1) {
     $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
+        $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;
-      $form['boinc_data']['#collapsed'] = FALSE;
-      $form['boinc_data']['db_connect_string_note'] = array('#value' => $output);
+        $ready_for_migration = 0;
+        $form['boinc_data']['#collapsed'] = FALSE;
+        $form['boinc_data']['db_connect_string_note'] = array('#value' => $output);
     }
 
     $form['boinc_data']['boincimport_db_url'] = array(
-      '#type' => 'textfield',
-      '#title' => t('BOINC database location'),
-      '#default_value' => variable_get('boincimport_db_url', $default_db_url),
-      '#size' => 80,
-      '#maxlength' => 255,
-      '#description' => '',
+        '#type' => 'textfield',
+        '#title' => t('BOINC database location'),
+        '#default_value' => variable_get('boincimport_db_url', $default_db_url),
+        '#size' => 80,
+        '#maxlength' => 255,
+        '#description' => '',
     );
-  }
+    }
 
-  $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
     postgresql, see !this_issue.', array('!this_issue' => l(t('this issue'),
     'http://drupal.org/node/64877', array('attributes' => array('target' => '_blank'))))) . '</p>';
-  $form['boinc_data']['note'] = array('#value' => $output);
+    $form['boinc_data']['note'] = array('#value' => $output);
 
-  // BOINC table prefix
-  $form['boinc_data']['boincimport_table_prefix'] = array(
+    // BOINC table prefix
+    $form['boinc_data']['boincimport_table_prefix'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC table prefix'),
     '#default_value' => variable_get('boincimport_table_prefix', ''),
@@ -116,30 +116,30 @@ 
     '#maxlength' => 255,
     '#description' => t('What prefix is used for your BOINC tables?'),
     '#disabled' => ($result['result']) ? TRUE : FALSE
-  );
+    );
 
-  $output = $result['html'];
-  if ($result['result'] != 1) {
+    $output = $result['html'];
+    if ($result['result'] != 1) {
     $ready_for_migration = 0;
     $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.');
     $output .= '</span>';
-  }
+    }
 
-  $form['boinc_data']['result'] = array('#value' => $output);
+    $form['boinc_data']['result'] = array('#value' => $output);
 
-  // USERS settings
-  $form['users'] = array(
+    // USERS settings
+    $form['users'] = array(
     '#type' => 'fieldset',
     '#title' => t('User import'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
+    );
 
-  // User import batch size
-  $form['users']['boincimport_user_batch_size'] = array(
+    // User import batch size
+    $form['users']['boincimport_user_batch_size'] = array(
     '#type' => 'textfield',
     '#title' => t('Number of accounts to process at a time'),
     '#default_value' => variable_get('boincimport_user_batch_size', 50),
@@ -148,10 +148,10 @@ 
     '#description' => t('Due to memory intensive API calls, this value may have to
       be adjusted to avoid exhausting system resources. The default value is a
       balance between performance and reliability.')
-  );
+    );
 
-  // Import users who have never posted?
-  $form['users']['boincimport_import_lurkers'] = array(
+    // Import users who have never posted?
+    $form['users']['boincimport_import_lurkers'] = array(
     '#type' => 'checkbox',
     '#title' => t('Import users who have never posted?'),
     '#return_value' => 1,
@@ -160,199 +160,199 @@ 
       involvement? This may not be desired, as it can take a very long time to
       import tens or hundreds of thousands of accounts. (note that users who
       are not imported now will still be imported on-the-fly upon login)'),
-  );
+    );
 
-  // Input format settings
-  $form['input'] = array(
+    // Input format settings
+    $form['input'] = array(
     '#type' => 'fieldset',
     '#title' => t('Input format settings'),
     '#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>';
-  $form['input']['intro'] = array('#value' => $output);
+    $form['input']['intro'] = array('#value' => $output);
 
-  $formats = db_query('SELECT format, name FROM {filter_formats}');
-  while ($format = db_fetch_array($formats)) {
+    $formats = db_query('SELECT format, name FROM {filter_formats}');
+    while ($format = db_fetch_array($formats)) {
     $input_formats[$format['format']]= $format['name'];
-  }
+    }
 
-  // By default, use the format named "Rich text"; fall back to Filtered HTML
-  $default_input_format = db_result(db_query("
+    // By default, use the format named "Rich text"; fall back to Filtered HTML
+    $default_input_format = db_result(db_query("
     SELECT format FROM {filter_formats} WHERE name = '%s'", 'Rich text'));
-  if (!$default_input_format) $default_input_format = 1;
+    if (!$default_input_format) $default_input_format = 1;
 
-  $input_format = variable_get('boincimport_input_format', $default_input_format);
-  $form['input']['boincimport_input_format'] = array(
+    $input_format = variable_get('boincimport_input_format', $default_input_format);
+    $form['input']['boincimport_input_format'] = array(
     '#type' => 'radios',
     '#title' => t('Input format'),
     '#default_value' => $input_format,
     '#options' => $input_formats
-  );
-  if (!$input_format) {
+    );
+    if (!$input_format) {
     $ready_for_migration = 0;
     $form['input']['#collapsed']= FALSE;
-  }
-  $output = '<p><em>'. t('This setting will be applied to all posts and private
+    }
+    $output = '<p><em>'. t('This setting will be applied to all posts and private
     messages.') .'</em></p>';
-  $form['input']['result'] = array('#value' => $output);
+    $form['input']['result'] = array('#value' => $output);
 
-  // BBcode settings
-  $form['bbcode'] = array(
+    // BBcode settings
+    $form['bbcode'] = array(
     '#type' => 'fieldset',
     '#title' => t('BBcode settings'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
+    );
 
-  $output = '<p>' . t('BOINC posts are often formatted in BBcode. During the
+    $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 .= '<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.
+    $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,
+    $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>';
 
-  $form['bbcode']['intro'] = array('#value' => $output);
-  $form['bbcode']['boincimport_bbcode'] = array(
+    $form['bbcode']['intro'] = array('#value' => $output);
+    $form['bbcode']['boincimport_bbcode'] = array(
     '#type' => 'radios',
     '#title' => t('BBcode handling'),
     '#default_value' => variable_get('boincimport_bbcode', 0),
     '#options' => array(t('Leave BBcode as is.'), t('Transform BBcode into HTML.')),
     '#description' => '',
-  );
+    );
 
-  $module_status = _boincimport_check_module('bbcode');
-  $bbcode_disabled = ($module_status['result'] == 0) ? true : false;
-  $output = $module_status['html'];
+    $module_status = _boincimport_check_module('bbcode');
+    $bbcode_disabled = ($module_status['result'] == 0) ? true : false;
+    $output = $module_status['html'];
 
-  if (variable_get('boincimport_bbcode', 0)) {
+    if (variable_get('boincimport_bbcode', 0)) {
     if ($bbcode_disabled) {
-      $ready_for_migration = 0;
-      $form['bbcode']['#collapsed'] = FALSE;
-      $output .= '<p><span class="marker">';
-      $output .= t('The !bbcode_module is required to transform BBcode into HTML.
+        $ready_for_migration = 0;
+        $form['bbcode']['#collapsed'] = FALSE;
+        $output .= '<p><span class="marker">';
+        $output .= t('The !bbcode_module is required to transform BBcode into HTML.
         You first need to !enable_bbcode', 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')));
-      $output .= '</span></p>';
+            '!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')));
+        $output .= '</span></p>';
     }
     $sql = "SELECT COUNT(*) FROM {filters} WHERE module = 'bbcode' AND format = %d";
     $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
+        $form['bbcode']['#collapsed'] = FALSE;
+        $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>';
+            '!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('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 {
+    } else {
     if ($bbcode_disabled) {
-      $form['bbcode']['#collapsed'] = FALSE;
-      $output .= '<p>'. t('The !bbcode_module is recommended, but not required.
+        $form['bbcode']['#collapsed'] = FALSE;
+        $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>';
+            '!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>';
     }
     $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>';
+        '!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>';
-  }
-  $output .= '<p><em>'. t('This setting will be applied to all posts, private
+    }
+    $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);
+    $form['bbcode']['result'] = array('#value' => $output);
 
-  // URL transform settings
-  $form['url_transforms'] = array(
+    // URL transform settings
+    $form['url_transforms'] = array(
     '#type' => 'fieldset',
     '#title' => t('URL transforms'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
-  if (!variable_get('boincimport_base_url_boinc', 0)) {
+    );
+    if (!variable_get('boincimport_base_url_boinc', 0)) {
     $form['url_transforms']['#collapsed']= FALSE;
     $output = '<span class="marker">';
     $ready_for_migration = 0;
-  }
+    }
 
-  // List of BOINC domains possible in URLs to transform
-  $form['url_transforms']['boincimport_base_url_boinc'] = array(
+    // List of BOINC domains possible in URLs to transform
+    $form['url_transforms']['boincimport_base_url_boinc'] = array(
     '#type' => 'textarea',
     '#title' => t('BOINC base URLs to transform'),
     '#default_value' => variable_get('boincimport_base_url_boinc', ''),
     '#description' => t('List URL bases that should be transformed from
       BOINC format to Drupal format (enter one domain per line, including http://).'),
-  );
+    );
 
-  // The Drupal domain to use in URL transform results
-  $form['url_transforms']['boincimport_base_url_drupal'] = array(
+    // The Drupal domain to use in URL transform results
+    $form['url_transforms']['boincimport_base_url_drupal'] = array(
     '#type' => 'textfield',
     '#title' => t('Target Drupal base URL'),
     '#default_value' => variable_get('boincimport_base_url_drupal', ''),
     '#description' => t('Specify the URL base to use in transform results. If
       left blank, the base_url configured in this Drupal environment will be
       used (currently: %url)', array('%url' =>$base_url)),
-  );
+    );
 
-  // Are we ready for migration?
-  $form['migration'] = array(
+    // Are we ready for migration?
+    $form['migration'] = array(
     '#type' => 'fieldset',
     '#title' => 'Migration',
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
-  );
-  variable_set('boincimport_ready', $ready_for_migration);
-  if ($ready_for_migration) {
+    );
+    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>';
-  } else {
+    } else {
     $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);
-  return system_settings_form($form);
+    $form['migration']['info'] = array('#value' => $output);
+    return system_settings_form($form);
 }
 
 /**
  * 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>';
-  $output .= '<ul>';
-  $output .= '<li>'. t('Imported users, teams, and forums using the BOINC
+    $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
+    $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 .= '</ul>';
+    //User Set up
+    $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')
+        '!user_settings' => l(t('user settings'), 'admin/user/settings')
     )) .'</p>';
-  $output .= '<p>' . t('Note that avatar/picture support is not tied to user
+    $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
+    /*$output .= '<p>' . t('In order to activate avatar/picture support, you need to
     enable pictures on this page and also:') . '</p>';
   $output .= '<ul>';
   $output .= '<li>'. t('Tick the checkboxes to allow "User pictures in posts" and/or
@@ -365,73 +365,73 @@ 
     )) .'</li>';
   $output .= '</ul>'; */
 
-  // Forum Set up
-  $output .= '<h2>'. t('Forum settings') .'</h2>';
-  $output .= '<p>'. t('Check any additional changes to make on the
+    // Forum Set up
+    $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')
+        '!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
+    $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')
+        '!forum_list' =>  l(t('forum list'), 'admin/content/forum')
     )) .'</p>';
-  /*$output .= '<p>'. t('If need be, set up the private forums as explained in the
+    /*$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')))
     )) .'</p>';
     */
-  /*
+    /*
   // Redirection from old URLs:
   $output .= '<h2>'. t('Redirection from BOINC forum URLs to new Drupal forum URLs') .'</h2>';
   $output .= '<p>'. t('Enable the boincforum_redirect.module. This way, users
     accessing URLs from your old BOINC installation will be redirected to your new
     Drupal forum.') .'</p>';
   */
-  // BBcode
-  $bbcode = variable_get('boincimport_bbcode', 0);
-  if ($bbcode) {
+    // 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>';
-  } else {
+    } else {
     $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;
+    return $output;
 }
 
 /**
  * Callback admin/boinc/import
  */
 function boincimport_main() {
-  // Start with a quick sanity check on the BOINC environment
-  boinc_get_path();
-  // If that's ok, on with the show
-  $output .= t('You may want to !check_documentation before starting.', array(
+    // Start with a quick sanity check on the BOINC environment
+    boinc_get_path();
+    // If that's ok, on with the show
+    $output .= t('You may want to !check_documentation before starting.', array(
     '!check_documentation' => l(t('check the documentation'), 'http://boinc.berkeley.edu/trac/wiki/InstallDrupal', array('attributes' =>array('target' => '_blank')))
-  ));
-  $output = '<ol><li>';
-  $output .= l(t('Configure the migration'), 'admin/boinc/import/settings');
-  $output .= '</li>';
-  $output .= '<li>';
-  $output .= l(t('Execute the migration'), 'admin/boinc/import/process');
-  $output .= '</li>';
-  $output .= '<li>';
-  $output .= l(t('Post migration configuration'), 'admin/boinc/import/post_configuration');
-  $output .= '</li>';
-  $output .= '<li>';
-  $output .= t('!cleanup (Accessing this link will delete all the saved BOINC forum
+    ));
+    $output = '<ol><li>';
+    $output .= l(t('Configure the migration'), 'admin/boinc/import/settings');
+    $output .= '</li>';
+    $output .= '<li>';
+    $output .= l(t('Execute the migration'), 'admin/boinc/import/process');
+    $output .= '</li>';
+    $output .= '<li>';
+    $output .= l(t('Post migration configuration'), 'admin/boinc/import/post_configuration');
+    $output .= '</li>';
+    $output .= '<li>';
+    $output .= t('!cleanup (Accessing this link will delete all the saved BOINC forum
     conversion settings: click only when you\'re done with all the above.)', array(
-      '!cleanup' => l(t('Cleanup'), 'admin/boinc/import/cleanup')
+        '!cleanup' => l(t('Cleanup'), 'admin/boinc/import/cleanup')
     ));
-  $output .= '</li>';
-  /*$output .= '<li>';
+    $output .= '</li>';
+    /*$output .= '<li>';
   $output .= t('Enable the boincforum_redirect module for seamless redirection
     from the old forums to the new. This module requires !clean_urls to be active.', array(
       '!clean_urls' => l(t('Clean URLs'), 'admin/settings/clean-urls')
@@ -442,14 +442,14 @@ 
     uninstall BOINC forum - This will delete tables necessary for redirection. You can,
     however, deactivate the module safely.');
   $output .= '</li>';*/
-  $output .= '</ol>';
+    $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
+    // 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
     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')
+        '!reset_db_url' => l(t('Click here to reset the database url'), 'admin/boinc/import/reset')
     )) .'</p>';
 
-  return $output;
+    return $output;
 }

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/all/features/private_messages/private_messages.features.user_permission.inc

Indentation +24 added lines, -24 removed lines

@@ -4,48 +4,48 @@
  * Implementation of hook_user_default_permissions().
  */
 function private_messages_user_default_permissions() {
-  $permissions = array();
+    $permissions = array();
 
-  // Exported permission: administer privatemsg settings
-  $permissions['administer privatemsg settings'] = array(
+    // Exported permission: administer privatemsg settings
+    $permissions['administer privatemsg settings'] = array(
     'name' => 'administer privatemsg settings',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: delete privatemsg
-  $permissions['delete privatemsg'] = array(
+    // Exported permission: delete privatemsg
+    $permissions['delete privatemsg'] = array(
     'name' => 'delete privatemsg',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'authenticated user',
+        '0' => 'administrator',
+        '1' => 'authenticated user',
     ),
-  );
+    );
 
-  // Exported permission: read all private messages
-  $permissions['read all private messages'] = array(
+    // Exported permission: read all private messages
+    $permissions['read all private messages'] = array(
     'name' => 'read all private messages',
     'roles' => array(),
-  );
+    );
 
-  // Exported permission: read privatemsg
-  $permissions['read privatemsg'] = array(
+    // Exported permission: read privatemsg
+    $permissions['read privatemsg'] = array(
     'name' => 'read privatemsg',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'authenticated user',
+        '0' => 'administrator',
+        '1' => 'authenticated user',
     ),
-  );
+    );
 
-  // Exported permission: write privatemsg
-  $permissions['write privatemsg'] = array(
+    // Exported permission: write privatemsg
+    $permissions['write privatemsg'] = array(
     'name' => 'write privatemsg',
     'roles' => array(
-      '0' => 'administrator',
-      '1' => 'community member',
+        '0' => 'administrator',
+        '1' => 'community member',
     ),
-  );
+    );
 
-  return $permissions;
+    return $permissions;
 }

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/util.inc

Braces +7 added lines, -6 removed lines

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

Indentation +6 added lines, -6 removed lines

@@ -556,14 +556,14 @@
     $tnow = get_str('tnow', true);
     $ttok = get_str('ttok', true);
     if (!$tnow) {
-      if (isset($_POST['tnow'])) {
-          $tnow = $_POST['tnow'];
-      }
+        if (isset($_POST['tnow'])) {
+            $tnow = $_POST['tnow'];
+        }
     }
     if (!$ttok) {
-      if (isset($_POST['ttok'])) {
-          $ttok = $_POST['ttok'];
-      }
+        if (isset($_POST['ttok'])) {
+            $ttok = $_POST['ttok'];
+        }
     }
     if (!$tnow) return false;
     if (!$ttok) return false;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -306,7 +306,7 @@
 <link rel="stylesheet" href="custom_dark.css" media="(prefers-color-scheme: dark)">
 <link rel="stylesheet" href="sample_bootstrap.min.css" media="(prefers-color-scheme: no-preference), (prefers-color-scheme: light)">
 <link rel="stylesheet" href="custom.css" media="(prefers-color-scheme: no-preference), (prefers-color-scheme: light)">
-EOT;
+eot;
     } else {
         echo '
             <link type="text/css" rel="stylesheet" href="'.secure_url_base().'/bootstrap.min.css" media="all">

Spacing +78 added lines, -78 removed lines

@@ -33,17 +33,17 @@ 
 //
 $config = get_config();
 global $master_url;
-$master_url = parse_config($config , "<master_url>");
+$master_url = parse_config($config, "<master_url>");
 $recaptcha_public_key = parse_config($config, "<recaptcha_public_key>");
 $recaptcha_private_key = parse_config($config, "<recaptcha_private_key>");
 
 // Set parameters to defaults if not defined in config.xml
 
 $x = parse_config($config, "<user_country>");
-define('USER_COUNTRY', ($x===null)?1:(int)$x);
+define('USER_COUNTRY', ($x === null) ? 1 : (int)$x);
 
 $x = parse_config($config, "<user_url>");
-define('USER_URL', ($x===null)?1:(int)$x);
+define('USER_URL', ($x === null) ? 1 : (int)$x);
 
 // Set parameters to defaults if not defined in project.inc
 
@@ -151,10 +151,10 @@ 
 }
 
 function url_base() {
-    return is_https()?secure_url_base():URL_BASE;
+    return is_https() ?secure_url_base() : URL_BASE;
 }
 
-function send_cookie($name, $value, $permanent, $ops=false) {
+function send_cookie($name, $value, $permanent, $ops = false) {
     global $master_url;
 
     // the following allows independent login for projects on the same server
@@ -165,11 +165,11 @@ 
         $path = substr($path, 0, -1);
         $path .= "_ops/";
     }
-    $expire = $permanent?time()+3600*24*365:0;
+    $expire = $permanent ?time() + 3600*24*365 : 0;
     setcookie($name, $value, $expire, $path);
 }
 
-function clear_cookie($name, $ops=false) {
+function clear_cookie($name, $ops = false) {
     global $master_url;
     $url = parse_url($master_url);
     $path = $url['path'];
@@ -177,13 +177,13 @@ 
         $path = substr($path, 0, -1);
         $path .= "_ops/";
     }
-    setcookie($name, '', time()-3600, $path);
+    setcookie($name, '', time() - 3600, $path);
 }
 
 $g_logged_in_user = null;
 $got_logged_in_user = false;
 
-function get_logged_in_user($must_be_logged_in=true) {
+function get_logged_in_user($must_be_logged_in = true) {
     global $g_logged_in_user, $got_logged_in_user;
     if ($got_logged_in_user) {
         // this could have been called earlier with $must_be_logged_in false
@@ -209,7 +209,7 @@ 
             $next_url = $_SERVER['REQUEST_URI'];
             $n = strrpos($next_url, "/");
             if ($n) {
-                $next_url = substr($next_url, $n+1);
+                $next_url = substr($next_url, $n + 1);
             }
         }
         $next_url = urlencode($next_url);
@@ -220,7 +220,7 @@ 
     return $g_logged_in_user;
 }
 
-function show_login_info($prefix="") {
+function show_login_info($prefix = "") {
     $user = get_logged_in_user(false);
     if ($user) {
         $url_tokens = url_tokens($user->authenticator);
@@ -230,7 +230,7 @@ 
     }
 }
 
-$cache_control_extra="";
+$cache_control_extra = "";
 $is_login_page = false;
 
 // Call this to start pages.
@@ -242,11 +242,11 @@ 
 // with an existing web framework can more easily do so.
 // To do so, define page_head() in the project include file.
 //
-if (!function_exists("page_head")){
+if (!function_exists("page_head")) {
 function page_head(
     $title,
         // page title. Put in <title>, used as title for browser tab.
-    $body_attrs=null,
+    $body_attrs = null,
         // <body XXXX>
         // e.g. Javascript to put focus in an input field
         // (onload="document.form.foo.focus()")
@@ -255,10 +255,10 @@ 
         // if set, include schedulers.txt.
         // also pass to project_banner() in case you want a different
         // header for your main page.
-    $url_prefix="",
+    $url_prefix = "",
         // prepend this to links.
         // Use for web pages not in the top directory
-    $head_extra=null
+    $head_extra = null
         // extra stuff to put in <head>. E.g.:
         // reCAPTCHA code (create_profile.php)
         // bbcode javascript (forums)
@@ -280,7 +280,7 @@ 
         header("Content-type: text/html; charset=utf-8");
         header("Expires: Mon, 26 Jul 1997 05:00:00 UTC");
             // Date in the past
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " UTC");
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s")." UTC");
             // always modified
         header("Cache-Control: $cache_control_extra no-cache, must-revalidate, post-check=0, pre-check=0");
             // for HTTP/1.1
@@ -301,11 +301,11 @@ 
     if ($head_extra) {
         echo "\n$head_extra\n";
     }
-    if ($is_main && (!defined('NO_COMPUTING')||!NO_COMPUTING)) {
+    if ($is_main && (!defined('NO_COMPUTING') || !NO_COMPUTING)) {
         readfile("schedulers.txt");
     }
 
-    $t = $title?$title:PROJECT;
+    $t = $title ? $title : PROJECT;
     echo "<title>$t</title>\n";
     echo '
         <meta charset="utf-8">
@@ -362,7 +362,7 @@ 
     echo '<div class="container-fluid">
     ';
 
-    switch($title) {    //kludge
+    switch ($title) {    //kludge
     case tra("Log in"):
     case tra("Create an account"):
     case tra("Server status page"):
@@ -377,13 +377,13 @@ 
 
 // See the comments for page_head()
 //
-if (!function_exists("page_tail")){
+if (!function_exists("page_tail")) {
 function page_tail(
-    $show_date=false,
+    $show_date = false,
         // true for pages that are generated periodically rather than on the fly
-    $url_prefix="",
+    $url_prefix = "",
         // use for pages not at top level
-    $is_main=false
+    $is_main = false
         // passed to project_footer;
 ) {
     echo "<br>\n";
@@ -398,10 +398,10 @@ 
 }
 }
 
-function display_cvs_versions(){
+function display_cvs_versions() {
     global $cvs_version_tracker;
     echo "\n<!-- SVN VERSIONS -->\n";
-    for ($i=0;$i<sizeof($cvs_version_tracker);$i++) {
+    for ($i = 0; $i < sizeof($cvs_version_tracker); $i++) {
         echo "<!-- ".$cvs_version_tracker[$i]." -->\n";
     }
 }
@@ -426,24 +426,24 @@ 
 // convert time interval in seconds to a string of the form
 // 'D days h hours m min s sec'.
 
-function time_diff($x, $res=3) {
+function time_diff($x, $res = 3) {
     $x = (int)$x;
     $days    = (int)($x/86400);
-    $hours   = (int)(($x-$days*86400)/3600);
-    $minutes = (int)(($x-$days*86400-$hours*3600)/60);
-    $seconds = $x % 60;
+    $hours   = (int)(($x - $days*86400)/3600);
+    $minutes = (int)(($x - $days*86400 - $hours*3600)/60);
+    $seconds = $x%60;
 
     $s = "";
     if ($days) {
         $s .= "$days ".tra("days")." ";
     }
-    if ($res>0 && ($hours || strlen($s))) {
+    if ($res > 0 && ($hours || strlen($s))) {
         $s .= "$hours ".tra("hours")." ";
     }
-    if ($res>1 && ($minutes || strlen($s))) {
+    if ($res > 1 && ($minutes || strlen($s))) {
         $s .= "$minutes ".tra("min")." ";
     }
-    if ($res>2) {
+    if ($res > 2) {
         $s .= "$seconds ".tra("sec")." ";
     }
     return $s;
@@ -457,7 +457,7 @@ 
 
 function time_str($x) {
     if ($x == 0) return "---";
-    return gmdate('j M Y, G:i:s', (int)$x) . " UTC";
+    return gmdate('j M Y, G:i:s', (int)$x)." UTC";
 }
 
 function local_time_str($x) {
@@ -469,14 +469,14 @@ 
     return time_str($x);
 }
 
-function start_table_str($class="", $style="") {
-    $s = $style?'style="'.$style.'"':'';
+function start_table_str($class = "", $style = "") {
+    $s = $style ? 'style="'.$style.'"' : '';
     return '<div class="table">
       <table '.$s.' width="100%" class="table table-condensed '.$class.'" >
     ';
 }
 
-function start_table($class="", $style="") {
+function start_table($class = "", $style = "") {
     echo start_table_str($class, $style);
 }
 
@@ -521,7 +521,7 @@ 
     echo "</tr>\n";
 }
 
-function row1($x, $ncols=2, $class="heading") {
+function row1($x, $ncols = 2, $class = "heading") {
     if ($class == "heading") {
         echo "<tr><th class=\"bg-primary\" colspan=\"$ncols\">$x</th></tr>\n";
     } else {
@@ -535,10 +535,10 @@ 
 
 // a table row with 2 columns, with the left on right-aligned
 
-function row2($x, $y, $show_error=false, $lwidth='40%') {
-    if ($x==="") $x="<br>";
-    if ($y==="") $y="<br>";
-    $attrs = $show_error?VALUE_ATTRS_ERR:VALUE_ATTRS;
+function row2($x, $y, $show_error = false, $lwidth = '40%') {
+    if ($x === "") $x = "<br>";
+    if ($y === "") $y = "<br>";
+    $attrs = $show_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
     echo "<tr>
         <td width=\"$lwidth\" ".NAME_ATTRS.">$x</td>
         <td $attrs >$y</td>
@@ -549,7 +549,7 @@ 
 // output the first part of row2();
 // then write the content, followed by </td></tr>
 
-function row2_init($x, $lwidth='40%') {
+function row2_init($x, $lwidth = '40%') {
     echo sprintf('<tr>
         <td width="%s" %s>%s</td>
         <td %s>',
@@ -565,31 +565,31 @@ 
     echo "<tr><td>$string</td></tr>";
 }
 
-function row_array($x, $attrs=null) {
+function row_array($x, $attrs = null) {
     echo "<tr>\n";
     $i = 0;
     foreach ($x as $h) {
-        $a = $attrs?$attrs[$i]:"";
+        $a = $attrs ? $attrs[$i] : "";
         echo "<td $a>$h</td>\n";
         $i++;
     }
     echo "</tr>\n";
 }
 
-define ('ALIGN_RIGHT', 'style="text-align:right;"');
+define('ALIGN_RIGHT', 'style="text-align:right;"');
 
-function row_heading_array($x, $attrs=null, $class='bg-primary') {
+function row_heading_array($x, $attrs = null, $class = 'bg-primary') {
     echo "<tr>";
     $i = 0;
     foreach ($x as $h) {
-        $a = $attrs?$attrs[$i]:"";
+        $a = $attrs ? $attrs[$i] : "";
         echo "<th $a class=\"$class\">$h</th>";
         $i++;
     }
     echo "</tr>\n";
 }
 
-function row_heading($x, $class='bg-primary') {
+function row_heading($x, $class = 'bg-primary') {
     echo sprintf('<tr><th class="%s" colspan=99>%s</th></tr>
         ', $class, $x
     );
@@ -649,7 +649,7 @@ 
 // If $ellipsis is true, then an ellipsis is added to any sentence which
 // is cut short.
 
-function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis=false) {
+function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis = false) {
     $words = explode($delimiter, $sentence);
     $total_chars = 0;
     $trunc = false;
@@ -732,8 +732,8 @@ 
 
 // returns null if the arg is optional and missing
 //
-function get_int($name, $optional=false) {
-    $x=null;
+function get_int($name, $optional = false) {
+    $x = null;
     if (isset($_GET[$name])) $x = $_GET[$name];
     if (!is_numeric($x)) {
         if ($optional) {
@@ -752,7 +752,7 @@ 
 
 // returns null if the arg is optional and missing
 //
-function post_num($name, $optional=false) {
+function post_num($name, $optional = false) {
     $x = null;
     if (isset($_POST[$name])) $x = $_POST[$name];
     if (!is_numeric($x)) {
@@ -767,7 +767,7 @@ 
 
 // returns null if the arg is optional and missing
 //
-function post_int($name, $optional=false) {
+function post_int($name, $optional = false) {
     $x = post_num($name, $optional);
     if (is_null($x)) return null;
     $y = (int)$x;
@@ -785,7 +785,7 @@ 
     }
 }
 
-function get_str($name, $optional=false) {
+function get_str($name, $optional = false) {
     if (isset($_GET[$name])) {
         $x = $_GET[$name];
     } else {
@@ -797,7 +797,7 @@ 
     return undo_magic_quotes($x);
 }
 
-function post_str($name, $optional=false) {
+function post_str($name, $optional = false) {
     if (isset($_POST[$name])) {
         $x = $_POST[$name];
     } else {
@@ -809,7 +809,7 @@ 
     return undo_magic_quotes($x);
 }
 
-function post_arr($name, $optional=false) {
+function post_arr($name, $optional = false) {
     if (isset($_POST[$name]) && is_array($_POST[$name])) {
         $x = $_POST[$name];
     } else {
@@ -825,7 +825,7 @@ 
     // the mb_* functions are not included by default
     // return (mb_detect_encoding($passwd) -= 'ASCII');
 
-    for ($i=0; $i<strlen($str); $i++) {
+    for ($i = 0; $i < strlen($str); $i++) {
         $c = ord(substr($str, $i));
         if ($c < 32 || $c > 127) return false;
     }
@@ -849,7 +849,7 @@ 
     $number = str_replace(',', '.', $number); // replace the german decimal separator
     // if no value was entered and this is ok
     //
-    if ($number=='' && !$low) return true;
+    if ($number == '' && !$low) return true;
 
     // the supplied value contains alphabetic characters
     //
@@ -866,7 +866,7 @@ 
 
 // Generate a "select" element from an array of values
 //
-function select_from_array($name, $array, $selection=null, $width=240) {
+function select_from_array($name, $array, $selection = null, $width = 240) {
     $out = '<select style="color:#000;"class="form-control input-sm" style="width:'.$width.'px" name="'.$name.'">"';
 
     foreach ($array as $key => $value) {
@@ -891,8 +891,8 @@ 
     return $str;
 }
 
-function strip_bbcode($string){
-    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
+function strip_bbcode($string) {
+    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/", "", $string);
 }
 
 function current_url() {
@@ -917,7 +917,7 @@ 
 // the colors for bootstrap's btn-success are almost illegible;
 // the green is too light.  Use a darker green.
 //
-function button_style($color='green', $font_size=null) {
+function button_style($color = 'green', $font_size = null) {
     $fs = '';
     if ($font_size) {
         $fs = sprintf('; font-size:%dpx', $font_size);
@@ -936,7 +936,7 @@ 
 // class: class of the button, e.g. btn
 // extra: Additional text in href tag
 //
-function button_text($url, $text, $desc=null, $class=null, $extra='') {
+function button_text($url, $text, $desc = null, $class = null, $extra = '') {
     if (!$desc) {
         $desc = $text;
     }
@@ -951,23 +951,23 @@ 
     );
 }
 
-function button_text_small($url, $text, $desc=null) {
+function button_text_small($url, $text, $desc = null) {
     return button_text($url, $text, $desc, "btn btn-xs", button_style());
 }
 
-function show_button($url, $text, $desc=null, $class=null, $extra=null) {
+function show_button($url, $text, $desc = null, $class = null, $extra = null) {
     echo button_text($url, $text, $desc, $class, $extra);
 }
 
 // for places with a bunch of buttons, like forum posts
 //
-function show_button_small($url, $text, $desc=null) {
+function show_button_small($url, $text, $desc = null) {
     echo button_text_small($url, $text, $desc);
 }
 
 // used for showing icons
 //
-function show_image($src, $title, $alt, $height=null) {
+function show_image($src, $title, $alt, $height = null) {
     $h = "";
     if ($height) {
         $h = "height=\"$height\"";
@@ -1004,7 +1004,7 @@ 
 // tries instead to connect to <replica_db_host> if tag exists.
 // DEPRECATED - use boinc_db.inc
 //
-function db_init($try_replica=false) {
+function db_init($try_replica = false) {
     check_web_stopped();
     $retval = db_init_aux($try_replica);
     if ($retval == 1) {
@@ -1120,7 +1120,7 @@ 
 // Check this to avoid XSS vulnerability
 //
 function sanitize_sort_by($x) {
-    switch($x) {
+    switch ($x) {
     case 'expavg_credit':
     case 'total_credit':
         return;
@@ -1138,7 +1138,7 @@ 
 }
 
 function do_download($path) {
-    $name=basename($path);
+    $name = basename($path);
     header('Content-Description: File Transfer');
     header('Content-Type: application/octet-stream');
     header('Content-Disposition: attachment; filename='.$name);
@@ -1146,7 +1146,7 @@ 
     header('Expires: 0');
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
-    header('Content-Length: ' . filesize($path));
+    header('Content-Length: '.filesize($path));
     flush();
     readfile($path);
 }
@@ -1195,10 +1195,10 @@ 
 // Otherwise return 0.
 // Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
 //
-function boinc_client_version(){
+function boinc_client_version() {
     if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
     $x = $_SERVER['HTTP_USER_AGENT'];
-    $e =  "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
+    $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
     if (preg_match($e, $x, $matches)) {
         return $matches[1]*10000 + $matches[2]*100 + $matches[3];
     }
@@ -1227,7 +1227,7 @@ 
     $rem_name = $name."_remaining";
     return "<textarea name=\"$name\" class=\"form-control\" rows=3 id=\"$name\" onkeydown=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\"
         onkeyup=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\">".$text."</textarea>
-        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen-strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
+        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen - strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
     ;
 }
 
@@ -1257,7 +1257,7 @@ 
 // use the following around text with long lines,
 // to limit the width and make it more readable.
 //
-function text_start($width=640) {
+function text_start($width = 640) {
     echo sprintf("<div style=\"max-width: %dpx;\">\n", $width);
 }
 function text_end() {
@@ -1283,7 +1283,7 @@ 
 }
 
 function cert_filename() {
-    return defined("CERT_FILENAME")?CERT_FILENAME:"cert1.php";
+    return defined("CERT_FILENAME") ?CERT_FILENAME:"cert1.php";
 }
 
 // if user hasn't validated their email addr, tell them to
@@ -1300,6 +1300,6 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

drupal/sites/default/boinc/modules/boinccore/includes/boinccore.rules.inc

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 function boinccore_rules_event_info() {
   return array(
     'boinccore_comment_convert' => array(
-      'label' => bts('A comment was converted to a new forum topic.', array(), NULL, 'boinc:rule-event'),
+      'label' => bts('A comment was converted to a new forum topic.', array(), null, 'boinc:rule-event'),
       'module' => 'BOINCcore',
       'arguments' => rules_events_hook_comment_arguments(t('converted comment')),
     ),

Indentation +8 added lines, -8 removed lines

@@ -16,16 +16,16 @@
  */
 
 function boinccore_rules_event_info() {
-  return array(
+    return array(
     'boinccore_comment_convert' => array(
-      'label' => bts('A comment was converted to a new forum topic.', array(), NULL, 'boinc:rule-event'),
-      'module' => 'BOINCcore',
-      'arguments' => rules_events_hook_comment_arguments(t('converted comment')),
+        'label' => bts('A comment was converted to a new forum topic.', array(), NULL, 'boinc:rule-event'),
+        'module' => 'BOINCcore',
+        'arguments' => rules_events_hook_comment_arguments(t('converted comment')),
     ),
     'boinccore_comment_unhidden' => array(
-      'label' => bts('A comment was unhidden.', array(), 'boinc:rule-event'),
-      'module' => 'BOINCcore',
-      'arguments' => rules_events_hook_comment_arguments(t('unhidden comment')),
+        'label' => bts('A comment was unhidden.', array(), 'boinc:rule-event'),
+        'module' => 'BOINCcore',
+        'arguments' => rules_events_hook_comment_arguments(t('unhidden comment')),
     ),
-  );
+    );
 }
\ No newline at end of file

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

Indentation +19 added lines, -19 removed lines

@@ -12,33 +12,33 @@
  */
 
 
-  require_once('./includes/bootstrap.inc');
-  drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-  require_boinc('db');
+    require_once('./includes/bootstrap.inc');
+    drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+    require_boinc('db');
   
-  // Parse arguments
-  $record_offset = isset($argv[1]) ? $argv[1] : 0;
-  $chunk_size = isset($argv[2]) ? $argv[2] : 100;
+    // Parse arguments
+    $record_offset = isset($argv[1]) ? $argv[1] : 0;
+    $chunk_size = isset($argv[2]) ? $argv[2] : 100;
   
-  // Construct sql conditions
-  $limit = sprintf('LIMIT %d,%d', $record_offset, $chunk_size);
+    // Construct sql conditions
+    $limit = sprintf('LIMIT %d,%d', $record_offset, $chunk_size);
   
-  $total_count = 0;
+    $total_count = 0;
   
-  // Get the users with subscriptions to import
-  db_set_active('boinc_rw');
-  $subscribed_boinc_users = db_query("
+    // Get the users with subscriptions to import
+    db_set_active('boinc_rw');
+    $subscribed_boinc_users = db_query("
     SELECT DISTINCT userid FROM {subscriptions}
     ORDER BY userid ASC %s", $limit
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  // Import subscriptions
-  while ($boinc_subscription = db_fetch_object($subscribed_boinc_users)) {
+    // Import subscriptions
+    while ($boinc_subscription = db_fetch_object($subscribed_boinc_users)) {
     $uid = get_drupal_id($boinc_subscription->userid);
     $count = boincuser_pull_subscriptions($uid);
     $total_count += $count;
     echo "\nuser: {$uid}; boinc_id: {$boinc_subscription->userid}; {$count} subscriptions";
-  }
-  echo "\n";
-  echo $total_count;
+    }
+    echo "\n";
+    echo $total_count;

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

Indentation +22 added lines, -22 removed lines

@@ -12,26 +12,26 @@ 
  */
 
 
-  require_once('./includes/bootstrap.inc');
-  drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-  require_boinc('db');
+    require_once('./includes/bootstrap.inc');
+    drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+    require_boinc('db');
   
-  // Parse arguments
-  $import_lurkers = isset($argv[1]) ? $argv[1] : false;
-  $record_offset = isset($argv[2]) ? $argv[2] : 0;
-  $chunk_size = isset($argv[3]) ? $argv[3] : 100;
+    // Parse arguments
+    $import_lurkers = isset($argv[1]) ? $argv[1] : false;
+    $record_offset = isset($argv[2]) ? $argv[2] : 0;
+    $chunk_size = isset($argv[3]) ? $argv[3] : 100;
   
-  // Construct sql conditions
-  $limit = sprintf('LIMIT %d,%d', $record_offset, $chunk_size);
+    // Construct sql conditions
+    $limit = sprintf('LIMIT %d,%d', $record_offset, $chunk_size);
   
-  $count = 0;
+    $count = 0;
   
-  db_set_active('boinc_rw');
-  if ($import_lurkers) {
+    db_set_active('boinc_rw');
+    if ($import_lurkers) {
     $boinc_accounts = db_query('SELECT id FROM user ORDER BY id %s', $limit);
-  }
-  //else $boinc_accounts = db_query('SELECT DISTINCT user AS boinc_id FROM post ORDER BY boinc_id %s', $limit);
-  else {
+    }
+    //else $boinc_accounts = db_query('SELECT DISTINCT user AS boinc_id FROM post ORDER BY boinc_id %s', $limit);
+    else {
     // Need to import any user who is currently ignored in order to keep them
     // ignored... not particularly clean (ignored users are stored in a string)
     $ignored_user_list = array();
@@ -42,7 +42,7 @@ 
       ORDER BY userid ASC"
     );
     while ($ignoring_user = db_fetch_object($ignoring_users)) {
-      $ignored_user_list = $ignored_user_list + array_fill_keys(explode('|', trim($ignoring_user->ignorelist, '|')), 1);
+        $ignored_user_list = $ignored_user_list + array_fill_keys(explode('|', trim($ignoring_user->ignorelist, '|')), 1);
     }
     $ignored_user_list = array_keys($ignored_user_list);
     $boinc_accounts = db_query("
@@ -58,14 +58,14 @@ 
         (SELECT DISTINCT senderid FROM {private_messages})
       ) AS usersToImport ORDER BY id ASC %s", implode(',', $ignored_user_list), $limit
     );
-  }
-  db_set_active('default');
+    }
+    db_set_active('default');
   
-  while ($boinc_account = db_fetch_object($boinc_accounts)) {
+    while ($boinc_account = db_fetch_object($boinc_accounts)) {
     // Grab the BOINC user object and create a Drupal user from it
     if (boincuser_register_make_drupal_user($boinc_account->id)) {
-      $count++;
+        $count++;
+    }
     }
-  }
   
-  echo $count;
+    echo $count;

drupal/sites/default/settings.php

Indentation +6 added lines, -6 removed lines

@@ -114,10 +114,10 @@ 
  */
 require_once('dbconfig.php');
 if (!isset($dbserver) || empty($dbserver))
-  $dbserver='localhost';
+    $dbserver='localhost';
 $db_url = array(
-  'default' => "{$dbtype}://{$dbuser}:".urlencode($dbpass)."@{$dbserver}/{$dbname}",
-  'boinc_rw' => "{$boinc_rw_dbtype}://{$boinc_rw_dbuser}:".urlencode($boinc_rw_dbpass)."@{$boinc_rw_dbserver}/{$boinc_rw_dbname}"
+    'default' => "{$dbtype}://{$dbuser}:".urlencode($dbpass)."@{$dbserver}/{$dbname}",
+    'boinc_rw' => "{$boinc_rw_dbtype}://{$boinc_rw_dbuser}:".urlencode($boinc_rw_dbpass)."@{$boinc_rw_dbserver}/{$boinc_rw_dbname}"
 );
 $db_prefix = '';
 
@@ -125,10 +125,10 @@ 
 // 'boinc_rw' entry as 'boinc_ro'.
 
 if (isset($boinc_ro_dbtype) && isset($boinc_ro_dbuser) && isset($boinc_ro_dbpass) && isset($boinc_ro_dbserver) && isset($boinc_ro_dbname)) {
-  $db_url['boinc_ro'] = "{$boinc_ro_dbtype}://{$boinc_ro_dbuser}:".urlencode($boinc_ro_dbpass)."@{$boinc_ro_dbserver}/{$boinc_ro_dbname}";
+    $db_url['boinc_ro'] = "{$boinc_ro_dbtype}://{$boinc_ro_dbuser}:".urlencode($boinc_ro_dbpass)."@{$boinc_ro_dbserver}/{$boinc_ro_dbname}";
 }
 else {
-  $db_url['boinc_ro'] = $db_url['boinc_rw'];
+    $db_url['boinc_ro'] = $db_url['boinc_rw'];
 }
 
 /**
@@ -216,5 +216,5 @@ 
  */
 
 if (stream_resolve_include_path('settings.local.php')) {
-  include 'settings.local.php';
+    include 'settings.local.php';
 }

Braces +1 added lines, -2 removed lines

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

Spacing +8 added lines, -8 removed lines

@@ -114,7 +114,7 @@ 
  */
 require_once('dbconfig.php');
 if (!isset($dbserver) || empty($dbserver))
-  $dbserver='localhost';
+  $dbserver = 'localhost';
 $db_url = array(
   'default' => "{$dbtype}://{$dbuser}:".urlencode($dbpass)."@{$dbserver}/{$dbname}",
   'boinc_rw' => "{$boinc_rw_dbtype}://{$boinc_rw_dbuser}:".urlencode($boinc_rw_dbpass)."@{$boinc_rw_dbserver}/{$boinc_rw_dbname}"
@@ -162,14 +162,14 @@ 
  * settings are used there. Settings defined here should not be
  * duplicated there so as to avoid conflict issues.
  */
-ini_set('session.cache_expire',     200000);
-ini_set('session.cache_limiter',    'none');
-ini_set('session.cookie_lifetime',  2000000);
-ini_set('session.gc_maxlifetime',   200000);
-ini_set('session.save_handler',     'user');
+ini_set('session.cache_expire', 200000);
+ini_set('session.cache_limiter', 'none');
+ini_set('session.cookie_lifetime', 2000000);
+ini_set('session.gc_maxlifetime', 200000);
+ini_set('session.save_handler', 'user');
 ini_set('session.use_only_cookies', 1);
-ini_set('session.use_trans_sid',    0);
-ini_set('url_rewriter.tags',        '');
+ini_set('session.use_trans_sid', 0);
+ini_set('url_rewriter.tags', '');
 ini_set('memory_limit', '128M');
 ini_set('post_max_size', '8MB');
 ini_set('upload_max_filesize', '8MB');