BOINC / boinc

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_team.php

Indentation +45 added lines, -45 removed lines

@@ -11,56 +11,56 @@ 
  * at a time and avoid exhausting memory.
  */
 
-  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
-  $team_id = isset($argv[1]) ? $argv[1] : null;
-  $team_type_tid = isset($argv[2]) ? $argv[2] : null;
-  $input_format = isset($argv[3]) ? $argv[3] : null;
+    // Parse arguments
+    $team_id = isset($argv[1]) ? $argv[1] : null;
+    $team_type_tid = isset($argv[2]) ? $argv[2] : null;
+    $input_format = isset($argv[3]) ? $argv[3] : null;
   
-  $count = 0;
+    $count = 0;
   
-  // Get teams from BOINC
-  db_set_active('boinc_rw');
-  $boincteam = db_fetch_object(db_query('SELECT * FROM team WHERE id=%d', array($team_id)));
-  $boincteam_members = db_query('SELECT id FROM user WHERE teamid=%d', array($team_id));
-  $boincteam_admin = (int) db_result(db_query('SELECT userid FROM team_admin WHERE teamid=%d', array($team_id)));
-  db_set_active('default');
+    // Get teams from BOINC
+    db_set_active('boinc_rw');
+    $boincteam = db_fetch_object(db_query('SELECT * FROM team WHERE id=%d', array($team_id)));
+    $boincteam_members = db_query('SELECT id FROM user WHERE teamid=%d', array($team_id));
+    $boincteam_admin = (int) db_result(db_query('SELECT userid FROM team_admin WHERE teamid=%d', array($team_id)));
+    db_set_active('default');
   
-  $team_exists = db_query('SELECT team_id FROM {boincteam} WHERE team_id = %d', $boincteam->id);
-  // FIXME: $team_exists==FALSE should be handled as an error and return an error code!
+    $team_exists = db_query('SELECT team_id FROM {boincteam} WHERE team_id = %d', $boincteam->id);
+    // FIXME: $team_exists==FALSE should be handled as an error and return an error code!
 
-  if ($team_exists != FALSE && db_fetch_object($team_exists) == FALSE) {
+    if ($team_exists != FALSE && db_fetch_object($team_exists) == FALSE) {
     $boincteam->description = _boincimport_text_sanitize($boincteam->description);
     $teaser = node_teaser($boincteam->description);
     
     // Construct the team as an organic group 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
     );
     
     // Use pathauto function, if available, to clean up the path
     if (module_exists('pathauto')) {
-      module_load_include('inc', 'pathauto', 'pathauto');
-      $node['path'] = pathauto_cleanstring($boincteam->name);
+        module_load_include('inc', 'pathauto', 'pathauto');
+        $node['path'] = pathauto_cleanstring($boincteam->name);
     }
     else {
-      echo 'Pathauto module is required!';
-      exit;
+        echo 'Pathauto module is required!';
+        exit;
     }
     
     $node = (object) $node; // node_save requires an object form
@@ -72,22 +72,22 @@ 
     
     // Save the team IDs to a BOINC <--> Drupal reference table.
     db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boincteam->id, $node->nid);
-  }
+    }
   
-  // Determine team membership
-  db_set_active('boinc_rw');
-  $boincteam_member_ids = array();
-  while ($boincuser = db_fetch_object($boincteam_members)) $boincteam_member_ids[] = $boincuser->id;
-  db_set_active('default');
-  if ($boincteam_member_ids) {
+    // Determine team membership
+    db_set_active('boinc_rw');
+    $boincteam_member_ids = array();
+    while ($boincuser = db_fetch_object($boincteam_members)) $boincteam_member_ids[] = $boincuser->id;
+    db_set_active('default');
+    if ($boincteam_member_ids) {
     $team_members = db_query('SELECT uid FROM {boincuser} WHERE boinc_id IN(%s)', implode(',', $boincteam_member_ids));
     $team_admin = (int) db_result(db_query('SELECT uid FROM {boincuser} WHERE boinc_id=%d', $boincteam_admin));
     
     while ($drupal_user = db_fetch_object($team_members)) {
-      // Add action to take on member accounts?
-      $count++;
+        // Add action to take on member accounts?
+        $count++;
+    }
     }
-  }
   
-  echo $count;
+    echo $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/boinc/modules/boincimport/boincimport.module

Indentation +1723 added lines, -1723 removed lines

@@ -19,9 +19,9 @@ 
  * Implementation of hook_menu()
  */
 function boincimport_menu() {
-  $items = array();
+    $items = array();
   
-  $items['admin/boinc/import'] = array(
+    $items['admin/boinc/import'] = array(
     'title' => 'Environment: Data import',
     'description' => 'Overview of the BOINC data import process.',
     'access callback' => 'user_access',
@@ -29,8 +29,8 @@ 
     'page callback' => 'boincimport_main',
     'file' => 'boincimport.pages.inc',
     'type' => MENU_NORMAL_ITEM,
-  );
-  $items['admin/boinc/import/post_configuration'] = array(
+    );
+    $items['admin/boinc/import/post_configuration'] = array(
     'title' => 'Post-migration configuration',
     'description' => 'Tie up a few odds and ends in the system configuration
       after data importation is complete.',
@@ -39,44 +39,44 @@ 
     'page callback' => 'boincimport_post_configuration', 
     'file' => 'boincimport.pages.inc',
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/cleanup'] = array(
+    );
+    $items['admin/boinc/import/cleanup'] = array(
     'title' => 'Cleanup',
     'access callback' => 'user_access',
     'access arguments' => array('import boinc data'),
     'page callback' => 'boincimport_cleanup', 
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/complete/%'] = array(
+    );
+    $items['admin/boinc/import/complete/%'] = array(
     'title' => 'Complete',
     'access callback' => 'user_access',
     'access arguments' => array('import boinc data'),
     'page callback' => 'boincimport_complete',
     'page arguments' => array(4),
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/process'] = array(
+    );
+    $items['admin/boinc/import/process'] = array(
     'title' => 'Execute migration',
     'access callback' => 'user_access',
     'access arguments' => array('import boinc data'),
     'page callback' => 'boincimport_process', 
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/reset'] = array(
+    );
+    $items['admin/boinc/import/reset'] = array(
     'title' => 'Reset BOINC database URL',
     'access callback' => 'user_access',
     'access arguments' => array('import boinc data'),
     'page callback' => 'boincimport_reset',
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/unlock'] = array(
+    );
+    $items['admin/boinc/import/unlock'] = array(
     'title' => 'Unlock BOINC import process',
     'access callback' => 'user_access',
     'access arguments' => array('import boinc data'),
     'page callback' => 'boincimport_unlock',
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/import/settings'] = array(
+    );
+    $items['admin/boinc/import/settings'] = array(
     'title' => 'BOINC data import settings',
     'description' => 'Configure the BOINC data import process in preparation
       for pulling user accounts, teams, and forums into Drupal.',
@@ -86,37 +86,37 @@ 
     'page arguments' => array('boincimport_admin_settings'),
     'file' => 'boincimport.pages.inc',
     'type' => MENU_CALLBACK,
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implementation of hook_perm()
  */
 function boincimport_perm() {
-  return array('import boinc data');
+    return array('import boinc data');
 }
 
 /**
  * Callback admin/boinc/import/reset
  */
 function boincimport_reset() {
-  global $db_url;
-  $boinc_db_url = (is_array($db_url)) ? (isset($db_url['boinc_rw']) ? $db_url['boinc_rw'] : $db_url['default']) : $db_url;
-  variable_set('boincimport_db_url', $boinc_db_url);
-  variable_set('boincimport_ready', 0);
-  return '<p>'. t('The BOINC database URL has been reset. You may now <a href="@configlink">go back to the configuration page</a>.',
-      array('@configlink' => url('admin/boinc/import/settings'))) .'</p>';
+    global $db_url;
+    $boinc_db_url = (is_array($db_url)) ? (isset($db_url['boinc_rw']) ? $db_url['boinc_rw'] : $db_url['default']) : $db_url;
+    variable_set('boincimport_db_url', $boinc_db_url);
+    variable_set('boincimport_ready', 0);
+    return '<p>'. t('The BOINC database URL has been reset. You may now <a href="@configlink">go back to the configuration page</a>.',
+        array('@configlink' => url('admin/boinc/import/settings'))) .'</p>';
 }
 
 /**
  * Callback admin/boinc/import/unlock
  */
 function boincimport_unlock() {
-  variable_del('boincimport_process_locked');
-  return '<p>'. t('The BOINC data import process has been unlocked. You may
+    variable_del('boincimport_process_locked');
+    return '<p>'. t('The BOINC data import process has been unlocked. You may
     now !proceed_with_import.', array(
-      '!proceed_with_import' => l(t('proceed with the import'),
+        '!proceed_with_import' => l(t('proceed with the import'),
         'admin/boinc/import/process')
     )) .'</p>';
 }
@@ -125,7 +125,7 @@ 
  * Callback admin/boinc/import/cleanup
  */
 function boincimport_cleanup() {
-  return boincimport_process_cleanup() .'<p>'. t('Drupal database cleaned.') .'</p>';
+    return boincimport_process_cleanup() .'<p>'. t('Drupal database cleaned.') .'</p>';
 }
 
 /**
@@ -139,23 +139,23 @@ 
  * want to test. Therefore, the test part of the code is not used, now.
  */
 function _boincimport_db_connect($test= 0) {
-  global $db_url;
-  $db_ready = variable_get('boincimport_db_configured', 1);
-  if (!$db_ready) {
+    global $db_url;
+    $db_ready = variable_get('boincimport_db_configured', 1);
+    if (!$db_ready) {
     if (is_array($db_url)) {
-      $db_url2 = $db_url;
+        $db_url2 = $db_url;
     } else {
-      $db_url2['default'] = $db_url;
+        $db_url2['default'] = $db_url;
     }
     $db_url2['boinc_rw'] = variable_get('boincimport_db_url', $db_url);
     $GLOBALS['db_url'] =& $db_url2;
     if ($test) {
-      if (!db_connect($db_url2['boinc_rw'])) {
+        if (!db_connect($db_url2['boinc_rw'])) {
         return 0;
-      }
+        }
     }
-  }
-  return 1;
+    }
+    return 1;
   
 }
 
@@ -167,17 +167,17 @@ 
  *    $out['result'] = boolean.
  */
 function _boincimport_check_module($module) {
-  $out['html'] = '<ul>';
-  $result = module_exists($module);
-  $out['result'] = $result;
-  if ($result == 1) {
+    $out['html'] = '<ul>';
+    $result = module_exists($module);
+    $out['result'] = $result;
+    if ($result == 1) {
     $out['html'] .= '<li>'. t('Module %module is enabled. OK!', array('%module' => $module)) .'</li>';
-  }
-  else {
+    }
+    else {
     $out['html'] .= '<li><span class="marker">'. t('Module %module is disabled.', array('%module' => $module)) .'</span></li>';
-  }
-  $out['html'] .= '</ul>';
-  return $out;
+    }
+    $out['html'] .= '</ul>';
+    return $out;
 }
 
 /**
@@ -188,258 +188,258 @@ 
  *   $out['result'] = boolean.
  */
 function _boincimport_check_tables($tables = array(), $db = 'default' , $prefix = 1) {
-  _boincimport_db_connect();
+    _boincimport_db_connect();
 
-  $out['html'] = '<ul>';
-  $out['result']= 1;
-  foreach ($tables as $table) {
+    $out['html'] = '<ul>';
+    $out['result']= 1;
+    foreach ($tables as $table) {
     if ($prefix) {
-      $table = db_prefix_tables('{'. $table .'}');
+        $table = db_prefix_tables('{'. $table .'}');
     }  
 
     db_set_active($db);
     if ($GLOBALS['db_type'] == 'pgsql') {
-      // adapt from db_table_exists in database.pgsql.inc
-      $result = (bool) db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
+        // adapt from db_table_exists in database.pgsql.inc
+        $result = (bool) db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
     }
     else {
-      // adapt from db_table_exists in database.mysql.inc
-      $result = (bool) db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
+        // adapt from db_table_exists in database.mysql.inc
+        $result = (bool) db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
     }
     db_set_active('default');
     if ($result) {
-      $out['html'] .= '<li>'. t('Table %table: OK!', array('%table' => $table)) .'</li>';
+        $out['html'] .= '<li>'. t('Table %table: OK!', array('%table' => $table)) .'</li>';
     }
     else {
-      $out['html'] .= '<li><span class="marker">'. t('Table <strong>%table</strong> does not exist!', array('%table' => $table)) .'</span></li>';
-      $out['result']= 0;
+        $out['html'] .= '<li><span class="marker">'. t('Table <strong>%table</strong> does not exist!', array('%table' => $table)) .'</span></li>';
+        $out['result']= 0;
     }
-  }
-  $out['html'] .= '</ul>';
-  return $out;
+    }
+    $out['html'] .= '</ul>';
+    return $out;
 }
 
 
 
 function boincimport_process() {
-  // 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();
   
-  if (!variable_get('boincimport_ready', 0)) {
+    if (!variable_get('boincimport_ready', 0)) {
     return '<p>'. t('You cannot import the data now. Please <a href="@settings">complete the setup first</a>', array('@settings' => url('admin/boinc/import/settings'))) .'</p>';
-  }
+    }
 
-  $output = 'BOINC import process form';
-  $output .= drupal_get_form('boincimport_process_form');
-  return $output;
+    $output = 'BOINC import process form';
+    $output .= drupal_get_form('boincimport_process_form');
+    return $output;
 }
 
 function boincimport_process_form() {
-  $form = array();
-  _boincimport_db_connect() ;
-  // Causes problems with form api redirect
-  //ini_set('display_errors', TRUE);
+    $form = array();
+    _boincimport_db_connect() ;
+    // Causes problems with form api redirect
+    //ini_set('display_errors', TRUE);
 
-  // Adjust how long you want the script to run...
-  if (!ini_get('safe_mode')) {
+    // Adjust how long you want the script to run...
+    if (!ini_get('safe_mode')) {
     set_time_limit(variable_get('boincimport_time_limit', 0));
-  }
+    }
   
-  // Check for a lock on the import process
-  if (variable_get('boincimport_process_locked', 0)) {
+    // Check for a lock on the import process
+    if (variable_get('boincimport_process_locked', 0)) {
     drupal_set_message(t('The import process is locked. If you are sure that
       it is no longer running, you may !unlock_it', 
-      array('!unlock_it' => l(t('release the lock'),
+        array('!unlock_it' => l(t('release the lock'),
         'admin/boinc/import/unlock')
-      )), 'warning');
+        )), 'warning');
     watchdog('boincimport', 'The import process is locked. If you are sure that
       it is no longer running, you may !unlock_it', 
-      array('!unlock_it' => l(t('release the lock'),
+        array('!unlock_it' => l(t('release the lock'),
         'admin/boinc/import/unlock')
-      ), WATCHDOG_WARNING); 
-  }
-  else {
+        ), WATCHDOG_WARNING); 
+    }
+    else {
     $boincimport_functions = array(
-      'users' => t('Import users'),
-      'teams' => t('Import teams'),
-      'friends' => t('Import friendships'), 
-      'preferences' => t('Import user preferences'),
-      'private messages' => t('Import private messages'),
-      'categories' => t('Import forum containers'),
-      'topics' => t('Import topics'),
-      'posts' => t('Import posts'),
-      'team forums' => t('Import team forums'),
-      'team topics' => t('Import team topics'),
-      'team posts' => t('Import team posts'),
-      'url' => t('Transform URLs'),
+        'users' => t('Import users'),
+        'teams' => t('Import teams'),
+        'friends' => t('Import friendships'), 
+        'preferences' => t('Import user preferences'),
+        'private messages' => t('Import private messages'),
+        'categories' => t('Import forum containers'),
+        'topics' => t('Import topics'),
+        'posts' => t('Import posts'),
+        'team forums' => t('Import team forums'),
+        'team topics' => t('Import team topics'),
+        'team posts' => t('Import team posts'),
+        'url' => t('Transform URLs'),
     );
 
     $form['import'] = array(
-      '#type' => 'select',
-      '#title' => t('Next import to perform'),
-      '#default_value' => $_SESSION['boincimport_stage_selected'],
-      '#options' => $boincimport_functions,
+        '#type' => 'select',
+        '#title' => t('Next import to perform'),
+        '#default_value' => $_SESSION['boincimport_stage_selected'],
+        '#options' => $boincimport_functions,
     );
     $form[] = array(
-      '#type' => 'submit',
-      '#value' => t('Import'),
+        '#type' => 'submit',
+        '#value' => t('Import'),
     );
-  }
-  return $form;
+    }
+    return $form;
 }
 
 function boincimport_process_form_submit($form, $form_state) {
   
-  // Lock the import process
-  if (!variable_get('boincimport_process_locked', 0)) {
+    // Lock the import process
+    if (!variable_get('boincimport_process_locked', 0)) {
     variable_set('boincimport_process_locked', 1);
-  }
-  else {
+    }
+    else {
     watchdog('boincimport', 'The import process is locked, but another process
       is trying to access it...', array(), WATCHDOG_WARNING); 
-  }
+    }
   
-  switch ($form_state['values']['import']) {
+    switch ($form_state['values']['import']) {
     case 'users':
       boincimport_users();
-      break;
+        break;
 
     case 'teams':
       boincimport_teams();
-      if (!variable_get('boincimport_import_team_successful', 0)) {
+        if (!variable_get('boincimport_import_team_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'teams';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      break;
+        }
+        break;
 
     case 'friends':
       boincimport_friends();
-      if (!variable_get('boincimport_import_friend_successful', 0)) {
+        if (!variable_get('boincimport_import_friend_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      break;
+        }
+        break;
 
     case 'preferences':
       boincimport_preferences();
-      if (!variable_get('boincimport_import_preferences_successful', 0)) {
+        if (!variable_get('boincimport_import_preferences_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      break;
+        }
+        break;
 
     case 'private messages':
       boincimport_private_msgs();
-      if (!variable_get('boincimport_import_private_msg_successful', 0)) {
+        if (!variable_get('boincimport_import_private_msg_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      break;
+        }
+        break;
 
     case 'categories':
       boincimport_forum_categories();
-      if (!variable_get('boincimport_import_category_successful', 0)) {
+        if (!variable_get('boincimport_import_category_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      break;
+        }
+        break;
 
     case 'topics':      
       boincimport_forum_topics();
-      if (!variable_get('boincimport_import_topic_successful', 0)) {
+        if (!variable_get('boincimport_import_topic_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      break;
+        }
+        break;
       
     case 'posts':
       boincimport_forum_posts();
-      if (!variable_get('boincimport_import_post_successful', 0)) {
+        if (!variable_get('boincimport_import_post_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      break;
+        }
+        break;
 
     case 'team forums':
       boincimport_team_forums();
-      if (!variable_get('boincimport_team_forum_successful', 0)) {
+        if (!variable_get('boincimport_team_forum_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team forums';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      break;
+        }
+        break;
 
     case 'team topics':      
       boincimport_team_forum_topics();
-      if (!variable_get('boincimport_team_topic_successful', 0)) {
+        if (!variable_get('boincimport_team_topic_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      break;
+        }
+        break;
       
     case 'team posts':
       boincimport_team_forum_posts();
-      if (!variable_get('boincimport_team_post_successful', 0)) {
+        if (!variable_get('boincimport_team_post_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      else {
+        }
+        else {
         $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      break;
+        }
+        break;
 
     case 'url':
       boincimport_replace_urls();
-      if (!variable_get('boincimport_replace_url_successful', 0)) {
+        if (!variable_get('boincimport_replace_url_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      else {
+        }
+        else {
         drupal_set_message('Congratulations.  Import Finished');
         drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
         watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO); 
         unset($_SESSION['boincimport_stage_selected']);
-      }
-      break;
+        }
+        break;
     default:
       $_SESSION['boincimport_stage_selected'] = 'users';
-      break;
-  }
+        break;
+    }
 }
 
 function boincimport_complete($section) {
-  switch ($section) {
-  case 'users':
+    switch ($section) {
+    case 'users':
     // Set the user import successful flag in the variable table
     variable_set('boincimport_import_user_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'teams';
     break;
-  case 'teams':
+    case 'teams':
     
     break;
   
-  default:
+    default:
   }
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
   
-  drupal_goto('admin/boinc/import/process');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -451,26 +451,26 @@ 
  * Import users (at least those required for further data import)
  */
 function boincimport_users() {
-  // Check whether the user table has been successfully imported already
-  if (variable_get('boincimport_import_user_successful', 0)) {
+    // Check whether the user table has been successfully imported already
+    if (variable_get('boincimport_import_user_successful', 0)) {
     drupal_set_message(t('Note: user import has already run successfully'));
     watchdog(
-      'boincimport', 'Note: user import has already run successfully',
-      array(), WATCHDOG_INFO
+        'boincimport', 'Note: user import has already run successfully',
+        array(), WATCHDOG_INFO
     ); 
-  } 
+    } 
 
-  if (!variable_get('boincimport_import_user_started', 0)) {
+    if (!variable_get('boincimport_import_user_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_user_started', 1);
-  }
+    }
 
-  $pre = variable_get('boincimport_table_prefix', '');
-  $import_lurkers = variable_get('boincimport_import_lurkers', 1);
+    $pre = variable_get('boincimport_table_prefix', '');
+    $import_lurkers = variable_get('boincimport_import_lurkers', 1);
 
-  // Determine which users need to be processed
-  db_set_active('boinc_rw');
-  if ($import_lurkers) {
+    // Determine which users need to be processed
+    db_set_active('boinc_rw');
+    if ($import_lurkers) {
     // Import all users, even those who have no community participation; other
     // users will be imported when they first try to log into the drupal site
     $boinc_accounts = db_query('
@@ -478,8 +478,8 @@ 
       ORDER BY id ASC'
     );
     $user_count = mysql_num_rows($boinc_accounts);
-  }
-  else {
+    }
+    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(0);
@@ -490,7 +490,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);
     // Get IDs for all users who will need to be imported now
@@ -506,86 +506,86 @@ 
         (SELECT DISTINCT userid FROM {private_messages}) UNION
         (SELECT DISTINCT senderid FROM {private_messages})
       ) AS usersToImport",
-      implode(',', $ignored_user_list)
+        implode(',', $ignored_user_list)
     );
     $user_count = mysql_num_rows($boinc_accounts);
-  }
-  db_set_active('default');
+    }
+    db_set_active('default');
   
-  if (!$user_count) {
+    if (!$user_count) {
     drupal_set_message(
-      t('There were no users found: Aborting script'), 'error'
+        t('There were no users found: Aborting script'), 'error'
     );
     watchdog('boincimport',
-      'There were no users found: Aborting script', array(), WATCHDOG_INFO
+        'There were no users found: Aborting script', array(), WATCHDOG_INFO
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no users found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %user_count users: Beginning import',
     array('%user_count' => $user_count), WATCHDOG_INFO
-  ); 
-  
-  // User import relies on Drupal and BOINC APIs to manage data being read
-  // from one database and saved to the other. This approach keeps things
-  // clean and simple, but since a sizable user base will wreak havoc on system
-  // resources, the job is broken into batches here and each batch is processed
-  // by a separate process. 
-  
-  //$batch_size = variable_get('boincimport_user_batch_size', 50);
-  //$batch_count = $user_count - ($user_count % $batch_size) + $batch_size;
-  $operations = array();
-  $existing_users = array();
-  $duplicates = array();
-  
-  // Get the list of users already in Drupal to be sure we're not importing
-  // any twice
-  $result = db_query('
+    ); 
+  
+    // User import relies on Drupal and BOINC APIs to manage data being read
+    // from one database and saved to the other. This approach keeps things
+    // clean and simple, but since a sizable user base will wreak havoc on system
+    // resources, the job is broken into batches here and each batch is processed
+    // by a separate process. 
+  
+    //$batch_size = variable_get('boincimport_user_batch_size', 50);
+    //$batch_count = $user_count - ($user_count % $batch_size) + $batch_size;
+    $operations = array();
+    $existing_users = array();
+    $duplicates = array();
+  
+    // Get the list of users already in Drupal to be sure we're not importing
+    // any twice
+    $result = db_query('
     SELECT uid, boinc_id FROM {boincuser}'
-  );
-  while ($row = db_fetch_object($result)) {
+    );
+    while ($row = db_fetch_object($result)) {
     $existing_users[$row->boinc_id] = $row->uid;
-  }
+    }
   
-  // Create batches to process
-  while ($boinc_account = db_fetch_object($boinc_accounts)) {
-     if (isset($existing_users[$boinc_account->id])) {
-      // This user has already been imported
-      $duplicates[] = $boinc_account->id;
+    // Create batches to process
+    while ($boinc_account = db_fetch_object($boinc_accounts)) {
+        if (isset($existing_users[$boinc_account->id])) {
+        // This user has already been imported
+        $duplicates[] = $boinc_account->id;
     }
     else {
-      $operations[] = array(
+        $operations[] = array(
         'boincimport_users_op', array(
-          $boinc_account->id
+            $boinc_account->id
         )
-      );
+        );
+    }
     }
-  }
   
-  if ($duplicates) {
+    if ($duplicates) {
     drupal_set_message(t(
-      'Skipped @count accounts that were already imported',
-      array('@count' => count($duplicates))
+        'Skipped @count accounts that were already imported',
+        array('@count' => count($duplicates))
     ));
     watchdog('boincimport',
-      'Skipped @count accounts that were already imported',
-      array('@count' => count($duplicates)), WATCHDOG_INFO
+        'Skipped @count accounts that were already imported',
+        array('@count' => count($duplicates)), WATCHDOG_INFO
     ); 
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_users_finished',
     'title' => t('Importing users'),
     'init_message' => t('Beginning user import...'),
     'progress_message' => t('Processed @current out of @total users.'),
     'error_message' => t('User import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -593,81 +593,81 @@ 
  */
 function boincimport_users_op($boinc_id, &$context) {
   
-  // Use the $context['sandbox'] to store information needed to track progress
-  // between successive calls.
-  if (!isset($context['sandbox']['progress'])) {
+    // Use the $context['sandbox'] to store information needed to track progress
+    // between successive calls.
+    if (!isset($context['sandbox']['progress'])) {
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['current_user'] = 0;
     $context['sandbox']['max'] = 1;
-  }
+    }
 
-  // Note about batch size: When a batch is processed, the batch update engine
-  // determines whether it should continue processing in the same request or
-  // provide progress feedback to the user and wait for the next request.
+    // Note about batch size: When a batch is processed, the batch update engine
+    // determines whether it should continue processing in the same request or
+    // provide progress feedback to the user and wait for the next request.
   
-  // Grab the BOINC user object and create a Drupal user from it
-  $account = boincuser_register_make_drupal_user($boinc_id);
-  $message = '';
-  if ($account) {
+    // Grab the BOINC user object and create a Drupal user from it
+    $account = boincuser_register_make_drupal_user($boinc_id);
+    $message = '';
+    if ($account) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $boinc_id;
     $message = "Successfully imported user {$boinc_id}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $boinc_id;
     $message = "Failed to import user {$boinc_id}!";
     watchdog('boincimport',
-      'Failed to import user @id!',
-      array('@id' => $boinc_id), WATCHDOG_WARNING
+        'Failed to import user @id!',
+        array('@id' => $boinc_id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_user'] = $boinc_id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_user'] = $boinc_id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_users_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $total_failures = count($results['failure']);
     $message = t(
-      'Successfully imported @count users (@fail_count failures)',
-      array('@count' => $total_imported, '@fail_count' => $total_failures)
+        'Successfully imported @count users (@fail_count failures)',
+        array('@count' => $total_imported, '@fail_count' => $total_failures)
     );
     watchdog('boincimport',
-      'Successfully imported @count users (@fail_count failures).',
-      array('@count' => $total_imported, '@fail_count' => $total_failures),
-      WATCHDOG_INFO
+        'Successfully imported @count users (@fail_count failures).',
+        array('@count' => $total_imported, '@fail_count' => $total_failures),
+        WATCHDOG_INFO
     ); 
     // Set the user import successful flag in the variable table
     variable_set('boincimport_import_user_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'teams';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -680,23 +680,23 @@ 
  */
 function boincimport_teams() {
   
-  // Check whether the team table has been successfully imported already
-  if (variable_get('boincimport_import_team_successful', 0)) {
+    // Check whether the team table has been successfully imported already
+    if (variable_get('boincimport_import_team_successful', 0)) {
     drupal_set_message(t('Note: team import has already run successfully'));
     watchdog(
-      'boincimport', 'Note: team import has already run successfully',
-      array(), WATCHDOG_INFO
+        'boincimport', 'Note: team import has already run successfully',
+        array(), WATCHDOG_INFO
     ); 
-  }
+    }
 
-  if (!variable_get('boincimport_import_team_started', 0)) {
+    if (!variable_get('boincimport_import_team_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_team_started', 1);
-  }
+    }
   
-  // Initialize the map of BOINC team types to taxonomy IDs, if needed
-  $team_type_map = variable_get('boincimport_team_types', array());
-  if (!$team_type_map) {
+    // Initialize the map of BOINC team types to taxonomy IDs, if needed
+    $team_type_map = variable_get('boincimport_team_types', array());
+    if (!$team_type_map) {
     // Import team types from BOINC to a Drupal vocabulary
     require_boinc('team_types');
     global $team_types;
@@ -704,112 +704,112 @@ 
     // Create vocabulary if it isn't set
     $team_vid = db_result(db_query('SELECT vid FROM {vocabulary} WHERE name="%s"', 'Teams'));
     if (!$team_vid) {
-      $team_vocab = array(
+        $team_vocab = array(
         'name' => t('Teams'),
         'description' => t('Types of BOINC teams'),
-      );
-      taxonomy_save_vocabulary($team_vocab);
-      $team_vid = db_result(db_query('SELECT vid FROM {vocabulary} WHERE name="%s"', 'Teams'));
+        );
+        taxonomy_save_vocabulary($team_vocab);
+        $team_vid = db_result(db_query('SELECT vid FROM {vocabulary} WHERE name="%s"', 'Teams'));
     }
     
     foreach ($team_types as $boinc_type_id => $name) {
-      // Check for an existing term in the vocabulary
-      $team_type_id = db_result(db_query("SELECT tid FROM {term_data} WHERE vid = '{$team_vid}' AND LOWER(name) = LOWER('%s')", trim($name)));
-      if ($team_type_id) {
+        // Check for an existing term in the vocabulary
+        $team_type_id = db_result(db_query("SELECT tid FROM {term_data} WHERE vid = '{$team_vid}' AND LOWER(name) = LOWER('%s')", trim($name)));
+        if ($team_type_id) {
         $team_type = array(
-          'tid' => $team_type_id
+            'tid' => $team_type_id
         );
-      }
-      else {
+        }
+        else {
         if (!$name) continue;
         $team_type = array(
-          'name' => strip_tags($name),
-          'vid' => $team_vid,
-          'description' => '',
-          'parent' => 0
+            'name' => strip_tags($name),
+            'vid' => $team_vid,
+            'description' => '',
+            'parent' => 0
         );
         taxonomy_save_term($team_type);
-      }
-      // Note the taxonomy ID for mapping forums to categories
-      $team_type_map[$boinc_type_id] = $team_type['tid'];
+        }
+        // Note the taxonomy ID for mapping forums to categories
+        $team_type_map[$boinc_type_id] = $team_type['tid'];
     }
     variable_set('boincimport_team_types', $team_type_map);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // 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
     FROM %steam',
     $pre
-  );
-  $team_count = mysql_num_rows($boinc_teams);
-  db_set_active('default');
+    );
+    $team_count = mysql_num_rows($boinc_teams);
+    db_set_active('default');
 
-  if (!$team_count) {
+    if (!$team_count) {
     drupal_set_message(
-      t('There were no teams found: Aborting script'), 'error'
+        t('There were no teams found: Aborting script'), 'error'
     );
     watchdog('boincimport',
-      'There were no teams found: Aborting script', array(), WATCHDOG_INFO
+        'There were no teams found: Aborting script', array(), WATCHDOG_INFO
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no teams found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %team_count teams: Beginning Import',
     array('%team_count' => $team_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
-  $existing_teams = array();
-  $duplicates = array();
+    $operations = array();
+    $existing_teams = array();
+    $duplicates = 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;
-  }
+    }
   
-  // Create batches to process
-  while ($boinc_team = db_fetch_object($boinc_teams)) {
-     if (isset($existing_teams[$boinc_team->id])) {
-      // This team has already been imported
-      $duplicates[] = $boinc_team->id;
+    // Create batches to process
+    while ($boinc_team = db_fetch_object($boinc_teams)) {
+        if (isset($existing_teams[$boinc_team->id])) {
+        // This team has already been imported
+        $duplicates[] = $boinc_team->id;
     }
     else {
-      $operations[] = array(
+        $operations[] = array(
         'boincimport_teams_op', array(
-          $boinc_team
+            $boinc_team
         )
-      );
+        );
+    }
     }
-  }
   
-  if ($duplicates) {
+    if ($duplicates) {
     drupal_set_message(t(
-      'Skipped @count teams that were already imported',
-      array('@count' => count($duplicates))
+        'Skipped @count teams that were already imported',
+        array('@count' => count($duplicates))
     ));
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_teams_finished',
     'title' => t('Importing teams'),
     'init_message' => t('Beginning team import...'),
     'progress_message' => t('Processed @current out of @total teams.'),
     'error_message' => t('Team import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -818,67 +818,67 @@ 
  */
 function boincimport_teams_op($boincteam, &$context) {
   
-  $success = boincteam_import($boincteam);
+    $success = boincteam_import($boincteam);
   
-  $message = '';
-  if ($success) {
+    $message = '';
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $boincteam->id;
     $message = "Successfully imported team {$boincteam->id}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $boincteam->id;
     $message = "Failed to import team {$boincteam->id}!";
     watchdog('boincimport',
-      'Failed to import team @id!',
-      array('@id' => $boincteam->id), WATCHDOG_WARNING
+        'Failed to import team @id!',
+        array('@id' => $boincteam->id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_team'] = $boincteam->id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_team'] = $boincteam->id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_teams_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $message = t(
-      'Successfully imported @count teams',
-      array('@count' => $total_imported)
+        'Successfully imported @count teams',
+        array('@count' => $total_imported)
     );
     watchdog('boincimport',
-      'Successfully imported @count teams.',
-      array('@count' => $total_imported), WATCHDOG_INFO
+        'Successfully imported @count teams.',
+        array('@count' => $total_imported), WATCHDOG_INFO
     ); 
     // Set the team import successful flag in the variable table
     variable_set('boincimport_import_team_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'friends';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -891,25 +891,25 @@ 
  */
 function boincimport_friends() {
   
-  // Check whether friendships have been successfully imported already
-  if (variable_get('boincimport_import_friend_successful', 0)) {
+    // Check whether friendships have been successfully imported already
+    if (variable_get('boincimport_import_friend_successful', 0)) {
     drupal_set_message(t('Note: Friends import has already run successfully'));
     watchdog(
-      'boincimport', 'Note: Friends import has already run successfully',
-      array(), WATCHDOG_INFO
+        'boincimport', 'Note: Friends import has already run successfully',
+        array(), WATCHDOG_INFO
     ); 
-  }
+    }
 
-  if (!variable_get('boincimport_import_friend_started', 0)) {
+    if (!variable_get('boincimport_import_friend_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_friend_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get stuff to import
-  db_set_active('boinc_rw');
-  $friendships = db_query('
+    // Get stuff to import
+    db_set_active('boinc_rw');
+    $friendships = db_query('
     SELECT
       f1.user_src,
       f1.user_dest,
@@ -923,51 +923,51 @@ 
       AND (f2.user_src IS NULL OR f1.create_time < f2.create_time)
     ORDER BY create_time',
     $pre, $pre
-  );
-  $friendship_count = mysql_num_rows($friendships);
-  db_set_active('default');
+    );
+    $friendship_count = mysql_num_rows($friendships);
+    db_set_active('default');
 
-  if (!$friendship_count) {
+    if (!$friendship_count) {
     drupal_set_message(
-      t('There were no friendships found: Aborting script'), 'error'
+        t('There were no friendships found: Aborting script'), 'error'
     );
     watchdog('boincimport',
-      'There were no friendships found: Aborting script', array(), WATCHDOG_INFO
+        'There were no friendships found: Aborting script', array(), WATCHDOG_INFO
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no friendships found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count friend relationships: Beginning Import',
     array('%count' => $friendship_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
+    $operations = array();
   
-  // It doesn't matter if a friend relationship has already been imported, just
-  // do it again if so
+    // It doesn't matter if a friend relationship has already been imported, just
+    // do it again if so
   
-  // Create batches to process
-  while ($friendship = db_fetch_object($friendships)) {
+    // Create batches to process
+    while ($friendship = db_fetch_object($friendships)) {
     $operations[] = array(
-      'boincimport_friends_op', array(
+        'boincimport_friends_op', array(
         $friendship
-      )
+        )
     );
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_friends_finished',
     'title' => t('Importing friend relationships'),
     'init_message' => t('Beginning friend import...'),
     'progress_message' => t('Processed @current out of @total friendships.'),
     'error_message' => t('Friend import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -976,83 +976,83 @@ 
  */
 function boincimport_friends_op($friendship, &$context) {
   
-  $input_format = variable_get('boincimport_input_format', 0);
-  $success = FALSE;
-  $message = '';
+    $input_format = variable_get('boincimport_input_format', 0);
+    $success = FALSE;
+    $message = '';
   
-  // Convert BOINC friends to Drupal friends
-  $uid = boincuser_lookup_uid($friendship->user_src);
-  $friend_uid = boincuser_lookup_uid($friendship->user_dest);
-  if ($uid AND $friend_uid) {
+    // Convert BOINC friends to Drupal friends
+    $uid = boincuser_lookup_uid($friendship->user_src);
+    $friend_uid = boincuser_lookup_uid($friendship->user_dest);
+    if ($uid AND $friend_uid) {
     $success = db_query("
       INSERT IGNORE INTO {flag_friend}
       SET uid = '%d', friend_uid = '%d', created = '%d'",
-      $uid, $friend_uid, $friendship->create_time
+        $uid, $friend_uid, $friendship->create_time
     );
-  }
-  else {
+    }
+    else {
     $boinc_id = ($uid) ? $friendship->user_dest : $friendship->user_src;
     $message = "No Drupal account exists for BOINC user {$boinc_id}!";
-  }
+    }
   
-  if ($success) {
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $uid;
     $message = "Successfully made users {$uid} and {$friend_uid} friends";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $uid;
     if (!$message) {
-      $message = "Failed to make users {$uid} and {$friend_uid} friends!";
+        $message = "Failed to make users {$uid} and {$friend_uid} friends!";
     }
     watchdog('boincimport', $message, array(), WATCHDOG_WARNING);
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_user'] = $uid;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_user'] = $uid;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_friends_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $failures = count($results['failure']);
     $message = t(
-      'Successfully imported @count friendships (@failed failures)',
-      array(
+        'Successfully imported @count friendships (@failed failures)',
+        array(
         '@count' => $total_imported,
         '@failed' => $failures,
-      )
+        )
     );
     watchdog('boincimport', $message, array(), WATCHDOG_INFO); 
     // Set the friend import successful flag in the variable table
     variable_set('boincimport_import_friend_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'preferences';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -1065,78 +1065,78 @@ 
  */
 function boincimport_preferences() {
   
-  // Check whether preferences have been successfully imported already
-  if (variable_get('boincimport_import_preferences_successful', 0)) {
+    // Check whether preferences have been successfully imported already
+    if (variable_get('boincimport_import_preferences_successful', 0)) {
     drupal_set_message(t('Note: preferences import has already run successfully'));
     watchdog(
-      'boincimport', 'Note: preferences import has already run successfully',
-      array(), WATCHDOG_INFO
+        'boincimport', 'Note: preferences import has already run successfully',
+        array(), WATCHDOG_INFO
     ); 
-  }
+    }
 
-  if (!variable_get('boincimport_import_preferences_started', 0)) {
+    if (!variable_get('boincimport_import_preferences_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_preferences_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
   
-  // Currently the only preferences being imported are BOINC "filtered users"
-  // This concept of users blocking other users when they don't get along maps
-  // to the Drupal ignore users module
+    // Currently the only preferences being imported are BOINC "filtered users"
+    // This concept of users blocking other users when they don't get along maps
+    // to the Drupal ignore users module
   
-  // Find users who are involved in quarrels
-  db_set_active('boinc_rw');
-  $quarrelers = db_query("
+    // Find users who are involved in quarrels
+    db_set_active('boinc_rw');
+    $quarrelers = db_query("
     SELECT userid, ignorelist
     FROM %sforum_preferences
     WHERE ignorelist <> ''",
     $pre
-  );
-  $quarreler_count = mysql_num_rows($quarrelers);
-  db_set_active('default');
+    );
+    $quarreler_count = mysql_num_rows($quarrelers);
+    db_set_active('default');
 
-  if (!$quarreler_count) {
+    if (!$quarreler_count) {
     drupal_set_message(
-      t('There were no quarrels found: Moving on...')
+        t('There were no quarrels found: Moving on...')
     );
     watchdog('boincimport',
-      'There were no quarrels found: Moving on...', array(), WATCHDOG_INFO
+        'There were no quarrels found: Moving on...', array(), WATCHDOG_INFO
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no quarrels found: Moving on...');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count quarreling users: Beginning Import',
     array('%count' => $quarreler_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
+    $operations = array();
   
-  // It doesn't matter if a filtered user preference has already been imported,
-  // just do it again if so
+    // It doesn't matter if a filtered user preference has already been imported,
+    // just do it again if so
   
-  // Create batches to process
-  while ($quarreler = db_fetch_object($quarrelers)) {
+    // Create batches to process
+    while ($quarreler = db_fetch_object($quarrelers)) {
     $operations[] = array(
-      'boincimport_quarrels_op', array(
+        'boincimport_quarrels_op', array(
         $quarreler
-      )
+        )
     );
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_preferences_finished',
     'title' => t('Importing preferences'),
     'init_message' => t('Beginning preference import...'),
     'progress_message' => t('Processed @current out of @total preferences.'),
     'error_message' => t('Preference import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -1145,99 +1145,99 @@ 
  */
 function boincimport_quarrels_op($boinc_user, &$context) {
   
-  $success = FALSE;
-  $uid = boincuser_lookup_uid($boinc_user->userid);
-  $ignored_users = explode('|', trim($boinc_user->ignorelist, '|'));
-  foreach ($ignored_users as $ignored_user) {
+    $success = FALSE;
+    $uid = boincuser_lookup_uid($boinc_user->userid);
+    $ignored_users = explode('|', trim($boinc_user->ignorelist, '|'));
+    foreach ($ignored_users as $ignored_user) {
     $ignored_user_uid = boincuser_lookup_uid($ignored_user);
     if (!$ignored_user_uid) {
-      $context['results']['warning'][] = "{$uid}:{$ignored_user_uid}";
-      watchdog('boincimport',
+        $context['results']['warning'][] = "{$uid}:{$ignored_user_uid}";
+        watchdog('boincimport',
         'Error adding to ignore list of user @uid: No Drupal ID found for BOINC user @boinc_id',
         array('@boinc_id' => $ignored_user, '@uid' => $uid),
         WATCHDOG_WARNING
-      );
-      continue;
+        );
+        continue;
     }
     $user_ignored = db_query("
       INSERT IGNORE INTO {ignore_user}
       SET uid = '%d', iuid = '%d'",
-      $uid, $ignored_user_uid
+        $uid, $ignored_user_uid
     );
     if ($user_ignored) {
-      $success = TRUE;
+        $success = TRUE;
     }
     else {
-      $context['results']['warning'][] = "{$uid}:{$ignored_user_uid}";
-      watchdog('boincimport',
+        $context['results']['warning'][] = "{$uid}:{$ignored_user_uid}";
+        watchdog('boincimport',
         'Could not add user @ignored_uid to the ignore list of user @uid',
         array('@ignored_uid' => $ignored_user_uid, '@uid' => $uid),
         WATCHDOG_WARNING
-      );
+        );
+    }
     }
-  }
   
-  $message = '';
-  if ($success) {
+    $message = '';
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $uid;
     $message = "Successfully imported ignored users for user {$uid}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $uid;
     $message = "Failed to import any user filter preferences for user {$uid}!";
     watchdog('boincimport',
-      'Failed to import any user filter preferences for user @id!',
-      array('@id' => $uid), WATCHDOG_WARNING
+        'Failed to import any user filter preferences for user @id!',
+        array('@id' => $uid), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_user'] = $uid;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_user'] = $uid;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_preferences_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $total_warnings = count($results['warning']);
     $message = t(
-      'Successfully imported preferences for @count users (with @warn warnings)',
-      array('@count' => $total_imported, '@warn' => $total_warnings)
+        'Successfully imported preferences for @count users (with @warn warnings)',
+        array('@count' => $total_imported, '@warn' => $total_warnings)
     );
     watchdog('boincimport',
-      'Successfully imported preferences for @count users (with @warn warnings)',
-      array('@count' => $total_imported, '@warn' => $total_warnings),
-      WATCHDOG_INFO
+        'Successfully imported preferences for @count users (with @warn warnings)',
+        array('@count' => $total_imported, '@warn' => $total_warnings),
+        WATCHDOG_INFO
     );
     // Set the preference import successful flag in the variable table
     variable_set('boincimport_import_preferences_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'private messages';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -1250,74 +1250,74 @@ 
  */
 function boincimport_private_msgs() {
   
-  // Check whether private messages have been successfully imported already
-  if (variable_get('boincimport_import_private_msg_successful', 0)) {
+    // Check whether private messages have been successfully imported already
+    if (variable_get('boincimport_import_private_msg_successful', 0)) {
     drupal_set_message(t('Private message import has already run successfully -- repeating this process could result in duplicate messages!'), 'warning');
     watchdog(
-      'boincimport', 'Private message import has already run successfully',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'Private message import has already run successfully',
+        array(), WATCHDOG_WARNING
     );
     return;
-  }
+    }
 
-  if (!variable_get('boincimport_import_private_msg_started', 0)) {
+    if (!variable_get('boincimport_import_private_msg_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_private_msg_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get stuff to import
-  db_set_active('boinc_rw');
-  $boinc_private_msgs = db_query('
+    // Get stuff to import
+    db_set_active('boinc_rw');
+    $boinc_private_msgs = db_query('
     SELECT id, subject, content, userid, senderid, date, opened
     FROM %sprivate_messages',
     $pre
-  );
-  $private_msg_count = mysql_num_rows($boinc_private_msgs);
-  db_set_active('default');
+    );
+    $private_msg_count = mysql_num_rows($boinc_private_msgs);
+    db_set_active('default');
 
-  if (!$private_msg_count) {
+    if (!$private_msg_count) {
     drupal_set_message(
-      t('There were no private messages found: Moving on...')
+        t('There were no private messages found: Moving on...')
     );
     watchdog('boincimport',
-      'There were no private messages found: Moving on...', array(), WATCHDOG_INFO
+        'There were no private messages found: Moving on...', array(), WATCHDOG_INFO
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no private messages found: Moving on...');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count private messages: Beginning Import',
     array('%count' => $private_msg_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
+    $operations = array();
   
-  // We don't know if a given private message has been imported already or not;
-  // if this is needed, a relation table must be added to the Drupal DB
+    // We don't know if a given private message has been imported already or not;
+    // if this is needed, a relation table must be added to the Drupal DB
   
-  // Create batches to process
-  while ($boinc_private_msg = db_fetch_object($boinc_private_msgs)) {
+    // Create batches to process
+    while ($boinc_private_msg = db_fetch_object($boinc_private_msgs)) {
     $operations[] = array(
-      'boincimport_private_msgs_op', array(
+        'boincimport_private_msgs_op', array(
         $boinc_private_msg
-      )
+        )
     );
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_private_msgs_finished',
     'title' => t('Importing private messages'),
     'init_message' => t('Beginning private message import...'),
     'progress_message' => t('Processed @current out of @total private messages.'),
     'error_message' => t('Private message import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -1326,95 +1326,95 @@ 
  */
 function boincimport_private_msgs_op($pm, &$context) {
   
-  $input_format = variable_get('boincimport_input_format', 0);
+    $input_format = variable_get('boincimport_input_format', 0);
   
-  $uid = boincuser_lookup_uid($pm->userid);
-  $sender_uid = boincuser_lookup_uid($pm->senderid);
+    $uid = boincuser_lookup_uid($pm->userid);
+    $sender_uid = boincuser_lookup_uid($pm->senderid);
   
-  $pm->content = _boincimport_strip_bbcode($pm->content);
-  $pm->content = _boincimport_text_sanitize($pm->content);
+    $pm->content = _boincimport_strip_bbcode($pm->content);
+    $pm->content = _boincimport_text_sanitize($pm->content);
   
-  // First save the message
-  $message_added = db_query("
+    // First save the message
+    $message_added = db_query("
     INSERT INTO {pm_message} (subject, author, body, format, timestamp)
     VALUES ('%s', %d, '%s', %d, %d)",
     $pm->subject, $sender_uid, $pm->content, $input_format, $pm->date
-  );
-  $mid = db_last_insert_id('pm_message', 'mid');
+    );
+    $mid = db_last_insert_id('pm_message', 'mid');
   
-  // Then attach recipients and set status (note that threads are not a BOINC
-  // feature, so just consider every message to be a new thread)
-  $recipient_added = db_query("
+    // Then attach recipients and set status (note that threads are not a BOINC
+    // feature, so just consider every message to be a new thread)
+    $recipient_added = db_query("
     INSERT INTO {pm_index} (mid, thread_id, uid, is_new, deleted)
     VALUES (%d, %d, %d, %d, 0)",
     $mid, $mid, $uid, !$pm->opened
-  );
-  // In Drupal, the sender should be attached as well
-  $sender_added = db_query("
+    );
+    // In Drupal, the sender should be attached as well
+    $sender_added = db_query("
     INSERT INTO {pm_index} (mid, thread_id, uid, is_new, deleted)
     VALUES (%d, %d, %d, %d, 0)",
     $mid, $mid, $sender_uid, 0
-  );
+    );
   
-  $message = '';
-  if ($message_added AND $recipient_added AND $sender_added) {
+    $message = '';
+    if ($message_added AND $recipient_added AND $sender_added) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $pm->id;
     $message = "Successfully imported private message {$pm->id}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $pm->id;
     $message = "Failed to import private message {$pm->id}!";
     watchdog('boincimport',
-      'Failed to import private message @id!',
-      array('@id' => $pm->id), WATCHDOG_WARNING
+        'Failed to import private message @id!',
+        array('@id' => $pm->id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_pm'] = $pm->id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_pm'] = $pm->id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_private_msgs_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $message = t(
-      'Successfully imported @count private messages',
-      array('@count' => $total_imported)
+        'Successfully imported @count private messages',
+        array('@count' => $total_imported)
     );
     watchdog('boincimport',
-      'Successfully imported @count private messages.',
-      array('@count' => $total_imported), WATCHDOG_INFO
+        'Successfully imported @count private messages.',
+        array('@count' => $total_imported), WATCHDOG_INFO
     ); 
     // Set the private message import successful flag in the variable table
     variable_set('boincimport_import_private_msg_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'categories';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -1427,196 +1427,196 @@ 
  */
 function boincimport_forum_categories() {
   
-  // Check whether forums have been successfully imported already
-  if (variable_get('boincimport_import_forum_category_successful', 0)) {
+    // Check whether forums have been successfully imported already
+    if (variable_get('boincimport_import_forum_category_successful', 0)) {
     drupal_set_message(t('Note: forum container import has already run successfully'));
     watchdog(
-      'boincimport', 'Note: forum container import has already run successfully',
-      array(), WATCHDOG_INFO
+        'boincimport', 'Note: forum container import has already run successfully',
+        array(), WATCHDOG_INFO
     ); 
-  }
+    }
 
-  if (!variable_get('boincimport_import_forum_category_started', 0)) {
+    if (!variable_get('boincimport_import_forum_category_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_forum_category_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Retrieve the vocabulary vid named "Forums"
-  //$forum_vid = variable_get('forum_nav_vocabulary', 0);
-  $forum_vid = db_result(db_query('
+    // Retrieve the vocabulary vid named "Forums"
+    //$forum_vid = variable_get('forum_nav_vocabulary', 0);
+    $forum_vid = db_result(db_query('
     SELECT vid FROM {vocabulary}
     WHERE name="%s"',
     'Forums'
-  ));
-  if (!$forum_vid) {
+    ));
+    if (!$forum_vid) {
     $forum_vocab = array(
-      'name' => t('Forums'),
-      'description' => t('The different forum categories / containers'),
+        'name' => t('Forums'),
+        'description' => t('The different forum categories / containers'),
     );
     taxonomy_save_vocabulary($forum_vocab);
     $forum_vid = db_result(db_query('
       SELECT vid FROM {vocabulary}
       WHERE name="%s"',
-      'Forums'
+        'Forums'
     ));
-  }
+    }
   
-  // Get both categories and forums from BOINC
-  db_set_active('boinc_rw');
-  $boinc_forum_categories = db_query('
+    // Get both categories and forums from BOINC
+    db_set_active('boinc_rw');
+    $boinc_forum_categories = db_query('
     SELECT id, name
     FROM %scategory
     ORDER BY orderID',
     $pre
-  );
-  $forum_category_count = mysql_num_rows($boinc_forum_categories);
-  $boinc_forums = db_query('
+    );
+    $forum_category_count = mysql_num_rows($boinc_forum_categories);
+    $boinc_forums = db_query('
     SELECT id, category, title, description, orderID
     FROM %sforum
     WHERE parent_type = 0
     ORDER BY category',
     $pre
-  );
-  $forum_count = mysql_num_rows($boinc_forums);
-  db_set_active('default');
+    );
+    $forum_count = mysql_num_rows($boinc_forums);
+    db_set_active('default');
 
-  if (!$forum_category_count) {
+    if (!$forum_category_count) {
     drupal_set_message(
-      t('There were no forum containers found: Aborting script'), 'warning'
+        t('There were no forum containers found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no forum containers found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no forum containers found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no forum containers found: Aborting script.');
-  }
-  if (!$forum_count) {
+    }
+    if (!$forum_count) {
     drupal_set_message(
-      t('There were no forums found: Aborting script'), 'warning'
+        t('There were no forums found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no forums found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no forums found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no forums found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %forum_count forums in %category_count containers: Beginning Import',
     array(
-      '%forum_count' => $forum_count,
-      '%category_count' => $forum_category_count,
+        '%forum_count' => $forum_count,
+        '%category_count' => $forum_category_count,
     ), WATCHDOG_INFO
-  );
-  
-  $operations = array();
-  $existing_categories = array();
-  $existing_forums = array();
-  $duplicate_categories = array();
-  $duplicate_forums = array();
-  $category_map = array();
-  
-  // Get the list of categories already in Drupal so as not to import any twice
-  $category_tree = taxonomy_get_tree($forum_vid, 0, -1, 1);
-  foreach ($category_tree as $term) {
+    );
+  
+    $operations = array();
+    $existing_categories = array();
+    $existing_forums = array();
+    $duplicate_categories = array();
+    $duplicate_forums = array();
+    $category_map = array();
+  
+    // Get the list of categories already in Drupal so as not to import any twice
+    $category_tree = taxonomy_get_tree($forum_vid, 0, -1, 1);
+    foreach ($category_tree as $term) {
     $existing_categories[] = $term->name;
-  }
+    }
   
-  // Get the list of forums already in Drupal
-  $result = db_query('
+    // Get the list of forums already in Drupal
+    $result = db_query('
     SELECT forum_id, tid FROM {boincimport_temp_forum}'
-  );
-  while ($row = db_fetch_object($result)) {
+    );
+    while ($row = db_fetch_object($result)) {
     $existing_forums[$row->forum_id] = $row->tid;
-  }
+    }
   
-  // Create batches to process
+    // Create batches to process
   
-  // Set up the "hidden" category, if necessary
-  // This is to support automatic hiding of empty categories
-  $hidden_forum_tid = db_result(db_query('
+    // Set up the "hidden" category, if necessary
+    // This is to support automatic hiding of empty categories
+    $hidden_forum_tid = db_result(db_query('
     SELECT tid FROM {term_data}
     WHERE vid = %d
     AND name = "%s"',
     $forum_vid, 'Hidden'
-  ));
-  if (!$hidden_forum_tid) {
+    ));
+    if (!$hidden_forum_tid) {
     $operations[] = array(
-      'boincimport_forum_categories_op', array(
+        'boincimport_forum_categories_op', array(
         NULL, $forum_vid, $pre, TRUE
-      )
+        )
     );
-  }
+    }
   
-  // Import categories
-  while ($boinc_forum_category = db_fetch_object($boinc_forum_categories)) {
+    // Import categories
+    while ($boinc_forum_category = db_fetch_object($boinc_forum_categories)) {
     if (in_array($boinc_forum_category->name, $existing_categories)) {
-      // This category has already been imported
-      $duplicate_categories[] = $boinc_forum_category->name;
+        // This category has already been imported
+        $duplicate_categories[] = $boinc_forum_category->name;
     }
     else {
-      $operations[] = array(
+        $operations[] = array(
         'boincimport_forum_categories_op', array(
-          $boinc_forum_category, $forum_vid, $pre, FALSE
+            $boinc_forum_category, $forum_vid, $pre, FALSE
         )
-      );
+        );
+    }
     }
-  }
   
-  // Import forums
-  while ($boinc_forum = db_fetch_object($boinc_forums)) {
-     if (isset($existing_forums[$boinc_forum->id])) {
-      // This forum has already been imported
-      $duplicates[] = $boinc_forum->id;
+    // Import forums
+    while ($boinc_forum = db_fetch_object($boinc_forums)) {
+        if (isset($existing_forums[$boinc_forum->id])) {
+        // This forum has already been imported
+        $duplicates[] = $boinc_forum->id;
     }
     else {
-      $operations[] = array(
+        $operations[] = array(
         'boincimport_forums_op', array(
-          $boinc_forum, $forum_vid, $pre
+            $boinc_forum, $forum_vid, $pre
         )
-      );
+        );
+    }
     }
-  }
   
-  // Report any duplicates that were skipped
-  $skipped_message = array();
-  $categories_skipped = count($duplicate_categories);
-  $forums_skipped = count($duplicate_forums);
-  if ($categories_skipped) {
+    // Report any duplicates that were skipped
+    $skipped_message = array();
+    $categories_skipped = count($duplicate_categories);
+    $forums_skipped = count($duplicate_forums);
+    if ($categories_skipped) {
     $skipped_message[] = format_plural(
-      $categories_skipped,
-      '1 container',
-      '@count containers'
+        $categories_skipped,
+        '1 container',
+        '@count containers'
     );
-  }
-  if ($forums_skipped) {
+    }
+    if ($forums_skipped) {
     $skipped_message[] = format_plural(
-      $forums_skipped,
-      '1 forum',
-      '@count forums'
+        $forums_skipped,
+        '1 forum',
+        '@count forums'
     );
-  }
-  if ($skipped_message) {
+    }
+    if ($skipped_message) {
     drupal_set_message(t('Skipped @forums that were already imported',
-      array('@forums' => implode(' and ', $skipped_message))
+        array('@forums' => implode(' and ', $skipped_message))
     ));
-  }
+    }
   
-  // Create and run the batch
-  $batch = array(
+    // Create and run the batch
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_forums_finished',
     'title' => t('Importing forums'),
     'init_message' => t('Beginning forum import...'),
     'progress_message' => t('Processed @current out of @total forums.'),
     'error_message' => t('Forum import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -1625,92 +1625,92 @@ 
  */
 function boincimport_forum_categories_op($category, $forum_vid, $pre, $create_hidden, &$context) {
   
-  // Set term parameters for categories
-  $forum_id = 0;
-  $parent_id = 0;
-  $description = '';
-  $weight = 0;
-  $hidden = FALSE;
+    // Set term parameters for categories
+    $forum_id = 0;
+    $parent_id = 0;
+    $description = '';
+    $weight = 0;
+    $hidden = FALSE;
   
-  $category_map = variable_get('boincimport_forum_category_map', array());
+    $category_map = variable_get('boincimport_forum_category_map', array());
   
-  if (!$category AND $create_hidden) {
+    if (!$category AND $create_hidden) {
     // Create the special "hidden" container
     $category = new stdClass();
     $category->name = 'Hidden';
     $category->id = 0;
     $hidden = TRUE;
-  }
-  else {
+    }
+    else {
     // If this container is empty, put it into the hidden container
     db_set_active('boinc_rw');
     $forums_contained = db_result(db_query('
       SELECT count(*) FROM %sforum
       WHERE parent_type = 0
       AND category = %d',
-      $pre, $category->id));
+        $pre, $category->id));
     db_set_active('default');
     if (!$forums_contained) {
-      $parent_id = $category_map[0];
-      $hidden = TRUE;
+        $parent_id = $category_map[0];
+        $hidden = TRUE;
+    }
     }
-  }
   
-  $forum = array(
+    $forum = array(
     'name' => $category->name,
     'vid' => $forum_vid,
     'description' => $description,
     'parent' => $parent_id,
     'weight' => $weight,
-  );
-  $forum['description'] = strip_tags($forum['description']);
+    );
+    $forum['description'] = strip_tags($forum['description']);
 
-  taxonomy_save_term($forum);
-  $success = isset($forum['tid']);
+    taxonomy_save_term($forum);
+    $success = isset($forum['tid']);
   
-  // Serialize the forum containers
-  $containers = variable_get('forum_containers', array());
-  $containers[] = $forum['tid'];
-  variable_set('forum_containers', $containers);
+    // Serialize the forum containers
+    $containers = variable_get('forum_containers', array());
+    $containers[] = $forum['tid'];
+    variable_set('forum_containers', $containers);
   
-  // Note the taxonomy ID for mapping forums to categories
-  $category_map[$category->id] = $forum['tid'];
-  variable_set('boincimport_forum_category_map', $category_map);
+    // Note the taxonomy ID for mapping forums to categories
+    $category_map[$category->id] = $forum['tid'];
+    variable_set('boincimport_forum_category_map', $category_map);
   
-  boincimport_forum_set_permissions($forum, $hidden);
+    boincimport_forum_set_permissions($forum, $hidden);
   
-  $message = '';
-  if ($success) {
+    $message = '';
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     if (!$category AND $create_hidden) {
-      $message = "Created special hidden container";
+        $message = "Created special hidden container";
     }
     else {
-      $context['results']['categories']['success'][] = $category->id;
-      $message = "Successfully imported container {$category->id}";
+        $context['results']['categories']['success'][] = $category->id;
+        $message = "Successfully imported container {$category->id}";
     }
-  }
-  else {
+    }
+    else {
     $context['results']['categories']['failure'][] = $category->id;
     $message = "Failed to import container {$category->id}!";
     watchdog('boincimport',
-      'Failed to import container @id!',
-      array('@id' => $category->id), WATCHDOG_WARNING
+        'Failed to import container @id!',
+        array('@id' => $category->id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_category'] = $category->id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_category'] = $category->id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
@@ -1719,40 +1719,40 @@ 
  */
 function boincimport_forums_op($boincforum, $forum_vid, $pre = '', &$context) {
   
-  $hidden_forum = FALSE;
-  $open_forum = FALSE;
-  $category_map = variable_get('boincimport_forum_category_map', array());
-  
-  // Set term parameters for forums
-  $forum_id = $boincforum->id;
-  $parent_id = isset($category_map[$boincforum->category]) ? $category_map[$boincforum->category] : $category_map[0];
-  $name = $boincforum->title;
-  $description = $boincforum->description;
-  $weight = $boincforum->orderID;
-  if ($parent_id == $category_map[0]) {
+    $hidden_forum = FALSE;
+    $open_forum = FALSE;
+    $category_map = variable_get('boincimport_forum_category_map', array());
+  
+    // Set term parameters for forums
+    $forum_id = $boincforum->id;
+    $parent_id = isset($category_map[$boincforum->category]) ? $category_map[$boincforum->category] : $category_map[0];
+    $name = $boincforum->title;
+    $description = $boincforum->description;
+    $weight = $boincforum->orderID;
+    if ($parent_id == $category_map[0]) {
     // If this forum is hidden, flag for appropriate access controls
     $hidden_forum = TRUE;
-  }
-  if ($name == 'Getting Started') {
+    }
+    if ($name == 'Getting Started') {
     // Must allow users to post in this forum even if they have no credit!
     $open_forum = TRUE;
-  }
+    }
   
-  // Try to detect a BOINC news forum and flag it so that news can be
-  // imported into a Drupal news content type later
-  if ($name == 'News') {
+    // Try to detect a BOINC news forum and flag it so that news can be
+    // imported into a Drupal news content type later
+    if ($name == 'News') {
     // Save the ID of the News forum for later import
     variable_set('boincimport_news_forum_id', $forum_id);
     $success = TRUE;
-  }
-  else {
+    }
+    else {
     // Save all other forums as taxonomy terms
     $forum = array(
-      'name' => $name,
-      'vid' => $forum_vid,
-      'description' => $description,
-      'parent' => $parent_id,
-      'weight' => $weight,
+        'name' => $name,
+        'vid' => $forum_vid,
+        'description' => $description,
+        'parent' => $parent_id,
+        'weight' => $weight,
     );
     $forum['description'] = strip_tags($forum['description']);
 
@@ -1764,31 +1764,31 @@ 
     
     // Set access controls
     boincimport_forum_set_permissions($forum, $hidden_forum, $open_forum);
-  }
+    }
   
-  $message = '';
-  if ($success) {
+    $message = '';
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['forums']['success'][] = $forum_id;
     $message = "Successfully imported forum {$forum_id}";
-  }
-  else {
+    }
+    else {
     $context['results']['forums']['failure'][] = $forum_id;
     $message = "Failed to import forum {$forum_id}!";
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_forum'] = $forum_id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_forum'] = $forum_id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
@@ -1796,46 +1796,46 @@ 
  */
 function boincimport_forum_set_permissions($forum, $hidden = FALSE, $open = FALSE) {
   
-  // Set access controls
-  $forum_perms = array();
-  $role_map = array_flip(user_roles());
-  $forum_perms[$role_map['anonymous user']] = array(
+    // Set access controls
+    $forum_perms = array();
+    $role_map = array_flip(user_roles());
+    $forum_perms[$role_map['anonymous user']] = array(
     'view' => (int) !$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => 0,
-  );
-  $forum_perms[$role_map['authenticated user']] = array(
+    );
+    $forum_perms[$role_map['authenticated user']] = array(
     'view' => (int) !$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => 0,
-  );
-  $forum_perms[$role_map['community member']] = array(
+    );
+    $forum_perms[$role_map['community member']] = array(
     'view' => (int) !$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => (int) $open,
-  );
-  $forum_perms[$role_map['verified contributor']] = array(
+    );
+    $forum_perms[$role_map['verified contributor']] = array(
     'view' => (int) !$hidden,
     'update' => 0,
     'delete' => 0,
     'create' => (int) !$hidden,
-  );
-  $forum_perms[$role_map['moderator']] = array(
+    );
+    $forum_perms[$role_map['moderator']] = array(
     'view' => (int) !$hidden,
     'update' => (int) !$hidden,
     'delete' => 0,
     'create' => (int) !$hidden,
-  );
-  $forum_perms[$role_map['administrator']] = array(
+    );
+    $forum_perms[$role_map['administrator']] = array(
     'view' => 1,
     'update' => 1,
     'delete' => 1,
     'create' => 1,
-  );
-  foreach ($forum_perms as $role => $perm) {
+    );
+    foreach ($forum_perms as $role => $perm) {
     db_query('
       INSERT INTO {forum_access}
       SET  tid = %d, rid = %d,
@@ -1844,61 +1844,61 @@ 
       ON DUPLICATE KEY UPDATE
         grant_view = %d, grant_update = %d,
         grant_delete = %d, grant_create = %d',
-      $forum['tid'], $role,
-      $perm['view'], $perm['update'],
-      $perm['delete'], $perm['create'],
-      $perm['view'], $perm['update'],
-      $perm['delete'], $perm['create']);
-  }
+        $forum['tid'], $role,
+        $perm['view'], $perm['update'],
+        $perm['delete'], $perm['create'],
+        $perm['view'], $perm['update'],
+        $perm['delete'], $perm['create']);
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_forums_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $categories_imported = count($results['categories']['success']);
     $forums_imported = count($results['forums']['success']);
     
     $success_message = array();
     if ($categories_imported) {
-      $success_message[] = format_plural(
+        $success_message[] = format_plural(
         $categories_imported,
         '1 container',
         '@count containers'
-      );
+        );
     }
     if ($forums_imported) {
-      $success_message[] = format_plural(
+        $success_message[] = format_plural(
         $forums_imported,
         '1 forum',
         '@count forums'
-      );
+        );
     }
     $message = t(
-      'Successfully imported @forums',
-      array('@forums' => implode(' and ', $success_message))
+        'Successfully imported @forums',
+        array('@forums' => implode(' and ', $success_message))
     );
     watchdog('boincimport',
-      'Successfully imported @forums',
-      array('@forums' => implode(' and ', $success_message)), WATCHDOG_INFO
+        'Successfully imported @forums',
+        array('@forums' => implode(' and ', $success_message)), WATCHDOG_INFO
     ); 
     // Set the forum import successful flag in the variable table
     variable_set('boincimport_import_forum_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'topics';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -1910,82 +1910,82 @@ 
  */
 function boincimport_forum_topics() {
   
-  // Check whether topics have been successfully imported already
-  if (variable_get('boincimport_import_topic_successful', 0)) {
+    // Check whether topics have been successfully imported already
+    if (variable_get('boincimport_import_topic_successful', 0)) {
     drupal_set_message(t('Topic import has already run successfully'), 'warning');
     watchdog(
-      'boincimport', 'Topic import has already run successfully',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'Topic import has already run successfully',
+        array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return;
-  }
+    }
 
-  if (!variable_get('boincimport_import_topic_started', 0)) {
+    if (!variable_get('boincimport_import_topic_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_topic_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get the count of non-team topics to import
-  db_set_active('boinc_rw');
-  $topic_count = db_result(db_query('
+    // Get the count of non-team topics to import
+    db_set_active('boinc_rw');
+    $topic_count = db_result(db_query('
     SELECT COUNT(DISTINCT t.id)
     FROM %sthread t
     JOIN %sforum f ON f.id = t.forum
     JOIN %spost p ON p.thread = t.id
     WHERE f.parent_type = 0',
     $pre, $pre, $pre
-  ));
-  db_set_active('default');
+    ));
+    db_set_active('default');
 
-  if (!$topic_count) {
+    if (!$topic_count) {
     drupal_set_message(
-      t('There were no topics found: Aborting script'), 'warning'
+        t('There were no topics found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no topics found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no topics found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no topics found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count topics: Beginning Import',
     array('%count' => $topic_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
-  $batch_size = 100;
+    $operations = array();
+    $batch_size = 100;
   
-  // Create batches to process
-  for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
+    // Create batches to process
+    for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
     $topics_per_batch = $batch_size;
     if ($offset + $batch_size > $topic_count) {
-      $topics_per_batch = $topic_count - $offset;
+        $topics_per_batch = $topic_count - $offset;
     }
     $operations[] = array(
-      'boincimport_topics_op', array(
+        'boincimport_topics_op', array(
         $offset, $topics_per_batch, $pre
-      )
+        )
     );
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_topics_finished',
     'title' => t('Importing topics'),
     'init_message' => t('Beginning topic import...'),
     'progress_message' => t('Processed @current out of @total batches (@size topics per batch).', array(
-      '@size' => $batch_size,
+        '@size' => $batch_size,
     )),
     'error_message' => t('Topic import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -1993,18 +1993,18 @@ 
  * Create a Drupal node from the given BOINC topic object
  */
 function boincimport_topics_op($offset, $batch_size, $pre = '', &$context) {
-  // Initialize the batch, if needed
-  if (!isset($context['sandbox']['progress'])) {
+    // Initialize the batch, if needed
+    if (!isset($context['sandbox']['progress'])) {
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['max'] = $batch_size;
-  }
+    }
   
-  $input_format = variable_get('boincimport_input_format', 0);
-  $news_forum_id = variable_get('boincimport_news_forum_id', 0);
+    $input_format = variable_get('boincimport_input_format', 0);
+    $news_forum_id = variable_get('boincimport_news_forum_id', 0);
   
-  // Get the topic to import
-  db_set_active('boinc_rw');
-  $topics = db_query('
+    // Get the topic to import
+    db_set_active('boinc_rw');
+    $topics = db_query('
     SELECT DISTINCT t.id, t.title, t.owner, t.forum, t.locked, t.hidden,
         t.sticky, t.timestamp, t.create_time
     FROM %sthread t
@@ -2014,10 +2014,10 @@ 
     ORDER BY t.id ASC
     LIMIT %d,%d',
     $pre, $pre, $pre, $offset, $batch_size
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  while ($topic = db_fetch_object($topics)) {
+    while ($topic = db_fetch_object($topics)) {
     
     $error_detail = '';
     
@@ -2030,52 +2030,52 @@ 
       WHERE thread = %d
       ORDER BY timestamp ASC
       LIMIT 1',
-      $pre, $topic->id
+        $pre, $topic->id
     ));
     db_set_active('default');
       
     $duplicate = db_result(db_query('
       SELECT COUNT(*) FROM {boincimport_temp_topic}
       WHERE topic_id = %d',
-      $topic->id
+        $topic->id
     ));
     
     if ($duplicate OR !$post) {
-      $success = FALSE;
+        $success = FALSE;
     }
     
     else {
-      // Get the user and term IDs along with other data to define the topic
-      $uid = boincuser_lookup_uid($topic->owner);
-      $tid = db_result(db_query('
+        // Get the user and term IDs along with other data to define the topic
+        $uid = boincuser_lookup_uid($topic->owner);
+        $tid = db_result(db_query('
         SELECT tid FROM {boincimport_temp_forum}
         WHERE forum_id = %d',
         $topic->forum
-      ));
-      if (!$topic->owner) {
+        ));
+        if (!$topic->owner) {
         $uid = 0;
-      }
+        }
       
-      $node_type = 'forum';
-      $promote = 0;
-      $comment = ($topic->locked) ? 1 : 2;
+        $node_type = 'forum';
+        $promote = 0;
+        $comment = ($topic->locked) ? 1 : 2;
       
-      $post->content = _boincimport_strip_bbcode($post->content);
-      $post->content = _boincimport_text_sanitize($post->content);
-      $teaser = node_teaser($post->content);
+        $post->content = _boincimport_strip_bbcode($post->content);
+        $post->content = _boincimport_text_sanitize($post->content);
+        $teaser = node_teaser($post->content);
       
-      if ($topic->timestamp < $topic->create_time) {
+        if ($topic->timestamp < $topic->create_time) {
         $topic->timestamp = $topic->create_time;
-      }
+        }
       
-      // If dealing with a News topic, be sure it is imported as such
-      if ($news_forum_id AND $topic->forum == $news_forum_id) {
+        // If dealing with a News topic, be sure it is imported as such
+        if ($news_forum_id AND $topic->forum == $news_forum_id) {
         $node_type = 'news';
         $promote = 1;
-      }
+        }
 
-      // Construct the thread as a forum topic node
-      $node = array(
+        // Construct the thread as a forum topic node
+        $node = array(
         'type' => $node_type,
         'title' => $topic->title,
         'uid' => $uid,
@@ -2089,61 +2089,61 @@ 
         'sticky' => $topic->sticky,
         'format' => $input_format,
         'teaser' => $teaser,
-      );
-      $node['tid'] = $tid;
+        );
+        $node['tid'] = $tid;
       
-      // Save the topic node
-      $node = (object) $node; // node_save requires an object form
-      node_save($node);
-      taxonomy_node_save($node, array($tid));
-      $success = ($node->nid) ? TRUE : FALSE;
-      if ($success) {
+        // Save the topic node
+        $node = (object) $node; // node_save requires an object form
+        node_save($node);
+        taxonomy_node_save($node, array($tid));
+        $success = ($node->nid) ? TRUE : FALSE;
+        if ($success) {
         $success = db_query('
           INSERT INTO {boincimport_temp_topic} (topic_id, post_id, nid)
           VALUES (%d, %d, %d)', $topic->id, $post->id, $node->nid
         );
         if ($success) {
-          // Hack to keep the topics in correct order
-          $success = db_query('UPDATE {node_comment_statistics} SET last_comment_timestamp = %d WHERE nid = %d', $node->created, $node->nid);
-          if (!$success) {
+            // Hack to keep the topics in correct order
+            $success = db_query('UPDATE {node_comment_statistics} SET last_comment_timestamp = %d WHERE nid = %d', $node->created, $node->nid);
+            if (!$success) {
             $error_detail = 'topic imported, but failed to set last comment timestamp';
-          }
+            }
         }
         else {
-          $error_detail = 'topic node saved, but failed to link in boincimport_temp_topic table';
+            $error_detail = 'topic node saved, but failed to link in boincimport_temp_topic table';
         }
-      }
-      else {
+        }
+        else {
         $error_detail = 'failed to save topic node to database';
-      }
+        }
     }
     
     // See if the import worked
     $message = '';
     if ($success) {
-      // Store some result for post-processing in the finished callback.
-      $context['results']['success'][] = $topic->id;
-      $message = "Successfully imported topic {$topic->id}";
+        // Store some result for post-processing in the finished callback.
+        $context['results']['success'][] = $topic->id;
+        $message = "Successfully imported topic {$topic->id}";
     }
     elseif ($duplicate) {
-      $context['results']['duplicate'][] = $topic->id;
-      $message = "Topic {$topic->id} was already imported";
+        $context['results']['duplicate'][] = $topic->id;
+        $message = "Topic {$topic->id} was already imported";
     }
     elseif (!$post) {
-      $context['results']['empty'][] = $topic->id;
-      $message = "Skipping topic {$topic->id} as empty";
+        $context['results']['empty'][] = $topic->id;
+        $message = "Skipping topic {$topic->id} as empty";
     }
     else {
-      $context['results']['failure'][] = $topic->id;
-      $message = "Failed to import topic {$topic->id}!";
-      watchdog('boincimport',
+        $context['results']['failure'][] = $topic->id;
+        $message = "Failed to import topic {$topic->id}!";
+        watchdog('boincimport',
         'Failed to import topic @id! (@error)',
         array(
-          '@id' => $topic->id,
-          '@error' => $error_detail,
+            '@id' => $topic->id,
+            '@error' => $error_detail,
         ),
         WATCHDOG_WARNING
-      ); 
+        ); 
     }
     
     // Update our progress information.
@@ -2153,54 +2153,54 @@ 
 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
-      $context['finished'] = 1;
+        $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+        $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    }
     }
-  }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_topics_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $duplicates = count($results['duplicate']);
     $empty_topics = count($results['empty']);
     $message = t(
-      'Successfully imported @count topics (skipped @duplicates already imported, @abandoned empty topics)',
-      array(
+        'Successfully imported @count topics (skipped @duplicates already imported, @abandoned empty topics)',
+        array(
         '@count' => $total_imported,
         '@duplicates' => $duplicates,
         '@abandoned' => $empty_topics,
-      )
+        )
     );
     watchdog('boincimport',
-      'Successfully imported @count topics (skipped @duplicates already imported, @abandoned empty topics).',
-      array(
+        'Successfully imported @count topics (skipped @duplicates already imported, @abandoned empty topics).',
+        array(
         '@count' => $total_imported,
         '@duplicates' => $duplicates,
         '@abandoned' => $empty_topics,
-      ), WATCHDOG_INFO
+        ), WATCHDOG_INFO
     ); 
     // Set the topic import successful flag in the variable table
     variable_set('boincimport_import_topic_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'posts';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -2213,91 +2213,91 @@ 
  */
 function boincimport_forum_posts() {
   
-  // Check whether forum posts have been successfully imported already
-  if (variable_get('boincimport_import_post_successful', 0)) {
+    // Check whether forum posts have been successfully imported already
+    if (variable_get('boincimport_import_post_successful', 0)) {
     drupal_set_message(t('Forum post import has already run successfully'), 'warning');
     watchdog(
-      'boincimport', 'Forum post import has already run successfully',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'Forum post import has already run successfully',
+        array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return;
-  }
+    }
 
-  if (!variable_get('boincimport_import_post_started', 0)) {
+    if (!variable_get('boincimport_import_post_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_post_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get the BOINC threads and get a count of posts to import
-  db_set_active('boinc_rw');
-  $topic_count = db_result(db_query("
+    // Get the BOINC threads and get a count of posts to import
+    db_set_active('boinc_rw');
+    $topic_count = db_result(db_query("
     SELECT COUNT(DISTINCT t.id) FROM %sthread t
     JOIN %sforum f ON f.id = t.forum
     JOIN %spost p ON p.thread = t.id
     WHERE f.parent_type = 0", $pre, $pre, $pre
-  ));
-  $total_post_count = db_result(db_query("
+    ));
+    $total_post_count = db_result(db_query("
     SELECT COUNT(p.id) FROM %spost p
     JOIN %sthread t ON t.id = p.thread
     JOIN %sforum f ON f.id = t.forum
     WHERE f.parent_type = 0", $pre, $pre, $pre
-  ));
-  $post_count = $total_post_count - $topic_count;
-  db_set_active('default');
+    ));
+    $post_count = $total_post_count - $topic_count;
+    db_set_active('default');
 
-  if ($post_count <= 0) {
+    if ($post_count <= 0) {
     drupal_set_message(
-      t('There were no posts found: Aborting script'), 'warning'
+        t('There were no posts found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no posts found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no posts found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no posts found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count posts: Beginning Import',
     array('%count' => $post_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
-  $batch_size = 100;
+    $operations = array();
+    $batch_size = 100;
   
-  // Create batches to process
-  for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
+    // Create batches to process
+    for ($offset = 0; $offset < $topic_count; $offset+=$batch_size) {
     $topics_per_batch = $batch_size;
     if ($offset + $batch_size > $topic_count) {
-      $topics_per_batch = $topic_count - $offset;
+        $topics_per_batch = $topic_count - $offset;
     }
     $operations[] = array(
-      'boincimport_posts_op', array(
+        'boincimport_posts_op', array(
         $offset, $topics_per_batch
-      )
+        )
     );
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_posts_finished',
     'title' => t('Importing posts'),
     'init_message' => t('Beginning post import...'),
     'progress_message' => t(
-      'Processed posts in @current out of @total batches (@size topics per batch).',
-      array(
+        'Processed posts in @current out of @total batches (@size topics per batch).',
+        array(
         '@size' => $batch_size,
         // @current and @total are managed by the batch API
-      )
+        )
     ),
     'error_message' => t('Post import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -2305,17 +2305,17 @@ 
  * Create a Drupal comment from the given BOINC post object
  */
 function boincimport_posts_op($offset, $batch_size, &$context) {
-  // Initialize the batch, if needed
-  if (!isset($context['sandbox']['progress'])) {
+    // Initialize the batch, if needed
+    if (!isset($context['sandbox']['progress'])) {
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['max'] = $batch_size;
-  }
+    }
   
-  $input_format = variable_get('boincimport_input_format', 0);
+    $input_format = variable_get('boincimport_input_format', 0);
   
- // Get the topics with posts to import
-  db_set_active('boinc_rw');
-  $boinc_topic_ids = db_query('
+    // Get the topics with posts to import
+    db_set_active('boinc_rw');
+    $boinc_topic_ids = db_query('
     SELECT DISTINCT t.id FROM %sthread t
     JOIN %sforum f ON f.id = t.forum
     JOIN %spost p ON p.thread = t.id
@@ -2323,10 +2323,10 @@ 
     ORDER BY t.id
     LIMIT %d,%d', 
     $pre, $pre, $pre, $offset, $batch_size
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  while ($boinc_topic = db_fetch_object($boinc_topic_ids)) {
+    while ($boinc_topic = db_fetch_object($boinc_topic_ids)) {
     // Get the posts in this topic
     db_set_active('boinc_rw');
     $boinc_posts = db_query('
@@ -2344,29 +2344,29 @@ 
 
     while ($post = db_fetch_object($boinc_posts)) {
       
-      // Skip the first post as it has already been imported as a topic
-      if ($first_post) {
+        // Skip the first post as it has already been imported as a topic
+        if ($first_post) {
         $first_post = false;
         continue;
-      }
+        }
       
-      // Making it this far confirms that there are posts to import
-      $topic_has_responses = TRUE;
+        // Making it this far confirms that there are posts to import
+        $topic_has_responses = TRUE;
       
-      $is_duplicate = db_result(db_query('
+        $is_duplicate = db_result(db_query('
         SELECT COUNT(*) FROM {boincimport_temp_post}
         WHERE post_id = %d',
         $post->id
-      ));
-      if ($is_duplicate) {
+        ));
+        if ($is_duplicate) {
         // This post has already been imported
         $context['results']['posts']['duplicate'][] = $post->id;
         $duplicate_posts++;
         continue;
-      }
+        }
       
-      // Make sure the post is valid
-      if ($post->content) {
+        // Make sure the post is valid
+        if ($post->content) {
         
         // Get user, node, and parent IDs for the post and sanitize
         $uid = boincuser_lookup_uid($post->user);
@@ -2375,14 +2375,14 @@ 
           FROM {boincimport_temp_topic} btt
           LEFT JOIN {node_revisions} AS nr ON btt.nid = nr.nid
           WHERE btt.topic_id = %d',
-          $post->thread
+            $post->thread
         ));
         $nid = $node->nid;
         $pid = db_result(db_query('
           SELECT cid
           FROM {boincimport_temp_post}
           WHERE post_id = %d',
-          $post->parent_post));
+            $post->parent_post));
         if (is_null($pid)) $pid = 0;
         if (!$uid) $uid = 0;
         
@@ -2393,85 +2393,85 @@ 
           SELECT COUNT(*)
           FROM {comments}
           WHERE nid = %d',
-          $nid
+            $nid
         ));
         $post_reply = $pid;
         
         if ($post_reply OR $topic_reply) {
-          // Create a subject for the post from the post content. The body may be in 
-          // any format, so we:
-          //  1) Filter it into HTML
-          //  2) Strip out all HTML tags
-          //  3) Convert entities back to plain-text.
-          // Note: format is checked by check_markup().
-          $subject = truncate_utf8(trim(decode_entities(strip_tags(check_markup($post->content, $input_format)))), 29, TRUE);
-          // Replace "Quote:" with "RE:"
-          $subject = str_replace('Quote:', 'RE: ', $subject);
-          // Fringe cases where the comment body is populated only by HTML tags
-          // will require a default subject...
-          if ($subject === '')
+            // Create a subject for the post from the post content. The body may be in 
+            // any format, so we:
+            //  1) Filter it into HTML
+            //  2) Strip out all HTML tags
+            //  3) Convert entities back to plain-text.
+            // Note: format is checked by check_markup().
+            $subject = truncate_utf8(trim(decode_entities(strip_tags(check_markup($post->content, $input_format)))), 29, TRUE);
+            // Replace "Quote:" with "RE:"
+            $subject = str_replace('Quote:', 'RE: ', $subject);
+            // Fringe cases where the comment body is populated only by HTML tags
+            // will require a default subject...
+            if ($subject === '')
             $subject = "RE: {$node->title}";
         } else {
-          // This is the first post in the topic
-          $subject = $node->title;
+            // This is the first post in the topic
+            $subject = $node->title;
         }
         
         // Construct the post as a Drupal comment
         $comment = array(
-          'pid' => $pid,
-          'nid' => $nid,
-          'uid' => $uid,
-          'subject' => $subject,
-          'comment' => $post->content,
-          'timestamp' => $post->timestamp,
-          'status' => $post->hidden,
-          'format' => $input_format
+            'pid' => $pid,
+            'nid' => $nid,
+            'uid' => $uid,
+            'subject' => $subject,
+            'comment' => $post->content,
+            'timestamp' => $post->timestamp,
+            'status' => $post->hidden,
+            'format' => $input_format
         );
         
         // Save the comment
         if (boincimport_forum_comment_save($comment)) {
-          $success = db_query('
+            $success = db_query('
             INSERT INTO {boincimport_temp_post} (post_id, cid)
             VALUES (%d, %d)',
             $post->id, $comment['cid']
-          );
-          if ($success) {
+            );
+            if ($success) {
             $posts_imported++;
             $context['results']['posts']['success'][] = $post->id;
-          }
-          else {
+            }
+            else {
             $context['results']['posts']['failure'][] = $post->id;
             $error_posts++;
-          }
+            }
         }
         else {
-          $context['results']['posts']['failure'][] = $post->id;
-          $error_posts++;
+            $context['results']['posts']['failure'][] = $post->id;
+            $error_posts++;
+        }
         }
-      }
-      else {
+        else {
         $context['results']['posts']['empty'][] = $post->id;
         $empty_posts++;
-      }
+        }
     }
     
     $message = '';
     if ($success OR !$topic_has_responses) {
-      // Store some result for post-processing in the finished callback.
-      $context['results']['success'][] = $boinc_topic->id;
-      $message = "Imported {$posts_imported} post(s) for topic {$boinc_topic->id}";
+        // Store some result for post-processing in the finished callback.
+        $context['results']['success'][] = $boinc_topic->id;
+        $message = "Imported {$posts_imported} post(s) for topic {$boinc_topic->id}";
     }
     else {
-      $context['results']['failure'][] = $boinc_topic->id;
-      $message = "Failed to import any posts for topic {$boinc_topic->id} (excluded {$error_posts} errors, {$duplicate_posts} duplicates, and {$empty_posts} empty)";
-      watchdog('boincimport', 'Failed to import any posts for topic @id (excluded @error_posts errors, @duplicate_posts duplicates, and @empty_posts empty)', 
+        $context['results']['failure'][] = $boinc_topic->id;
+        $message = "Failed to import any posts for topic {$boinc_topic->id} (excluded {$error_posts} errors, {$duplicate_posts} duplicates, and {$empty_posts} empty)";
+        watchdog('boincimport', 'Failed to import any posts for topic @id (excluded @error_posts errors, @duplicate_posts duplicates, and @empty_posts empty)', 
         array(
-          '@id' => $boinc_topic->id,
-          '@error_posts' => $error_posts,
-          '@duplicate_posts' => $duplicate_posts,
-          '@empty_posts' => $empty_posts,
+            '@id' => $boinc_topic->id,
+            '@error_posts' => $error_posts,
+            '@duplicate_posts' => $duplicate_posts,
+            '@empty_posts' => $empty_posts,
         ), WATCHDOG_WARNING
-      ); 
+        ); 
     }
     
     // Update our progress information.
@@ -2481,19 +2481,19 @@ 
 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
-      $context['finished'] = 1;
+        $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+        $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    }
     }
-  }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_posts_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $posts_imported = count($results['posts']['success']);
     $topic_count = count($results['success']);
@@ -2502,39 +2502,39 @@ 
     $empty_posts = count($results['posts']['empty']);
     $failed_posts = count($results['posts']['failure']);
     $message = t(
-      'Successfully imported @post_count posts in @topic_count topics ' .
-      '(@skipped topics either had no replies or all replies were already imported, ' .
-      '@duplicates posts were skipped as already imported, ' .
-      '@empty_posts had no content, ' .
-      'and @error_posts encountered errors during import)',
-      array(
+        'Successfully imported @post_count posts in @topic_count topics ' .
+        '(@skipped topics either had no replies or all replies were already imported, ' .
+        '@duplicates posts were skipped as already imported, ' .
+        '@empty_posts had no content, ' .
+        'and @error_posts encountered errors during import)',
+        array(
         '@post_count' => $posts_imported,
         '@topic_count' => $topic_count,
         '@skipped' => $topics_skipped,
         '@duplicates' => $duplicates,
         '@empty_posts' => $empty_posts,
         '@error_posts' => $failed_posts,
-      )
+        )
     );
     watchdog('boincimport',
-      $message,
-      array(), WATCHDOG_INFO
+        $message,
+        array(), WATCHDOG_INFO
     ); 
     // Set the post import successful flag in the variable table
     variable_set('boincimport_import_post_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team forums';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -2547,97 +2547,97 @@ 
  */
 function boincimport_team_forums() {
   
-  // Check whether team forums have been successfully imported already
-  if (variable_get('boincimport_import_team_forum_successful', 0)) {
+    // Check whether team forums have been successfully imported already
+    if (variable_get('boincimport_import_team_forum_successful', 0)) {
     drupal_set_message(t('Team forum import has already run successfully'), 'warning');
     watchdog(
-      'boincimport', 'Team forum import has already run successfully',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'Team forum import has already run successfully',
+        array(), WATCHDOG_WARNING
     );
-  }
+    }
 
-  if (!variable_get('boincimport_import_team_forum_started', 0)) {
+    if (!variable_get('boincimport_import_team_forum_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_team_forum_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get team forums from BOINC database
-  db_set_active('boinc_rw');
-  $boincteam_forums = db_query('
+    // Get team forums from BOINC database
+    db_set_active('boinc_rw');
+    $boincteam_forums = db_query('
     SELECT id, title, description, category, timestamp, post_min_interval,
       post_min_total_credit, post_min_expavg_credit
     FROM %sforum
     WHERE parent_type = 1
     ORDER BY id ASC',
     $pre
-  );
-  $team_forum_count = mysql_num_rows($boincteam_forums);
-  db_set_active('default');
+    );
+    $team_forum_count = mysql_num_rows($boincteam_forums);
+    db_set_active('default');
 
-  if (!$team_forum_count) {
+    if (!$team_forum_count) {
     drupal_set_message(
-      t('There were no team forums found: Aborting script'), 'warning'
+        t('There were no team forums found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no team forums found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no team forums found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no BLAH found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count team forums: Beginning Import',
     array('%count' => $team_forum_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
-  $existing_team_forums = array();
-  $duplicates = array();
+    $operations = array();
+    $existing_team_forums = array();
+    $duplicates = array();
   
-  // Get the list of team forums already in Drupal to be sure we're not
-  // importing any twice
-  $result = db_query('
+    // Get the list of team forums already in Drupal to be sure we're not
+    // importing any twice
+    $result = db_query('
     SELECT nid, boinc_id FROM {boincteam_forum}'
-  );
-  while ($row = db_fetch_object($result)) {
+    );
+    while ($row = db_fetch_object($result)) {
     $existing_team_forums[$row->boinc_id] = $row->nid;
-  }
+    }
   
-  // Create batches to process
-  while ($boincteam_forum = db_fetch_object($boincteam_forums)) {
-     if (isset($existing_team_forums[$boincteam_forum->id])) {
-      // This team has already been imported
-      $duplicates[] = $boincteam_forum->id;
+    // Create batches to process
+    while ($boincteam_forum = db_fetch_object($boincteam_forums)) {
+        if (isset($existing_team_forums[$boincteam_forum->id])) {
+        // This team has already been imported
+        $duplicates[] = $boincteam_forum->id;
     }
     else {
-      $operations[] = array(
+        $operations[] = array(
         'boincimport_team_forums_op', array(
-          $boincteam_forum
+            $boincteam_forum
         )
-      );
+        );
+    }
     }
-  }
   
-  if ($duplicates) {
+    if ($duplicates) {
     drupal_set_message(t(
-      'Skipped @count team forums that were already imported',
-      array('@count' => count($duplicates))
+        'Skipped @count team forums that were already imported',
+        array('@count' => count($duplicates))
     ));
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_team_forums_finished',
     'title' => t('Importing team forums'),
     'init_message' => t('Beginning team forum import...'),
     'progress_message' => t('Processed @current out of @total team forums.'),
     'error_message' => t('Team forum import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -2647,15 +2647,15 @@ 
  */
 function boincimport_team_forums_op($boincteam_forum, &$context) {
   
-  $input_format = variable_get('boincimport_input_format', 0);
+    $input_format = variable_get('boincimport_input_format', 0);
   
-  // Set term parameters for forums
-  $forum_id = $boincteam_forum->id;
-  $team_id = boincteam_lookup_nid($boincteam_forum->category);
-  $name = $boincteam_forum->title;
-  $description = strip_tags($boincteam_forum->description);
+    // Set term parameters for forums
+    $forum_id = $boincteam_forum->id;
+    $team_id = boincteam_lookup_nid($boincteam_forum->category);
+    $name = $boincteam_forum->title;
+    $description = strip_tags($boincteam_forum->description);
   
-  $success = db_query("
+    $success = db_query("
     INSERT INTO {boincteam_forum} SET 
       boinc_id = %d,
       nid = %d,
@@ -2671,67 +2671,67 @@ 
     time(), 0, $boincteam_forum->post_min_interval, 
     $boincteam_forum->post_min_total_credit,
     $boincteam_forum->post_min_expavg_credit
-  );
+    );
   
-  $message = '';
-  if ($success) {
+    $message = '';
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $forum_id;
     $message = "Successfully imported team forum {$forum_id}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $forum_id;
     $message = "Failed to import team forum {$forum_id}!";
     watchdog('boincimport',
-      'Failed to import team forum @id!',
-      array('@id' => $forum_id), WATCHDOG_WARNING
+        'Failed to import team forum @id!',
+        array('@id' => $forum_id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_forum'] = $forum_id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_forum'] = $forum_id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_team_forums_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $message = t(
-      'Successfully imported @count team forums',
-      array('@count' => $total_imported)
+        'Successfully imported @count team forums',
+        array('@count' => $total_imported)
     );
     watchdog('boincimport',
-      'Successfully imported @count team forums.',
-      array('@count' => $total_imported), WATCHDOG_INFO
+        'Successfully imported @count team forums.',
+        array('@count' => $total_imported), WATCHDOG_INFO
     ); 
     // Set the team forum import successful flag in the variable table
     variable_set('boincimport_import_team_forum_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team topics';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -2744,25 +2744,25 @@ 
  */
 function boincimport_team_forum_topics() {
   
-  // Check whether team forum topics have been successfully imported already
-  if (variable_get('boincimport_import_team_topic_successful', 0)) {
+    // Check whether team forum topics have been successfully imported already
+    if (variable_get('boincimport_import_team_topic_successful', 0)) {
     drupal_set_message(t('Team topic import has already run successfully'), 'warning');
     watchdog(
-      'boincimport', 'Team topic import has already run successfully',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'Team topic import has already run successfully',
+        array(), WATCHDOG_WARNING
     );
-  }
+    }
 
-  if (!variable_get('boincimport_import_team_topic_started', 0)) {
+    if (!variable_get('boincimport_import_team_topic_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_team_topic_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get all team topics to import from BOINC
-  db_set_active('boinc_rw');
-  $boincteam_topics = db_query('
+    // Get all team topics to import from BOINC
+    db_set_active('boinc_rw');
+    $boincteam_topics = db_query('
     SELECT DISTINCT t.id, t.title, t.owner, t.forum, t.locked, t.hidden,
       t.sticky, t.timestamp, t.create_time
     FROM %sthread t
@@ -2771,78 +2771,78 @@ 
     WHERE f.parent_type = 1
     ORDER BY id',
     $pre, $pre, $pre
-  );
-  $boincteam_topic_count = mysql_num_rows($boincteam_topics);
-  $total_team_topic_count = db_result(db_query('
+    );
+    $boincteam_topic_count = mysql_num_rows($boincteam_topics);
+    $total_team_topic_count = db_result(db_query('
     SELECT COUNT(*) FROM %sthread t
     JOIN %sforum f ON f.id = t.forum
     WHERE f.parent_type = 1', $pre, $pre
-  ));
-  $empty_topic_count = $total_team_topic_count - $boincteam_topic_count;
-  db_set_active('default');
+    ));
+    $empty_topic_count = $total_team_topic_count - $boincteam_topic_count;
+    db_set_active('default');
 
-  if (!$boincteam_topic_count) {
+    if (!$boincteam_topic_count) {
     drupal_set_message(
-      t('There were no team topics found: Aborting script'), 'warning'
+        t('There were no team topics found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no team topics found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no team topics found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no team topics found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count team topics: Beginning Import',
     array('%count' => $boincteam_topic_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
-  $existing_team_topics = array();
-  $duplicates = array();
+    $operations = array();
+    $existing_team_topics = array();
+    $duplicates = array();
   
-  // Get the list of team topics already in Drupal to be sure we're not
-  // importing any twice
-  $result = db_query('
+    // Get the list of team topics already in Drupal to be sure we're not
+    // importing any twice
+    $result = db_query('
     SELECT nid, topic_id FROM {boincimport_temp_topic}'
-  );
-  while ($row = db_fetch_object($result)) {
+    );
+    while ($row = db_fetch_object($result)) {
     $existing_team_topics[$row->topic_id] = $row->nid;
-  }
+    }
   
-  // Create batches to process
-  while ($boincteam_topic = db_fetch_object($boincteam_topics)) {
-     if (isset($existing_team_topics[$boincteam_topic->id])) {
-      // This team topic has already been imported
-      $duplicates[] = $boincteam_topic->id;
+    // Create batches to process
+    while ($boincteam_topic = db_fetch_object($boincteam_topics)) {
+        if (isset($existing_team_topics[$boincteam_topic->id])) {
+        // This team topic has already been imported
+        $duplicates[] = $boincteam_topic->id;
     }
     else {
-      $operations[] = array(
+        $operations[] = array(
         'boincimport_team_topics_op', array(
-          $boincteam_topic
+            $boincteam_topic
         )
-      );
+        );
+    }
     }
-  }
   
-  if ($duplicates) {
+    if ($duplicates) {
     drupal_set_message(t(
-      'Skipped @count team topics that were already imported',
-      array('@count' => count($duplicates))
+        'Skipped @count team topics that were already imported',
+        array('@count' => count($duplicates))
     ));
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_team_topics_finished',
     'title' => t('Importing team topics'),
     'init_message' => t('Beginning team topic import...'),
     'progress_message' => t('Processed @current out of @total team topics.'),
     'error_message' => t('Team topic import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -2851,21 +2851,21 @@ 
  */
 function boincimport_team_topics_op($topic, &$context) {
   
-  $input_format = variable_get('boincimport_input_format', 0);
-  $success = FALSE;
-  $missing_parent = array();
-  $empty_topics = array();
+    $input_format = variable_get('boincimport_input_format', 0);
+    $success = FALSE;
+    $missing_parent = array();
+    $empty_topics = array();
   
-  // Verify that the team forum container has been imported
-  $team_forum_id = db_result(db_query("
+    // Verify that the team forum container has been imported
+    $team_forum_id = db_result(db_query("
     SELECT tfid FROM {boincteam_forum}
     WHERE boinc_id = %d",
     $topic->forum
-  ));
-  if (!$team_forum_id) {
+    ));
+    if (!$team_forum_id) {
     $missing_parent[] = $topic->id;
-  }
-  else {
+    }
+    else {
     // Get the content of the post that started the topic
     db_set_active('boinc_rw');
     $query = db_query('
@@ -2874,36 +2874,36 @@ 
       WHERE thread = %d
       ORDER BY timestamp ASC
       LIMIT 1',
-      $pre, $topic->id);
+        $pre, $topic->id);
     db_set_active('default');
       
     // Skip this topic if there are no posts
     if (!$post = db_fetch_object($query)) {
-      // Empty topics should have already been filtered out of the import, so
-      // consider this an error condition
-      $empty_topics[] = $topic->id;
+        // Empty topics should have already been filtered out of the import, so
+        // consider this an error condition
+        $empty_topics[] = $topic->id;
     }
     else {
-      // Get the user ID along with other data to define the topic
-      $uid = boincuser_lookup_uid($topic->owner);
-       if (!$topic->owner) {
+        // Get the user ID along with other data to define the topic
+        $uid = boincuser_lookup_uid($topic->owner);
+        if (!$topic->owner) {
         $uid = 0;
-      }
+        }
       
-      $node_type = 'team_forum';
-      $promote = 0;
-      $comment = ($topic->locked) ? 1 : 2;
+        $node_type = 'team_forum';
+        $promote = 0;
+        $comment = ($topic->locked) ? 1 : 2;
       
-      $post->content = _boincimport_strip_bbcode($post->content);
-      $post->content = _boincimport_text_sanitize($post->content);
-      $teaser = node_teaser($post->content);
+        $post->content = _boincimport_strip_bbcode($post->content);
+        $post->content = _boincimport_text_sanitize($post->content);
+        $teaser = node_teaser($post->content);
       
-      if ($topic->timestamp < $topic->create_time) {
+        if ($topic->timestamp < $topic->create_time) {
         $topic->timestamp = $topic->create_time;
-      }
+        }
 
-      // Construct the thread as a team_forum topic node
-      $node = array(
+        // Construct the thread as a team_forum topic node
+        $node = array(
         'type' => $node_type,
         'title' => $topic->title,
         'uid' => $uid,
@@ -2918,89 +2918,89 @@ 
         'format' => $input_format,
         'teaser' => $teaser,
         'tfid' => $team_forum_id,
-      );
+        );
       
-      // Save the team topic node
-      $node = (object) $node; // node_save requires an object form
-      node_save($node);
+        // Save the team topic node
+        $node = (object) $node; // node_save requires an object form
+        node_save($node);
 
-      if ($node->nid) {
+        if ($node->nid) {
         db_query('
           INSERT INTO {boincimport_temp_topic} (topic_id, post_id, nid)
           VALUES (%d, %d, %d)',
-          $topic->id, $post->id, $node->nid
+            $topic->id, $post->id, $node->nid
         );
         // Hack to keep the topics in correct order
         db_query('
           UPDATE {node_comment_statistics}
           SET last_comment_timestamp = %d
           WHERE nid = %d',
-          $node->created, $node->nid
+            $node->created, $node->nid
         );
         $success = TRUE;
-      }
+        }
+    }
     }
-  }
   
-  $message = '';
-  if ($success) {
+    $message = '';
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $topic->id;
     $message = "Successfully imported team topic {$topic->id}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $topic->id;
     $message = "Failed to import team topic {$topic->id}!";
     watchdog('boincimport',
-      'Failed to import team topic @id!',
-      array('@id' => $topic->id), WATCHDOG_WARNING
+        'Failed to import team topic @id!',
+        array('@id' => $topic->id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_topic'] = $topic->id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_topic'] = $topic->id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_team_topics_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $message = t(
-      'Successfully imported @count team topics',
-      array('@count' => $total_imported)
+        'Successfully imported @count team topics',
+        array('@count' => $total_imported)
     );
     watchdog('boincimport',
-      'Successfully imported @count team topics.',
-      array('@count' => $total_imported), WATCHDOG_INFO
+        'Successfully imported @count team topics.',
+        array('@count' => $total_imported), WATCHDOG_INFO
     ); 
     // Set the BLAH import successful flag in the variable table
     variable_set('boincimport_import_team_topic_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team posts';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -3013,81 +3013,81 @@ 
  */
 function boincimport_team_forum_posts() {
   
-  // Check whether team forum posts have been successfully imported already
-  if (variable_get('boincimport_import_team_post_successful', 0)) {
+    // Check whether team forum posts have been successfully imported already
+    if (variable_get('boincimport_import_team_post_successful', 0)) {
     drupal_set_message(t('Team forum post import has already run successfully'), 'warning');
     watchdog(
-      'boincimport', 'Team forum post import has already run successfully',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'Team forum post import has already run successfully',
+        array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return;
-  }
+    }
 
-  if (!variable_get('boincimport_import_team_post_started', 0)) {
+    if (!variable_get('boincimport_import_team_post_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_team_post_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get the BOINC threads and get a count of team posts to import
-  db_set_active('boinc_rw');
-  $team_topic_ids = db_query('
+    // Get the BOINC threads and get a count of team posts to import
+    db_set_active('boinc_rw');
+    $team_topic_ids = db_query('
     SELECT DISTINCT t.id FROM %sthread t
     JOIN %sforum f ON f.id = t.forum
     JOIN %spost p ON p.thread = t.id
     WHERE f.parent_type = 1
     ORDER BY id', $pre, $pre
-  );
-  $team_topic_count = db_result(db_query("
+    );
+    $team_topic_count = db_result(db_query("
     SELECT COUNT(DISTINCT t.id) FROM %sthread t
     JOIN %sforum f ON f.id = t.forum
     JOIN %spost p ON p.thread = t.id
     WHERE f.parent_type = 1", $pre, $pre, $pre
-  ));
-  $total_team_post_count = db_result(db_query("
+    ));
+    $total_team_post_count = db_result(db_query("
     SELECT COUNT(p.id) FROM %spost p
     JOIN %sthread t ON t.id = p.thread
     JOIN %sforum f ON f.id = t.forum
     WHERE f.parent_type = 1", $pre, $pre, $pre
-  ));
-  $team_post_count = $total_team_post_count - $team_topic_count;
-  db_set_active('default');
+    ));
+    $team_post_count = $total_team_post_count - $team_topic_count;
+    db_set_active('default');
 
-  if ($team_post_count <= 0) {
+    if ($team_post_count <= 0) {
     drupal_set_message(
-      t('There were no team posts found: Aborting script'), 'warning'
+        t('There were no team posts found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no team posts found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no team posts found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no posts found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count team posts: Beginning Import',
     array('%count' => $team_post_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
-  $existing_posts = array();
-  $duplicates = array();
+    $operations = array();
+    $existing_posts = array();
+    $duplicates = array();
   
-  // Get the list of team posts already in Drupal to be sure we're not
-  // importing any twice
-  $result = db_query('
+    // Get the list of team posts already in Drupal to be sure we're not
+    // importing any twice
+    $result = db_query('
     SELECT cid, post_id FROM {boincimport_temp_post}'
-  );
-  while ($row = db_fetch_object($result)) {
+    );
+    while ($row = db_fetch_object($result)) {
     $existing_posts[$row->post_id] = $row->cid;
-  }
+    }
   
-  // Create batches to process
-  while ($boincteam_topic = db_fetch_object($team_topic_ids)) {
+    // Create batches to process
+    while ($boincteam_topic = db_fetch_object($team_topic_ids)) {
     
     db_set_active('boinc_rw');
     $boincteam_posts = db_query('
@@ -3095,7 +3095,7 @@ 
       FROM %spost
       WHERE thread = %d
       ORDER BY timestamp ASC',
-      $pre, $boincteam_topic->id
+        $pre, $boincteam_topic->id
     );
     db_set_active('default');
     
@@ -3103,43 +3103,43 @@ 
 
     while ($boincteam_post = db_fetch_object($boincteam_posts)) {
       
-      // Skip the first post as it has already been imported as a topic
-      if ($first_post) {
+        // Skip the first post as it has already been imported as a topic
+        if ($first_post) {
         $first_post = false;
         continue;
-      }
+        }
 
-      if (isset($existing_posts[$boincteam_post->id])) {
+        if (isset($existing_posts[$boincteam_post->id])) {
         // This post has already been imported
         $duplicates[] = $boincteam_post->id;
-      }
-      else {
+        }
+        else {
         $operations[] = array(
-          'boincimport_team_posts_op', array(
+            'boincimport_team_posts_op', array(
             $boincteam_post
-          )
+            )
         );
-      }
+        }
+    }
     }
-  }
   
-  if ($duplicates) {
+    if ($duplicates) {
     drupal_set_message(t(
-      'Skipped @count team posts that were already imported',
-      array('@count' => count($duplicates))
+        'Skipped @count team posts that were already imported',
+        array('@count' => count($duplicates))
     ));
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_team_posts_finished',
     'title' => t('Importing team posts'),
     'init_message' => t('Beginning team post import...'),
     'progress_message' => t('Processed @current out of @total team posts.'),
     'error_message' => t('Team post import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -3148,11 +3148,11 @@ 
  */
 function boincimport_team_posts_op($post, &$context) {
   
-  $input_format = variable_get('boincimport_input_format', 0);
-  $success = FALSE;
+    $input_format = variable_get('boincimport_input_format', 0);
+    $success = FALSE;
   
-  // Make sure the post is valid
-  if ($post->content) {
+    // Make sure the post is valid
+    if ($post->content) {
     
     // Get user, node, and parent IDs for the post and sanitize
     $uid = boincuser_lookup_uid($post->user);
@@ -3161,14 +3161,14 @@ 
       FROM {boincimport_temp_topic} btt
       LEFT JOIN {node_revisions} AS nr ON btt.nid = nr.nid
       WHERE btt.topic_id = %d',
-      $post->thread
+        $post->thread
     ));
     $nid = $node->nid;
     $pid = db_result(db_query('
       SELECT cid
       FROM {boincimport_temp_post}
       WHERE post_id = %d',
-      $post->parent_post));
+        $post->parent_post));
     if (is_null($pid)) $pid = 0;
     if (!$uid) $uid = 0;
     
@@ -3179,110 +3179,110 @@ 
       SELECT COUNT(*)
       FROM {comments}
       WHERE nid = %d',
-      $nid
+        $nid
     ));
     $post_reply = $pid;
     
     if ($post_reply OR $topic_reply) {
-      // Create a subject for the post from the post content. The body may be in 
-      // any format, so we:
-      //  1) Filter it into HTML
-      //  2) Strip out all HTML tags
-      //  3) Convert entities back to plain-text.
-      // Note: format is checked by check_markup().
-      $subject = truncate_utf8(trim(decode_entities(strip_tags(check_markup($post->content, $input_format)))), 29, TRUE);
-      // Replace "Quote:" with "RE:"
-      $subject = str_replace('Quote:', 'RE: ', $subject);
-      // Fringe cases where the comment body is populated only by HTML tags
-      // will require a default subject...
-      if ($subject === '')
+        // Create a subject for the post from the post content. The body may be in 
+        // any format, so we:
+        //  1) Filter it into HTML
+        //  2) Strip out all HTML tags
+        //  3) Convert entities back to plain-text.
+        // Note: format is checked by check_markup().
+        $subject = truncate_utf8(trim(decode_entities(strip_tags(check_markup($post->content, $input_format)))), 29, TRUE);
+        // Replace "Quote:" with "RE:"
+        $subject = str_replace('Quote:', 'RE: ', $subject);
+        // Fringe cases where the comment body is populated only by HTML tags
+        // will require a default subject...
+        if ($subject === '')
         $subject = "RE: {$node->title}";
     } else {
-      // This is the first post in the topic
-      $subject = $node->title;
+        // This is the first post in the topic
+        $subject = $node->title;
     }
     
     // Construct the post as a Drupal comment
     $comment = array(
-      'pid' => $pid,
-      'nid' => $nid,
-      'uid' => $uid,
-      'subject' => $subject,
-      'comment' => $post->content,
-      'timestamp' => $post->timestamp,
-      'status' => $post->hidden,
-      'format' => $input_format
+        'pid' => $pid,
+        'nid' => $nid,
+        'uid' => $uid,
+        'subject' => $subject,
+        'comment' => $post->content,
+        'timestamp' => $post->timestamp,
+        'status' => $post->hidden,
+        'format' => $input_format
     );
     
     // Save the comment
     if (boincimport_forum_comment_save($comment)) {
-      $success = db_query('
+        $success = db_query('
         INSERT INTO {boincimport_temp_post} (post_id, cid)
         VALUES (%d, %d)',
         $post->id, $comment['cid']
-      );
+        );
+    }
     }
-  }
   
-  $message = '';
-  if ($success) {
+    $message = '';
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $post->id;
     $message = "Successfully imported team post {$post->id}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $post->id;
     $message = "Failed to import team post {$post->id}!";
     watchdog('boincimport',
-      'Failed to import team post @id!',
-      array('@id' => $post->id), WATCHDOG_WARNING
+        'Failed to import team post @id!',
+        array('@id' => $post->id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_post'] = $post->id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_post'] = $post->id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_team_posts_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_imported = count($results['success']);
     $message = t(
-      'Successfully imported @count team posts',
-      array('@count' => $total_imported)
+        'Successfully imported @count team posts',
+        array('@count' => $total_imported)
     );
     watchdog('boincimport',
-      'Successfully imported @count team posts.',
-      array('@count' => $total_imported), WATCHDOG_INFO
+        'Successfully imported @count team posts.',
+        array('@count' => $total_imported), WATCHDOG_INFO
     ); 
     // Set the team post import successful flag in the variable table
     variable_set('boincimport_import_team_post_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'url';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -3295,71 +3295,71 @@ 
  */
 function boincimport_subscriptions() {
   
-  // Check whether subscriptions have been successfully imported already
-  if (variable_get('boincimport_import_subscription_successful', 0)) {
+    // Check whether subscriptions have been successfully imported already
+    if (variable_get('boincimport_import_subscription_successful', 0)) {
     drupal_set_message(t('Subscription import has already run successfully'), 'warning');
     watchdog(
-      'boincimport', 'Subscription import has already run successfully',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'Subscription import has already run successfully',
+        array(), WATCHDOG_WARNING
     );
-  }
+    }
 
-  if (!variable_get('boincimport_import_subscription_started', 0)) {
+    if (!variable_get('boincimport_import_subscription_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_import_subscription_started', 1);
-  }
+    }
   
-  $pre = variable_get('boincimport_table_prefix', '');
+    $pre = variable_get('boincimport_table_prefix', '');
 
-  // Get users with subscriptions to import
-  db_set_active('boinc_rw');
-  $users_with_subscriptions = db_query('
+    // Get users with subscriptions to import
+    db_set_active('boinc_rw');
+    $users_with_subscriptions = db_query('
     SELECT DISTINCT userid
     FROM %ssubscriptions
     ORDER BY userid ASC',
     $pre
-  );
-  $user_count = mysql_num_rows($users_with_subscriptions);
-  db_set_active('default');
+    );
+    $user_count = mysql_num_rows($users_with_subscriptions);
+    db_set_active('default');
 
-  if (!$user_count) {
+    if (!$user_count) {
     drupal_set_message(
-      t('There were no subscriptions found: Aborting script'), 'warning'
+        t('There were no subscriptions found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no subscriptions found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no subscriptions found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no subscriptions found: Aborting script.');
-  }
+    }
 
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %count users with subscriptions: Beginning import',
     array('%count' => $user_count), WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
+    $operations = array();
   
-  // Create batches to process
-  while ($subscribed_user = db_fetch_object($users_with_subscriptions)) {
+    // Create batches to process
+    while ($subscribed_user = db_fetch_object($users_with_subscriptions)) {
     $operations[] = array(
-      'boincimport_subscriptions_op', array(
+        'boincimport_subscriptions_op', array(
         $subscribed_user->userid
-      )
+        )
     );
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_subscriptions_finished',
     'title' => t('Importing subscriptions'),
     'init_message' => t('Beginning subscription import...'),
     'progress_message' => t('Processed @current out of @total subscriptions.'),
     'error_message' => t('Subscription import has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -3368,72 +3368,72 @@ 
  */
 function boincimport_subscriptions_op($boincuser_id, &$context) {
   
-  // Get the drupal user and pull subscriptions
-  $uid = get_drupal_id($boincuser_id);
-  $count = boincuser_pull_subscriptions($uid);
+    // Get the drupal user and pull subscriptions
+    $uid = get_drupal_id($boincuser_id);
+    $count = boincuser_pull_subscriptions($uid);
   
-  $message = '';
-  if ($count) {
+    $message = '';
+    if ($count) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $boincuser_id;
     $context['results']['subscriptions'][$boincuser_id] = $count;
     $message = "Successfully imported {$count} subscriptions for user {$boincuser_id}";
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = $boincuser_id;
     $message = "Failed to import subscriptions for user {$boincuser_id}!";
     watchdog('boincimport',
-      'Failed to import subscriptions for user @id!',
-      array('@id' => $boincuser_id), WATCHDOG_WARNING
+        'Failed to import subscriptions for user @id!',
+        array('@id' => $boincuser_id), WATCHDOG_WARNING
     ); 
-  }
+    }
   
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['current_user'] = $boincuser_id;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['current_user'] = $boincuser_id;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_subscriptions_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $user_count = count($results['success']);
     $subscriptions_imported = array_sum($results['subscriptions']);
     $message = t(
-      'Successfully imported @count subscriptions for @distinct users',
-      array('@count' => $subscriptions_imported, '@distinct' => $user_count)
+        'Successfully imported @count subscriptions for @distinct users',
+        array('@count' => $subscriptions_imported, '@distinct' => $user_count)
     );
     watchdog('boincimport',
-      'Successfully imported @count subscriptions for @distinct users.',
-      array('@count' => $subscriptions_imported, '@distinct' => $user_count),
-      WATCHDOG_INFO
+        'Successfully imported @count subscriptions for @distinct users.',
+        array('@count' => $subscriptions_imported, '@distinct' => $user_count),
+        WATCHDOG_INFO
     ); 
     // Set the subscription import successful flag in the variable table
     variable_set('boincimport_import_subscription_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'url';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -3445,112 +3445,112 @@ 
  */
 function boincimport_replace_urls() {
   
-  // Check whether URLs have already been fixed
-  if (variable_get('boincimport_replace_url_successful', 0)) {
+    // Check whether URLs have already been fixed
+    if (variable_get('boincimport_replace_url_successful', 0)) {
     drupal_set_message(t('URLs have already been updated'), 'warning');
     watchdog(
-      'boincimport', 'URLs have already been updated',
-      array(), WATCHDOG_WARNING
+        'boincimport', 'URLs have already been updated',
+        array(), WATCHDOG_WARNING
     );
-  }
+    }
 
-  if (!variable_get('boincimport_replace_url_started', 0)) {
+    if (!variable_get('boincimport_replace_url_started', 0)) {
     // Could prepare database tables, if new fields are necessary, etc.
     variable_set('boincimport_replace_url_started', 1);
-  }
+    }
   
-  // Get the count of nodes and comments to process for URL updates
-  $node_count = db_result(db_query('
+    // Get the count of nodes and comments to process for URL updates
+    $node_count = db_result(db_query('
     SELECT COUNT(DISTINCT btt.nid)
     FROM {boincimport_temp_topic} AS btt
     LEFT JOIN {node_revisions} AS nr ON btt.nid = nr.nid'
-  ));
+    ));
   
-  $comment_count = db_result(db_query('
+    $comment_count = db_result(db_query('
     SELECT COUNT(c.cid)
     FROM {boincimport_temp_post} AS p
     LEFT JOIN {comments} AS c ON p.cid = c.cid'
-  ));
+    ));
   
-  $pm_count = db_result(db_query('
+    $pm_count = db_result(db_query('
     SELECT COUNT(*)
     FROM {pm_message} pm'
-  ));
+    ));
   
-  if (!$node_count AND !$comment_count AND !$pm_count) {
+    if (!$node_count AND !$comment_count AND !$pm_count) {
     drupal_set_message(
-      t('There were no nodes, comments, or private messages found: Aborting script'), 'warning'
+        t('There were no nodes, comments, or private messages found: Aborting script'), 'warning'
     );
     watchdog('boincimport',
-      'There were no nodes,comments, or private messages found: Aborting script', array(), WATCHDOG_WARNING
+        'There were no nodes,comments, or private messages found: Aborting script', array(), WATCHDOG_WARNING
     );
     // Release the lock on the import process
     variable_del('boincimport_process_locked');
     return t('There were no nodes, comments, or private messages found: Aborting script.');
-  }
+    }
   
-  watchdog('boincimport',
+    watchdog('boincimport',
     'Found %node_count nodes, %comment_count comments, and %pm_count private messages: Updating URLs...',
     array(
-      '%node_count' => $node_count,
-      '%comment_count' => $comment_count,
-      '%pm_count' => $pm_count,
+        '%node_count' => $node_count,
+        '%comment_count' => $comment_count,
+        '%pm_count' => $pm_count,
     ),
     WATCHDOG_INFO
-  );
+    );
   
-  $operations = array();
-  $batch_size = 100;
+    $operations = array();
+    $batch_size = 100;
   
-  // Create node batches to process
-  for ($offset = 0; $offset < $node_count; $offset+=$batch_size) {
+    // Create node batches to process
+    for ($offset = 0; $offset < $node_count; $offset+=$batch_size) {
     $nodes_per_batch = $batch_size;
     if ($offset + $batch_size > $node_count) {
-      $nodes_per_batch = $node_count - $offset;
+        $nodes_per_batch = $node_count - $offset;
     }
     $operations[] = array(
-      'boincimport_replace_urls_node_op', array(
+        'boincimport_replace_urls_node_op', array(
         $offset, $nodes_per_batch
-      )
+        )
     );
-  }
-  // Add comment batches
-  for ($offset = 0; $offset < $comment_count; $offset+=$batch_size) {
+    }
+    // Add comment batches
+    for ($offset = 0; $offset < $comment_count; $offset+=$batch_size) {
     $comments_per_batch = $batch_size;
     if ($offset + $batch_size > $comment_count) {
-      $comments_per_batch = $comment_count - $offset;
+        $comments_per_batch = $comment_count - $offset;
     }
     $operations[] = array(
-      'boincimport_replace_urls_comment_op', array(
+        'boincimport_replace_urls_comment_op', array(
         $offset, $comments_per_batch
-      )
+        )
     );
-  }
-  // And don't forget to process private messages
-  for ($offset = 0; $offset < $pm_count; $offset+=$batch_size) {
+    }
+    // And don't forget to process private messages
+    for ($offset = 0; $offset < $pm_count; $offset+=$batch_size) {
     $messages_per_batch = $batch_size;
     if ($offset + $batch_size > $pm_count) {
-      $messages_per_batch = $pm_count - $offset;
+        $messages_per_batch = $pm_count - $offset;
     }
     $operations[] = array(
-      'boincimport_replace_urls_pm_op', array(
+        'boincimport_replace_urls_pm_op', array(
         $offset, $messages_per_batch
-      )
+        )
     );
-  }
+    }
   
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boincimport_replace_urls_finished',
     'title' => t('Updating URLs...'),
     'init_message' => t('Beginning URL update...'),
     'progress_message' => t('Processed URLs in @current out of @total batches (@size items per batch).', array(
-      '@size' => $batch_size,
+        '@size' => $batch_size,
     )),
     'error_message' => t('URL update has encountered an error.'),
-  );
+    );
   
-  batch_set($batch);
+    batch_set($batch);
 }
 
 /**
@@ -3558,27 +3558,27 @@ 
  * Find URLs for the old system and update them with Drupal paths
  */
 function boincimport_replace_urls_node_op($offset, $batch_size, &$context) {
-  // Initialize the batch, if needed
-  if (!isset($context['sandbox']['progress'])) {
+    // Initialize the batch, if needed
+    if (!isset($context['sandbox']['progress'])) {
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['max'] = $batch_size;
-  }
+    }
   
-  $input_format = variable_get('boincimport_input_format', 0);
+    $input_format = variable_get('boincimport_input_format', 0);
 
-  // Since topics have just been imported, there should be only one vid for
-  // each nid, so we can update node_revisions by nid
-  // Get nodes to process
-  $nodes = db_query('
+    // Since topics have just been imported, there should be only one vid for
+    // each nid, so we can update node_revisions by nid
+    // Get nodes to process
+    $nodes = db_query('
     SELECT btt.nid, nr.body, nr.teaser
     FROM {boincimport_temp_topic} AS btt
     LEFT JOIN {node_revisions} AS nr ON btt.nid = nr.nid
     ORDER BY btt.nid
     LIMIT %d,%d',
     $offset, $batch_size
-  );
+    );
   
-  while ($node = db_fetch_object($nodes)) {
+    while ($node = db_fetch_object($nodes)) {
     $updated = FALSE;
     
     // Update URLs in node contents
@@ -3587,23 +3587,23 @@ 
     $node->body = _boincimport_replace_links($node->body);
     $node->teaser = _boincimport_replace_links($node->teaser);
     if ($node->body != $original_body OR $node->teaser != $original_teaser) {
-      $updated = db_query("
+        $updated = db_query("
         UPDATE {node_revisions}
         SET body= '%s', teaser = '%s'
         WHERE nid = %d",
         $node->body, $node->teaser, $node->nid
-      );
+        );
     }
     
     $message = '';
     $context['results']['success'][] = $node->nid;
     if ($updated) {
-      // Store some result for post-processing in the finished callback.
-      $context['results']['nodes']['updated'][] = $node->nid;
-      $message = "Successfully updated node {$node->nid}";
+        // Store some result for post-processing in the finished callback.
+        $context['results']['nodes']['updated'][] = $node->nid;
+        $message = "Successfully updated node {$node->nid}";
     }
     else {
-      $message = "No changes made to node {$node->nid}!";
+        $message = "No changes made to node {$node->nid}!";
     }
     
     // Update our progress information.
@@ -3613,12 +3613,12 @@ 
 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
-      $context['finished'] = 1;
+        $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+        $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    }
     }
-  }
 }
 
 /**
@@ -3626,48 +3626,48 @@ 
  * Find URLs for the old system and update them with Drupal paths
  */
 function boincimport_replace_urls_comment_op($offset, $batch_size, &$context) {
-  // Initialize the batch, if needed
-  if (!isset($context['sandbox']['progress'])) {
+    // Initialize the batch, if needed
+    if (!isset($context['sandbox']['progress'])) {
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['max'] = $batch_size;
-  }
+    }
   
-  $input_format = variable_get('boincimport_input_format', 0);
+    $input_format = variable_get('boincimport_input_format', 0);
   
-  // Get comments to process
-  $comments = db_query('
+    // Get comments to process
+    $comments = db_query('
     SELECT c.cid, c.comment
     FROM {boincimport_temp_post} AS p
     LEFT JOIN {comments} AS c ON p.cid = c.cid
     ORDER BY c.cid
     LIMIT %d,%d',
     $offset, $batch_size
-  );
+    );
   
-  while ($comment = db_fetch_object($comments)) {
+    while ($comment = db_fetch_object($comments)) {
     $updated = FALSE;
     
     // Update URLs in comment contents
     $original_comment = $comment->comment;
     $comment->comment = _boincimport_replace_links($comment->comment);
     if ($comment->comment != $original_comment) {
-      $updated = db_query("
+        $updated = db_query("
         UPDATE {comments}
         SET comment= '%s'
         WHERE cid = %d",
         $comment->comment, $comment->cid
-      );
+        );
     }
     
     $message = '';
     $context['results']['success'][] = $comment->cid;
     if ($updated) {
-      // Store some result for post-processing in the finished callback.
-      $context['results']['comments']['updated'][] = $comment->cid;
-      $message = "Successfully updated comment {$comment->cid}";
+        // Store some result for post-processing in the finished callback.
+        $context['results']['comments']['updated'][] = $comment->cid;
+        $message = "Successfully updated comment {$comment->cid}";
     }
     else {
-      $message = "No changes made to comment {$comment->cid}!";
+        $message = "No changes made to comment {$comment->cid}!";
     }
     
     // Update our progress information.
@@ -3677,12 +3677,12 @@ 
 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
-      $context['finished'] = 1;
+        $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+        $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    }
     }
-  }
 }
 
 /**
@@ -3690,47 +3690,47 @@ 
  * Find URLs for the old system and update them with Drupal paths
  */
 function boincimport_replace_urls_pm_op($offset, $batch_size, &$context) {
-  // Initialize the batch, if needed
-  if (!isset($context['sandbox']['progress'])) {
+    // Initialize the batch, if needed
+    if (!isset($context['sandbox']['progress'])) {
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['max'] = $batch_size;
-  }
+    }
   
-  $input_format = variable_get('boincimport_input_format', 0);
+    $input_format = variable_get('boincimport_input_format', 0);
   
-  // Get private messages to process
-  $messages = db_query('
+    // Get private messages to process
+    $messages = db_query('
     SELECT pm.mid, pm.body
     FROM {pm_message} pm
     ORDER BY pm.mid
     LIMIT %d,%d',
     $offset, $batch_size
-  );
+    );
   
-  while ($pm = db_fetch_object($messages)) {
+    while ($pm = db_fetch_object($messages)) {
     $updated = FALSE;
     
     // Update URLs in private message body
     $original_pm_body = $pm->body;
     $pm->body = _boincimport_replace_links($pm->body);
     if ($pm->body != $original_pm_body) {
-      $updated = db_query("
+        $updated = db_query("
         UPDATE {pm_message}
         SET body= '%s'
         WHERE mid = %d",
         $pm->body, $pm->mid
-      );
+        );
     }
     
     $message = '';
     $context['results']['success'][] = $pm->mid;
     if ($updated) {
-      // Store some result for post-processing in the finished callback.
-      $context['results']['pm']['updated'][] = $pm->mid;
-      $message = "Successfully updated private message {$pm->mid}";
+        // Store some result for post-processing in the finished callback.
+        $context['results']['pm']['updated'][] = $pm->mid;
+        $message = "Successfully updated private message {$pm->mid}";
     }
     else {
-      $message = "No changes made to private message {$pm->mid}!";
+        $message = "No changes made to private message {$pm->mid}!";
     }
     
     // Update our progress information.
@@ -3740,85 +3740,85 @@ 
 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
-      $context['finished'] = 1;
+        $context['finished'] = 1;
     }
     else {
-      $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+        $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    }
     }
-  }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boincimport_replace_urls_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $total_processed = count($results['success']);
     $nodes_updated = count($results['nodes']['updated']);
     $comments_updated = count($results['comments']['updated']);
     $private_messages_updated = count($results['pm']['updated']);
     $message = t(
-      'Successfully processed @count nodes, comments, and private messages (@nodes_updated nodes, @comments_updated comments, and @pm_updated private messages were updated)',
-      array(
+        'Successfully processed @count nodes, comments, and private messages (@nodes_updated nodes, @comments_updated comments, and @pm_updated private messages were updated)',
+        array(
         '@count' => $total_processed,
         '@nodes_updated' => $nodes_updated,
         '@comments_updated' => $comments_updated,
         '@pm_updated' => $private_messages_updated,
-      )
+        )
     );
     if ($private_messages_updated) {
-      watchdog('boincimport',
+        watchdog('boincimport',
         'Updated URLs in these private_messages: @mid_list',
         array(
-          '@mid_list' => implode(', ', $results['pm']['updated']),
+            '@mid_list' => implode(', ', $results['pm']['updated']),
         ),
         WATCHDOG_INFO
-      );
+        );
     }
     if ($comments_updated) {
-      watchdog('boincimport',
+        watchdog('boincimport',
         'Updated URLs in these comments: @cid_list',
         array(
-          '@cid_list' => implode(', ', $results['comments']['updated']),
+            '@cid_list' => implode(', ', $results['comments']['updated']),
         ),
         WATCHDOG_INFO
-      );
+        );
     }
     if ($nodes_updated) {
-      watchdog('boincimport',
+        watchdog('boincimport',
         'Updated URLs in these nodes: @nid_list',
         array(
-          '@nid_list' => implode(', ', $results['nodes']['updated']),
+            '@nid_list' => implode(', ', $results['nodes']['updated']),
         ),
         WATCHDOG_INFO
-      );
+        );
     }
     watchdog('boincimport',
-      'Successfully processed @count nodes, comments, and private messages (@nodes_updated nodes, @comments_updated comments, and @pm_updated private messages were updated)',
-      array(
+        'Successfully processed @count nodes, comments, and private messages (@nodes_updated nodes, @comments_updated comments, and @pm_updated private messages were updated)',
+        array(
         '@count' => $total_processed,
         '@nodes_updated' => $nodes_updated,
         '@comments_updated' => $comments_updated,
         '@pm_updated' => $private_messages_updated,
-      ),
-      WATCHDOG_INFO
+        ),
+        WATCHDOG_INFO
     );
     // Set the replace URLs successful flag in the variable table
     variable_set('boincimport_replace_urls_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'users';
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
-  }
-  drupal_set_message($message);
+    }
+    drupal_set_message($message);
   
-  // Release the lock on the import process
-  variable_del('boincimport_process_locked');
-  drupal_goto('admin/boinc/import/process');
+    // Release the lock on the import process
+    variable_del('boincimport_process_locked');
+    drupal_goto('admin/boinc/import/process');
 }
 
 
@@ -3830,43 +3830,43 @@ 
  * Remove temporary variables, clear caches, etc.
  */
 function boincimport_process_cleanup() {
-  db_set_active('default');
-  
-  variable_del('boincimport_base_url_boinc');
-  variable_del('boincimport_base_url_drupal');
-  variable_del('boincimport_import_user_successful');
-  variable_del('boincimport_import_user_started');
-  variable_del('boincimport_import_team_successful');
-  variable_del('boincimport_import_team_started');
-  variable_del('boincimport_import_category_successful');
-  variable_del('boincimport_replace_url_successful');
-  variable_del('boincimport_import_category_started');
-  variable_del('boincimport_import_topic_successful');
-  variable_del('boincimport_import_topic_started');
-  variable_del('boincimport_import_post_successful');
-  variable_del('boincimport_import_post_started');
-  variable_del('boincimport_team_forum_successful');
-  variable_del('boincimport_team_topic_successful');
-  variable_del('boincimport_team_post_successful');
-  variable_del('boincimport_team_post_started');
-  variable_del('boincimport_ready');
-  variable_del('boincimport_db_url');
-  variable_del('boincimport_tested');
-  variable_del('boincimport_db_configured');
-  variable_del('boincimport_table_prefix');
-  variable_del('boincimport_team_types');
-  variable_del('boincimport_time_limit');
-  variable_del('boincimport_import_lurkers');
-  variable_del('boincimport_import_polls'); 
-  variable_del('boincimport_import_poll_started');
-  variable_del('boincimport_import_poll_successful');
-  variable_del('boincimport_import_pm_successful');
-  variable_del('boincimport_encode');
-  variable_del('boincimport_encoding_phpbb');
-  variable_del('boincimport_encoding_drupal');
-  variable_del('boincimport_version');
-
-  db_query('DELETE FROM {cache}');
+    db_set_active('default');
+  
+    variable_del('boincimport_base_url_boinc');
+    variable_del('boincimport_base_url_drupal');
+    variable_del('boincimport_import_user_successful');
+    variable_del('boincimport_import_user_started');
+    variable_del('boincimport_import_team_successful');
+    variable_del('boincimport_import_team_started');
+    variable_del('boincimport_import_category_successful');
+    variable_del('boincimport_replace_url_successful');
+    variable_del('boincimport_import_category_started');
+    variable_del('boincimport_import_topic_successful');
+    variable_del('boincimport_import_topic_started');
+    variable_del('boincimport_import_post_successful');
+    variable_del('boincimport_import_post_started');
+    variable_del('boincimport_team_forum_successful');
+    variable_del('boincimport_team_topic_successful');
+    variable_del('boincimport_team_post_successful');
+    variable_del('boincimport_team_post_started');
+    variable_del('boincimport_ready');
+    variable_del('boincimport_db_url');
+    variable_del('boincimport_tested');
+    variable_del('boincimport_db_configured');
+    variable_del('boincimport_table_prefix');
+    variable_del('boincimport_team_types');
+    variable_del('boincimport_time_limit');
+    variable_del('boincimport_import_lurkers');
+    variable_del('boincimport_import_polls'); 
+    variable_del('boincimport_import_poll_started');
+    variable_del('boincimport_import_poll_successful');
+    variable_del('boincimport_import_pm_successful');
+    variable_del('boincimport_encode');
+    variable_del('boincimport_encoding_phpbb');
+    variable_del('boincimport_encoding_drupal');
+    variable_del('boincimport_version');
+
+    db_query('DELETE FROM {cache}');
 }
 
 /**
@@ -3874,15 +3874,15 @@ 
  */
 
 function boincimport_forum_comment_save(&$edit) {
-  // Here we are building the thread field.  See the comment in comment_render().
-  if ($edit['pid'] == 0) {
+    // Here we are building the thread field.  See the comment in comment_render().
+    if ($edit['pid'] == 0) {
     // This is a comment with no parent comment (depth 0): we start by retrieving
     // the maximum thread level.
     $max = db_result(db_query('SELECT MAX(thread) FROM {comments} WHERE nid = %d', $edit['nid']));
     // Strip the "/" from the end of the thread.
     $max = rtrim($max, '/');
     $thread = int2vancode(vancode2int($max)+1) .'/';
-  } else {
+    } else {
     // This is comment with a parent comment: we increase the part of the thread
     // value at the proper depth.
     $parent = db_fetch_object(db_query('SELECT * FROM {comments} WHERE cid = %d', $edit['pid']));
@@ -3891,71 +3891,71 @@ 
     // Get the max value in _this_ thread.
     $max = db_result(db_query("SELECT MAX(thread) FROM {comments} WHERE thread LIKE '%s.%%' AND nid = %d", $parent->thread, $edit['nid']));
     if ($max == '') {
-      // First child of this parent.
-      $thread = $parent->thread .'.'. int2vancode(1) .'/';
+        // First child of this parent.
+        $thread = $parent->thread .'.'. int2vancode(1) .'/';
     } else {
-      // Strip the "/" at the end of the thread.
-      $max = rtrim($max, '/');
-      // We need to get the value at the correct depth.
-      $parts = explode('.', $max);
-      $parent_depth = count(explode('.', $parent->thread));
-      $last = $parts[$parent_depth];
-      // Finally, build the thread field for this new comment.
-      $thread = $parent->thread .'.'. int2vancode(vancode2int($last) + 1) .'/';
+        // Strip the "/" at the end of the thread.
+        $max = rtrim($max, '/');
+        // We need to get the value at the correct depth.
+        $parts = explode('.', $max);
+        $parent_depth = count(explode('.', $parent->thread));
+        $last = $parts[$parent_depth];
+        // Finally, build the thread field for this new comment.
+        $thread = $parent->thread .'.'. int2vancode(vancode2int($last) + 1) .'/';
+    }
     }
-  }
 
-  $status = 0; // 1 - not published, 0 - published
-  $format = variable_get('boincimport_input_format', 0);
-  $score = 0; // 0 default value, comments get higher score depending on the author's roles
-  $users = serialize(array(0 => 1));  // default value for everybody!!
+    $status = 0; // 1 - not published, 0 - published
+    $format = variable_get('boincimport_input_format', 0);
+    $score = 0; // 0 default value, comments get higher score depending on the author's roles
+    $users = serialize(array(0 => 1));  // default value for everybody!!
   
-  if ($edit['uid'] === $user->uid) { // '===' because we want to modify anonymous users too
+    if ($edit['uid'] === $user->uid) { // '===' because we want to modify anonymous users too
     $edit['name'] = $user->name;
-  }
+    }
 
-  $success = db_query("INSERT INTO {comments} (nid, pid, uid, subject, comment, format, hostname, timestamp, status, thread, name) VALUES (%d, %d, %d, '%s', '%s', %d, '%s', %d, %d, '%s', '%s')", $edit['nid'], $edit['pid'], $edit['uid'], $edit['subject'], $edit['comment'], $edit['format'], ip_address(), $edit['timestamp'], $edit['status'], $thread, $edit['name']);
-  if ($success) {
+    $success = db_query("INSERT INTO {comments} (nid, pid, uid, subject, comment, format, hostname, timestamp, status, thread, name) VALUES (%d, %d, %d, '%s', '%s', %d, '%s', %d, %d, '%s', '%s')", $edit['nid'], $edit['pid'], $edit['uid'], $edit['subject'], $edit['comment'], $edit['format'], ip_address(), $edit['timestamp'], $edit['status'], $thread, $edit['name']);
+    if ($success) {
     $edit['cid'] = db_last_insert_id('comments', 'cid');
     _comment_update_node_statistics($edit['nid']);
-  }
-  return $success;
+    }
+    return $success;
 }
 
 /**
  * Strips text of extra phpbb3 markup and if requested, also strips all bbcode from text.
  */
 function _boincimport_strip_bbcode($text) {
-  // Strip the text of extra markup - regular expressions taken from phpbb3 includes/function.php, function get_preg_expression().
-  $match = array(
+    // Strip the text of extra markup - regular expressions taken from phpbb3 includes/function.php, function get_preg_expression().
+    $match = array(
     '#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#',
     '#<!\-\- l \-\-><a (?:class="[\w-]+" )?href="(.*?)(?:(&amp;|\?)sid=[0-9a-f]{32})?">.*?</a><!\-\- l \-\->#',
     '#<!\-\- ([mw]) \-\-><a (?:class="[\w-]+" )?href="(.*?)">.*?</a><!\-\- \1 \-\->#',
     '#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#',
     '#<!\-\- .*? \-\->#s',
     '#<.*?>#s',
-  );
-  $replace = array('$1', '$1', '$2', '$1', '', '');
-  $text = preg_replace($match, $replace, $text);
+    );
+    $replace = array('$1', '$1', '$2', '$1', '', '');
+    $text = preg_replace($match, $replace, $text);
 
-  // If BBcode conversion to has been selected, the following will convert the
-  // BBcode to normal html
-  if (variable_get('boincimport_bbcode', 0)) {
+    // If BBcode conversion to has been selected, the following will convert the
+    // BBcode to normal html
+    if (variable_get('boincimport_bbcode', 0)) {
     $input_format = variable_get('boincimport_input_format', 0);
     $text = bbcode_filter('process', 0 , $input_format, $text);
-  }
-  return $text;
+    }
+    return $text;
 }
 
 /**
  * Function to properly encode strings.
  */
 function _boincimport_text_sanitize($text) {
-  $input_format = variable_get('boincimport_input_format', 0);
-  $text = html_entity_decode($text, ENT_QUOTES, 'utf-8');
-  // Be sure the text is filtered for the default input format
-  $text = check_markup($text, $input_format);
-  return $text;
+    $input_format = variable_get('boincimport_input_format', 0);
+    $text = html_entity_decode($text, ENT_QUOTES, 'utf-8');
+    // Be sure the text is filtered for the default input format
+    $text = check_markup($text, $input_format);
+    return $text;
 }
 
 
@@ -3964,25 +3964,25 @@ 
  */
 function _boincimport_replace_links($html) {
   
-  $transformer = new BoincImportUrlTransformer();
-  
-  // Update links to posts, threads, and forums
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_thread\.php\?id=(\d+)&postid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformPostLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_thread\.php\?id=(\d+)(&\w+=\w*)*?(#(\d+)?)}i', array($transformer, 'transformOldPostLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_thread\.php\?id=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformTopicLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_forum\.php\?id=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformForumLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)show_user\.php\?userid=(\d+)((&\w+=\w*)+)?}i', array($transformer, 'transformUserLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)workunit\.php\?wuid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformWorkUnitLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)result\.php\?resultid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformResultLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)results\.php\?userid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformUserResultsLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)results\.php\?hostid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformHostResultsLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)show_host_detail\.php\?hostid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformHostLinks'), $html);
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)hosts_user\.php\?userid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformUserHostsLinks'), $html);
-  
-  // Update any links to the top level index
-  $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_index.php}i', array($transformer, 'transformForumIndexLinks'), $html);
-  
-  return $html;
+    $transformer = new BoincImportUrlTransformer();
+  
+    // Update links to posts, threads, and forums
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_thread\.php\?id=(\d+)&postid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformPostLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_thread\.php\?id=(\d+)(&\w+=\w*)*?(#(\d+)?)}i', array($transformer, 'transformOldPostLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_thread\.php\?id=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformTopicLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_forum\.php\?id=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformForumLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)show_user\.php\?userid=(\d+)((&\w+=\w*)+)?}i', array($transformer, 'transformUserLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)workunit\.php\?wuid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformWorkUnitLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)result\.php\?resultid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformResultLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)results\.php\?userid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformUserResultsLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)results\.php\?hostid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformHostResultsLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)show_host_detail\.php\?hostid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformHostLinks'), $html);
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)hosts_user\.php\?userid=(\d+)(&\w+=\w*)*?}i', array($transformer, 'transformUserHostsLinks'), $html);
+  
+    // Update any links to the top level index
+    $html = preg_replace_callback('{(?:(http|https)://([^\s]*?)|href="(?:/)?)forum_index.php}i', array($transformer, 'transformForumIndexLinks'), $html);
+  
+    return $html;
 }
 
 /**
@@ -3990,14 +3990,14 @@ 
  */
 class BoincImportUrlTransformer {
   
-  var $basePath;
-  var $boincDomain;
-  var $drupalDomain;
+    var $basePath;
+    var $boincDomain;
+    var $drupalDomain;
   
-  /**
-   * Constructor
-   */
-  function BoincImportUrlTransformer() {
+    /**
+     * Constructor
+     */
+    function BoincImportUrlTransformer() {
     global $base_url;
     global $base_path;
     $boinc_base_urls = variable_get('boincimport_base_url_boinc', '');
@@ -4007,203 +4007,203 @@ 
     $this->boincDomains = array();
     $boinc_base_urls = preg_split('/\s+/', $boinc_base_urls);
     foreach ($boinc_base_urls as $url) {
-      $domain = parse_url($url, PHP_URL_HOST);
-      if ($domain) {
+        $domain = parse_url($url, PHP_URL_HOST);
+        if ($domain) {
         $this->boincDomains[$domain] = TRUE;
-      }
+        }
     }
     if (!$this->boincDomains) {
-      watchdog('boincimport', 'No valid BOINC base URLs found to transform!',
+        watchdog('boincimport', 'No valid BOINC base URLs found to transform!',
         array(), WATCHDOG_WARNING); 
     }
-  }
+    }
   
-  /**
-   * Get what the new base URL should be (needed for every transformation)
-   */
-  function getNewBaseUrl($matches) {
+    /**
+     * Get what the new base URL should be (needed for every transformation)
+     */
+    function getNewBaseUrl($matches) {
     $http = $matches[1];
     $domain = trim($matches[2], '/');
     if ($http) {
-      if (isset($this->boincDomains[$domain])) {
+        if (isset($this->boincDomains[$domain])) {
         // This is a URL configured to be transformed
         return "{$http}://{$this->drupalDomain}{$this->basePath}";
-      }
-      else {
+        }
+        else {
         // This URL should not be transformed
         return NULL;
-      }
+        }
     }
     else {
-      // This is a relative URL
-      return $this->basePath;
+        // This is a relative URL
+        return $this->basePath;
+    }
     }
-  }
   
-  /**
-   * Replace links to specific posts. If the given post is the first in the
-   * thread, it is a topic node in Drupal, not a comment.
-   */
-  function transformPostLinks($matches) {
+    /**
+     * Replace links to specific posts. If the given post is the first in the
+     * thread, it is a topic node in Drupal, not a comment.
+     */
+    function transformPostLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $id = db_result(db_query('
+        $id = db_result(db_query('
         SELECT p.cid
         FROM {boincimport_temp_post} p
         WHERE p.post_id = %d',
         $matches[4]
-      ));
-      if ($id) {
+        ));
+        if ($id) {
         $link = "{$newBaseUrl}goto/comment/{$id}";
-      }
-      else {
+        }
+        else {
         // This post is not in the post import table, so it's probably a topic
         $link = $this->transformTopicLinks($matches);
-      }
+        }
     }
     return $link;
-  }
+    }
   
-  /**
-   * Replace links that include anchors to specific posts. If the given post is
-   * the first in the thread, it is a topic node in Drupal, not a comment.
-   */
-  function transformOldPostLinks($matches) {
+    /**
+     * Replace links that include anchors to specific posts. If the given post is
+     * the first in the thread, it is a topic node in Drupal, not a comment.
+     */
+    function transformOldPostLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $id = db_result(db_query('
+        $id = db_result(db_query('
         SELECT p.cid
         FROM {boincimport_temp_post} p
         WHERE p.post_id = %d',
         $matches[6]
-      ));
-      if ($id) {
+        ));
+        if ($id) {
         $link = "{$newBaseUrl}goto/comment/{$id}";
-      }
-      else {
+        }
+        else {
         // This post is not in the post import table, so it's probably a topic
         $link = $this->transformTopicLinks($matches);
-      }
+        }
     }
     return $link;
-  }
+    }
   
-  function transformTopicLinks($matches) {
+    function transformTopicLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $id = db_result(db_query('
+        $id = db_result(db_query('
         SELECT nid
         FROM {boincimport_temp_topic}
         WHERE topic_id = %d',
         $matches[3]
-      ));
-      $link = "{$newBaseUrl}node/{$id}";
+        ));
+        $link = "{$newBaseUrl}node/{$id}";
     }
     return $link;
-  }
+    }
 
-  function transformForumLinks($matches) {
+    function transformForumLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $forum = db_fetch_object(db_query('
+        $forum = db_fetch_object(db_query('
         SELECT tid
         FROM {boincimport_temp_forum}
         WHERE forum_id = %d',
         $matches[3]
-      ));
-      $link = "{$newBaseUrl}community/forum/{$forum->tid}";
+        ));
+        $link = "{$newBaseUrl}community/forum/{$forum->tid}";
     }
     return $link;
-  }
+    }
 
-  function transformUserLinks($matches) {
+    function transformUserLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      // Make sure this isn't an RPC link (no need to transform those)
-      if (!$matches[5]) {
+        // Make sure this isn't an RPC link (no need to transform those)
+        if (!$matches[5]) {
         // TODO: This regex doesn't seem to capture the format=xml part of the
         // URL, making it impossible to distinguish if this is an RPC or not...
         //watchdog('DEBUG', 'matches: @m', array('@m' => print_r($matches,true)), WATCHDOG_DEBUG);
         $uid = boincuser_lookup_uid($matches[3]);
         $link = "{$newBaseUrl}account/{$uid}";
-      }
+        }
     }
     return $link;
-  }
+    }
 
-  function transformWorkUnitLinks($matches) {
+    function transformWorkUnitLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $id = $matches[3];
-      $link = "{$newBaseUrl}workunit/{$id}";
+        $id = $matches[3];
+        $link = "{$newBaseUrl}workunit/{$id}";
     }
     return $link;
-  }
+    }
 
-  function transformResultLinks($matches) {
+    function transformResultLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $id = $matches[3];
-      $link = "{$newBaseUrl}task/{$id}";
+        $id = $matches[3];
+        $link = "{$newBaseUrl}task/{$id}";
     }
     return $link;
-  }
+    }
 
-  function transformHostResultsLinks($matches) {
+    function transformHostResultsLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $id = $matches[3];
-      $link = "{$newBaseUrl}host/{$id}/tasks";
+        $id = $matches[3];
+        $link = "{$newBaseUrl}host/{$id}/tasks";
     }
     return $link;
-  }
+    }
   
-  function transformUserResultsLinks($matches) {
+    function transformUserResultsLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $link = "{$newBaseUrl}account/tasks";
+        $link = "{$newBaseUrl}account/tasks";
     }
     return $link;
-  }
+    }
   
-  function transformHostLinks($matches) {
+    function transformHostLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $id = $matches[3];
-      $link = "{$newBaseUrl}host/{$id}";
+        $id = $matches[3];
+        $link = "{$newBaseUrl}host/{$id}";
     }
     return $link;
-  }
+    }
   
-  function transformUserHostsLinks($matches) {
+    function transformUserHostsLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $uid = boincuser_lookup_uid($matches[3]);
-      if ($uid) {
+        $uid = boincuser_lookup_uid($matches[3]);
+        if ($uid) {
         $link = "{$newBaseUrl}account/{$uid}/computers";
-      }
+        }
     }
     return $link;
-  }
+    }
   
-  function transformForumIndexLinks($matches) {
+    function transformForumIndexLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
     if ($newBaseUrl !== NULL) {
-      $link = "{$newBaseUrl}community/forum";
+        $link = "{$newBaseUrl}community/forum";
     }
     return $link;
-  }
+    }
 
 }

drupal/sites/default/boinc/modules/boincwork/boincwork.views.inc

Indentation +793 added lines, -793 removed lines

@@ -13,1660 +13,1660 @@ 
  */
 function boincwork_views_data() {
   
-  // -----------------------------------------------------------------------------------------------
-  // Definition for host table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for host table
+    // -----------------------------------------------------------------------------------------------
   
-  $data['host']['table']['group'] = t('BOINC');
+    $data['host']['table']['group'] = t('BOINC');
   
-  $data['host']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC host'),
-      'help' => t('Computers attached to BOINC'),
-      'database' => 'boinc_ro'
-  );
+    $data['host']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC host'),
+        'help' => t('Computers attached to BOINC'),
+        'database' => 'boinc_ro'
+    );
   
-  // This table references the {user} table.
-  // This join creates an 'implicit' relationship to the user table, so that when
-  // "User" is the base table, the fields are automatically available.
+    // This table references the {user} table.
+    // This join creates an 'implicit' relationship to the user table, so that when
+    // "User" is the base table, the fields are automatically available.
   
-  // Index this array by the table name to which this table refers.
-  // 'left_field' is the primary key in the referenced table.
-  // 'field' is the foreign key in this table.
+    // Index this array by the table name to which this table refers.
+    // 'left_field' is the primary key in the referenced table.
+    // 'field' is the foreign key in this table.
   
-  $data['host']['table']['join'] = array(
+    $data['host']['table']['join'] = array(
     'user' => array(
-      'left_field' => 'id',
-      'field' => 'userid',
+        'left_field' => 'id',
+        'field' => 'userid',
     )
-  );
+    );
 
-  // Describe each of the individual fields in this table to Views. For
-  // each field, you may define what field, sort, argument, and/or filter
-  // handlers it supports. This will determine where in the Views interface you
-  // may use the field.
+    // Describe each of the individual fields in this table to Views. For
+    // each field, you may define what field, sort, argument, and/or filter
+    // handlers it supports. This will determine where in the Views interface you
+    // may use the field.
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
   
-  $data['host']['id'] = array(
+    $data['host']['id'] = array(
     'title' => bts('Computer ID', array(), NULL, 'boinc:host-list'),
     'help' => t('The ID number of this host.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['venue'] = array(
+    );
+    $data['host']['venue'] = array(
     'title' => bts('Location', array(), NULL, 'boinc:host-list'),
     'help' => t('The name of the preference set assigned to this host.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['host']['userid'] = array(
+    $data['host']['userid'] = array(
     'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
     'help' => t('The owner of this host.'),
     // Because this is a foreign key to the {user} table. This allows us to
     // have, when the view is configured with this relationship, all the fields
     // for the related node available.
     'argument' => array(
-      'handler' => 'views_handler_argument_boincuser_id',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincuser_id',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'user',
-      'field' => 'userid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('User')
+        'base' => 'user',
+        'field' => 'userid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('User')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of general host fields (alphabetized)
+    // Descriptions of general host fields (alphabetized)
   
-  $data['host']['active_frac'] = array(
+    $data['host']['active_frac'] = array(
     'title' => bts('While BOINC running, % of time work is allowed', array(), NULL, 'boinc:host-details'),
     'help' => t('The percentage of time that work is allowed.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['avg_turnaround'] = array(
+    );
+    $data['host']['avg_turnaround'] = array(
     'title' => bts('Average turnaround time', array(), NULL, 'boinc:host-details'),
     'help' => t('The average time required for work to be completed.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['create_time'] = array(
+    );
+    $data['host']['create_time'] = array(
     'title' => bts('Created', array(), NULL, 'boinc:host-details'),
     'help' => t('The time the host record was created.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['host']['connected_frac'] = array(
+    );
+    $data['host']['connected_frac'] = array(
     'title' => bts('While BOINC running, % of time host has an Internet connection', array(), NULL, 'boinc:host-details'),
     'help' => t('The percentage of time that the host has an Internet connection.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['cpu_efficiency'] = array(
+    );
+    $data['host']['cpu_efficiency'] = array(
     'title' => bts('Average CPU efficiency', array(), NULL, 'boinc:host-details'),
     'help' => t('The average efficiency of the host CPU.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['d_free'] = array(
+    );
+    $data['host']['d_free'] = array(
     'title' => bts('Free disk space', array(), NULL, 'boinc:host-details'),
     'help' => t('The amount of disk space that is not in use.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['d_total'] = array(
+    );
+    $data['host']['d_total'] = array(
     'title' => bts('Total disk space', array(), NULL, 'boinc:host-details'),
     'help' => t('The size of the disk on which BOINC is installed.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['domain_name'] = array(
+    );
+    $data['host']['domain_name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
     'help' => t('The name of the host.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['duration_correction_factor'] = array(
+    );
+    $data['host']['duration_correction_factor'] = array(
     'title' => bts('Task duration correction factor', array(), NULL, 'boinc:host-details'),
     'help' => t('Task duration correction factor.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['expavg_credit'] = array(
+    );
+    $data['host']['expavg_credit'] = array(
     'title' => bts('Avg. credit', array(), NULL, 'boinc:host-details'),
     'help' => t('A decaying average of credit per day.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['external_ip_addr'] = array(
+    );
+    $data['host']['external_ip_addr'] = array(
     'title' => bts('External IP address', array(), NULL, 'boinc:host-details'),
     'help' => t('The IP address from which the host last communicated.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['host_cpid'] = array(
+    );
+    $data['host']['host_cpid'] = array(
     'title' => bts('Cross project ID', array(), NULL, 'boinc:host-details'),
     'help' => t('The consistent identifier of the host across projects.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['last_ip_addr'] = array(
+    );
+    $data['host']['last_ip_addr'] = array(
     'title' => bts('Last IP address', array(), NULL, 'boinc:host-details'),
     'help' => t('The IP address of the host at last communication.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['m_cache'] = array(
+    );
+    $data['host']['m_cache'] = array(
     'title' => bts('Cache', array(), NULL, 'boinc:host-details'),
     'help' => t('The amount of cache on the processor(s).'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['m_nbytes'] = array(
+    );
+    $data['host']['m_nbytes'] = array(
     'title' => bts('Memory', array(), NULL, 'boinc:host-details'),
     'help' => t('The amount of memory installed.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['m_swap'] = array(
+    );
+    $data['host']['m_swap'] = array(
     'title' => bts('Swap space', array(), NULL, 'boinc:host-details'),
     'help' => t('The amount of swap space configured.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['max_results_day'] = array(
+    );
+    $data['host']['max_results_day'] = array(
     'title' => bts('Maximum daily WU quota per CPU', array(), NULL, 'boinc:host-details'),
     'help' => t('The maximum number of workunits to be allocated per CPU.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['n_bwdown'] = array(
+    );
+    $data['host']['n_bwdown'] = array(
     'title' => bts('Average download rate', array(), NULL, 'boinc:host-details'),
     'help' => t('The average rate at which new work is downloaded.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['n_bwup'] = array(
+    );
+    $data['host']['n_bwup'] = array(
     'title' => bts('Average upload rate', array(), NULL, 'boinc:host-details'),
     'help' => t('The average rate at which completed work is uploaded.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['nsame_ip_addr'] = array(
+    );
+    $data['host']['nsame_ip_addr'] = array(
     'title' => bts('Same IP address count', array(), NULL, 'boinc:host-details'),
     'help' => t('The number of times the last IP address.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['on_frac'] = array(
+    );
+    $data['host']['on_frac'] = array(
     'title' => bts('% of time BOINC client is running', array(), NULL, 'boinc:host-details'),
     'help' => t('The percentage of time that the BOINC client is running.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['os_name'] = array(
+    );
+    $data['host']['os_name'] = array(
     'title' => bts('Operating system', array(), NULL, 'boinc:host-details'),
     'help' => t('The name of the host operating system.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );  
-  $data['host']['os_version'] = array(
+    );  
+    $data['host']['os_version'] = array(
     'title' => bts('Operating system version', array(), NULL, 'boinc:host-details'),
     'help' => t('The version of the host operating system.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['p_fpops'] = array(
+    );
+    $data['host']['p_fpops'] = array(
     'title' => bts('Measured floating point speed', array(), NULL, 'boinc:host-details'),
     'help' => t('The capability of the host in floating point operations per second.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['p_iops'] = array(
+    );
+    $data['host']['p_iops'] = array(
     'title' => bts('Measured integer speed', array(), NULL, 'boinc:host-details'),
     'help' => t('The capability of the host in integer operations per second.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['p_model'] = array(
+    );
+    $data['host']['p_model'] = array(
     'title' => bts('CPU model', array(), NULL, 'boinc:host-details'),
     'help' => t('The model of the CPU in the host.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['p_ncpus'] = array(
+    );
+    $data['host']['p_ncpus'] = array(
     'title' => bts('Number of processors', array(), NULL, 'boinc:host-details'),
     'help' => t('The count of CPU cores in the system.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['p_vendor'] = array(
+    );
+    $data['host']['p_vendor'] = array(
     'title' => bts('CPU', array(), NULL, 'boinc:host-details'),
     'help' => t('The manufacturer of the CPU in the host.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['rpc_seqno'] = array(
+    );
+    $data['host']['rpc_seqno'] = array(
     'title' => bts('Number of times client has contacted server', array(), NULL, 'boinc:host-details'),
     'help' => t('The number of times the client has contacted the server.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['rpc_time'] = array(
+    );
+    $data['host']['rpc_time'] = array(
     'title' => bts('Last contact', array(), NULL, 'boinc:host-details'),
     'help' => t('The time of the last RPC contact with the host.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['host']['serialnum'] = array(
+    );
+    $data['host']['serialnum'] = array(
     'title' => bts('Serial number', array(), NULL, 'boinc:host-details'),
     'help' => t('Contains the release number of the BOINC application in use and the GPU of the host.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['host']['timezone'] = array(
+    );
+    $data['host']['timezone'] = array(
     'title' => bts('Timezone', array(), NULL, 'boinc:host-details'),
     'help' => t('The UTC offset of the local time.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host']['total_credit'] = array(
+    );
+    $data['host']['total_credit'] = array(
     'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
     'help' => t('The total accumulated BOINC credit for a host.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for platform table
-  // ------------------------------------------------------------------------------------------------
+    // ------------------------------------------------------------------------------------------------
+    // Definition for platform table
+    // ------------------------------------------------------------------------------------------------
   
-  $data['platform']['table']['group'] = t('BOINC');
-  $data['platform']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC platform'),
-      'help' => t('Operating system platforms'),
-      'database' => 'boinc_ro'
-  );
+    $data['platform']['table']['group'] = t('BOINC');
+    $data['platform']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC platform'),
+        'help' => t('Operating system platforms'),
+        'database' => 'boinc_ro'
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['platform']['id'] = array(
+    $data['platform']['id'] = array(
     'title' => bts('Platform ID', array(), NULL, 'boinc:platform-details'),
     'help' => t('The ID number of the platform.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of app fields (alphabetized)
+    // Descriptions of app fields (alphabetized)
   
-  $data['platform']['name'] = array(
+    $data['platform']['name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
     'help' => t('The name of the platform.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
+    );
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for result (task) table
-  // ------------------------------------------------------------------------------------------------
+    // ------------------------------------------------------------------------------------------------
+    // Definition for result (task) table
+    // ------------------------------------------------------------------------------------------------
   
-  $data['result']['table']['group'] = t('BOINC');
-  $data['result']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC result'),
-      'help' => t('Results produced by BOINC'),
-      'database' => 'boinc_ro'
-  );
+    $data['result']['table']['group'] = t('BOINC');
+    $data['result']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC result'),
+        'help' => t('Results produced by BOINC'),
+        'database' => 'boinc_ro'
+    );
   
-  // Create implicit relationships to the user, workunit, and host tables
+    // Create implicit relationships to the user, workunit, and host tables
   
-  $data['result']['table']['join'] = array(
+    $data['result']['table']['join'] = array(
     'user' => array(
-      'left_field' => 'id',
-      'field' => 'userid'
+        'left_field' => 'id',
+        'field' => 'userid'
     ),
     'workunit' => array(
-      'left_field' => 'id',
-      'field' => 'workunitid'
+        'left_field' => 'id',
+        'field' => 'workunitid'
     ),
     'host' => array(
-      'left_field' => 'id',
-      'field' => 'hostid'
+        'left_field' => 'id',
+        'field' => 'hostid'
     )
-  );
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['result']['id'] = array(
+    $data['result']['id'] = array(
     'title' => bts('Task ID', array(), NULL, 'boinc:task-details'),
     'help' => t('The ID number of this result.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['result']['userid'] = array(
+    $data['result']['userid'] = array(
     'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
     'help' => t('The owner of this result.'),
     // Foreign key to the {user} table
     'argument' => array(
-      'handler' => 'views_handler_argument_boincuser_id',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincuser_id',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'user',
-      'field' => 'userid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('User')
+        'base' => 'user',
+        'field' => 'userid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('User')
     )
-  );
-  $data['result']['workunitid'] = array(
+    );
+    $data['result']['workunitid'] = array(
     'title' => bts('Workunit ID', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The workunit associated with this result.'),
     // Foreign key to the {workunit} table
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'workunit',
-      'field' => 'workunitid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Workunit')
+        'base' => 'workunit',
+        'field' => 'workunitid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Workunit')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['hostid'] = array(
+    );
+    $data['result']['hostid'] = array(
     'title' => bts('Host ID', array(), NULL, 'boinc:task-details'),
     'help' => t('The host associated with this result.'),
     // Foreign key to the {host} table
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'host',
-      'field' => 'hostid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Host')
+        'base' => 'host',
+        'field' => 'hostid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Host')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of result fields (alphabetized)
+    // Descriptions of result fields (alphabetized)
   
-  $data['result']['appid'] = array(
+    $data['result']['appid'] = array(
     'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
     'help' => t('The ID number of the application.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['app_version_id'] = array(
+    );
+    $data['result']['app_version_id'] = array(
     'title' => bts('Application version', array(), NULL, 'boinc:task-details'),
     'help' => t('The version number of the application.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['claimed_credit'] = array(
+    );
+    $data['result']['claimed_credit'] = array(
     'title' => bts('Claimed credit', array(), NULL, 'boinc:task-details'),
     'help' => t('The credit claimed for this result.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['client_state'] = array(
+    );
+    $data['result']['client_state'] = array(
     'title' => bts('Client state', array(), NULL, 'boinc:task-details'),
     'help' => t('The state of the task on the client side.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['cpu_time'] = array(
+    );
+    $data['result']['cpu_time'] = array(
     'title' => bts('CPU time', array(), NULL, 'boinc:task-details'),
     'help' => t('The CPU time spent on the task.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['create_time'] = array(
+    );
+    $data['result']['create_time'] = array(
     'title' => bts('Created', array(), NULL, 'boinc:task-details:-1:ignoreoverwrite'),
     'help' => t('The time that the task was created.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['result']['elapsed_time'] = array(
+    );
+    $data['result']['elapsed_time'] = array(
     'title' => bts('Run time', array(), NULL, 'boinc:task-details'),
     'help' => t('The run time of the task.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['exit_status'] = array(
+    );
+    $data['result']['exit_status'] = array(
     'title' => bts('Exit status', array(), NULL, 'boinc:task-details'),
     'help' => t('The exit code of the task.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['granted_credit'] = array(
+    );
+    $data['result']['granted_credit'] = array(
     'title' => bts('Granted credit', array(), NULL, 'boinc:task-details'),
     'help' => t('The credit granted for this result.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['name'] = array(
+    );
+    $data['result']['name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
     'help' => t('The name of the task.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['result']['outcome'] = array(
+    );
+    $data['result']['outcome'] = array(
     'title' => bts('Outcome', array(), NULL, 'boinc:task-details'),
     'help' => t('The outcome of the task.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['received_time'] = array(
+    );
+    $data['result']['received_time'] = array(
     'title' => bts('Received time', array(), NULL, 'boinc:task-details'),
     'help' => t('The time that the result was received.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['result']['report_deadline'] = array(
+    );
+    $data['result']['report_deadline'] = array(
     'title' => bts('Report deadline', array(), NULL, 'boinc:task-details'),
     'help' => t('The deadline for the task.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['result']['sent_time'] = array(
+    );
+    $data['result']['sent_time'] = array(
     'title' => bts('Sent', array(), NULL, 'boinc:task-details'),
     'help' => t('The time that the task was sent.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['result']['server_state'] = array(
+    );
+    $data['result']['server_state'] = array(
     'title' => bts('Server state', array(), NULL, 'boinc:task-details'),
     'help' => t('The state of task on the server side.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['stderr_out'] = array(
+    );
+    $data['result']['stderr_out'] = array(
     'title' => bts('Stderr out', array(), NULL, 'boinc:task-details'),
     'help' => t('The output to standard error.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['result']['validate_state'] = array(
+    );
+    $data['result']['validate_state'] = array(
     'title' => bts('Validation state', array(), NULL, 'boinc:task-details'),
     'help' => t('The state of validation of this result.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['peak_working_set_size'] = array(
+    );
+    $data['result']['peak_working_set_size'] = array(
     'title' => bts('Peak working set size', array(), NULL, 'boinc:task-details'),
     'help' => t('Peak working set size.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['result']['peak_swap_size'] = array(
+    );
+    $data['result']['peak_swap_size'] = array(
     'title' => bts('Peak swap size', array(), NULL, 'boinc:task-details'),
     'help' => t('Peak swap size.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
     $data['result']['peak_disk_usage'] = array(
     'title' => bts('Peak disk usage', array(), NULL, 'boinc:task-details'),
     'help' => t('Peak disk usage.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
 
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for workunit table
-  // ------------------------------------------------------------------------------------------------
+    // ------------------------------------------------------------------------------------------------
+    // Definition for workunit table
+    // ------------------------------------------------------------------------------------------------
   
-  $data['workunit']['table']['group'] = t('BOINC');
-  $data['workunit']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC workunit'),
-      'help' => t('Workunits produced by BOINC'),
-      'database' => 'boinc_ro'
-  );
+    $data['workunit']['table']['group'] = t('BOINC');
+    $data['workunit']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC workunit'),
+        'help' => t('Workunits produced by BOINC'),
+        'database' => 'boinc_ro'
+    );
   
-  // Create implicit relationship to the app table
+    // Create implicit relationship to the app table
   
-  $data['workunit']['table']['join'] = array(
+    $data['workunit']['table']['join'] = array(
     'app' => array(
-      'left_field' => 'id',
-      'field' => 'appid'
+        'left_field' => 'id',
+        'field' => 'appid'
     )
-  );
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
   
-  $data['workunit']['id'] = array(
+    $data['workunit']['id'] = array(
     'title' => bts('Workunit ID', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The ID number of this workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['workunit']['appid'] = array(
+    $data['workunit']['appid'] = array(
     'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
     'help' => t('The application associated with this workunit.'), 
     'argument' => array( // foreign key to the {app} table
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'app',
-      'field' => 'appid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Application')
+        'base' => 'app',
+        'field' => 'appid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Application')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of workunit fields (alphabetized)
+    // Descriptions of workunit fields (alphabetized)
   
-  $data['workunit']['canonical_credit'] = array(
+    $data['workunit']['canonical_credit'] = array(
     'title' => bts('Canonical credit', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The canonical credit of the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['canonical_resultid'] = array(
+    );
+    $data['workunit']['canonical_resultid'] = array(
     'title' => bts('Canonical result ID', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The ID of the canonical result associated with the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['create_time'] = array(
+    );
+    $data['workunit']['create_time'] = array(
     'title' => bts('Created time', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The time that the workunit was created.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['workunit']['error_mask'] = array(
+    );
+    $data['workunit']['error_mask'] = array(
     'title' => bts('Error mask', array(), NULL, 'boinc:workunit-details'),
     'help' => t('Error mask of the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['min_quorum'] = array(
+    );
+    $data['workunit']['min_quorum'] = array(
     'title' => bts('Minimum quorum', array(), NULL, 'boinc:workunit-details'),
     'help' => t('Minimum quorum of the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['name'] = array(
+    );
+    $data['workunit']['name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreovewrite'),
     'help' => t('The name of the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['workunit']['max_error_results'] = array(
+    );
+    $data['workunit']['max_error_results'] = array(
     'title' => bts('Max error tasks', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The maximum number of error tasks in the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['max_success_results'] = array(
+    );
+    $data['workunit']['max_success_results'] = array(
     'title' => bts('Max success tasks', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The maximum number of successful tasks in the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['max_total_results'] = array(
+    );
+    $data['workunit']['max_total_results'] = array(
     'title' => bts('Max total tasks', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The maximum number of total tasks in the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['need_validate'] = array(
+    );
+    $data['workunit']['need_validate'] = array(
     'title' => bts('Needs validation', array(), NULL, 'boinc:workunit-details'),
     'help' => t('Whether or not a workunit needs validation.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['workunit']['target_nresults'] = array(
+    );
+    $data['workunit']['target_nresults'] = array(
     'title' => bts('Initial replication', array(), NULL, 'boinc:workunit-details'),
     'help' => t('The target number of results for the workunit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for app table
-  // ------------------------------------------------------------------------------------------------
+    // ------------------------------------------------------------------------------------------------
+    // Definition for app table
+    // ------------------------------------------------------------------------------------------------
   
-  $data['app']['table']['group'] = t('BOINC');
-  $data['app']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC app'),
-      'help' => t('Research applications run by BOINC'),
-      'database' => 'boinc_ro'
-  );
+    $data['app']['table']['group'] = t('BOINC');
+    $data['app']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC app'),
+        'help' => t('Research applications run by BOINC'),
+        'database' => 'boinc_ro'
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['app']['id'] = array(
+    $data['app']['id'] = array(
     'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
     'help' => t('The ID number of this application.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of app fields (alphabetized)
+    // Descriptions of app fields (alphabetized)
   
-  $data['app']['target_nresults'] = array(
+    $data['app']['target_nresults'] = array(
     'title' => bts('Target number of results', array(), NULL, 'boinc:application-details'),
     'help' => t('The number of times to replicate tasks in this application.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['app']['user_friendly_name'] = array(
+    );
+    $data['app']['user_friendly_name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
     'help' => t('The user friendly name of the application.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
+    );
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for app_version table
-  // ------------------------------------------------------------------------------------------------
+    // ------------------------------------------------------------------------------------------------
+    // Definition for app_version table
+    // ------------------------------------------------------------------------------------------------
   
-  $data['app_version']['table']['group'] = t('BOINC');
-  $data['app_version']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC app version'),
-      'help' => t('Versions of research applications run by BOINC'),
-      'database' => 'boinc_ro'
-  );
+    $data['app_version']['table']['group'] = t('BOINC');
+    $data['app_version']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC app version'),
+        'help' => t('Versions of research applications run by BOINC'),
+        'database' => 'boinc_ro'
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['app_version']['id'] = array(
+    $data['app_version']['id'] = array(
     'title' => bts('Application version ID', array(), NULL, 'boinc:application-details'),
     'help' => t('The ID number of this application version.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['app_version']['appid'] = array(
+    $data['app_version']['appid'] = array(
     'title' => bts('Application ID', array(), NULL, 'boinc:application-details'),
     'help' => t('The application ID associated with this app version.'),
     // Because this is a foreign key to the {app} table. This allows us to
     // have, when the view is configured with this relationship, all the fields
     // for the related node available.
     'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_numeric',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'app',
-      'field' => 'id',
-      'handler' => 'views_handler_relationship',
-      'label' => t('App ID')
+        'base' => 'app',
+        'field' => 'id',
+        'handler' => 'views_handler_relationship',
+        'label' => t('App ID')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  $data['app_version']['platformid'] = array(
+    $data['app_version']['platformid'] = array(
     'title' => bts('Platform ID', array(), NULL, 'boinc:platform-details'),
     'help' => t('The platform ID associated with this app version.'),
     // Because this is a foreign key to the {platform} table. This allows us to
     // have, when the view is configured with this relationship, all the fields
     // for the related node available.
     'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_numeric',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'platform',
-      'field' => 'id',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Platform ID')
+        'base' => 'platform',
+        'field' => 'id',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Platform ID')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of app fields (alphabetized)
+    // Descriptions of app fields (alphabetized)
   
-  $data['app_version']['plan_class'] = array(
+    $data['app_version']['plan_class'] = array(
     'title' => bts('Plan class', array(), NULL, 'boinc:application-details'),
     'help' => t('App version plan class.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['app_version']['version_num'] = array(
+    );
+    $data['app_version']['version_num'] = array(
     'title' => bts('Version number', array(), NULL, 'boinc:application-details'),
     'help' => t('The application version number.'),
     'field' => array(
-      'handler' => 'views_handler_field_boincwork_app_version_number',
-      'click sortable' => TRUE,
-      'float' => TRUE,
+        'handler' => 'views_handler_field_boincwork_app_version_number',
+        'click sortable' => TRUE,
+        'float' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // ------------------------------------------------------------------------------------------------
-  // Definition for host_app_version table
-  // ------------------------------------------------------------------------------------------------
+    // ------------------------------------------------------------------------------------------------
+    // Definition for host_app_version table
+    // ------------------------------------------------------------------------------------------------
   
-  $data['host_app_version']['table']['group'] = t('BOINC');
+    $data['host_app_version']['table']['group'] = t('BOINC');
   
-  // This table references the {host} table.
-  // This join creates an 'implicit' relationship to the host table, so that when
-  // "Host" is the base table, the fields are automatically available.
+    // This table references the {host} table.
+    // This join creates an 'implicit' relationship to the host table, so that when
+    // "Host" is the base table, the fields are automatically available.
   
-  // Index this array by the table name to which this table refers.
-  // 'left_field' is the primary key in the referenced table.
-  // 'field' is the foreign key in this table.
+    // Index this array by the table name to which this table refers.
+    // 'left_field' is the primary key in the referenced table.
+    // 'field' is the foreign key in this table.
   
-  $data['host_app_version']['table']['join'] = array(
+    $data['host_app_version']['table']['join'] = array(
     'host' => array(
-      'left_field' => 'id',
-      'field' => 'host_id',
+        'left_field' => 'id',
+        'field' => 'host_id',
     )
-  );
+    );
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
 
-  $data['host_app_version']['host_id'] = array(
+    $data['host_app_version']['host_id'] = array(
     'title' => bts('Computer', array(), NULL, 'boinc:host-details'),
     'help' => t('The host ID connected to this app version data.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['host_app_version']['app_version_id'] = array(
+    $data['host_app_version']['app_version_id'] = array(
     'title' => bts('App version ID', array(), NULL, 'boinc:application-details'),
     'help' => t('The app version ID connected to this host data.'),
     // Because this is a foreign key to the {host} table. This allows us to
     // have, when the view is configured with this relationship, all the fields
     // for the related node available.
     'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_numeric',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'app_version',
-      'field' => 'id',
-      'handler' => 'views_handler_relationship',
-      'label' => t('App version')
+        'base' => 'app_version',
+        'field' => 'id',
+        'handler' => 'views_handler_relationship',
+        'label' => t('App version')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of host_app_version fields (alphabetized)
+    // Descriptions of host_app_version fields (alphabetized)
   
-  $data['host_app_version']['consecutive_valid'] = array(
+    $data['host_app_version']['consecutive_valid'] = array(
     'title' => bts('Consecutive valid tasks', array(), NULL, 'boinc:application-details'),
     'help' => t('The number of consecutive valid tasks for this app and by this host.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['et_avg'] = array(
+    );
+    $data['host_app_version']['et_avg'] = array(
     'title' => t('Average processing rate'),
     'help' => t('The "et_avg" for this app and by this host.'),
     'field' => array(
-      'handler' => 'views_handler_field_boincwork_host_app_et_avg',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_boincwork_host_app_et_avg',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['et_n'] = array(
+    );
+    $data['host_app_version']['et_n'] = array(
     'title' => bts('Number of tasks completed', array(), NULL, 'boinc:application-details'),
     'help' => t('The tasks completed for this app and by this host.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['max_jobs_per_day'] = array(
+    );
+    $data['host_app_version']['max_jobs_per_day'] = array(
     'title' => bts('Max tasks per day', array(), NULL, 'boinc:application-details'),
     'help' => t('The maximum tasks per day for this app and by this host.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['n_jobs_today'] = array(
+    );
+    $data['host_app_version']['n_jobs_today'] = array(
     'title' => bts('Number of tasks today', array(), NULL, 'boinc:application-details'),
     'help' => t('The number of tasks today for this app and by this host.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['turnaround_avg'] = array(
+    );
+    $data['host_app_version']['turnaround_avg'] = array(
     'title' => bts('Average turnaround time', array(), NULL, 'boinc:application-details:-1:ignoreoverwrite'),
     'help' => t('The average turnaround time per task for this app and by this host.'),
     'field' => array(
-      'handler' => 'views_handler_field_boincwork_host_app_turnaround_avg',
-      'click sortable' => TRUE,
-      'float' => TRUE,
+        'handler' => 'views_handler_field_boincwork_host_app_turnaround_avg',
+        'click sortable' => TRUE,
+        'float' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['host_app_version']['user_friendly_name'] = array(
+    );
+    $data['host_app_version']['user_friendly_name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'),
     'help' => t('The user friendly name of the application.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
+    );
   
-  return $data;
+    return $data;
 }
 
 /*
@@ -1678,23 +1678,23 @@ 
 
 function boincwork_views_handlers() {
   
-  return array(
+    return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincwork') . '/views',
+        'path' => drupal_get_path('module', 'boincwork') . '/views',
     ),
     'handlers' => array(
-      'views_handler_argument_boincuser_id' => array(
+        'views_handler_argument_boincuser_id' => array(
         'parent' => 'views_handler_argument_numeric'
-      ),
-      'views_handler_field_boincwork_app_version_number' => array(
+        ),
+        'views_handler_field_boincwork_app_version_number' => array(
         'parent' => 'views_handler_field_numeric'
-      ),
-      'views_handler_field_boincwork_host_app_et_avg' => array(
+        ),
+        'views_handler_field_boincwork_host_app_et_avg' => array(
         'parent' => 'views_handler_field_numeric'
-      ),
-      'views_handler_field_boincwork_host_app_turnaround_avg' => array(
+        ),
+        'views_handler_field_boincwork_host_app_turnaround_avg' => array(
         'parent' => 'views_handler_field_numeric'
-      ),
+        ),
     )
-  );
+    );
 }

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

drupal/sites/default/boinc/modules/boincuser/boincuser.views.inc

Indentation +125 added lines, -125 removed lines

@@ -13,255 +13,255 @@ 
  */
 function boincuser_views_data() {
   
-  // -----------------------------------------------------------------------------------------------
-  // Definition for user table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for user table
+    // -----------------------------------------------------------------------------------------------
   
-  $data['user']['table']['group'] = t('BOINC');
+    $data['user']['table']['group'] = t('BOINC');
   
-  $data['user']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC user'),
-      'help' => t('BOINC account data for a user'),
-      'database' => 'boinc_ro'
-  );
+    $data['user']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC user'),
+        'help' => t('BOINC account data for a user'),
+        'database' => 'boinc_ro'
+    );
 
-  // Describe each of the individual fields in this table to Views. For
-  // each field, you may define what field, sort, argument, and/or filter
-  // handlers it supports. This will determine where in the Views interface you
-  // may use the field.
+    // Describe each of the individual fields in this table to Views. For
+    // each field, you may define what field, sort, argument, and/or filter
+    // handlers it supports. This will determine where in the Views interface you
+    // may use the field.
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
   
-  $data['user']['id'] = array(
+    $data['user']['id'] = array(
     'title' => bts('Id', array(), NULL, 'boinc:user-id'),
     'help' => t('The BOINC ID of the user account.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument_boincuser_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincuser_id', // custom handler
+        'name field' => 'title', // the field to display in the summary.
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['user']['teamid'] = array(
+    );
+    $data['user']['teamid'] = array(
     'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
     'help' => t('The ID of the user\'s team.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincteam_id', // custom handler
+        'name field' => 'title', // the field to display in the summary.
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of general host fields (alphabetized)
+    // Descriptions of general host fields (alphabetized)
   
-  $data['user']['authenticator'] = array(
+    $data['user']['authenticator'] = array(
     'title' => bts('Account Key', array(), NULL, 'boinc:user-info'),
     'help' => t('The BOINC account key of the user.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['country'] = array(
+    );
+    $data['user']['country'] = array(
     'title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     'help' => t('The country of the user.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['create_time'] = array(
+    );
+    $data['user']['create_time'] = array(
     'title' => bts('Member since', array(), NULL, 'boinc:user-info'),
     'help' => t('When the BOINC account was created.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['user']['cross_project_id'] = array(
+    );
+    $data['user']['cross_project_id'] = array(
     'title' => bts('CPID', array(), NULL, 'boinc:user-info'),
     'help' => t('The cross project user identifier.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['email_addr'] = array(
-      'title' => bts('Email Address', array(), NULL, 'boinc:user-info'),
+    );
+    $data['user']['email_addr'] = array(
+        'title' => bts('Email Address', array(), NULL, 'boinc:user-info'),
     'help' => t('The BOINC account email address.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['expavg_credit'] = array(
+    );
+    $data['user']['expavg_credit'] = array(
     'title' => bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC'),
     'help' => t('A decaying average of credit per day for the user.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['user']['name'] = array(
+    );
+    $data['user']['name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
     'help' => t('The BOINC account user name.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )                           
-  );
-  $data['user']['passwd_hash'] = array(
+    );
+    $data['user']['passwd_hash'] = array(
     'title' => bts('Password Hash', array(), NULL, 'boinc:user-info'),
     'help' => t('The user password hash'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['postal_code'] = array(
+    );
+    $data['user']['postal_code'] = array(
     'title' => bts('Postal Code', array(), NULL, 'boinc:user-info'),
     'help' => t('The postal code of the user.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['send_email'] = array(
+    );
+    $data['user']['send_email'] = array(
     'title' => bts('Send Email', array(), NULL, 'boinc:user-info'),
     'help' => t('User preference to allow email communications.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['user']['show_hosts'] = array(
+    );
+    $data['user']['show_hosts'] = array(
     'title' => bts('Show Hosts', array(), NULL, 'boinc:user-info'),
     'help' => t('User preference to display owned computers.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['user']['total_credit'] = array(
+    );
+    $data['user']['total_credit'] = array(
     'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
     'help' => t('The total accumulated BOINC credit for the user.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['user']['url'] = array(
+    );
+    $data['user']['url'] = array(
     'title' => bts('URL', array(), NULL, 'boinc:website-of-user-or-team'),
     'help' => t('The URL provided by the user'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
+    );
   
-  return $data;
+    return $data;
 }
 
 /*
@@ -272,17 +272,17 @@ 
  */
 
 function boincuser_views_handlers() {
-  return array(
+    return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincuser') . '/views',
+        'path' => drupal_get_path('module', 'boincuser') . '/views',
     ),
     'handlers' => array(
-      'views_handler_argument_boincuser_id' => array(
+        'views_handler_argument_boincuser_id' => array(
         'parent' => 'views_handler_argument_numeric'
-      ),
-      'views_handler_argument_boincteam_id' => array(
+        ),
+        'views_handler_argument_boincteam_id' => array(
         'parent' => 'views_handler_argument_numeric'
-      ),
+        ),
     )
-  );
+    );
 }

drupal/sites/default/boinc/modules/boincteam/boincteam.admin.inc

Indentation +99 added lines, -99 removed lines

@@ -17,15 +17,15 @@ 
  * Utility Form to delete teams suspected of being spammers.
  */
 function boincteam_utility_delete(&$form_state) {
-  $form = array();
+    $form = array();
 
-  $form['help'] = array(
+    $form['help'] = array(
     '#type' => 'fieldset',
     '#title' => t('Help'),
     '#collapsible' => TRUE,
-  );
+    );
 
-  $form['help']['text'] = array(
+    $form['help']['text'] = array(
     '#type' => 'item',
     '#description' => t('This utility page will help in identifying BOINC teams created by SPAMMERs which can be deleted. The search will find BOINC teams that meet the following criteria.
 <ul>
@@ -38,19 +38,19 @@ 
 <p> <i>How teams are deleted</i>: Select the teams to be deleted from the table below. Click "Delete Selected Teams" button to begin a batch operation to delete the teams. If you select teams, and then page through to another page of the table, your selections will be lost. I.e., only the teams select on the current page will be deleted.
 <p> The site must be offline/in maintenance mode before searching for and deleting teams. If not, the delete button below is disabled.
 '),
-  );
+    );
 
-  // This variable name has been changed for Drupal 7/8.
-  $maintenance_mode = variable_get('site_offline');
-  if (!$maintenance_mode) {
+    // This variable name has been changed for Drupal 7/8.
+    $maintenance_mode = variable_get('site_offline');
+    if (!$maintenance_mode) {
     drupal_set_message(t('WARNING: Site is online (not in maintenance mode)! Deleting teams is only allowed when site is offline. Change this setting in ') . l(t('Site maintenance'), '/admin/settings/site-maintenance'), 'warning');
-  }
+    }
 
-  $form['teamdelete'] = array(
+    $form['teamdelete'] = array(
     '#type' => 'fieldset',
     '#title' => t('Teams to delete'),
-  );
-  $form['teamdelete']['deleteall'] = array(
+    );
+    $form['teamdelete']['deleteall'] = array(
     '#type' => 'submit',
     '#disabled' => !($maintenance_mode),
     '#value' => t('Delete Selected Teams'),
@@ -58,101 +58,101 @@ 
     '#attributes' => array(
         'onclick' => 'return confirm(\'' . t('You are about to delete the selected teams suspected of being SPAM. Do you want to continue?') . '\')',
     ),
-  );
-  $form['teamdelete']['results_table'] = array(
+    );
+    $form['teamdelete']['results_table'] = array(
     '#value' => drupal_get_form('boincteam_utility_team_table'),
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 function boincteam_utility_team_table() {
 
-  $limit=50;
-  $sql = "SELECT team.id AS id, team.name AS name, team.nusers AS nusers FROM {team} WHERE team.nusers<2 AND team.total_credit=0 AND team.seti_id=0 AND team.description REGEXP '<a href'";
+    $limit=50;
+    $sql = "SELECT team.id AS id, team.name AS name, team.nusers AS nusers FROM {team} WHERE team.nusers<2 AND team.total_credit=0 AND team.seti_id=0 AND team.description REGEXP '<a href'";
 
-  // @todo - add bts() or t()
-  $resultheader = array(
+    // @todo - add bts() or t()
+    $resultheader = array(
     array(
-      'data' => 'Team ID',
-      'field' => 'id',
-      'sort' => 'asc',
+        'data' => 'Team ID',
+        'field' => 'id',
+        'sort' => 'asc',
     ),
     array(
-      'data' => 'Team Name',
-      'field' => 'name',
+        'data' => 'Team Name',
+        'field' => 'name',
     ),
     array(
-      'data' => 'Num Users',
-      'field' => 'nusers',
+        'data' => 'Num Users',
+        'field' => 'nusers',
     ),
     array(
-      'data' => 'Link to Team',
-      'field' => 'link',
+        'data' => 'Link to Team',
+        'field' => 'link',
     ),
-  );
+    );
 
-  $tablesort = tablesort_sql($resultheader);
-  db_set_active('boinc_rw');
-  $db_res = pager_query($sql . $tablesort, $limit);
-  db_set_active('default');
+    $tablesort = tablesort_sql($resultheader);
+    db_set_active('boinc_rw');
+    $db_res = pager_query($sql . $tablesort, $limit);
+    db_set_active('default');
 
-  $form = array();
-  $form['options'] = array();
-  $checkboxes = array();
-  if ($db_res) {
+    $form = array();
+    $form['options'] = array();
+    $checkboxes = array();
+    if ($db_res) {
     while ($result = db_fetch_object($db_res)) {
-      $drupalnid = boincteam_lookup_nid($result->id);
-      if ($drupalnid) {
+        $drupalnid = boincteam_lookup_nid($result->id);
+        if ($drupalnid) {
         $tlink = l($result->name, '/community/teams/' . $drupalnid);
-      }
-      else {
+        }
+        else {
         $tlink = '';
-      }
-      // only keys no values
-      $checkboxes[$result->id] = '';
+        }
+        // only keys no values
+        $checkboxes[$result->id] = '';
 
-      $form['id'][$result->id] = array(
+        $form['id'][$result->id] = array(
         '#value' => $result->id,
-      );
-      $form['name'][$result->id] = array(
+        );
+        $form['name'][$result->id] = array(
         '#value' => $result->name,
-      );
-      $form['nusers'][$result->id] = array(
+        );
+        $form['nusers'][$result->id] = array(
         '#value' => $result->nusers,
-      );
-      $form['link'][$result->id] = array(
+        );
+        $form['link'][$result->id] = array(
         '#value' => $tlink,
-      );
+        );
     }
 
     $form['checkboxes'] = array('#type' => 'checkboxes', '#options' => $checkboxes);
     $form['pager'] = array('#value' => theme('pager', NULL, $limit, 0));
 
     return $form;
-  }
-  return "<p>No teams matched the criteria for a SPAM team.</p>";
+    }
+    return "<p>No teams matched the criteria for a SPAM team.</p>";
 }
 
 /**
  * Submit handler - also creates the batch job to delete the teams.
  */
 function boincteam_utility_delete_team($form, &$form_state) {
-  $checkedteamids = $form_state['clicked_button']['#post']['checkboxes'];
-  // Use batch to delete teams
-  $operations = array();
-  foreach ($checkedteamids as $id) {
+    $checkedteamids = $form_state['clicked_button']['#post']['checkboxes'];
+    // Use batch to delete teams
+    $operations = array();
+    foreach ($checkedteamids as $id) {
     $operations[] = array('boincteam_utility_batch_process', array($id));
-  }
-  $batch = array(
+    }
+    $batch = array(
     'title' => t('Processing BOINC Teams'),
     'operations' => $operations,
     'init_message' => t('Starting team deletion'),
     'finished' => 'boincteam_utility_batch_finished',
     'file' => drupal_get_path('module', 'boincteam') . '/boincteam.admin.inc',
-  );
-  batch_set($batch);
-  //batch_process('/admin/boinc/utility-team-delete');
+    );
+    batch_set($batch);
+    //batch_process('/admin/boinc/utility-team-delete');
 }
 
 /*
@@ -163,37 +163,37 @@ 
  *     Input form (table)
  */
 function theme_boincteam_utility_team_table($form) {
-  //define table header
-  $header = array(
+    //define table header
+    $header = array(
     theme('table_select_header_cell'), //using that previously empty field
     array('data' => t('Team ID'), 'field' => 'id', 'sort' => 'asc'),
     array('data' => t('Name'), 'field' => 'name'),
     array('data' => t('Num Users'), 'field' => 'nusers'),
     array('data' => t('Link to Team'), 'field' => 'link'),
-  );
-  $rows = array();
-  $output = "";
-  if(!empty($form['checkboxes']['#options'])) {
+    );
+    $rows = array();
+    $output = "";
+    if(!empty($form['checkboxes']['#options'])) {
     foreach (element_children($form['id']) as $key) {
-      $rows[] = array(
+        $rows[] = array(
         drupal_render($form['checkboxes'][$key]),
         drupal_render($form['id'][$key]),
         drupal_render($form['name'][$key]),
         drupal_render($form['nusers'][$key]),
         drupal_render($form['link'][$key]),
-      );
+        );
+    }
     }
-  }
-  else {
+    else {
     $rows[] = array(array('data' => '<div class="error">No teams found</div>', 'colspan' => 5));
-  }
-  $output .= theme('table', $header, $rows);
-  if ($form['pager']['#value']) {
+    }
+    $output .= theme('table', $header, $rows);
+    if ($form['pager']['#value']) {
     $output .= drupal_render($form['pager']);
-  }
+    }
 
-  $output .= drupal_render($form);
-  return $output;
+    $output .= drupal_render($form);
+    return $output;
 }
 
 /**
@@ -202,26 +202,26 @@ 
  * table. It also removes the team's drupal page (node) if found.
  */
 function boincteam_utility_batch_process($id, &$context) {
-  $boincteam = boincteam_load($id);
-  $drupalid = boincteam_lookup_nid($id);
+    $boincteam = boincteam_load($id);
+    $drupalid = boincteam_lookup_nid($id);
 
-  // Delete entry in team table
-  db_set_active('boinc_rw');
-  $sql1='DELETE FROM {team} WHERE id=%d';
-  $db_res = db_query($sql1, $id);
-  db_set_active('default');
+    // Delete entry in team table
+    db_set_active('boinc_rw');
+    $sql1='DELETE FROM {team} WHERE id=%d';
+    $db_res = db_query($sql1, $id);
+    db_set_active('default');
 
-  // Delete entry in boincteam table
-  $sql2='DELETE FROM {boincteam} WHERE id=%d';
-  $db_res = db_query($sql2, $id);
+    // Delete entry in boincteam table
+    $sql2='DELETE FROM {boincteam} WHERE id=%d';
+    $db_res = db_query($sql2, $id);
 
-  // Delete the drupal node (if present)
-  if ($drupalid) {
+    // Delete the drupal node (if present)
+    if ($drupalid) {
     node_delete($drupalid);
-  }
+    }
 
-  $context['results'][] = $id . ' : ' . check_plain($boincteam->name);
-  $context['message'] = t('Processing team @name', array('@name' => $boincteam->name));
+    $context['results'][] = $id . ' : ' . check_plain($boincteam->name);
+    $context['message'] = t('Processing team @name', array('@name' => $boincteam->name));
 }
 
 /**
@@ -229,15 +229,15 @@ 
  * or failure.
  */
 function boincteam_utility_batch_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     $message = 'Info: Delete SPAM Teams utility- ' . count($results) . ' team(s) deleted.';
     drupal_set_message($message, 'info');
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'Error: An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
     drupal_set_message($message, 'error');
-  }
+    }
 }
\ No newline at end of file

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

Indentation +642 added lines, -642 removed lines

@@ -15,30 +15,30 @@ 
  */
 function boinctranslate_initialize_languages() {
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  $api_base_url = 'https://www.transifex.com/api/2';
-  $project_name = variable_get(
+    $api_base_url = 'https://www.transifex.com/api/2';
+    $project_name = variable_get(
     'boinc_translate_transifex_project_name', ''
-  );
-  $operations = array();
+    );
+    $operations = array();
 
-  if ($project_name) {
+    if ($project_name) {
     // Get all languages configured for this project at Transifex
     $path = "project/{$project_name}/languages";
     $response = boinctranslate_transifex_request($path);
 
     if ($response == '404 NOT FOUND') {
-      drupal_set_message(
+        drupal_set_message(
         t('Unable to get languages for %project.',
-          array(
+            array(
             '%project' => $project_name,
-          )
+            )
         ), 'warning'
-      );
+        );
     }
     elseif ($response) {
-      if (is_array($response)) {
+        if (is_array($response)) {
 
         $installed_languages = language_list();
         $available_languages = _locale_get_predefined_list();
@@ -48,13 +48,13 @@ 
 
         // Set up Transifex languages in Drupal
         foreach ($response as $language) {
-          $posix_code = $language['language_code'];
-          $rfc_code = strtolower(str_replace('_', '-', $posix_code));
-          $transifex_languages[$rfc_code] = $language;
-          if (!isset($installed_languages[$rfc_code])) {
+            $posix_code = $language['language_code'];
+            $rfc_code = strtolower(str_replace('_', '-', $posix_code));
+            $transifex_languages[$rfc_code] = $language;
+            if (!isset($installed_languages[$rfc_code])) {
             // See if this language can be installed from a predefined list
             if (isset($available_languages[$rfc_code])) {
-              locale_add_language(
+                locale_add_language(
                 $rfc_code,
                 NULL,
                 NULL,
@@ -62,30 +62,30 @@ 
                 NULL,
                 NULL,
                 FALSE
-              );
-              drupal_set_message(
+                );
+                drupal_set_message(
                 'Added predefined language: '.$available_languages[$rfc_code][0]
-              );
-              db_query("UPDATE {languages} SET enabled = 1 WHERE language = '%s'", $rfc_code);
+                );
+                db_query("UPDATE {languages} SET enabled = 1 WHERE language = '%s'", $rfc_code);
             }
             else {
-              // Retrieve language details from Transifex
-              $path = "language/{$posix_code}";
-              $response = boinctranslate_transifex_request($path);
+                // Retrieve language details from Transifex
+                $path = "language/{$posix_code}";
+                $response = boinctranslate_transifex_request($path);
 
-              if ($response == '404 NOT FOUND') {
+                if ($response == '404 NOT FOUND') {
                 drupal_set_message(
-                  t('Unable to get details for language %code.',
+                    t('Unable to get details for language %code.',
                     array(
-                      '%code' => $posix_code,
+                        '%code' => $posix_code,
                     )
-                  ), 'warning'
+                    ), 'warning'
                 );
-              }
-              elseif ($response) {
+                }
+                elseif ($response) {
                 if (!empty($response['name'])) {
-                  // Add a custom language to Drupal and enable
-                  locale_add_language(
+                    // Add a custom language to Drupal and enable
+                    locale_add_language(
                     $rfc_code,
                     $response['name'],
                     $response['name'],
@@ -93,362 +93,362 @@ 
                     NULL,
                     NULL,
                     TRUE
-                  );
-                  drupal_set_message(
+                    );
+                    drupal_set_message(
                     'Added new language: '.$response['name']
-                  );
+                    );
                 }
                 else {
-                  $variables = array(
+                    $variables = array(
                     '%code' => $posix_code,
-                  );
-                  drupal_set_message(
+                    );
+                    drupal_set_message(
                     t('Unable to get details for language %code.', $variables),
                     'error'
-                  );
-                  watchdog(
+                    );
+                    watchdog(
                     'boinctranslate',
                     'Unable to get details for language %code.',
                     $variables,
                     WATCHDOG_ERROR
-                  );
+                    );
+                }
                 }
-              }
-              else {
-               $variables = array(
-                  '%code' => $posix_code,
+                else {
+                $variables = array(
+                    '%code' => $posix_code,
                 );
                 drupal_set_message(
-                  t('Invalid response while getting details for language %code.', $variables),
-                  'error'
+                    t('Invalid response while getting details for language %code.', $variables),
+                    'error'
                 );
                 watchdog(
-                  'boinctranslate',
-                  'Invalid response while getting details for language %code.',
-                  $variables,
-                  WATCHDOG_ERROR
+                    'boinctranslate',
+                    'Invalid response while getting details for language %code.',
+                    $variables,
+                    WATCHDOG_ERROR
                 );
-              }
+                }
             }
             // Import any language files for the newly added language
             if ($batch = locale_batch_by_language($rfc_code, '_locale_batch_language_finished')) {
-              $operations = array_merge($operations, $batch['operations']);
-              $process_batches = TRUE;
+                $operations = array_merge($operations, $batch['operations']);
+                $process_batches = TRUE;
+            }
             }
-          }
         }
         drupal_set_message('Finished installing official BOINC languages.');
         // Disable languages that are not in Transifex
         foreach ($installed_languages as $langcode => $language) {
-          if (!isset($transifex_languages[$langcode])) {
+            if (!isset($transifex_languages[$langcode])) {
             $disabled_languages[$langcode] = $langcode;
             db_query("UPDATE {languages} SET enabled = 0 WHERE language = '%s'", $langcode);
-          }
+            }
         }
         if ($disabled_languages) {
-          drupal_set_message('The following languages were not found in Transifex and were disabled: ' . implode(' ', $disabled_languages));
+            drupal_set_message('The following languages were not found in Transifex and were disabled: ' . implode(' ', $disabled_languages));
         }
         if ($process_batches) {
-          $batch = array(
+            $batch = array(
             'operations' => $operations,
-          );
-          batch_set($batch);
-          batch_process('admin/boinc/translation');
+            );
+            batch_set($batch);
+            batch_process('admin/boinc/translation');
+        }
         }
-      }
-      else {
+        else {
         $variables = array(
-          '%project' => $project_name,
+            '%project' => $project_name,
         );
         drupal_set_message(
-          t('No languages found for %project. (Does the configured account have sufficient privileges at Transifex?)', $variables),
-          'error'
+            t('No languages found for %project. (Does the configured account have sufficient privileges at Transifex?)', $variables),
+            'error'
         );
         watchdog(
-          'boinctranslate',
-          'No languages found for %project. (Does the configured account have sufficient privileges at Transifex?)',
-          $variables,
-          WATCHDOG_ERROR
+            'boinctranslate',
+            'No languages found for %project. (Does the configured account have sufficient privileges at Transifex?)',
+            $variables,
+            WATCHDOG_ERROR
         );
-      }
+        }
     }
     else {
-     $variables = array(
+        $variables = array(
         '%project' => $project_name,
-      );
-      drupal_set_message(
+        );
+        drupal_set_message(
         t('Invalid response while getting languages for %project.', $variables),
         'error'
-      );
-      watchdog(
+        );
+        watchdog(
         'boinctranslate',
         'Invalid response while getting languages for %project.',
         $variables,
         WATCHDOG_ERROR
-      );
+        );
     }
-  }
-  drupal_goto('admin/boinc/translation');
+    }
+    drupal_goto('admin/boinc/translation');
 }
 
 /**
  *
  */
 function boinctranslate_export_translations() {
-  require_once(getcwd() . '/includes/locale.inc');
-  $project_name = variable_get(
+    require_once(getcwd() . '/includes/locale.inc');
+    $project_name = variable_get(
     'boinc_translate_transifex_project_name', ''
-  );
-  // Get resource names from local config
-  $resource_config = (variable_get(
+    );
+    // Get resource names from local config
+    $resource_config = (variable_get(
     'boinc_translate_transifex_project_resources', ''
-  ));
-  $resource_names = boinctranslate_parse_resources($resource_config);
-  $primary_resource = reset($resource_names);
+    ));
+    $resource_names = boinctranslate_parse_resources($resource_config);
+    $primary_resource = reset($resource_names);
 
-  if ($project_name AND $primary_resource) {
+    if ($project_name AND $primary_resource) {
     // Create or update the translation source, if needed
     $source_exists = FALSE;
     $path = "project/{$project_name}/resources";
     $resources = boinctranslate_transifex_request($path);
     if ($resources AND is_array($resources)) {
-      foreach ($resources as $resource) {
+        foreach ($resources as $resource) {
         if ($resource['slug'] == $primary_resource) {
-          $source_exists = TRUE;
-          break;
+            $source_exists = TRUE;
+            break;
         }
-      }
-      if (!$source_exists) {
+        }
+        if (!$source_exists) {
         // Create the source
         $path = "project/{$project_name}/resources";
         $post = array(
-          'slug' => $primary_resource,
-          'name' => 'Drupal-Project',
-          'i18n_type' => 'PO',
-          'category' => 'Drupal',
-          'content' => boinctranslate_get_po('en', 'project'),
+            'slug' => $primary_resource,
+            'name' => 'Drupal-Project',
+            'i18n_type' => 'PO',
+            'category' => 'Drupal',
+            'content' => boinctranslate_get_po('en', 'project'),
         );
         $result = boinctranslate_transifex_request($path, $post);
-      }
-      else {
+        }
+        else {
         // Update the source
         $path = "project/{$project_name}/resource/{$primary_resource}/content";
         $post = array(
-          'content' => boinctranslate_get_po('en', 'project')
+            'content' => boinctranslate_get_po('en', 'project')
         );
         $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
-      }
+        }
     }
 
     if (is_array($result) OR substr($result, 0, 6) != 'ERROR:') {
-      $enabled_languages = locale_language_list();
-      if ($source_exists) {
+        $enabled_languages = locale_language_list();
+        if ($source_exists) {
         drupal_set_message('Updated source translation strings at Transifex');
-      }
-      else {
+        }
+        else {
         drupal_set_message('Established new translation resource at Transifex');
-      }
-      // Try to export translations for all enabled languages
-      foreach ($enabled_languages as $langcode => $language_name) {
+        }
+        // Try to export translations for all enabled languages
+        foreach ($enabled_languages as $langcode => $language_name) {
         if ($langcode == 'en') {
-          continue;
+            continue;
         }
         $po_file = boinctranslate_get_po($langcode, 'project');
         if ($po_file) {
-          $path = "project/{$project_name}/resource/{$primary_resource}/translation/{$langcode}";
-          $post = array(
+            $path = "project/{$project_name}/resource/{$primary_resource}/translation/{$langcode}";
+            $post = array(
             'content' => $po_file,
-          );
-          $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
-          if (!is_array($result)
+            );
+            $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
+            if (!is_array($result)
           AND substr($result, 0, 6) == 'ERROR:') {
             drupal_set_message(
-              "Unable to update {$language_name} translations: {$result}",
-              'warning'
+                "Unable to update {$language_name} translations: {$result}",
+                'warning'
             );
-          }
-          else {
+            }
+            else {
             drupal_set_message("Updated {$language_name} translations");
             //drupal_set_message('DEBUG: <pre>'.print_r($result,1).'</pre>');
-          }
+            }
         }
         else {
-          drupal_set_message("No translations to export for {$language_name}");
+            drupal_set_message("No translations to export for {$language_name}");
+        }
         }
-      }
     }
     else {
-      drupal_set_message(
+        drupal_set_message(
         "Unable to update the translation source: {$result}",
         'warning'
-      );
+        );
     }
-  }
-  else {
+    }
+    else {
     drupal_set_message(
-      'Failed to export translations: Transifex settings are not intiailized.',
-      'error'
+        'Failed to export translations: Transifex settings are not intiailized.',
+        'error'
     );
-  }
-  drupal_goto('admin/boinc/translation');
+    }
+    drupal_goto('admin/boinc/translation');
 }
 
 /**
  *
  */
 function boinctranslate_update_official_boinc_translations() {
-  require_once(getcwd() . '/includes/locale.inc');
-  $project_name = variable_get(
+    require_once(getcwd() . '/includes/locale.inc');
+    $project_name = variable_get(
     'boinc_translate_transifex_standard_name', ''
-  );
-  $drupal_resource = variable_get(
+    );
+    $drupal_resource = variable_get(
     'boinc_translate_transifex_boinc_drupal_resource', ''
-  );
+    );
 
-  if ($project_name AND $drupal_resource) {
+    if ($project_name AND $drupal_resource) {
     // Create or update the translation source, if needed
     $source_exists = FALSE;
     $path = "project/{$project_name}/resources";
     $resources = boinctranslate_transifex_request($path);
     if ($resources AND is_array($resources)) {
-      foreach ($resources as $resource) {
+        foreach ($resources as $resource) {
         if ($resource['slug'] == $drupal_resource) {
-          $source_exists = TRUE;
-          break;
+            $source_exists = TRUE;
+            break;
+        }
         }
-      }
     }
 
     if ($source_exists) {
-      $enabled_languages = locale_language_list();
-      // Try to export translations for all enabled languages
-      foreach ($enabled_languages as $langcode => $language_name) {
+        $enabled_languages = locale_language_list();
+        // Try to export translations for all enabled languages
+        foreach ($enabled_languages as $langcode => $language_name) {
         if ($langcode == 'en') {
-          continue;
+            continue;
         }
         $po_file = boinctranslate_get_po($langcode, 'boinc');
         if ($po_file) {
-          $path = "project/{$project_name}/resource/{$drupal_resource}/translation/{$langcode}";
-          $post = array(
+            $path = "project/{$project_name}/resource/{$drupal_resource}/translation/{$langcode}";
+            $post = array(
             'content' => $po_file,
-          );
-          $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
+            );
+            $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
 
-          if (!is_array($result)) {
+            if (!is_array($result)) {
             if (substr($result, 0, 6) == 'ERROR:') {
-              drupal_set_message(
+                drupal_set_message(
                 "Unable to update {$language_name} official BOINC translations: {$result}",
                 'warning'
-              );
+                );
             }
             elseif ($result == '401 UNAUTHORIZED') {
-              drupal_set_message(
+                drupal_set_message(
                 'Not authorized to update official BOINC translations',
                 'warning'
-              );
-              break;
+                );
+                break;
             }
             elseif ($result == 'success') {
-              drupal_set_message("Updated {$language_name} official BOINC translations");
+                drupal_set_message("Updated {$language_name} official BOINC translations");
             }
             else {
-              drupal_set_message(
+                drupal_set_message(
                 "Unexpected response for {$language_name}: {$result}",
                 'warning'
-              );
+                );
             }
-          }
-          else {
+            }
+            else {
             drupal_set_message("Updated {$language_name} official BOINC translations");
             //drupal_set_message('DEBUG: <pre>'.print_r($result,1).'</pre>');
-          }
+            }
         }
         else {
-          drupal_set_message("No official BOINC translations to export for {$language_name}");
+            drupal_set_message("No official BOINC translations to export for {$language_name}");
+        }
         }
-      }
     }
     else {
-      drupal_set_message(
+        drupal_set_message(
         "The {$drupal_resource} resource does not exist in the {$project_name} project at Transifex",
         'warning'
-      );
+        );
     }
-  }
-  else {
+    }
+    else {
     drupal_set_message(
-      'Failed to export official BOINC translations: Transifex settings are not intiailized.',
-      'error'
+        'Failed to export official BOINC translations: Transifex settings are not intiailized.',
+        'error'
     );
-  }
-  drupal_goto('admin/boinc/translation');
+    }
+    drupal_goto('admin/boinc/translation');
 }
 
 /**
  *
  */
 function boinctranslate_download_pot($type = 'boinc') {
-  $po = boinctranslate_get_po(NULL, $type);
-  _locale_export_po(NULL, $po);
+    $po = boinctranslate_get_po(NULL, $type);
+    _locale_export_po(NULL, $po);
 }
 
 /**
  *
  */
 function boinctranslate_transifex_request($path, $post = NULL, $json = TRUE, $use_put = FALSE, $username = '', $password = '') {
-  $debug_mode = variable_get('boinc_debug_mode', 0);
+    $debug_mode = variable_get('boinc_debug_mode', 0);
 
-  // Transifex details
-  $api_base_url = 'https://www.transifex.com/api/2';
-  if (!$username) $username = variable_get('boinc_translate_transifex_user', '');
-  if (!$password) $password = variable_get('boinc_translate_transifex_pass', '');
+    // Transifex details
+    $api_base_url = 'https://www.transifex.com/api/2';
+    if (!$username) $username = variable_get('boinc_translate_transifex_user', '');
+    if (!$password) $password = variable_get('boinc_translate_transifex_pass', '');
 
-  $url = "{$api_base_url}/{$path}";
-  $headers = array(
+    $url = "{$api_base_url}/{$path}";
+    $headers = array(
     'Authorization' => 'Basic ' . base64_encode($username . ":" . $password),
-  );
-  $data = NULL;
+    );
+    $data = NULL;
 
-  if ($post) {
+    if ($post) {
     if ($json) {
-      $headers['Content-Type'] = 'application/json';
-      $data = json_encode($post);
+        $headers['Content-Type'] = 'application/json';
+        $data = json_encode($post);
     }
     else {
-      $data = drupal_query_string_encode($post);
+        $data = drupal_query_string_encode($post);
     }
     $method = ($use_put) ? 'PUT' : 'POST';
-  }
-  else {
+    }
+    else {
     $method = 'GET';
-  }
+    }
 
-  $response = drupal_http_request($url, $headers, $method, $data, 1, 10);
+    $response = drupal_http_request($url, $headers, $method, $data, 1, 10);
 
-  switch ($response->code) {
-  case 200:
+    switch ($response->code) {
+    case 200:
   case 304:
     if ($json) {
-      // Process as JSON
-      return json_decode($response->data, TRUE);
+        // Process as JSON
+        return json_decode($response->data, TRUE);
     }
     else {
-      return (string) $response->data;
+        return (string) $response->data;
     }
     break;
-  case 404:
+    case 404:
     return '404 NOT FOUND';
-  case 401:
+    case 401:
     return '401 UNAUTHORIZED';
-  case 400:
+    case 400:
     if ($debug_mode) watchdog('boinctranslate', "The following response was received when trying to communicate with the Transifex system: \n{$response}", array(), WATCHDOG_WARNING);
     return "ERROR: {$response->data}";
-  case 405:
+    case 405:
     if ($debug_mode) watchdog('boinctranslate', "The following response was received when trying to communicate with the Transifex system: \n{$response}", array(), WATCHDOG_WARNING);
     return "ERROR: User not allowed to perform this action";
-  }
+    }
 
-  return NULL;
+    return NULL;
 }
 
 /**
@@ -456,58 +456,58 @@ 
  */
 function boinctranslate_get_po($langcode, $type = 'standard') {
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  $all_languages = language_list();
-  $language = $langcode ? $all_languages[$langcode] : NULL;
-  $textgroups = array();
-  $strings = array();
+    $all_languages = language_list();
+    $language = $langcode ? $all_languages[$langcode] : NULL;
+    $textgroups = array();
+    $strings = array();
 
-  switch ($type) {
-  case 'standard':
+    switch ($type) {
+    case 'standard':
     $textgroups = array(
-      'default',
-      'taxonomy',
-      'views',
+        'default',
+        'taxonomy',
+        'views',
     );
     break;
-  case 'boinc':
+    case 'boinc':
     $textgroups = array(
-      'boinc',
+        'boinc',
     );
     break;
-  case 'project':
+    case 'project':
     $textgroups = array(
-      'blocks',
-      'menu',
-      'project',
+        'blocks',
+        'menu',
+        'project',
     );
     break;
-  default:
+    default:
   }
 
-  // Merge textgroup strings together for export as one file
-  foreach ($textgroups as $textgroup) {
+    // Merge textgroup strings together for export as one file
+    foreach ($textgroups as $textgroup) {
     $strings += _locale_export_get_strings($language, $textgroup);
-  }
-  ksort($strings);
-  foreach ($strings as $id => $string) {
+    }
+    ksort($strings);
+    foreach ($strings as $id => $string) {
     // Set the string context
     $strings[$id]['context'] = trim($string['comment']);
-  }
-  if ($langcode AND $langcode != 'en') {
+    }
+    if ($langcode AND $langcode != 'en') {
     // If not the source language, remove untranslated strings from the ouput
     foreach ($strings as $i => $string) {
-      if (!$string['translation']) {
+        if (!$string['translation']) {
         unset($strings[$i]);
-      }
+        }
     }
-  }
-  if ($strings) {
+    }
+    if ($strings) {
     return boinctranslate_export_po_generate($language, $strings, NULL, $type);
-  }
+    }
 
-  return NULL;
+    return NULL;
 }
 
 /**
@@ -515,21 +515,21 @@ 
  */
 function boinctranslate_export_po_generate($language = NULL, $strings = array(), $header = NULL, $type = NULL) {
 
-  require_once(getcwd() . '/includes/locale.inc');
-  global $user;
+    require_once(getcwd() . '/includes/locale.inc');
+    global $user;
 
-  // unset $language to indicate template creation
-  if (isset($language) && $language->language == "en") {
+    // unset $language to indicate template creation
+    if (isset($language) && $language->language == "en") {
     $language = NULL;
-  }
+    }
 
-  if (!isset($header)) {
+    if (!isset($header)) {
     if (isset($type) && $type == "project") {
-      $header = "# ".variable_get('site_name', 'Drupal-BOINC')." drupal localization template\n";
-      $header .= "# Copyright (C) ".date("Y")." ".variable_get('site_name', 'Drupal-BOINC')."\n";
+        $header = "# ".variable_get('site_name', 'Drupal-BOINC')." drupal localization template\n";
+        $header .= "# Copyright (C) ".date("Y")." ".variable_get('site_name', 'Drupal-BOINC')."\n";
     } else {
-      $header = "# BOINC drupal localization template\n";
-      $header .= "# Copyright (C) ".date("Y")." University of California\n";
+        $header = "# BOINC drupal localization template\n";
+        $header .= "# Copyright (C) ".date("Y")." University of California\n";
     }
     $header .= '# Generated by ' . $user->name . ' <' . $user->mail . ">\n";
     $header .= "#\n";
@@ -538,201 +538,201 @@ 
     $header .= "msgid \"\"\n";
     $header .= "msgstr \"\"\n";
     if (isset($type) && $type == "project") {
-      $header .= "\"Project-Id-Version: ".variable_get('site_name', 'Drupal-BOINC')." ".date("Y-m-d-H:iO")."\\n\"\n";
+        $header .= "\"Project-Id-Version: ".variable_get('site_name', 'Drupal-BOINC')." ".date("Y-m-d-H:iO")."\\n\"\n";
     } else {
-      $header .= "\"Project-Id-Version: BOINC unknown\\n\"\n"; // TODO: add SHA1 of source checkout here
+        $header .= "\"Project-Id-Version: BOINC unknown\\n\"\n"; // TODO: add SHA1 of source checkout here
     }
     $header .= "\"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc@ssl.berkeley.edu>\\n\"\n";
     $header .= "\"POT-Creation-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
     if (isset($language)) {
-      $header .= "\"PO-Revision-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
+        $header .= "\"PO-Revision-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
     }
     $header .= "\"Last-Translator: Generated automatically from Drupal translate interface\\n\"\n";
     $header .= "\"MIME-Version: 1.0\\n\"\n";
     $header .= "\"Content-Type: text/plain; charset=utf-8\\n\"\n";
     $header .= "\"Content-Transfer-Encoding: 8bit\\n\"\n";
     if (isset($language)) {
-      $header .= "\"Language: ".$language->language."\\n\"";
-      if ($language->formula && $language->plurals) {
+        $header .= "\"Language: ".$language->language."\\n\"";
+        if ($language->formula && $language->plurals) {
         $header .= "\"Plural-Forms: nplurals=" . $language->plurals . "; plural=" . strtr($language->formula, array('$' => '')) . ";\\n\"\n";
-      }
+        }
     }
     $header .= "\"X-Poedit-SourceCharset: utf-8\\n\"\n";
-  }
+    }
 
-  $output = $header . "\n";
+    $output = $header . "\n";
 
-  foreach ($strings as $lid => $string) {
+    foreach ($strings as $lid => $string) {
     // Only process non-children, children are output below their parent.
     if (!isset($string['child'])) {
-      if ($string['comment']) {
+        if ($string['comment']) {
         $output .= '#: ' . $string['comment'] . "\n";
-      }
-      if ($string['context']) {
+        }
+        if ($string['context']) {
         $output .= 'msgctxt "' . $string['context'] . "\"\n";
-      }
-      $output .= 'msgid ' . _locale_export_string($string['source']);
-      if (!empty($string['plural'])) {
+        }
+        $output .= 'msgid ' . _locale_export_string($string['source']);
+        if (!empty($string['plural'])) {
         $plural = $string['plural'];
         $output .= 'msgid_plural ' . _locale_export_string($strings[$plural]['source']);
         if (isset($language)) {
-          $translation = $string['translation'];
-          for ($i = 0; $i < $language->plurals; $i++) {
+            $translation = $string['translation'];
+            for ($i = 0; $i < $language->plurals; $i++) {
             $output .= 'msgstr[' . $i . '] ' . _locale_export_string($translation);
             if ($plural) {
-              $translation = _locale_export_remove_plural($strings[$plural]['translation']);
-              $plural = isset($strings[$plural]['plural']) ? $strings[$plural]['plural'] : 0;
+                $translation = _locale_export_remove_plural($strings[$plural]['translation']);
+                $plural = isset($strings[$plural]['plural']) ? $strings[$plural]['plural'] : 0;
             }
             else {
-              $translation = '';
+                $translation = '';
+            }
             }
-          }
         }
         else {
-          $output .= 'msgstr[0] ""' . "\n";
-          $output .= 'msgstr[1] ""' . "\n";
+            $output .= 'msgstr[0] ""' . "\n";
+            $output .= 'msgstr[1] ""' . "\n";
+        }
         }
-      }
-      else {
+        else {
         $output .= 'msgstr ' . _locale_export_string($string['translation']);
-      }
-      $output .= "\n";
+        }
+        $output .= "\n";
     }
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  *
  */
 function boinctranslate_refresh_translations() {
-  require_once(getcwd() . '/includes/locale.inc');
-  $errors = array();
-  $languages = locale_language_list();
-  $translation_resources = array();
-  $operations = array();
-  $debug_mode = variable_get('boinc_debug_mode', 0);
-
-  $boinc_name = variable_get(
+    require_once(getcwd() . '/includes/locale.inc');
+    $errors = array();
+    $languages = locale_language_list();
+    $translation_resources = array();
+    $operations = array();
+    $debug_mode = variable_get('boinc_debug_mode', 0);
+
+    $boinc_name = variable_get(
     'boinc_translate_transifex_standard_name', ''
-  );
-  $boinc_resources = boinctranslate_parse_resources(
+    );
+    $boinc_resources = boinctranslate_parse_resources(
     variable_get('boinc_translate_transifex_standard_resources', array())
-  );
-  // Add the Official BOINC resource to the list of BOINC resources;
-  // The official resource overrides any additional resources provided, so it
-  // should be added to the end so as to be processed last
-  $drupal_resource = variable_get(
+    );
+    // Add the Official BOINC resource to the list of BOINC resources;
+    // The official resource overrides any additional resources provided, so it
+    // should be added to the end so as to be processed last
+    $drupal_resource = variable_get(
     'boinc_translate_transifex_boinc_drupal_resource', ''
-  );
-  $boinc_resources[] = $drupal_resource;
-  if ($boinc_name AND $boinc_resources) {
+    );
+    $boinc_resources[] = $drupal_resource;
+    if ($boinc_name AND $boinc_resources) {
     $translation_resources[$boinc_name] = array(
-      'resources' => $boinc_resources,
-      'textgroups' => array(
+        'resources' => $boinc_resources,
+        'textgroups' => array(
         'boinc',
         'default',
         'taxonomy',
         'views',
-      ),
+        ),
     );
-  }
-  $project_name = variable_get(
+    }
+    $project_name = variable_get(
     'boinc_translate_transifex_project_name', ''
-  );
-  $project_resources = boinctranslate_parse_resources(
+    );
+    $project_resources = boinctranslate_parse_resources(
     variable_get('boinc_translate_transifex_project_resources', array())
-  );
-  if ($project_name AND $project_resources) {
+    );
+    if ($project_name AND $project_resources) {
     $translation_resources[$project_name] = array(
-      'resources' => $project_resources,
-      'textgroups' => array(
+        'resources' => $project_resources,
+        'textgroups' => array(
         'blocks',
         'menu',
         'project',
-      ),
+        ),
     );
     // Be sure any strings from the override file are added to the boinc group
     $override_file = './' . drupal_get_path('module', 'boinctranslate') . '/includes/other-boinc-translation-strings.txt';
     $other_strings = file($override_file);
     if ($other_strings) {
-      foreach ($other_strings as $string) {
+        foreach ($other_strings as $string) {
         $string = trim($string);
         if ($string) {
-          // Ignore lines starting with '#' i.e., comments.
-          if ($string[0] === "#")
+            // Ignore lines starting with '#' i.e., comments.
+            if ($string[0] === "#")
             continue;
 
-          // Use '|' as delimiter to split string and context info.
-          $line = explode("|", $string);
-          if ($line) {
+            // Use '|' as delimiter to split string and context info.
+            $line = explode("|", $string);
+            if ($line) {
             if (count($line)==1) {
-              $tl0 = trim($line[0]);
-              if ($tl0) {
+                $tl0 = trim($line[0]);
+                if ($tl0) {
                 bts($tl0);
-              }
+                }
             }
             elseif (count($line)>1) {
-              $tl0 = trim($line[0]);
-              $tl1 = trim($line[1]);
-              if ($tl0 and $tl1) {
+                $tl0 = trim($line[0]);
+                $tl1 = trim($line[1]);
+                if ($tl0 and $tl1) {
                 bts($tl0, array(), NULL, $tl1);
-              }
+                }
             }
-          }// if ($line)
+            }// if ($line)
 
         }// if ($string)
-      }// foreach
+        }// foreach
     }// if ($other_strings)
-  }
+    }
 
-  foreach ($languages as $langcode => $language) {
+    foreach ($languages as $langcode => $language) {
     if ($langcode == 'en') {
-      continue;
+        continue;
     }
 
     $import_stats = array(
-      'new' => 0,
-      'updated' => 0,
-      'deleted' => 0,
-      'skipped' => 0,
+        'new' => 0,
+        'updated' => 0,
+        'deleted' => 0,
+        'skipped' => 0,
     );
 
     foreach ($translation_resources as $project => $translation) {
-      foreach ($translation['resources'] as $resource) {
+        foreach ($translation['resources'] as $resource) {
 
         // Add this language to the batch operations
         $operations[] = array(
-          'boinctranslate_refresh_translations_op',
-          array(
+            'boinctranslate_refresh_translations_op',
+            array(
             $project, $resource, $langcode, $language, $translation['textgroups'], $debug_mode
-          ),
+            ),
         );
-      }
+        }
     }
     if ($batch = locale_batch_by_language($langcode)) {
-      foreach ($batch['operations'] as $op) {
+        foreach ($batch['operations'] as $op) {
         $operations[] = array(
-          'boinctranslate_refresh_translations_op',
-          array(
+            'boinctranslate_refresh_translations_op',
+            array(
             NULL, $op[1][0], $langcode, $language, array('default'), $debug_mode
-          ),
+            ),
         );
-      }
+        }
+    }
     }
-  }
 
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boinctranslate_refresh_translations_finished',
     'title' => t('Importing translations'),
     'init_message' => t('Beginning translation import...'),
     'progress_message' => t('Applied @current out of @total translation updates.'),
     'error_message' => t('Translation import has encountered an error.'),
-  );
+    );
 
-  batch_set($batch);
-  batch_process();
+    batch_set($batch);
+    batch_process();
 }
 
 
@@ -741,18 +741,18 @@ 
  */
 function boinctranslate_refresh_translations_op($project, $resource, $langcode, $language, $textgroups, $debug_mode, &$context) {
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  if ($debug_mode) {
+    if ($debug_mode) {
     watchdog(
-      'boinctranslate',
-      'Checking for @language updates in @project:@resource',
-      array('@language' => $language, '@project' => $project, '@resource' => $resource),
-      WATCHDOG_INFO
+        'boinctranslate',
+        'Checking for @language updates in @project:@resource',
+        array('@language' => $language, '@project' => $project, '@resource' => $resource),
+        WATCHDOG_INFO
     );
-  }
+    }
 
-  if ($project) {
+    if ($project) {
     // Import the configured resources
     $success = FALSE;
     $message = '';
@@ -760,10 +760,10 @@ 
     $response = boinctranslate_transifex_request($path);
 
     if ($response == '404 NOT FOUND') {
-      $message = "Project resource {$project}:{$resource} not found in {$language}.";
+        $message = "Project resource {$project}:{$resource} not found in {$language}.";
     }
     elseif ($response) {
-      if (!empty($response['content'])) {
+        if (!empty($response['content'])) {
         $po_text = $response['content'];
 
         // Write the translation file to a temporary location
@@ -771,163 +771,163 @@ 
         $file->filepath = file_save_data($po_text, NULL);
         $file->filename = basename($file->filepath);
         if (!$file->filepath) {
-          $message = 'Unable to create temporary file in '
+            $message = 'Unable to create temporary file in '
             . file_directory_temp() . " for {$language} translation "
             . "resource {$project}:{$resource}";
         }
 
         foreach ($textgroups as $textgroup) {
-          // Import the translations from the file to each related textgroup
-          if (!$results = _boinctranslate_locale_import_po($file, $langcode, LOCALE_IMPORT_OVERWRITE, $textgroup)) {
+            // Import the translations from the file to each related textgroup
+            if (!$results = _boinctranslate_locale_import_po($file, $langcode, LOCALE_IMPORT_OVERWRITE, $textgroup)) {
             $message = "The {$language} translation import of"
-              . " {$project}:{$resource} failed.";
+                . " {$project}:{$resource} failed.";
             $success = FALSE;
             break;
-          }
-          else {
+            }
+            else {
             $success = TRUE;
-          }
+            }
+        }
         }
-      }
-      else {
+        else {
         $message = "Unable to read response for {$language} translation import"
-          . " of {$project}:{$resource}.";
-      }
+            . " of {$project}:{$resource}.";
+        }
     }
     else {
-      $message = "Translation data not found in response for {$language}"
+        $message = "Translation data not found in response for {$language}"
         . " translation import of {$project}:{$resource}.";
     }
-  }
-  else {
+    }
+    else {
     // If project isn't specified, import as a local Drupal resource
     $project = 'drupal.local';
     $file = new stdClass();
     $file->filepath = $resource;
     $file->filename = basename($file->filepath);
     if (!$results = _boinctranslate_locale_import_po($file, $langcode, LOCALE_IMPORT_OVERWRITE, $textgroup)) {
-      $message = "The {$language} translation import of"
+        $message = "The {$language} translation import of"
         . " local file {$resource} failed.";
-      $success = FALSE;
+        $success = FALSE;
     }
     else {
-      $success = TRUE;
+        $success = TRUE;
+    }
     }
-  }
 
-  if ($success) {
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = "{$langcode}:{$textgroup}";
     $message = "Imported {$language} translations in {$project}:{$resource} ({$results['new']} added, {$results['updated']} refreshed, {$results['deleted']} removed)";
 
     if ($debug_mode) {
-      watchdog(
+        watchdog(
         'boinctranslate',
         $message,
         array(),
         WATCHDOG_INFO
-      );
+        );
     }
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = "{$langcode}:{$textgroup}";
     watchdog(
-      'boinctranslate',
-      $message,
-      array(),
-      WATCHDOG_WARNING
+        'boinctranslate',
+        $message,
+        array(),
+        WATCHDOG_WARNING
     );
-  }
+    }
 
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['language'] = $langcode;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['language'] = $langcode;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // Update the progress for the batch engine
+    if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+    }
+    else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boinctranslate_refresh_translations_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $count = count($results['success']);
     $message = "Successfully completed {$count} import operations";
     watchdog(
-      'boinctranslate',
-      'Successfully completed @count import operations.',
-      array('@count' => $count),
-      WATCHDOG_INFO
+        'boinctranslate',
+        'Successfully completed @count import operations.',
+        array('@count' => $count),
+        WATCHDOG_INFO
     ); 
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
     watchdog(
-      'boinctranslate',
-      $message,
-      array(),
-      WATCHDOG_WARNING
+        'boinctranslate',
+        $message,
+        array(),
+        WATCHDOG_WARNING
     );
-  }
-  drupal_set_message($message);
-  drupal_goto('admin/boinc/translation');
+    }
+    drupal_set_message($message);
+    drupal_goto('admin/boinc/translation');
 }
 
 /**
  *
  */
 function _boinctranslate_locale_import_po($file, $langcode, $mode, $group = NULL) {
-  // Try to allocate enough time to parse and import the data.
-  if (function_exists('set_time_limit')) {
+    // Try to allocate enough time to parse and import the data.
+    if (function_exists('set_time_limit')) {
     @set_time_limit(240);
-  }
+    }
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  // Check if we have the language already in the database.
-  if (!db_fetch_object(db_query("SELECT language FROM {languages} WHERE language = '%s'", $langcode))) {
+    // Check if we have the language already in the database.
+    if (!db_fetch_object(db_query("SELECT language FROM {languages} WHERE language = '%s'", $langcode))) {
     drupal_set_message(t('The language selected for import is not supported.'), 'error');
     return FALSE;
-  }
+    }
 
-  // Get strings from file (returns on failure after a partial import, or on success)
-  $status = _boinctranslate_locale_import_read_po('db-store', $file, $mode, $langcode, $group);
-  if ($status === FALSE) {
+    // Get strings from file (returns on failure after a partial import, or on success)
+    $status = _boinctranslate_locale_import_read_po('db-store', $file, $mode, $langcode, $group);
+    if ($status === FALSE) {
     // Error messages are set in _locale_import_read_po().
     return FALSE;
-  }
+    }
 
-  // Get status information on import process.
-  list($headerdone, $additions, $updates, $deletes, $skips) = _boinctranslate_locale_import_one_string('db-report');
+    // Get status information on import process.
+    list($headerdone, $additions, $updates, $deletes, $skips) = _boinctranslate_locale_import_one_string('db-report');
 
-  if (!$headerdone) {
+    if (!$headerdone) {
     drupal_set_message(t('The translation file %filename appears to have a missing or malformed header.', array('%filename' => $file->filename)), 'error');
-  }
+    }
 
-  // Clear cache and force refresh of JavaScript translations.
-  _locale_invalidate_js($langcode);
-  cache_clear_all('locale:', 'cache', TRUE);
+    // Clear cache and force refresh of JavaScript translations.
+    _locale_invalidate_js($langcode);
+    cache_clear_all('locale:', 'cache', TRUE);
 
-  // Rebuild the menu, strings may have changed.
-  menu_rebuild();
+    // Rebuild the menu, strings may have changed.
+    menu_rebuild();
 
-  return array(
+    return array(
     'new' => $additions,
     'updated' => $updates,
     'deleted' => $deletes,
     'skipped' => $skips,
-  );
+    );
 }
 
 /**
@@ -935,253 +935,253 @@ 
  */
 function _boinctranslate_locale_import_read_po($op, $file, $mode = NULL, $lang = NULL, $group = 'default') {
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  $fd = fopen($file->filepath, "rb"); // File will get closed by PHP on return
-  if (!$fd) {
+    $fd = fopen($file->filepath, "rb"); // File will get closed by PHP on return
+    if (!$fd) {
     watchdog(
-      'boinctranslate',
-      'The translation import for %lang failed, because %filename could not be read.',
-      array('%lang' => $lang, '%filename' => $file->filename),
-      WATCHDOG_WARNING
+        'boinctranslate',
+        'The translation import for %lang failed, because %filename could not be read.',
+        array('%lang' => $lang, '%filename' => $file->filename),
+        WATCHDOG_WARNING
     );
     _locale_import_message('The translation import failed, because the file %filename could not be read.', $file);
     return FALSE;
-  }
+    }
 
-  $context = "COMMENT"; // Parser context: COMMENT, MSGID, MSGID_PLURAL, MSGSTR and MSGSTR_ARR
-  $current = array(); // Current entry being read
-  $plural = 0; // Current plural form
-  $lineno = 0; // Current line
+    $context = "COMMENT"; // Parser context: COMMENT, MSGID, MSGID_PLURAL, MSGSTR and MSGSTR_ARR
+    $current = array(); // Current entry being read
+    $plural = 0; // Current plural form
+    $lineno = 0; // Current line
 
-  while (!feof($fd)) {
+    while (!feof($fd)) {
     $line = fgets($fd, 10 * 1024); // A line should not be this long
     if ($lineno == 0) {
-      // The first line might come with a UTF-8 BOM, which should be removed.
-      $line = str_replace("\xEF\xBB\xBF", '', $line);
+        // The first line might come with a UTF-8 BOM, which should be removed.
+        $line = str_replace("\xEF\xBB\xBF", '', $line);
     }
     $lineno++;
     $line = trim(strtr($line, array("\\\n" => "")));
 
     if (!strncmp("#", $line, 1)) { // A comment
-      if ($context == "COMMENT") { // Already in comment context: add
+        if ($context == "COMMENT") { // Already in comment context: add
         $current["#"][] = substr($line, 1);
-      }
-      elseif (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
+        }
+        elseif (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
         _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
         $current = array();
         $current["#"][] = substr($line, 1);
         $context = "COMMENT";
-      }
-      else { // Parse error
+        }
+        else { // Parse error
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: "msgstr" was expected but not found on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgstr" was expected but not found on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgstr" was expected but not found on line %line.', $file, $lineno);
         return FALSE;
-      }
+        }
     }
     elseif (!strncmp("msgctxt", $line, 7)) {
-      if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
+        if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
         _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
         $current = array();
-      }
-      elseif (($context == "MSGID") || ($context == "MSGCTXT")) { // Already in this context? Parse error
+        }
+        elseif (($context == "MSGID") || ($context == "MSGCTXT")) { // Already in this context? Parse error
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: "msgctxt" is unexpected on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgctxt" is unexpected on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgid" is unexpected on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $line = trim(substr($line, 7));
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        }
+        $line = trim(substr($line, 7));
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $current["msgctxt"] = $quoted;
-      $context = "MSGCTXT";
+        }
+        $current["msgctxt"] = $quoted;
+        $context = "MSGCTXT";
     }
     elseif (!strncmp("msgid_plural", $line, 12)) {
-      if ($context != "MSGID") { // Must be plural form for current entry
+        if ($context != "MSGID") { // Must be plural form for current entry
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: "msgid_plural" was expected but not found on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgid_plural" was expected but not found on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgid_plural" was expected but not found on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $line = trim(substr($line, 12));
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        }
+        $line = trim(substr($line, 12));
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $current["msgid"] = $current["msgid"] . "\0" . $quoted;
-      $context = "MSGID_PLURAL";
+        }
+        $current["msgid"] = $current["msgid"] . "\0" . $quoted;
+        $context = "MSGID_PLURAL";
     }
     elseif (!strncmp("msgid", $line, 5)) {
-      if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
+        if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
         _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
         $current = array();
-      }
-      elseif ($context == "MSGID") { // Already in this context? Parse error
+        }
+        elseif ($context == "MSGID") { // Already in this context? Parse error
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: "msgid" is unexpected on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgid" is unexpected on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgid" is unexpected on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $line = trim(substr($line, 5));
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        }
+        $line = trim(substr($line, 5));
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $current["msgid"] = $quoted;
-      $context = "MSGID";
+        }
+        $current["msgid"] = $quoted;
+        $context = "MSGID";
     }
     elseif (!strncmp("msgstr[", $line, 7)) {
-      if (($context != "MSGID") && ($context != "MSGID_PLURAL") && ($context != "MSGSTR_ARR")) { // Must come after msgid, msgid_plural, or msgstr[]
+        if (($context != "MSGID") && ($context != "MSGID_PLURAL") && ($context != "MSGSTR_ARR")) { // Must come after msgid, msgid_plural, or msgstr[]
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: "msgstr[]" is unexpected on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgstr[]" is unexpected on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgstr[]" is unexpected on line %line.', $file, $lineno);
         return FALSE;
-      }
-      if (strpos($line, "]") === FALSE) {
+        }
+        if (strpos($line, "]") === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $frombracket = strstr($line, "[");
-      $plural = substr($frombracket, 1, strpos($frombracket, "]") - 1);
-      $line = trim(strstr($line, " "));
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        }
+        $frombracket = strstr($line, "[");
+        $plural = substr($frombracket, 1, strpos($frombracket, "]") - 1);
+        $line = trim(strstr($line, " "));
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $current["msgstr"][$plural] = $quoted;
-      $context = "MSGSTR_ARR";
+        }
+        $current["msgstr"][$plural] = $quoted;
+        $context = "MSGSTR_ARR";
     }
     elseif (!strncmp("msgstr", $line, 6)) {
-      if ($context != "MSGID") { // Should come just after a msgid block
+        if ($context != "MSGID") { // Should come just after a msgid block
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: "msgstr" is unexpected on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgstr" is unexpected on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgstr" is unexpected on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $line = trim(substr($line, 6));
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        }
+        $line = trim(substr($line, 6));
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $current["msgstr"] = $quoted;
-      $context = "MSGSTR";
+        }
+        $current["msgstr"] = $quoted;
+        $context = "MSGSTR";
     }
     elseif ($line != "") {
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      if (($context == "MSGID") || ($context == "MSGID_PLURAL")) {
+        }
+        if (($context == "MSGID") || ($context == "MSGID_PLURAL")) {
         $current["msgid"] .= $quoted;
-      }
-      elseif ($context == "MSGSTR") {
+        }
+        elseif ($context == "MSGSTR") {
         $current["msgstr"] .= $quoted;
-      }
-      elseif ($context == "MSGSTR_ARR") {
+        }
+        elseif ($context == "MSGSTR_ARR") {
         $current["msgstr"][$plural] .= $quoted;
-      }
-      else {
+        }
+        else {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: there is an unexpected string on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: there is an unexpected string on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: there is an unexpected string on line %line.', $file, $lineno);
         return FALSE;
-      }
+        }
+    }
     }
-  }
 
-  // End of PO file, flush last entry
-  if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) {
+    // End of PO file, flush last entry
+    if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) {
     _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
-  }
-  elseif ($context != "COMMENT") {
+    }
+    elseif ($context != "COMMENT") {
     watchdog(
-      'boinctranslate',
-      'The translation file %filename for %lang ended unexpectedly at line %line.',
-      array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-      WATCHDOG_WARNING
+        'boinctranslate',
+        'The translation file %filename for %lang ended unexpectedly at line %line.',
+        array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+        WATCHDOG_WARNING
     );
     _locale_import_message('The translation file %filename ended unexpectedly at line %line.', $file, $lineno);
     return FALSE;
-  }
+    }
 
 }
 
@@ -1190,28 +1190,28 @@ 
  */
 function _boinctranslate_locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NULL, $file = NULL, $group = 'default') {
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  static $report = array(
+    static $report = array(
     'additions' => 0,
     'updates' => 0,
     'deletes' => 0,
     'skips' => 0,
-  );
-  static $headerdone = FALSE;
-  static $strings = array();
+    );
+    static $headerdone = FALSE;
+    static $strings = array();
 
-  switch ($op) {
+    switch ($op) {
     // Return stored strings
     case 'mem-report':
       return $strings;
 
-      // Store string in memory (only supports single strings)
+        // Store string in memory (only supports single strings)
     case 'mem-store':
       $strings[$value['msgid']] = $value['msgstr'];
-      return;
+        return;
 
-      // Called at end of import to inform the user
+        // Called at end of import to inform the user
     case 'db-report':
       return array(
         $headerdone,
@@ -1219,57 +1219,57 @@ 
         $report['updates'],
         $report['deletes'],
         $report['skips'],
-      );
+        );
 
-      // Store the string we got in the database.
+        // Store the string we got in the database.
     case 'db-store':
       // We got header information.
       if ($value['msgid'] == '') {
         $languages = language_list();
         if (($mode != LOCALE_IMPORT_KEEP) || empty($languages[$lang]->plurals)) {
-          // Since we only need to parse the header if we ought to update the
-          // plural formula, only run this if we don't need to keep existing
-          // data untouched or if we don't have an existing plural formula.
-          $header = _locale_import_parse_header($value['msgstr']);
+            // Since we only need to parse the header if we ought to update the
+            // plural formula, only run this if we don't need to keep existing
+            // data untouched or if we don't have an existing plural formula.
+            $header = _locale_import_parse_header($value['msgstr']);
 
-          // Get and store the plural formula if available.
-          if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filename)) {
+            // Get and store the plural formula if available.
+            if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filename)) {
             list($nplurals, $plural) = $p;
             db_query("UPDATE {languages} SET plurals = %d, formula = '%s' WHERE language = '%s'", $nplurals, $plural, $lang);
-          }
+            }
         }
         $headerdone = TRUE;
-      }
+        }
 
-      else {
+        else {
         // Some real string to import.
         $comments = _locale_import_shorten_comments(empty($value['#']) ? array() : $value['#']);
 
         if (strpos($value['msgid'], "\0")) {
-          // This string has plural versions.
-          $english = explode("\0", $value['msgid'], 2);
-          $entries = array_keys($value['msgstr']);
-          for ($i = 3; $i <= count($entries); $i++) {
+            // This string has plural versions.
+            $english = explode("\0", $value['msgid'], 2);
+            $entries = array_keys($value['msgstr']);
+            for ($i = 3; $i <= count($entries); $i++) {
             $english[] = $english[1];
-          }
-          $translation = array_map('_locale_import_append_plural', $value['msgstr'], $entries);
-          $english = array_map('_locale_import_append_plural', $english, $entries);
-          foreach ($translation as $key => $trans) {
+            }
+            $translation = array_map('_locale_import_append_plural', $value['msgstr'], $entries);
+            $english = array_map('_locale_import_append_plural', $english, $entries);
+            foreach ($translation as $key => $trans) {
             if ($key == 0) {
-              $plid = 0;
+                $plid = 0;
             }
             $plid = _boinctranslate_locale_import_one_string_db($report, $lang, $english[$key], $trans, $group, $comments, $mode, $plid, $key);
-          }
+            }
         }
 
         else {
-          // A simple string to import.
-          $english = $value['msgid'];
-          $translation = $value['msgstr'];
-          _boinctranslate_locale_import_one_string_db($report, $lang, $english, $translation, $group, $comments, $mode);
+            // A simple string to import.
+            $english = $value['msgid'];
+            $translation = $value['msgstr'];
+            _boinctranslate_locale_import_one_string_db($report, $lang, $english, $translation, $group, $comments, $mode);
         }
-      }
-  } // end of db-store operation
+        }
+    } // end of db-store operation
 }
 
 /**
@@ -1286,15 +1286,15 @@ 
  */
 function _boinctranslate_locale_import_one_string_db(&$report, $langcode, $source, $translation, $textgroup, $location, $mode, $plid = NULL, $plural = NULL) {
 
-  $ignoreoverwrite = FALSE;
-  $lid = 0;
+    $ignoreoverwrite = FALSE;
+    $lid = 0;
 
-  // Use different DB query depending on the textgroup.
-  $uselocation = array("boinc", "project");
-  if (in_array($textgroup, $uselocation)) {
+    // Use different DB query depending on the textgroup.
+    $uselocation = array("boinc", "project");
+    if (in_array($textgroup, $uselocation)) {
     $resource = db_query("SELECT lid FROM {locales_source} WHERE location = '%s' AND source = '%s' AND textgroup = '%s'", $location, $source, $textgroup);
-  }
-  else {
+    }
+    else {
     $resource = db_query("SELECT lid FROM {locales_source} WHERE source = '%s' AND textgroup = '%s'", $source, $textgroup);
 
     // Parse the location string for the string ignoreoverwrite, which
@@ -1303,61 +1303,61 @@ 
     // location string.
     $parts = explode(':', $location);
     if (!empty($parts[2])) {
-      if (preg_match('/(ignoreoverwrite)/', $parts[2])) {
+        if (preg_match('/(ignoreoverwrite)/', $parts[2])) {
         $ignoreoverwrite = TRUE;
-      }
+        }
     }
-  }// if (in_array($textgroup, $uselocation))
+    }// if (in_array($textgroup, $uselocation))
 
-  if (!empty($translation)) {
+    if (!empty($translation)) {
     // Skip this string unless it passes a check for dangerous code.
     // Text groups other than default still can contain HTML tags
     // (i.e. translatable blocks).
     if ($textgroup == "default" && !locale_string_is_safe($translation)) {
-      $report['skips']++;
-      $lid = 0;
+        $report['skips']++;
+        $lid = 0;
     }
     elseif ($resource) {
-      // We have this source string saved already. Loop over the db results from locales_source table.
-      while ($row = db_fetch_array($resource)) {
+        // We have this source string saved already. Loop over the db results from locales_source table.
+        while ($row = db_fetch_array($resource)) {
 
         $lid = $row['lid'];
         // Check of if one or more translations exist for this lid in locales_target table.
         $exists = (bool) db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
         if (!$exists) {
-          // No translation in this language, insert translation into locales_target table.
-          db_query("INSERT INTO {locales_target} (lid, language, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $langcode, $translation, $plid, $plural);
-          $report['additions']++;
+            // No translation in this language, insert translation into locales_target table.
+            db_query("INSERT INTO {locales_target} (lid, language, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $langcode, $translation, $plid, $plural);
+            $report['additions']++;
         }
         else if ( ($mode == LOCALE_IMPORT_OVERWRITE) and (!$ignoreoverwrite) ) {
-          // Translation exists, only overwrite if instructed.
-          db_query("UPDATE {locales_target} SET translation = '%s', plid = %d, plural = %d WHERE language = '%s' AND lid = %d", $translation, $plid, $plural, $langcode, $lid);
-          $report['updates']++;
+            // Translation exists, only overwrite if instructed.
+            db_query("UPDATE {locales_target} SET translation = '%s', plid = %d, plural = %d WHERE language = '%s' AND lid = %d", $translation, $plid, $plural, $langcode, $lid);
+            $report['updates']++;
         }
         else {
-          $report['skips']++;
+            $report['skips']++;
         }// end if !$exists
 
-      }// while
+        }// while
     }
-  }
-  elseif ($mode == LOCALE_IMPORT_OVERWRITE AND $resource) {
+    }
+    elseif ($mode == LOCALE_IMPORT_OVERWRITE AND $resource) {
     // Loop over db results from locales_source table.
     while ($row = db_fetch_array($resource)) {
-      $lid = $row['lid'];
-      $exists = (bool) db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
-      if ($exists) {
+        $lid = $row['lid'];
+        $exists = (bool) db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
+        if ($exists) {
         // Empty translation, remove existing if instructed.
         db_query("DELETE FROM {locales_target} WHERE language = '%s' AND lid = %d AND plid = %d AND plural = %d", $langcode, $lid, $plid, $plural);
         $report['deletes']++;
-      }// if $exists
+        }// if $exists
     }// while
-  }
-  else {
+    }
+    else {
     $report['skips']++;
-  }
+    }
 
-  return $lid;
+    return $lid;
 }
 
 
@@ -1366,17 +1366,17 @@ 
  * Parse valid resources out of configuration
  */
 function boinctranslate_parse_resources($resource_text) {
-  $resources = array();
-  $resource_array = explode(
+    $resources = array();
+    $resource_array = explode(
     "\n", $resource_text
-  );
-  foreach ($resource_array as $resource) {
+    );
+    foreach ($resource_array as $resource) {
     $resource = trim($resource);
     if ($resource AND $resource[0] != '#') {
-      $resources[] = $resource;
+        $resources[] = $resource;
     }
-  }
-  return $resources;
+    }
+    return $resources;
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1403,5 +1403,5 @@ 
  * database.
  */
 function _boinctranslate_supertrim($instr) {
-  return implode("\n", array_map('trim', preg_split('/\r\n|\r|\n/', $instr) ) );
+    return implode("\n", array_map('trim', preg_split('/\r\n|\r|\n/', $instr) ) );
 }