BOINC / boinc

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

Indentation +1727 added lines, -1727 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,259 +188,259 @@ 
  *   $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')) {
     // This will always be set on PHP7, but not on PHP5 with 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');
 }
 
 
@@ -452,26 +452,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('
@@ -479,8 +479,8 @@ 
       ORDER BY id ASC'
     );
     $user_count = mysqli_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);
@@ -491,7 +491,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
@@ -507,86 +507,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 = mysqli_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);
 }
 
 /**
@@ -594,81 +594,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');
 }
 
 
@@ -681,23 +681,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;
@@ -705,112 +705,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 = mysqli_num_rows($boinc_teams);
-  db_set_active('default');
+    );
+    $team_count = mysqli_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);
 }
 
 /**
@@ -819,67 +819,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');
 }
 
 
@@ -892,25 +892,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,
@@ -924,51 +924,51 @@ 
       AND (f2.user_src IS NULL OR f1.create_time < f2.create_time)
     ORDER BY create_time',
     $pre, $pre
-  );
-  $friendship_count = mysqli_num_rows($friendships);
-  db_set_active('default');
+    );
+    $friendship_count = mysqli_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);
 }
 
 /**
@@ -977,83 +977,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');
 }
 
 
@@ -1066,78 +1066,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 = mysqli_num_rows($quarrelers);
-  db_set_active('default');
+    );
+    $quarreler_count = mysqli_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);
 }
 
 /**
@@ -1146,99 +1146,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');
 }
 
 
@@ -1251,74 +1251,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 = mysqli_num_rows($boinc_private_msgs);
-  db_set_active('default');
+    );
+    $private_msg_count = mysqli_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);
 }
 
 /**
@@ -1327,95 +1327,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');
 }
 
 
@@ -1428,196 +1428,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 = mysqli_num_rows($boinc_forum_categories);
-  $boinc_forums = db_query('
+    );
+    $forum_category_count = mysqli_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 = mysqli_num_rows($boinc_forums);
-  db_set_active('default');
+    );
+    $forum_count = mysqli_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);
 }
 
 /**
@@ -1626,92 +1626,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'];
-  }
+    }
 }
 
 /**
@@ -1720,40 +1720,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']);
 
@@ -1765,31 +1765,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'];
-  }
+    }
 }
 
 /**
@@ -1797,46 +1797,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,
@@ -1845,61 +1845,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');
 }
 
 
@@ -1911,82 +1911,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);
 }
 
 /**
@@ -1994,18 +1994,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
@@ -2015,10 +2015,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 = '';
 
@@ -2031,52 +2031,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,
@@ -2090,61 +2090,61 @@ 
         'sticky' => $topic->sticky,
         'format' => $input_format,
         'teaser' => $teaser,
-      );
-      $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) {
+        );
+        $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) {
         $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.
@@ -2154,54 +2154,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');
 }
 
 
@@ -2214,91 +2214,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);
 }
 
 /**
@@ -2306,17 +2306,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
@@ -2324,10 +2324,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('
@@ -2345,29 +2345,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);
@@ -2376,14 +2376,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;
 
@@ -2394,85 +2394,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.
@@ -2482,19 +2482,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']);
@@ -2503,39 +2503,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');
 }
 
 
@@ -2548,97 +2548,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 = mysqli_num_rows($boincteam_forums);
-  db_set_active('default');
+    );
+    $team_forum_count = mysqli_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);
 }
 
 /**
@@ -2648,15 +2648,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,
@@ -2672,67 +2672,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');
 }
 
 
@@ -2745,25 +2745,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
@@ -2772,78 +2772,78 @@ 
     WHERE f.parent_type = 1
     ORDER BY id',
     $pre, $pre, $pre
-  );
-  $boincteam_topic_count = mysqli_num_rows($boincteam_topics);
-  $total_team_topic_count = db_result(db_query('
+    );
+    $boincteam_topic_count = mysqli_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);
 }
 
 /**
@@ -2852,21 +2852,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('
@@ -2875,36 +2875,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,
@@ -2919,89 +2919,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');
 }
 
 
@@ -3014,81 +3014,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('
@@ -3096,7 +3096,7 @@ 
       FROM %spost
       WHERE thread = %d
       ORDER BY timestamp ASC',
-      $pre, $boincteam_topic->id
+        $pre, $boincteam_topic->id
     );
     db_set_active('default');
 
@@ -3104,43 +3104,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);
 }
 
 /**
@@ -3149,11 +3149,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);
@@ -3162,14 +3162,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;
 
@@ -3180,110 +3180,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');
 }
 
 
@@ -3296,71 +3296,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 = mysqli_num_rows($users_with_subscriptions);
-  db_set_active('default');
+    );
+    $user_count = mysqli_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);
 }
 
 /**
@@ -3369,72 +3369,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');
 }
 
 
@@ -3446,112 +3446,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);
 }
 
 /**
@@ -3559,27 +3559,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
@@ -3588,23 +3588,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.
@@ -3614,12 +3614,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'];
+    }
     }
-  }
 }
 
 /**
@@ -3627,48 +3627,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.
@@ -3678,12 +3678,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'];
+    }
     }
-  }
 }
 
 /**
@@ -3691,47 +3691,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.
@@ -3741,85 +3741,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');
 }
 
 
@@ -3831,43 +3831,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}');
 }
 
 /**
@@ -3875,15 +3875,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']));
@@ -3892,71 +3892,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;
 }
 
 
@@ -3965,25 +3965,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;
 }
 
 /**
@@ -3991,14 +3991,14 @@ 
  */
 class BoincImportUrlTransformer {
 
-  var $basePath;
-  var $boincDomain;
-  var $drupalDomain;
+    var $basePath;
+    var $boincDomain;
+    var $drupalDomain;
 
-  /**
-   * Constructor
-   */
-  function __construct() {
+    /**
+     * Constructor
+     */
+    function __construct() {
     global $base_url;
     global $base_path;
     $boinc_base_urls = variable_get('boincimport_base_url_boinc', '');
@@ -4008,208 +4008,208 @@ 
     $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);
     }
-  }
+    }
 
-  // old-style constructor for backwards compatibility
-  function BoincImportUrlTransformer() {
+    // old-style constructor for backwards compatibility
+    function BoincImportUrlTransformer() {
     self::__construct();
-  }
+    }
 
-  /**
-   * 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.module

Indentation +383 added lines, -383 removed lines

@@ -2,9 +2,9 @@ 
 // $Id$
 
 /**
-  * @file
-  * Enable BOINC features related to processing work and credit.
-  */
+ * @file
+ * Enable BOINC features related to processing work and credit.
+ */
 
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -21,70 +21,70 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * Implementation of hook_menu().
-  */
+ * Implementation of hook_menu().
+ */
 function boincwork_menu() {
-  require_boinc('util');
-  $items['account/prefs'] = array(
+    require_boinc('util');
+    $items['account/prefs'] = array(
     'title' => 'Computing',
     'description' => '',
     'page callback' => 'generalprefs_page',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_NORMAL_ITEM
-  );
-  $items['account/prefs/computing'] = array(
+    );
+    $items['account/prefs/computing'] = array(
     'title' => 'Computing',
     'page callback' => 'generalprefs_page',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => 0
-  );
-  $items['account/prefs/project'] = array(
+    );
+    $items['account/prefs/project'] = array(
     'title' => 'Project',
     'page callback' => 'projectprefs_page',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_LOCAL_TASK,
     'weight' => 5
-  );
-  $items['account/prefs/community'] = array(
+    );
+    $items['account/prefs/community'] = array(
     'title' => 'Community',
     'page callback' => 'communityprefs_page',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_LOCAL_TASK,
     'weight' => 10
-  );
-  $items['account/prefs/privacy'] = array(
+    );
+    $items['account/prefs/privacy'] = array(
     'title' => 'Privacy',
     'page callback' => 'privacyprefs_page',
     'access callback' => 'user_is_logged_in',
     'type' => MENU_LOCAL_TASK,
     'weight' => 15
-  );
-  if (module_exists('ignore_user')) {
+    );
+    if (module_exists('ignore_user')) {
     $items['account/prefs/privacy/ignore_user/add'] = array(
-      'title' => 'Add from ignore list',
-      'description' => 'Add user that you with to ignore to your ignore list.',
-      'page callback' => 'boincwork_ignore_user_add_user',
-      'access callback' => 'user_access',
-      'access arguments' => array('ignore user'),
-      'type' => MENU_CALLBACK,
+        'title' => 'Add from ignore list',
+        'description' => 'Add user that you with to ignore to your ignore list.',
+        'page callback' => 'boincwork_ignore_user_add_user',
+        'access callback' => 'user_access',
+        'access arguments' => array('ignore user'),
+        'type' => MENU_CALLBACK,
     );
     $items['account/prefs/privacy/ignore_user/remove'] = array(
-      'title' => 'Remove from ignore list',
-      'description' => 'Remove user from your ignore list.',
-      'page callback' => 'boincwork_ignore_user_remove_user',
-      'access callback' => 'user_access',
-      'access arguments' => array('ignore user'),
-      'type' => MENU_CALLBACK,
+        'title' => 'Remove from ignore list',
+        'description' => 'Remove user from your ignore list.',
+        'page callback' => 'boincwork_ignore_user_remove_user',
+        'access callback' => 'user_access',
+        'access arguments' => array('ignore user'),
+        'type' => MENU_CALLBACK,
     );
-  }// endif module_exists
-  $items['account/certs'] = array(
+    }// endif module_exists
+    $items['account/certs'] = array(
     'title' =>'Account certificate',
     'page callback' => 'boincwork_certificates',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['admin/boinc/prefs/general'] = array(
+    );
+    $items['admin/boinc/prefs/general'] = array(
     'title' => 'Preferences: General',
     'description' => 'Set options for BOINC preference set pages',
     'page callback' => 'drupal_get_form',
@@ -92,16 +92,16 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincwork.admin.inc'
-  );
-  $items['admin/boinc/prefs/presets'] = array(
+    );
+    $items['admin/boinc/prefs/presets'] = array(
     'title' => 'Preferences: Presets',
     'description' => 'Set values for BOINC preference set presets.',
     'page callback' => 'boincwork_admin_prefs_presets_page',
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincwork.admin.inc'
-  );
-  $items['admin/boinc/prefs/upload'] = array(
+    );
+    $items['admin/boinc/prefs/upload'] = array(
     'title' => 'Preferences: Project-specific XML upload',
     'description' => 'Upload XML configuration for project specific preferences.',
     'page callback' => 'drupal_get_form',
@@ -109,153 +109,153 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincwork.admin.inc'
-  );
-  $items['host/%/delete'] = array(
+    );
+    $items['host/%/delete'] = array(
     'title' => 'Delete host',
     'page callback' => 'boincwork_host_delete',
     'page arguments' => array(1),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['host/%/log'] = array(
+    );
+    $items['host/%/log'] = array(
     'title' => 'Host log',
     'page callback' => 'boincwork_host_log',
     'page arguments' => array(1),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['host/%/merge'] = array(
+    );
+    $items['host/%/merge'] = array(
     'title' => 'Merge computer',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('boincwork_host_merge_form', 1),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['host/%/set-venue/%'] = array(
+    );
+    $items['host/%/set-venue/%'] = array(
     'title' => 'Set host venue',
     'page callback' => 'boincwork_host_set_venue',
     'page arguments' => array(1,3),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK,
-  );
-  $items['user/%/mobile'] = array(
+    );
+    $items['user/%/mobile'] = array(
     'title' => 'Mobile stats',
     'page callback' => 'boincwork_mobile_stats',
     'page arguments' => array(1),
     'access callback' => 'user_is_logged_in',
     'type' => MENU_CALLBACK
-  );
-  $items['server_status.php'] = array(
+    );
+    $items['server_status.php'] = array(
     'title' => 'Server status',
     'page callback' => 'boincwork_server_status',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['job_file.php'] = array(
+    );
+    $items['job_file.php'] = array(
     'title' => 'Job file input',
     'page callback' => 'boincwork_job_file',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['get_output.php'] = array(
+    );
+    $items['get_output.php'] = array(
     'title' => 'Get output file',
     'page callback' => 'boincwork_get_output',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['get_project_config.php'] = array(
+    );
+    $items['get_project_config.php'] = array(
     'title' => 'Project config',
     'page callback' => 'boincwork_get_project_config',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['submit_rpc_handler.php'] = array(
+    );
+    $items['submit_rpc_handler.php'] = array(
     'title' => 'Remote job submission',
     'page callback' => 'boincwork_submit_rpc_handler',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['userw.php'] = array(
+    );
+    $items['userw.php'] = array(
     'title' => 'User WAP',
     'page callback' => 'boincwork_user_wap',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['account/tasks/%/%'] = array(
+    );
+    $items['account/tasks/%/%'] = array(
     'title' => 'Account Tasks Table',
     'description' => '',
     'page callback' => 'boincwork_account_task_table',
     'page arguments' => array(2,3),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
-  );
-  $items['host/%/tasks/%/%'] = array(
+    );
+    $items['host/%/tasks/%/%'] = array(
     'title' => 'Host Tasks Table',
     'description' => '',
     'page callback' => 'boincwork_host_task_table',
     'page arguments' => array(1,3,4),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
-  );
-  // Workunit task table disabled
-  //$items['workunit/%/tasks/%/%'] = array(
-  //  'title' => 'Workunit Tasks Table',
-  //  'description' => '',
-  //  'page callback' => 'boincwork_workunit_task_table',
-  //  'page arguments' => array(1,3,4),
-  //  'access arguments' => array('access content'),
-  //  'type' => MENU_CALLBACK,
-  //);
-  return $items;
+    );
+    // Workunit task table disabled
+    //$items['workunit/%/tasks/%/%'] = array(
+    //  'title' => 'Workunit Tasks Table',
+    //  'description' => '',
+    //  'page callback' => 'boincwork_workunit_task_table',
+    //  'page arguments' => array(1,3,4),
+    //  'access arguments' => array('access content'),
+    //  'type' => MENU_CALLBACK,
+    //);
+    return $items;
 }
 
 /**
  * Implementation of hook_theme().
  */
 function boincwork_theme() {
-  return array(
+    return array(
     'boincwork_privacyprefs_form' => array(
-      'arguments' => array('form'),
+        'arguments' => array('form'),
     ),
-  );
+    );
 }
 
 /**
 * Implementation of hook_views_api().
 */
 function boincwork_views_api() {
-  return array(
+    return array(
     'api' => 2.0,
     'path' => drupal_get_path('module', 'boincwork')
-  );
+    );
 }
 
 /**
  * Implementation of hook_locale().
  */
 function boincwork_locale($op = 'groups', $group = NULL) {
-  switch ($op) {
+    switch ($op) {
     case 'groups':
       return array('project' => bts('Project'));
     case 'info':
       $info['project']['refresh callback'] = 'boincwork_locale_refresh';
-      $info['project']['format'] = FALSE;
-      return $info;
-  }
+        $info['project']['format'] = FALSE;
+        return $info;
+    }
 }
 
 /**
  * Refresh strings.
  */
 function boincwork_locale_refresh() {
-  // Mimic process of adding project specific prefs to the project preferences
-  // form -- this parses the prefs XML and calls i18nstrings_update()
-  $form = array();
-  $prefs = array(
+    // Mimic process of adding project specific prefs to the project preferences
+    // form -- this parses the prefs XML and calls i18nstrings_update()
+    $form = array();
+    $prefs = array(
     'project_specific' => array(),
-  );
-  boincwork_add_project_specific_prefs($form, $prefs);
-  return TRUE; // Meaning it completed with no issues
+    );
+    boincwork_add_project_specific_prefs($form, $prefs);
+    return TRUE; // Meaning it completed with no issues
 }
 
 
@@ -264,43 +264,43 @@ 
  */
 
 function boincwork_privatemsg_message_view_alter(&$vars) {
-  global $user;
+    global $user;
 
-  $author = $vars['message']['author'];
-  if (!isset($vars['message']['thread_id'])) {
+    $author = $vars['message']['author'];
+    if (!isset($vars['message']['thread_id'])) {
     // No thread id, this is probably only a preview
     return;
-  }
-  $thread_id = $vars['message']['thread_id'];
+    }
+    $thread_id = $vars['message']['thread_id'];
 
-  if ($user->uid != $author->uid) {
+    if ($user->uid != $author->uid) {
     if ($vars['message']['is_blocked']) {
-      $vars['message_actions']['unignore_user'] = array(
+        $vars['message_actions']['unignore_user'] = array(
         'title' => bts('Stop Ignoring User', array(), NULL, 'boinc:ignore-user-remove'),
         'href' => 'account/prefs/privacy/ignore_user/remove/'. $author->uid,
         'query' => 'destination=messages/view/' . $thread_id,
-      );
+        );
     }
     else {
-      $vars['message_actions']['ignore_user'] = array(
+        $vars['message_actions']['ignore_user'] = array(
         'title' => bts('Ignore User', array(), NULL, 'boinc:ignore-user-add'),
         'href' => 'account/prefs/privacy/ignore_user/add/'. $author->uid,
         'query' => 'destination=messages/view/' . $thread_id,
-      );
+        );
+    }
     }
-  }
 }
 
 /**
  * Implementation of hook_cron()
  */
 function boincwork_cron() {
-  // Delete expired hosts in the BOINC database, host_delete table.
-  require_boinc('boinc_db');
-  $num_deleted = BoincHostDeleted::delete_expired();
-  if ($num_deleted>0) {
+    // Delete expired hosts in the BOINC database, host_delete table.
+    require_boinc('boinc_db');
+    $num_deleted = BoincHostDeleted::delete_expired();
+    if ($num_deleted>0) {
     watchdog('boincwork', "Deleted ${num_deleted} hosts from host_deleted table", WATCHDOG_NOTICE);
-  }
+    }
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -308,41 +308,41 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * General preferences menu callback.
-  * Called when user goes to edit preferences page
-  */
+ * General preferences menu callback.
+ * Called when user goes to edit preferences page
+ */
 function generalprefs_page($action = null, $venue = null, $advanced = FALSE) {
 
-  // Keep the venue selected across preference pages
-  boincwork_select_venue($venue);
+    // Keep the venue selected across preference pages
+    boincwork_select_venue($venue);
 
-  $pref_sets = array('generic', 'home', 'school', 'work');
-  $output = null;
-  // Set the page title
-  $title = 'Computing';
-  drupal_set_title($title);
+    $pref_sets = array('generic', 'home', 'school', 'work');
+    $output = null;
+    // Set the page title
+    $title = 'Computing';
+    drupal_set_title($title);
 
-  switch ($action) {
+    switch ($action) {
 
-  case 'clear':
+    case 'clear':
     // Remove settings from this preference set
     if ($venue AND $venue != 'generic') {
-      boincwork_save_prefs(NULL, 'general', $venue);
-      drupal_set_message(t('Settings for the "@name" preference set have been
+        boincwork_save_prefs(NULL, 'general', $venue);
+        drupal_set_message(t('Settings for the "@name" preference set have been
         cleared', array('@name' => ucfirst($venue))));
-      // Set the generic preference set as active
-      $_SESSION['prefs venue'] = 'generic';
+        // Set the generic preference set as active
+        $_SESSION['prefs venue'] = 'generic';
     }
     drupal_goto();
     break;
 
-  case 'combined':
+    case 'combined':
     // Compare preference sets; tabular view
 
     foreach ($pref_sets as $pref_set) {
-      $form_state = array();
-      $prefs[$pref_set] = drupal_retrieve_form('boincwork_generalprefs_form', $form_state, $pref_set);
-      drupal_prepare_form('boincwork_generalprefs_form', $prefs[$pref_set], $form_state);
+        $form_state = array();
+        $prefs[$pref_set] = drupal_retrieve_form('boincwork_generalprefs_form', $form_state, $pref_set);
+        drupal_prepare_form('boincwork_generalprefs_form', $prefs[$pref_set], $form_state);
     }
 
     $output .= '<p>' . bts('These apply to all BOINC projects in which you participate.', array(), NULL, 'boinc:account-preferences-computing') . '<br/>';
@@ -355,29 +355,29 @@ 
     $prefs_table = boincwork_make_prefs_table($prefs['generic']['prefs']['advanced']);
 
     foreach ($prefs_table as $category => $section) {
-      $output .= '<tr class="section-heading">';
-      $output .= "<td>{$section['name']}</td>";
-      foreach ($pref_sets as $pref_set) {
+        $output .= '<tr class="section-heading">';
+        $output .= "<td>{$section['name']}</td>";
+        foreach ($pref_sets as $pref_set) {
         $output .= '<td>' . $pref_set . '</td>';
-      }
-      $output .= '</tr>';
-      foreach ($section['elements'] as $name => $setting) {
+        }
+        $output .= '</tr>';
+        foreach ($section['elements'] as $name => $setting) {
         // Output the setting name and description, with an ugly exception
         // made for preferences with special formatting
         $special_map = array(
-          'start_hour' => 'end_hour',
-          'net_start_hour'=> 'net_end_hour',
-          'daily_xfer_limit_mb' => 'daily_xfer_period_days',
+            'start_hour' => 'end_hour',
+            'net_start_hour'=> 'net_end_hour',
+            'daily_xfer_limit_mb' => 'daily_xfer_period_days',
         );
         $special_delimiter = array(
-          'start_hour' => bts('and', array(), NULL, 'boinc:account-preference'),
-          'net_start_hour'=> bts('and', array(), NULL, 'boinc:account-preference'),
-          'daily_xfer_limit_mb' => bts('every', array(), NULL, 'boinc:account-preference'),
+            'start_hour' => bts('and', array(), NULL, 'boinc:account-preference'),
+            'net_start_hour'=> bts('and', array(), NULL, 'boinc:account-preference'),
+            'daily_xfer_limit_mb' => bts('every', array(), NULL, 'boinc:account-preference'),
         );
         $special = isset($special_map[$name]);
         $very_special = in_array($name, $special_map);
         if ($very_special) {
-          continue;
+            continue;
         }
         $output .= '<tr>';
         $output .= '<td>';
@@ -387,35 +387,35 @@ 
         // Output values for each preference set, again with ugly hacks for
         // time range preferences
         foreach ($pref_sets as $pref_set) {
-          if (($prefs[$pref_set]) AND
+            if (($prefs[$pref_set]) AND
               $prefs[$pref_set]['#established'] AND
               isset($prefs[$pref_set]['prefs']['advanced'][$category])) {
             $pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$name];
             $value = isset($pref_setting['#options']) ? $pref_setting['#options'][$pref_setting['#default_value']] : $pref_setting['#default_value'];
             if ($value == '') {
-              $value = '---';
+                $value = '---';
             }
             if (!isset($pref_setting['#field_suffix'])) {
-              $pref_setting['#field_suffix'] = '';
+                $pref_setting['#field_suffix'] = '';
             }
             if (!$special) {
-              $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
+                $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
             }
             else {
-              // The "very special" case where we merge two prefs
-              $second_pref = $special_map[$name];
-              $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref];
-              $second_value = isset($second_pref_setting['#options']) ? $second_pref_setting['#options'][$second_pref_setting['#default_value']] : $second_pref_setting['#default_value'];
-              $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
+                // The "very special" case where we merge two prefs
+                $second_pref = $special_map[$name];
+                $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref];
+                $second_value = isset($second_pref_setting['#options']) ? $second_pref_setting['#options'][$second_pref_setting['#default_value']] : $second_pref_setting['#default_value'];
+                $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
                 " {$second_value} {$second_pref_setting['#field_suffix']} </td>";
             }
-          }
-          else  {
+            }
+            else  {
             $output .= '<td>---</td>';
-          }
+            }
         }
         $output .= '</tr>';
-      }
+        }
     }
 
     // Empty line above action links... :/
@@ -431,24 +431,24 @@ 
     $output .= '<tr>';
     $output .= '<td></td>';
     foreach ($pref_sets as $pref_set) {
-      $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
-      $output .= '<td><ul class="tab-list"><li class="first tab">';
-      $output .= l($action_text, "account/prefs/computing/edit/{$pref_set}/1",
+        $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
+        $output .= '<td><ul class="tab-list"><li class="first tab">';
+        $output .= l($action_text, "account/prefs/computing/edit/{$pref_set}/1",
         array('fragment' => "")
-      );
-      // Show Clear links for established preference sets
-      if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
+        );
+        // Show Clear links for established preference sets
+        if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
         $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$pref_set}",
-          array(
+            array(
             'query' => drupal_get_destination(),
             'attributes' => array(
-              'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
+                'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
                 array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-computing-preferences') . '\')'
             )
-          )
+            )
         );
-      }
-      $output .= '</li></ul></td>';
+        }
+        $output .= '</li></ul></td>';
     }
     $output .= '</tr>';
 
@@ -456,28 +456,28 @@ 
 
     break;
 
-  case 'edit':
+    case 'edit':
   default:
 
     // Return the HTML generated from the $form data structure.
     if (function_exists('jump_quickly')) {
-      $path = 'account/prefs/computing/edit';
-      $venues = array(
+        $path = 'account/prefs/computing/edit';
+        $venues = array(
         "{$path}/generic" => bts('Generic', array(), NULL, 'boinc:account-preferences-location'),
         "{$path}/home" => bts('Home', array(), NULL, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
         "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location'),
         "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location')
-      );
-      variable_set('jump_use_js_venues-Array', 1);
-      drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-      drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
-
-      $output .= '<div id="venue-selector" class="simple-form-controls">';
-      $output .= '  <div class="form-item venue">';
-      $output .= '    <label>Preference set:</label>';
-      $output .= jump_quickly($venues, 'venues', 1, "{$path}/{$venue}");
-      $output .= '  </div>';
-      $output .= '</div>';
+        );
+        variable_set('jump_use_js_venues-Array', 1);
+        drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
+        drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
+
+        $output .= '<div id="venue-selector" class="simple-form-controls">';
+        $output .= '  <div class="form-item venue">';
+        $output .= '    <label>Preference set:</label>';
+        $output .= jump_quickly($venues, 'venues', 1, "{$path}/{$venue}");
+        $output .= '  </div>';
+        $output .= '</div>';
     }
     $output .= drupal_get_form('boincwork_generalprefs_form', $venue, NULL, $advanced);
 
@@ -488,54 +488,54 @@ 
     drupal_prepare_form('boincwork_generalprefs_form', $current_set, $form_state);
 
     if (!$current_set['#established']) {
-      drupal_set_message(bts(
-          "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
-          array( '@venue' => $venue, ),
-          NULL, 'boinc:account-preferences'), 'status');
+        drupal_set_message(bts(
+            "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
+            array( '@venue' => $venue, ),
+            NULL, 'boinc:account-preferences'), 'status');
     }
 
     break;
-  }
+    }
 
-  return $output;
+    return $output;
 }
 
 /**
-  * Project preferences menu callback
-  * Called when user goes to edit project preferences page.
-  */
+ * Project preferences menu callback
+ * Called when user goes to edit project preferences page.
+ */
 function projectprefs_page($action = null, $venue = null) {
 
-  // Keep the venue selected across preference pages
-  boincwork_select_venue($venue);
+    // Keep the venue selected across preference pages
+    boincwork_select_venue($venue);
 
-  require_boinc(array('util', 'prefs'));
-  global $project_has_beta;
-  $pref_sets = array('generic', 'home', 'school', 'work');
-  $output = null;
+    require_boinc(array('util', 'prefs'));
+    global $project_has_beta;
+    $pref_sets = array('generic', 'home', 'school', 'work');
+    $output = null;
 
-  $title = 'Project';
-  drupal_set_title($title);
+    $title = 'Project';
+    drupal_set_title($title);
 
-  switch ($action) {
+    switch ($action) {
 
-  case 'clear':
+    case 'clear':
     // Remove settings from this preference set
     if ($venue AND $venue != 'generic') {
-      boincwork_save_prefs(NULL, 'project', $venue);
-      drupal_set_message(t('Settings for the "@name" preference set have been
+        boincwork_save_prefs(NULL, 'project', $venue);
+        drupal_set_message(t('Settings for the "@name" preference set have been
         cleared', array('@name' => ucfirst($venue))));
 
-      // Set the generic preference set as active
-      $_SESSION['prefs venue'] = 'generic';
+        // Set the generic preference set as active
+        $_SESSION['prefs venue'] = 'generic';
 
-      // If the user has removed their default preference set, make it generic
-      boincwork_set_default_venue();
+        // If the user has removed their default preference set, make it generic
+        boincwork_set_default_venue();
     }
     drupal_goto();
     break;
 
-  case 'combined':
+    case 'combined':
 
     // Compare preference sets; tabular view
 
@@ -544,9 +544,9 @@ 
     $boincuser = BoincUser::lookup_id($account->boincuser_id);
 
     foreach ($pref_sets as $pref_set) {
-      $form_state = array();
-      $prefs[$pref_set] = drupal_retrieve_form('boincwork_projectprefs_form', $form_state, $pref_set);
-      drupal_prepare_form('boincwork_projectprefs_form', $prefs[$pref_set], $form_state);
+        $form_state = array();
+        $prefs[$pref_set] = drupal_retrieve_form('boincwork_projectprefs_form', $form_state, $pref_set);
+        drupal_prepare_form('boincwork_projectprefs_form', $prefs[$pref_set], $form_state);
     }
 
     $output .= '<p>' . bts('Preferences last modified: @mod_time', array('@mod_time' => pretty_time_str($prefs['generic']['modified']['#value'])), NULL, 'boinc:account-preferences') . '</p>';
@@ -557,20 +557,20 @@ 
     $prefs_table = boincwork_make_prefs_table($prefs['generic']);
 
     foreach ($prefs_table as $category => $section) {
-      $output .= '<tr class="section-heading">';
-      $output .= "<td>{$section['name']}</td>";
-      foreach ($pref_sets as $pref_set) {
+        $output .= '<tr class="section-heading">';
+        $output .= "<td>{$section['name']}</td>";
+        foreach ($pref_sets as $pref_set) {
         $output .= '<td>' . $pref_set . '</td>';
-      }
-      $output .= '</tr>';
-      foreach ($section['elements'] as $name => $setting) {
+        }
+        $output .= '</tr>';
+        foreach ($section['elements'] as $name => $setting) {
         $output .= '<tr>';
         $output .= '<td>';
         $output .= "<div class=\"title\">{$setting['name']}</div>";
         $output .= "<div class=\"description\">{$setting['description']}</div>";
         $output .= '</td>';
         foreach ($pref_sets as $pref_set) {
-          if (($prefs[$pref_set]) AND
+            if (($prefs[$pref_set]) AND
               $prefs[$pref_set]['#established'] AND
               isset($prefs[$pref_set][$category])) {
             $pref_setting = $prefs[$pref_set][$category][$name];
@@ -578,10 +578,10 @@ 
             if ($value == '') $value = '---';
             if (!isset($pref_setting['#field_suffix'])) $pref_setting['#field_suffix'] = '';
             $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
-          } else $output .= '<td>---</td>';
+            } else $output .= '<td>---</td>';
         }
         $output .= '</tr>';
-      }
+        }
     }
 
     // Empty line above action links... :/
@@ -597,29 +597,29 @@ 
     $output .= '<tr>';
     $output .= '<td></td>';
     foreach ($pref_sets as $pref_set) {
-      $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
-      $output .= '<td><ul class="tab-list"><li class="first tab">';
-      $output .= l($action_text, "account/prefs/project/edit/{$pref_set}");
-      // Show Clear links for established preference sets
-      if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
+        $action_text = ($prefs[$pref_set]['#established']) ? bts('Edit', array(), NULL, 'boinc:form-edit') : bts('Add', array(), NULL, 'boinc:form-add');
+        $output .= '<td><ul class="tab-list"><li class="first tab">';
+        $output .= l($action_text, "account/prefs/project/edit/{$pref_set}");
+        // Show Clear links for established preference sets
+        if ($pref_set != 'generic' AND $prefs[$pref_set]['#established']) {
         $output .= ' </li><li class="tab"> ' . l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$pref_set}",
-          array(
+            array(
             'query' => drupal_get_destination(),
             'attributes' => array(
-              'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
+                'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the "@name" preference set. Are you sure?',
                 array('@name' => ucfirst($pref_set)), NULL, 'boinc:account-preferences-project') . '\')'
             )
-          )
+            )
         );
-      }
-      $output .= '</li></ul></td>';
+        }
+        $output .= '</li></ul></td>';
     }
 
     $output .= '</table>';
 
     break;
 
-  case 'set-default':
+    case 'set-default':
     // Set this preference set as the one to use for any new hosts attached
     // to the user account
     boincwork_set_default_venue($venue);
@@ -627,30 +627,30 @@ 
     drupal_goto('account/prefs/project/combined');
     break;
 
-  case 'edit':
+    case 'edit':
   default:
 
     // Return the HTML generated from the $form data structure.
     require_boinc('util');
 
     if (function_exists('jump_quickly')) {
-      $path = 'account/prefs/project/edit';
-      $venues = array(
+        $path = 'account/prefs/project/edit';
+        $venues = array(
         "{$path}/generic" => bts('Generic', array(), NULL, 'boinc:account-preferences-location'),
         "{$path}/home" => bts('Home', array(), NULL, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
         "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location'),
         "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location')
-      );
-      variable_set('jump_use_js_venues-Array', 1);
-      drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-      drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
-
-      $output .= '<div id="venue-selector" class="simple-form-controls">';
-      $output .= '  <div class="form-item venue">';
-      $output .= '    <label>Preference set:</label>';
-      $output .= jump_quickly($venues, 'venues', 1, "{$path}/{$venue}");
-      $output .= '  </div>';
-      $output .= '</div>';
+        );
+        variable_set('jump_use_js_venues-Array', 1);
+        drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
+        drupal_add_js(drupal_get_path('theme', 'boinc') . '/js/prefs.js', 'theme');
+
+        $output .= '<div id="venue-selector" class="simple-form-controls">';
+        $output .= '  <div class="form-item venue">';
+        $output .= '    <label>Preference set:</label>';
+        $output .= jump_quickly($venues, 'venues', 1, "{$path}/{$venue}");
+        $output .= '  </div>';
+        $output .= '</div>';
     }
     $output .= drupal_get_form('boincwork_projectprefs_form', $venue);
 
@@ -661,63 +661,63 @@ 
     drupal_prepare_form('boincwork_projectprefs_form', $current_set, $form_state);
 
     if (!$current_set['#established']) {
-      drupal_set_message(bts(
-          "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
-          array( '@venue' => $venue, ),
-          NULL, 'boinc:account-preferences'), 'status');
+        drupal_set_message(bts(
+            "No preferences found for set '@venue'. Click SAVE CHANGES below to save the following preferences to your account.",
+            array( '@venue' => $venue, ),
+            NULL, 'boinc:account-preferences'), 'status');
     }
 
     break;
 
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
-  * Community preferences menu callback
-  * Called when user goes to edit community preferences page.
-  */
+ * Community preferences menu callback
+ * Called when user goes to edit community preferences page.
+ */
 function communityprefs_page($action = null) {
 
-  require_boinc(array('util', 'prefs'));
-  $output = null;
+    require_boinc(array('util', 'prefs'));
+    $output = null;
 
-  $title = 'Community';
-  drupal_set_title($title);
+    $title = 'Community';
+    drupal_set_title($title);
 
-  //$output .= '<h2>Community preferences</h2>';
+    //$output .= '<h2>Community preferences</h2>';
 
-  $output .= drupal_get_form('communityprefs_form');
+    $output .= drupal_get_form('communityprefs_form');
 
-  return $output;
+    return $output;
 }
 
 /**
-  * Privacy preferences menu callback
-  * Called when user goes to edit privacy preferences page.
-  */
+ * Privacy preferences menu callback
+ * Called when user goes to edit privacy preferences page.
+ */
 function privacyprefs_page($action = null) {
 
-  require_boinc(array('util', 'prefs'));
-  $output = null;
-  $title = 'Privacy';
-  drupal_set_title($title);
+    require_boinc(array('util', 'prefs'));
+    $output = null;
+    $title = 'Privacy';
+    drupal_set_title($title);
 
-  switch ($action) {
-  case 'view':
+    switch ($action) {
+    case 'view':
     $form_state = array();
     $prefs = drupal_retrieve_form('boincwork_privacyprefs_form', $form_state);
     drupal_prepare_form('boincwork_privacyprefs_form', $prefs, $form_state);
     $output .= '<table>';
 
     $sections = array(
-      'privacy' => $prefs['privacy']
+        'privacy' => $prefs['privacy']
     );
 
     foreach ($sections as $section) {
-      $output .= '<tr class="section-heading">';
-      $output .= "<td>{$section['#title']}</td></tr>";
-      foreach ($section as $name => $setting) {
+        $output .= '<tr class="section-heading">';
+        $output .= "<td>{$section['#title']}</td></tr>";
+        foreach ($section as $name => $setting) {
         if ($name{0} == '#') continue;
         $value = isset($setting['#default_value']) ? $setting['#default_value'] : '';
         if ($value AND isset($setting['#options'])) $value = $setting['#options'][$value];
@@ -729,7 +729,7 @@ 
         $output .= "<td>{$setting['#title']}<br/>{$setting['#description']}</td>";
         $output .= "<td>{$value} {$setting['#field_suffix']}</td>";
         $output .= '</tr>';
-      }
+        }
     }
 
     // Edit preferences link
@@ -742,33 +742,33 @@ 
 
     break;
 
-  case 'edit':
+    case 'edit':
   default:
     require_boinc('util');
     // Return the HTML generated from the $form data structure.
     $output .= drupal_get_form('boincwork_privacyprefs_form');
     break;
 
-  }
+    }
 
-  return $output;
+    return $output;
 }
 
 /**
-  * Certificates menu callback
-  * Called when user goes to account certificate pages
-  */
+ * Certificates menu callback
+ * Called when user goes to account certificate pages
+ */
 function boincwork_certificates($type = null, $border = null) {
-  global $user;
-  $drupuser = user_load($user->uid);
-  // Load BOINC account and pre-authenticate with BOINC code
-  require_boinc(array('util', 'cert'));
-  $boincuser = BoincUser::lookup_id($drupuser->boincuser_id);
-  //global $g_logged_in_user;
-  //$g_logged_in_user = $boincuser;
-  //print_r($boincuser); exit;
-  switch ($type) {
-  case 'all':
+    global $user;
+    $drupuser = user_load($user->uid);
+    // Load BOINC account and pre-authenticate with BOINC code
+    require_boinc(array('util', 'cert'));
+    $boincuser = BoincUser::lookup_id($drupuser->boincuser_id);
+    //global $g_logged_in_user;
+    //$g_logged_in_user = $boincuser;
+    //print_r($boincuser); exit;
+    switch ($type) {
+    case 'all':
     //include_boinc('user/cert_all.php');
     require_boinc(array('util','cert','user'));
 
@@ -838,7 +838,7 @@ 
     ";
     break;
 
-  case 'account':
+    case 'account':
   default:
     //include_boinc('user/cert1.php');
     require_boinc(array('util','cert'));
@@ -914,7 +914,7 @@ 
     echo "
     </td><tr></table>
     ";
-  }
+    }
 }
 
 /**
@@ -922,42 +922,42 @@ 
  * Called when user selects to delete a host
  */
 function boincwork_host_delete($host_id) {
-  // Verify that host has no tasks
-  if (boincwork_host_user_is_owner($host_id)) {
+    // Verify that host has no tasks
+    if (boincwork_host_user_is_owner($host_id)) {
     if (!boincwork_host_get_task_count($host_id)) {
-      // Delete the host record
-      db_set_active('boinc_rw');
-      $host_deleted = db_query(
+        // Delete the host record
+        db_set_active('boinc_rw');
+        $host_deleted = db_query(
         "DELETE FROM {host} WHERE id = '%d'",
         $host_id
-      );
-      db_set_active('default');
-      if ($host_deleted) {
+        );
+        db_set_active('default');
+        if ($host_deleted) {
         drupal_set_message(t('Host @id has been removed from your account.',
-          array('@id' => $host_id)));
+            array('@id' => $host_id)));
         drupal_goto('account/computers');
-      }
-      else {
+        }
+        else {
         drupal_set_message(t('Host @id could not be deleted. Not sure why...',
-          array('@id' => $host_id)), 'error'
+            array('@id' => $host_id)), 'error'
         );
-      }
+        }
     }
     else {
-      drupal_set_message(t('Host @id cannot be deleted because it still has
+        drupal_set_message(t('Host @id cannot be deleted because it still has
         tasks associated with it. These tasks should be processed within the
         next few days, after which the host can be deleted.',
         array('@id' => $host_id)), 'warning'
-      );
+        );
+    }
     }
-  }
-  else {
+    else {
     drupal_set_message(t('You are not the owner of host @id, so you cannot
       delete it.',
-      array('@id' => $host_id)), 'error'
+        array('@id' => $host_id)), 'error'
     );
-  }
-  drupal_goto("host/{$host_id}");
+    }
+    drupal_goto("host/{$host_id}");
 }
 
 /**
@@ -965,55 +965,55 @@ 
  * Called when user accesses the log for a host
  */
 function boincwork_host_log($host_id = null) {
-  $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
-  $log = '';
-  if ($root_log_dir AND $host_id) {
+    $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
+    $log = '';
+    if ($root_log_dir AND $host_id) {
     $subdir = substr($host_id, 0, -3) OR $subdir = 0;
     $log = implode('/', array($root_log_dir, $subdir, $host_id));
-  }
-  if ($log AND file_exists($log)) {
+    }
+    if ($log AND file_exists($log)) {
     header('Content-type: text/plain');
     include($log);
-  }
+    }
 }
 
 function boincwork_host_set_venue($host_id = NULL, $venue = NULL) {
-  global $user;
-  $account = user_load($user->uid);
-  db_set_active('boinc_ro');
-  // Verify that this is my host
-  $host_owner = db_result(db_query(
+    global $user;
+    $account = user_load($user->uid);
+    db_set_active('boinc_ro');
+    // Verify that this is my host
+    $host_owner = db_result(db_query(
     "SELECT userid FROM {host} WHERE id = '%d'",
     $host_id
-  ));
-  db_set_active('default');
-  if ($host_owner AND $host_owner == $account->boincuser_id) {
+    ));
+    db_set_active('default');
+    if ($host_owner AND $host_owner == $account->boincuser_id) {
     db_set_active('boinc_rw');
     $updated = db_query(
-      "UPDATE {host} SET venue = '%s' WHERE id = '%d'",
-      $venue, $host_id
+        "UPDATE {host} SET venue = '%s' WHERE id = '%d'",
+        $venue, $host_id
     );
     db_set_active('default');
     if ($updated) {
-      drupal_set_message(
+        drupal_set_message(
         bts('The location for this host has been updated.', array(), NULL, 'boinc:account-host-details')
         . bts('This will take effect next time the host contacts the project.', array(), NULL, 'boinc:account-host-details')
-      );
+        );
     }
     else {
-      drupal_set_message(
+        drupal_set_message(
         bts('Unable to save changes to this host for some reason!', array(), NULL, 'boinc:account-host-details'),
         'error'
-      );
+        );
     }
-  }
-  else {
+    }
+    else {
     drupal_set_message(
-      bts('You are not allowed to make changes to this host.', array(), NULL, 'boinc:account-host-details'),
-      'warning'
+        bts('You are not allowed to make changes to this host.', array(), NULL, 'boinc:account-host-details'),
+        'warning'
     );
-  }
-  drupal_goto("host/{$host_id}");
+    }
+    drupal_goto("host/{$host_id}");
 }
 
 /**
@@ -1021,8 +1021,8 @@ 
  * Called when user accesses cell phone stats
  */
 function boincwork_mobile_stats($userid = null) {
-  $_GET['id'] = $userid;
-  include_boinc('user/userw.php');
+    $_GET['id'] = $userid;
+    include_boinc('user/userw.php');
 }
 
 /**
@@ -1030,7 +1030,7 @@ 
  * Called to build the server status page
  */
 function boincwork_server_status() {
-  include_boinc('user/server_status.php');
+    include_boinc('user/server_status.php');
 }
 
 /**
@@ -1038,7 +1038,7 @@ 
  * RPC for managing job input files
  */
 function boincwork_job_file() {
-  include_boinc('user/job_file.php');
+    include_boinc('user/job_file.php');
 }
 
 /**
@@ -1046,7 +1046,7 @@ 
  * Get output file from remote job submission
  */
 function boincwork_get_output() {
-  include_boinc('user/get_output.php');
+    include_boinc('user/get_output.php');
 }
 
 /**
@@ -1054,28 +1054,28 @@ 
  * Get the project configuration XML; used by client software
  */
 function boincwork_get_project_config() {
-  ob_start();
-  include_boinc('user/get_project_config.php');
-  $xml = ob_get_clean();
-  $xml = load_configuration($xml);
-
-  // obtain Drupal variables
-  $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-  $overrideboinctou = variable_get('boinc_weboptions_overrideboinctou', FALSE);
-
-  // If terms of use string exists and override is true, set terms-of-use
-  // to Drupal varaible.
-  if ( (!empty($termsofuse) && ($overrideboinctou)) ) {
+    ob_start();
+    include_boinc('user/get_project_config.php');
+    $xml = ob_get_clean();
+    $xml = load_configuration($xml);
+
+    // obtain Drupal variables
+    $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
+    $overrideboinctou = variable_get('boinc_weboptions_overrideboinctou', FALSE);
+
+    // If terms of use string exists and override is true, set terms-of-use
+    // to Drupal varaible.
+    if ( (!empty($termsofuse) && ($overrideboinctou)) ) {
     if (!empty($xml['project_config']['terms_of_use'])) {
-      // Remove any existing terms of use
-      unset($xml['project_config']['terms_of_use']);
+        // Remove any existing terms of use
+        unset($xml['project_config']['terms_of_use']);
     }
 
     // Add terms of use from Drupal
     $xml['project_config']['terms_of_use']['@value'] = $termsofuse;
-  }
+    }
 
-  print save_configuration($xml);
+    print save_configuration($xml);
 }
 
 
@@ -1083,16 +1083,16 @@ 
  * Page callback for the remote job submission RPC (submit_rpc_handler.php).
  */
 function boincwork_submit_rpc_handler() {
-  include_boinc('user/submit_rpc_handler.php');
+    include_boinc('user/submit_rpc_handler.php');
 }
 
 /**
  * Page callback for user WAP (userw.php).
  */
 function boincwork_user_wap() {
-  // Remove q from the GET request or BOINC will panic
-  unset($_GET['q']);
-  include_boinc('user/userw.php');
+    // Remove q from the GET request or BOINC will panic
+    unset($_GET['q']);
+    include_boinc('user/userw.php');
 }
 
 
@@ -1100,44 +1100,44 @@ 
  * Page callback for user account task table
  */
 function boincwork_account_task_table($tselect = NULL, $app_id = NULL) {
-  $title = bts('Tasks for your account', array(), NULL, 'boinc:account-task-table');
-  drupal_set_title($title);
+    $title = bts('Tasks for your account', array(), NULL, 'boinc:account-task-table');
+    drupal_set_title($title);
 
-  global $user;
-  $account = user_load($user->uid);
-  return boincwork_tasktable(0, $account->boincuser_id, $tselect, $app_id);
+    global $user;
+    $account = user_load($user->uid);
+    return boincwork_tasktable(0, $account->boincuser_id, $tselect, $app_id);
 }
 
 /**
  * Page callback for host task table
  */
 function boincwork_host_task_table($host_id = NULL, $tselect = NULL, $app_id = NULL) {
-  require_boinc( array('util', 'result') );
+    require_boinc( array('util', 'result') );
 
-  $title = bts('Tasks for computer @host_id', array('@host_id' => $host_id), NULL, 'boinc:host-task-table');
-  drupal_set_title($title);
+    $title = bts('Tasks for computer @host_id', array('@host_id' => $host_id), NULL, 'boinc:host-task-table');
+    drupal_set_title($title);
 
-  if (is_null($host_id)) {
+    if (is_null($host_id)) {
     drupal_set_message(bts('ERROR: Invalid host ID', array(), NULL, 'boinc:host-task-table'), 'error');
     return '';
-  }
+    }
 
-  return boincwork_tasktable(2, $host_id, $tselect, $app_id);
+    return boincwork_tasktable(2, $host_id, $tselect, $app_id);
 }
 
 /**
  * Page callback for workunit task table
  */
 function boincwork_workunit_task_table($workunit_id = NULL, $tselect = NULL, $app_id = NULL) {
-  $title = bts('Tasks for workunit @workunit_id', array('@workunit_id' => $workunit_id), NULL, 'boinc:workunit-task-table');
-  drupal_set_title($title);
+    $title = bts('Tasks for workunit @workunit_id', array('@workunit_id' => $workunit_id), NULL, 'boinc:workunit-task-table');
+    drupal_set_title($title);
 
-  if (is_null($workunit_id)) {
+    if (is_null($workunit_id)) {
     drupal_set_message(bts('ERROR: Invalid workunit ID', array(), NULL, 'boinc:workunit-task-table'), 'error');
     return '';
-  }
+    }
 
-  return boincwork_tasktable(1, $workunit_id, $tselect, $app_id);
+    return boincwork_tasktable(1, $workunit_id, $tselect, $app_id);
 }
 
 /**
@@ -1145,8 +1145,8 @@ 
  * Take a node ID and render that node as a page
  */
 function boincwork_view_page($nid) {
-  $node = node_load($nid);
-  return node_page_view($node);
+    $node = node_load($nid);
+    return node_page_view($node);
 }
 
 
@@ -1158,16 +1158,16 @@ 
  * Determine which venue should be selected
  */
 function boincwork_select_venue(&$venue) {
-  if (!$venue) {
+    if (!$venue) {
     $active_venue = isset($_SESSION['prefs venue']) ? $_SESSION['prefs venue'] : NULL;
     if ($active_venue) {
-      $venue = $active_venue;
-      //unset($_SESSION['prefs venue']);
+        $venue = $active_venue;
+        //unset($_SESSION['prefs venue']);
+    }
     }
-  }
-  else {
+    else {
     // Set the active venue to keep it selected between computing and project
     // preference pages
     $_SESSION['prefs venue'] = $venue;
-  }
+    }
 }

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

Indentation +865 added lines, -865 removed lines

@@ -11,19 +11,19 @@ 
  * that was selected
  */
 function boincwork_ahah_helper_venue_submit($form, &$form_state) {
-  $form_state['storage']['prefs']['preset'] = null;
-  ahah_helper_generic_submit($form, $form_state);
+    $form_state['storage']['prefs']['preset'] = null;
+    ahah_helper_generic_submit($form, $form_state);
 }
 
 /**
  * Get a predetermined set of preferences
  */
 function boincwork_get_preset_prefs($preset = null) {
-  $saved_state = variable_get('boincwork_preset_prefs', null);
+    $saved_state = variable_get('boincwork_preset_prefs', null);
 
-  // If not configured yet, use these values as for inital
-  // computing/general preferences.
-  if (!$saved_state) {
+    // If not configured yet, use these values as for inital
+    // computing/general preferences.
+    if (!$saved_state) {
     // Get BOINC project disk space configurations from config.xml to
     // fill in initial preference values.
     require_boinc(array('db', 'prefs'));
@@ -160,88 +160,88 @@ 
           <dont_verify_images>0</dont_verify_images>
         </preset>
       </general_preferences>';
-  }
+    }
 
-  // Convert XML data to array format
-  $preset_prefs = load_configuration($saved_state);
+    // Convert XML data to array format
+    $preset_prefs = load_configuration($saved_state);
 
-  if ($preset) {
+    if ($preset) {
     // Load preset from configuration
     $preset_prefs = (array) $preset_prefs['general_preferences'];
     if (isset($preset_prefs['preset'])) {
-      if (!is_numeric(key($preset_prefs['preset']))) {
+        if (!is_numeric(key($preset_prefs['preset']))) {
         $preset_prefs['preset'] = array($preset_prefs['preset']);
-      }
-      foreach ($preset_prefs['preset'] as $key => $prefs) {
+        }
+        foreach ($preset_prefs['preset'] as $key => $prefs) {
         if (isset($prefs['@attributes']['name']) AND $prefs['@attributes']['name'] == $preset) {
-          return $preset_prefs['preset'][$key];
+            return $preset_prefs['preset'][$key];
+        }
         }
-      }
     }
-  }
-  return $preset_prefs;
+    }
+    return $preset_prefs;
 }
 
 /**
  * Load (and validate) the project specific configuration XML
  */
 function boincwork_get_project_specific_config() {
-  $raw_config_data = variable_get('boinc_project_specific_prefs_config', '');
+    $raw_config_data = variable_get('boinc_project_specific_prefs_config', '');
 
-  $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
-  libxml_use_internal_errors(true);
+    $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
+    libxml_use_internal_errors(true);
 
-  $xml = new DomDocument();
-  $xml->loadXML($raw_config_data, LIBXML_NOBLANKS);
-  if (!$xml->schemaValidate($xsd)) {
+    $xml = new DomDocument();
+    $xml->loadXML($raw_config_data, LIBXML_NOBLANKS);
+    if (!$xml->schemaValidate($xsd)) {
     $errors = libxml_get_errors();
     $lines = explode("\r", $raw_config_data);
     drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
-      ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
+        ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
     return NULL;
-  }
+    }
 
-  // Convert XML to array for validation
-  $xml = load_configuration($raw_config_data);
-  return $xml;
+    // Convert XML to array for validation
+    $xml = load_configuration($raw_config_data);
+    return $xml;
 }
 
 /**
  * Get rules by which to validate project specific data
  */
 function boincwork_get_project_specific_config_validation_rules($xml = array()) {
-  $rules = array();
-  if (!$xml) {
+    $rules = array();
+    if (!$xml) {
     // Read the config XML
     $xml = boincwork_get_project_specific_config();
     $xml = $xml['project_specific_preferences'];
-  }
-  foreach ($xml as $type => $elements) {
+    }
+    foreach ($xml as $type => $elements) {
     if (is_array($elements) AND !is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     switch ($type) {
     case 'compound':
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
         $rules[$name] = boincwork_get_project_specific_config_validation_rules($element['attributes']);
-      }
-      break;
+        }
+        break;
 
     case 'text':
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
         $rules[$name] = array(
-          'datatype' => $element['@attributes']['datatype']
+            'datatype' => $element['@attributes']['datatype']
         );
         if (isset($element['@attributes']['min'])) {
-          $rules[$name]['min'] = $element['@attributes']['min'];
+            $rules[$name]['min'] = $element['@attributes']['min'];
         }
         if (isset($element['@attributes']['max'])) {
-          $rules[$name]['max'] = $element['@attributes']['max'];
+            $rules[$name]['max'] = $element['@attributes']['max'];
         }
-      }
-      break;
+        }
+        break;
     /*
     case 'radio':
     case 'dropdown':
@@ -265,24 +265,24 @@ 
       $rules['apps'] = array(
         'minimum selected' => 1,
         'list' => array()
-      );
-      foreach ($elements as $element) {
+        );
+        foreach ($elements as $element) {
         foreach ($element['app'] as $app) {
-          $name = "app_{$app['@attributes']['id']}";
-          $rules['apps']['list'][] = $name;
-          //$rules[$name] = array(
-          //  'options' => $options
-          //);
+            $name = "app_{$app['@attributes']['id']}";
+            $rules['apps']['list'][] = $name;
+            //$rules[$name] = array(
+            //  'options' => $options
+            //);
         }
-      }
-      break;
+        }
+        break;
 
     case 'group':
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
         $rules += boincwork_get_project_specific_config_validation_rules($element);
-      }
-      break;
+        }
+        break;
     /*
     case 'boolean':
       // Shouldn't need to validate boolean...
@@ -290,39 +290,39 @@ 
       */
     default:
     }
-  }
-  return $rules;
+    }
+    return $rules;
 }
 
 /**
  * Define how project specific settings should be saved
  */
 function boincwork_format_project_specific_prefs_data($values, $xml = array()) {
-  $defaults = array();
-  if (!$xml) {
+    $defaults = array();
+    if (!$xml) {
     // Read the config XML
     $xml = boincwork_get_project_specific_config();
     $xml = $xml['project_specific_preferences'];
-  }
-  foreach ($xml as $type => $elements) {
+    }
+    foreach ($xml as $type => $elements) {
     $structure_data = array();
     if (is_array($elements) AND !is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     switch ($type) {
     case 'compound':
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
         $default[$name]['@attributes'] = boincwork_format_project_specific_prefs_data($values[$name], $element['attributes']);
-      }
-      $defaults += $default;
-      break;
+        }
+        $defaults += $default;
+        break;
 
     case 'group':
       foreach ($elements as $element) {
         $defaults += boincwork_format_project_specific_prefs_data($values, $element);
-      }
-      break;
+        }
+        break;
 
     case 'text':
     case 'radio':
@@ -331,315 +331,315 @@ 
       foreach ($elements as $element) {
         $name = $element['@attributes']['name'];
         if (isset($element['@attributes']['entitytype']) AND $element['@attributes']['entitytype'] == 'attribute') {
-          $defaults['@attributes'][$name] = $values[$name];
+            $defaults['@attributes'][$name] = $values[$name];
         }
         else {
-          $defaults[$name] = $values[$name];
+            $defaults[$name] = $values[$name];
         }
-      }
-      break;
+        }
+        break;
 
     case 'apps':
       foreach ($elements as $element) {
         $defaults['app_id'] = array();
         foreach ($element['app'] as $app) {
-          $app_id = $app['@attributes']['id'];
-          if ($values['applications']["app_{$app_id}"]) {
+            $app_id = $app['@attributes']['id'];
+            if ($values['applications']["app_{$app_id}"]) {
             $defaults['app_id'][] = $app_id;
-          }
+            }
         }
-      }
-      break;
+        }
+        break;
 
     default:
     }
-  }
-  return $defaults;
+    }
+    return $defaults;
 }
 
 /**
  * Add an element to the form based on its definition
  */
 function boincwork_generate_prefs_element(&$form, $type, $elements, $user_prefs = null) {
-  switch ($type) {
-  case 'text':
+    switch ($type) {
+    case 'text':
     if (!is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     foreach ($elements as $element) {
-      $name = $element['@attributes']['name'];
-      $default = $element['@attributes']['default'];
-      $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $description = '';
-      if (isset($element['description'])) {
+        $name = $element['@attributes']['name'];
+        $default = $element['@attributes']['default'];
+        $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
+        $description = '';
+        if (isset($element['description'])) {
         $description = is_array($element['description']) ? $element['description']['@value'] : $element['description'];
-      }
+        }
 
-      $value = $default;
-      $user_pref = $user_prefs;
-      $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
-      if ($entitytype == 'attribute') {
+        $value = $default;
+        $user_pref = $user_prefs;
+        $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
+        if ($entitytype == 'attribute') {
         $user_pref = $user_prefs['@attributes'];
-      }
-      if (isset($user_pref[$name])) {
+        }
+        if (isset($user_pref[$name])) {
         if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
-          $value = $user_pref[$name]['@value'];
+            $value = $user_pref[$name]['@value'];
         }
         else {
-          $value = $user_pref[$name];
+            $value = $user_pref[$name];
+        }
         }
-      }
 
-      // Use appropriate datatype
-      if (isset($element['@attributes']['datatype'])) {
+        // Use appropriate datatype
+        if (isset($element['@attributes']['datatype'])) {
         switch($element['@attributes']['datatype']) {
         case 'integer':
           $value = (int) $value;
-          break;
+            break;
 
         case 'float':
           $value = number_format((float) $value, 2);
-          break;
+            break;
 
         default:
         }
-      }
+        }
 
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($title));
         $title = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($title));
-      }
-      if ($description) {
+        }
+        if ($description) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($description));
         $description = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($description));
-      }
+        }
 
-      $form[$name] = array(
+        $form[$name] = array(
         '#title' => $title,
         '#type' => 'textfield',
         '#default_value' => $value,
         '#size' => 5,
         '#description' => $description . bts(' Default value: @default', array('@default' => $default), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     break;
 
-  case 'boolean':
+    case 'boolean':
     if (!is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     foreach ($elements as $element) {
-      $name = $element['@attributes']['name'];
-      $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $default = (isset($element['@attributes']['selected']) AND $element['@attributes']['selected'] == 'true') ? 1 : 0;
-      $description = '';
-      if (isset($element['description'])) {
+        $name = $element['@attributes']['name'];
+        $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
+        $default = (isset($element['@attributes']['selected']) AND $element['@attributes']['selected'] == 'true') ? 1 : 0;
+        $description = '';
+        if (isset($element['description'])) {
         $description = is_array($element['description']) ? $element['description']['@value'] : $element['description'];
-      }
+        }
 
-      $value = $default;
-      $user_pref = $user_prefs;
-      $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
-      if ($entitytype == 'attribute') {
+        $value = $default;
+        $user_pref = $user_prefs;
+        $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
+        if ($entitytype == 'attribute') {
         $user_pref = $user_prefs['@attributes'];
-      }
-      if (isset($user_pref[$name])) {
+        }
+        if (isset($user_pref[$name])) {
         if (is_array($user_pref[$name]) AND isset($user_pref[$name]['@value'])) {
-          $value = $user_pref[$name]['@value'];
+            $value = $user_pref[$name]['@value'];
         }
         else {
-          $value = $user_pref[$name];
+            $value = $user_pref[$name];
+        }
         }
-      }
 
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($title));
         $title = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($title));
-      }
-      if ($description) {
+        }
+        if ($description) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($description));
         $description = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($description));
-      }
+        }
 
-      $form[$name] = array(
+        $form[$name] = array(
         '#title' => $title,
         '#type' => 'radios',
         '#options' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $value,
         '#description' => $description
-      );
+        );
     }
     break;
 
-  case 'radio':
+    case 'radio':
   case 'dropdown':
 
     if (!is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     foreach ($elements as $element) {
-      $name = $element['@attributes']['name'];
-      $default = null;
-      $options = array();
-      foreach($element['items']['item'] as $item) {
+        $name = $element['@attributes']['name'];
+        $default = null;
+        $options = array();
+        foreach($element['items']['item'] as $item) {
         if (is_array($item)) {
-          $value = $item['@value'];
-          if ($default === NULL AND
+            $value = $item['@value'];
+            if ($default === NULL AND
               isset($item['@attributes']) AND
               isset($item['@attributes']['selected'])) {
             $default = ($item['@attributes']['selected'] == 'true') ? $item['@value'] : null;
-          }
+            }
         }
         else {
-          $value = $item;
+            $value = $item;
         }
         $options[$value] = $value;
-      }
-      $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $description = '';
-      if (isset($element['description'])) {
+        }
+        $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
+        $description = '';
+        if (isset($element['description'])) {
         $description = is_array($element['description']) ? $element['description']['@value'] : $element['description'];
-      }
-      $user_pref = $user_prefs;
-      $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
-      if ($entitytype == 'attribute') {
+        }
+        $user_pref = $user_prefs;
+        $entitytype = isset($element['@attributes']['entitytype']) ? $element['@attributes']['entitytype'] : 'element';
+        if ($entitytype == 'attribute') {
         $user_pref = $user_prefs['@attributes'];
-      }
-      $value = isset($user_pref[$name]) ? $user_pref[$name] : $default;
+        }
+        $value = isset($user_pref[$name]) ? $user_pref[$name] : $default;
 
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($title));
         $title = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($title));
-      }
-      if ($description) {
+        }
+        if ($description) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($description));
         $description = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($description));
-      }
+        }
 
-      $form[$name] = array(
+        $form[$name] = array(
         '#title' => $title,
         '#type' => ($type == 'radio') ? 'radios' : 'select',
         '#options' => $options,
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $value,
         '#description' => $description . bts(' Default value: @default', array('@default' =>$default), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     break;
 
-  case 'apps':
+    case 'apps':
     $title = is_array($elements['title']) ? $elements['title']['@value'] : $elements['title'];
 
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($title));
         $title = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($title));
-      }
+        }
 
     $form['applications'] = array(
-      '#title' => bts('Applications', array(), NULL, 'boinc:account-preferences'),
-      '#type' => 'fieldset',
-      '#description' => $title,
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE
+        '#title' => bts('Applications', array(), NULL, 'boinc:account-preferences'),
+        '#type' => 'fieldset',
+        '#description' => $title,
+        '#collapsible' => TRUE,
+        '#collapsed' => FALSE
     );
     $applications = array();
     if (!is_array($user_prefs['app_id'])) {
-      $user_prefs['app_id'] = array($user_prefs['app_id']);
+        $user_prefs['app_id'] = array($user_prefs['app_id']);
     }
     foreach ($user_prefs['app_id'] as $app) {
-      if (!$app) continue;
-      if (is_array($app) AND isset($app['@value'])) {
+        if (!$app) continue;
+        if (is_array($app) AND isset($app['@value'])) {
         $app = $app['@value'];
-      }
-      $applications[] = $app;
+        }
+        $applications[] = $app;
     }
     foreach ($elements['app'] as $app) {
-      $app_id = $app['@attributes']['id'];
-      $app_name = $app['@value'];
-      $app_enabled = TRUE;
-      if (isset($app['@attributes']['enabled']) AND
+        $app_id = $app['@attributes']['id'];
+        $app_name = $app['@value'];
+        $app_enabled = TRUE;
+        if (isset($app['@attributes']['enabled']) AND
           $app['@attributes']['enabled'] == 'false') {
         $app_enabled = FALSE;
-      }
-      if ($applications) {
+        }
+        if ($applications) {
         $checked = in_array($app_id, $applications);
-      } else {
+        } else {
         $checked = TRUE;
         if (isset($app['@attributes']['selected']) AND
             $app['@attributes']['selected'] == 'false') {
-          $checked = FALSE;
+            $checked = FALSE;
         }
-      }
-      $form['applications']["app_{$app_id}"] = array(
+        }
+        $form['applications']["app_{$app_id}"] = array(
         '#title' => $app_name,
         '#type' => 'checkbox',
         '#default_value' => ($checked) ? 'x' : false,
         '#disabled' => !$app_enabled
-      );
+        );
     }
 
     break;
 
-  case 'group':
+    case 'group':
     if (!is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     foreach ($elements as $key => $element) {
-      $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
-      $name = str_replace(' ','_',strtolower($title));
-      $name = "group_{$name}";
+        $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
+        $name = str_replace(' ','_',strtolower($title));
+        $name = "group_{$name}";
 
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($title));
         $title = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($title));
-      }
+        }
 
-      $form[$name] = array(
-          '#title' => $title,
-          '#type' => 'fieldset',
-          '#tree' => FALSE,
-          //'#description' => t('Notes about this group of fields'),
-          '#collapsible' => TRUE,
-          '#collapsed' => FALSE
-      );
-      // Recursively populate the compound element
-      foreach ($element as $child_type => $child) {
+        $form[$name] = array(
+            '#title' => $title,
+            '#type' => 'fieldset',
+            '#tree' => FALSE,
+            //'#description' => t('Notes about this group of fields'),
+            '#collapsible' => TRUE,
+            '#collapsed' => FALSE
+        );
+        // Recursively populate the compound element
+        foreach ($element as $child_type => $child) {
         boincwork_generate_prefs_element($form[$name], $child_type, $child, $user_prefs);
-      }
+        }
     }
     break;
 
-  case 'compound':
+    case 'compound':
     if (!is_numeric(key($elements))) {
-      $elements = array($elements);
+        $elements = array($elements);
     }
     foreach ($elements as $element) {
-      $name = $element['@attributes']['name'];
-      $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
+        $name = $element['@attributes']['name'];
+        $title = is_array($element['title']) ? $element['title']['@value'] : $element['title'];
 
-      // Translate elements as appropriate
-      if ($title) {
+        // Translate elements as appropriate
+        if ($title) {
         i18nstrings_update('project:prefs_xml', _boinctranslate_supertrim($title));
         $title = i18nstrings('project:prefs_xml', _boinctranslate_supertrim($title));
-      }
+        }
 
-      $form[$name] = array(
-          '#title' => $title,
-          '#type' => 'fieldset',
-          //'#description' => t('Notes about this group of fields'),
-          '#collapsible' => TRUE,
-          '#collapsed' => FALSE
-      );
-      // Recursively populate the compound element
-      foreach ($element['attributes'] as $child_type => $child) {
+        $form[$name] = array(
+            '#title' => $title,
+            '#type' => 'fieldset',
+            //'#description' => t('Notes about this group of fields'),
+            '#collapsible' => TRUE,
+            '#collapsed' => FALSE
+        );
+        // Recursively populate the compound element
+        foreach ($element['attributes'] as $child_type => $child) {
         boincwork_generate_prefs_element($form[$name], $child_type, $child, $user_prefs[$name]['@attributes']);
-      }
+        }
     }
     break;
 
@@ -655,24 +655,24 @@ 
  */
 function boincwork_make_prefs_table($prefs, $top_level = TRUE) {
 
-  $prefs_table = array();
-  $uncategorized = array();
+    $prefs_table = array();
+    $uncategorized = array();
 
-  // Parse the project preferences form
-  foreach ($prefs as $key => $element) {
+    // Parse the project preferences form
+    foreach ($prefs as $key => $element) {
 
     // Determine which type of element this is and act accordingly
     $element_type = NULL;
     if (is_array($element) AND isset($element['#type'])) {
-      $element_type = $element['#type'];
+        $element_type = $element['#type'];
     }
     switch ($element_type) {
     case 'fieldset':
       $prefs_table[$key] = array(
         'name' => $element['#title'],
         'elements' => boincwork_make_prefs_table($element, FALSE),
-      );
-      break;
+        );
+        break;
     case 'textfield':
     case 'radios':
     case 'checkbox':
@@ -682,45 +682,45 @@ 
         switch ($key) {
         case 'start_hour':
           $element['#title'] = bts('Compute only between:', array(), NULL, 'boinc:account-preferences-computing');
-          break;
+            break;
         case 'net_start_hour':
           $element['#title'] = bts('Transfer files only between:', array(), NULL, 'boinc:account-preferences-comuting');
-          break;
+            break;
         default:
         }
-      }
-      $prefs_element = array(
+        }
+        $prefs_element = array(
         'name' => (isset($element['#title'])) ? $element['#title'] : '',
         'description' => (isset($element['#description'])) ? $element['#description'] : '',
         'default_value' => (isset($element['#default_value'])) ? $element['#default_value'] : NULL,
-      );
-      if ($top_level) {
+        );
+        if ($top_level) {
         $uncategorized[$key] = $prefs_element;
-      }
-      else {
+        }
+        else {
         $prefs_table[$key] = $prefs_element;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
+    }
 
-  if ($prefs_table AND $uncategorized) {
+    if ($prefs_table AND $uncategorized) {
     // Throw any settings that don't fit elsewhere into "other"
     $prefs_table['other'] = array(
-      'name' => bts('Other settings', array(), NULL, 'boinc:account-preferences'),
-      'elements' => $uncategorized,
+        'name' => bts('Other settings', array(), NULL, 'boinc:account-preferences'),
+        'elements' => $uncategorized,
     );
-  }
-  elseif ($uncategorized) {
+    }
+    elseif ($uncategorized) {
     // If nothing is categorized, output all prefs under a general "settings"
     $prefs_table['settings'] = array(
-      'name' => bts('Settings', array(), NULL, 'boinc:account-preferences'),
-      'elements' => $uncategorized,
+        'name' => bts('Settings', array(), NULL, 'boinc:account-preferences'),
+        'elements' => $uncategorized,
     );
-  }
+    }
 
-  return $prefs_table;
+    return $prefs_table;
 }
 
 /**
@@ -728,33 +728,33 @@ 
  */
 function boincwork_load_prefs($type = 'general', $venue = null, $account = null) {
 
-  require_boinc(array('user'));
+    require_boinc(array('user'));
 
-  // Load the BOINC user object
-  if (!$account) {
+    // Load the BOINC user object
+    if (!$account) {
     global $user;
     $account = $user;
-  }
-  $account = user_load($account->uid);
-  $boincuser = BoincUser::lookup_id($account->boincuser_id);
+    }
+    $account = user_load($account->uid);
+    $boincuser = BoincUser::lookup_id($account->boincuser_id);
 
-  // Load the desired preferences for the user
-  $main_prefs = array();
-  if ($type == 'project') {
+    // Load the desired preferences for the user
+    $main_prefs = array();
+    if ($type == 'project') {
     if ($boincuser->project_prefs) {
-      $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+        $main_prefs = load_configuration($boincuser->project_prefs);
+        $main_prefs = (array) $main_prefs['project_preferences'];
     }
-  }
-  else {
+    }
+    else {
     if ($boincuser->global_prefs) {
-      $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+        $main_prefs = load_configuration($boincuser->global_prefs);
+        $main_prefs = (array) $main_prefs['global_preferences'];
+    }
     }
-  }
 
-  // Return general preferences or a subset based on venue
-  if (!$venue OR $venue == 'generic') {
+    // Return general preferences or a subset based on venue
+    if (!$venue OR $venue == 'generic') {
     unset($main_prefs['venue']);
     // Use the length of the $main_prefs array as a condition as to
     // whether the preferences have already been set. This is
@@ -762,23 +762,23 @@ 
     if (count($main_prefs) < 3)
         $main_prefs['@attributes'] = array('cleared' => 1);
     return $main_prefs;
-  }
-  else {
+    }
+    else {
     if (isset($main_prefs['venue'])) {
-      if (!is_numeric(key($main_prefs['venue']))) {
+        if (!is_numeric(key($main_prefs['venue']))) {
         $main_prefs['venue'] = array($main_prefs['venue']);
-      }
-      foreach ($main_prefs['venue'] as $key => $prefs_venue) {
+        }
+        foreach ($main_prefs['venue'] as $key => $prefs_venue) {
         if (isset($prefs_venue['@attributes']['name']) AND $prefs_venue['@attributes']['name'] == $venue) {
-          return $main_prefs['venue'][$key];
+            return $main_prefs['venue'][$key];
+        }
         }
-      }
     }
-  }
+    }
 
-  return array(
+    return array(
     '@attributes' => array('name' => $venue, 'cleared' => 1)
-  );
+    );
 }
 
 /**
@@ -786,104 +786,104 @@ 
  */
 function boincwork_save_prefs($prefs, $type = 'general', $venue = null, $account = null) {
 
-  require_boinc(array('user'));
+    require_boinc(array('user'));
 
-  // Load existing project prefs from the BOINC user object
-  if (!$account) {
+    // Load existing project prefs from the BOINC user object
+    if (!$account) {
     global $user;
     $account = $user;
-  }
-  $account = user_load($account->uid);
-  $boincuser = BoincUser::lookup_id($account->boincuser_id);
+    }
+    $account = user_load($account->uid);
+    $boincuser = BoincUser::lookup_id($account->boincuser_id);
 
-  // Load the specified preferences for the user
-  $main_prefs = array();
-  if ($type == 'project') {
+    // Load the specified preferences for the user
+    $main_prefs = array();
+    if ($type == 'project') {
     if ($boincuser->project_prefs) {
-      $main_prefs = load_configuration($boincuser->project_prefs);
-      $main_prefs = (array) $main_prefs['project_preferences'];
+        $main_prefs = load_configuration($boincuser->project_prefs);
+        $main_prefs = (array) $main_prefs['project_preferences'];
     }
-  }
-  else {
+    }
+    else {
     if ($boincuser->global_prefs) {
-      $main_prefs = load_configuration($boincuser->global_prefs);
-      $main_prefs = (array) $main_prefs['global_preferences'];
+        $main_prefs = load_configuration($boincuser->global_prefs);
+        $main_prefs = (array) $main_prefs['global_preferences'];
+    }
     }
-  }
 
-  // Save all preferences or a subset based on venue
-  //drupal_set_message('<pre>' . print_r($main_prefs, true) . '</pre>');
-  $new_venue = true;
-  if (!$venue OR $venue == 'generic') {
+    // Save all preferences or a subset based on venue
+    //drupal_set_message('<pre>' . print_r($main_prefs, true) . '</pre>');
+    $new_venue = true;
+    if (!$venue OR $venue == 'generic') {
     //$main_prefs = $prefs;
     $main_prefs = $prefs + $main_prefs;
-  }
-  else {
+    }
+    else {
     if (isset($main_prefs['venue'])) {
-      if (!is_numeric(key($main_prefs['venue']))) {
+        if (!is_numeric(key($main_prefs['venue']))) {
         $main_prefs['venue'] = array($main_prefs['venue']);
-      }
-      foreach ($main_prefs['venue'] as $key => $prefs_venue) {
+        }
+        foreach ($main_prefs['venue'] as $key => $prefs_venue) {
         if (isset($prefs_venue['@attributes']['name']) AND $prefs_venue['@attributes']['name'] == $venue) {
-          if ($prefs) {
+            if ($prefs) {
             $main_prefs['venue'][$key] = $prefs;
-          }
-          else {
+            }
+            else {
             // If prefs is null, clear out this preference set
             unset($main_prefs['venue'][$key]);
             if (count($main_prefs['venue']) == 0) {
-              // If that was the only preference set configured, unset the
-              // venue tag altogether
-              unset($main_prefs['venue']);
+                // If that was the only preference set configured, unset the
+                // venue tag altogether
+                unset($main_prefs['venue']);
             }
-          }
-          $new_venue = false;
-          break;
+            }
+            $new_venue = false;
+            break;
+        }
         }
-      }
     }
     if ($new_venue) {
-      $main_prefs['venue'][] = $prefs;
+        $main_prefs['venue'][] = $prefs;
+    }
     }
-  }
 
-  // Set modified time
-  if ($type == 'project') {
+    // Set modified time
+    if ($type == 'project') {
     if (!isset($main_prefs['modified'])) {
-      $main_prefs = array_merge(array('modified' => 0), $main_prefs);
+        $main_prefs = array_merge(array('modified' => 0), $main_prefs);
     }
     $main_prefs['modified'] = time();
-  } else {
+    } else {
     if (!isset($main_prefs['mod_time'])) {
-      $main_prefs = array_merge(array('mod_time' => 0), $main_prefs);
+        $main_prefs = array_merge(array('mod_time' => 0), $main_prefs);
     }
     $main_prefs['mod_time'] = time();
     // unset source information, the Client will fill this in again
     if (isset($main_prefs['source_project'])) {
-      unset($main_prefs['source_project']);
+        unset($main_prefs['source_project']);
     }
     if (isset($main_prefs['source_scheduler'])) {
-      unset($main_prefs['source_scheduler']);
+        unset($main_prefs['source_scheduler']);
+    }
     }
-  }
 
-  // Convert prefs back to XML and save to database
-  $result = null;
-  if ($type == 'project') {
+    // Convert prefs back to XML and save to database
+    $result = null;
+    if ($type == 'project') {
     $main_prefs = array('project_preferences' => $main_prefs);
     $boincuser->project_prefs = save_configuration($main_prefs);
     db_set_active('boinc_rw');
     $result = db_query("UPDATE user SET project_prefs = '{$boincuser->project_prefs}' WHERE id = '{$boincuser->id}'");
     db_set_active('default');
-  }
-  else {
+    }
+    else {
     $main_prefs = array('global_preferences' => $main_prefs);
     $boincuser->global_prefs = save_configuration($main_prefs);
     db_set_active('boinc_rw');
     $result = db_query("UPDATE user SET global_prefs = '{$boincuser->global_prefs}' WHERE id = '{$boincuser->id}'");
     db_set_active('default');
-  }
-  return $result;
+    }
+    return $result;
 }
 
 
@@ -900,9 +900,9 @@ 
  *username. Called from privacy preference form.
  */
 function boincwork_ignore_user_add_user_username($name = NULL) {
-  global $user;
+    global $user;
 
-  if (isset($name)) {
+    if (isset($name)) {
     // Get the BOINC ID from the name string, and lookup the
     // corresponding drupal user.
     $boincname = substr($name, 0, strrpos($name, '_'));
@@ -911,84 +911,84 @@ 
     $iuid = get_drupal_id($boincid);
 
     if ($user->uid == $iuid) {
-      drupal_set_message(bts('You can\'t add yourself to your own ignore list.', array(), NULL, 'boinc:ignore-user-error-message'), 'error');
-      drupal_goto('account/prefs/privacy');
+        drupal_set_message(bts('You can\'t add yourself to your own ignore list.', array(), NULL, 'boinc:ignore-user-error-message'), 'error');
+        drupal_goto('account/prefs/privacy');
     }
 
     if (is_numeric($iuid) && $iuid > 0) {
-      if (!db_result(db_query('SELECT COUNT(iuid) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $iuid))) {
+        if (!db_result(db_query('SELECT COUNT(iuid) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $iuid))) {
         db_query('INSERT INTO {ignore_user} (uid, iuid) VALUES (%d, %d)', $user->uid, $iuid);
-      }// endif db_result
+        }// endif db_result
 
-      if (module_exists('pm_block_user')) {
+        if (module_exists('pm_block_user')) {
         if (!db_result(db_query('SELECT COUNT(recipient) FROM {pm_block_user} WHERE author = %d AND recipient = %d', $iuid, $user->uid))) {
-          db_query('INSERT INTO {pm_block_user} (author, recipient) VALUES (%d, %d)', $iuid, $user->uid);
+            db_query('INSERT INTO {pm_block_user} (author, recipient) VALUES (%d, %d)', $iuid, $user->uid);
         }// endif db_result
-      }// endif module_exists('pm_block_user')
+        }// endif module_exists('pm_block_user')
 
     }// endif $iuid
-  }
+    }
 }
 
 /**
  * Add another user's UID to the current user's ignore list.
  */
 function boincwork_ignore_user_add_user($iuid = NULL) {
-  global $user;
+    global $user;
 
-  if ($user->uid == $iuid) {
+    if ($user->uid == $iuid) {
     drupal_set_message(bts('You can\'t add yourself to your own ignore list.', array(), NULL, 'boinc:ignore-user-error-message'), 'error');
     drupal_goto();
-  }
+    }
 
-  $otheraccount = user_load($iuid);
+    $otheraccount = user_load($iuid);
 
-  if (is_numeric($iuid) && $iuid > 0) {
+    if (is_numeric($iuid) && $iuid > 0) {
     if (!db_result(db_query('SELECT COUNT(iuid) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $iuid))) {
-      db_query('INSERT INTO {ignore_user} (uid, iuid) VALUES (%d, %d)', $user->uid, $iuid);
+        db_query('INSERT INTO {ignore_user} (uid, iuid) VALUES (%d, %d)', $user->uid, $iuid);
     }// endif db_result
 
     if (module_exists('pm_block_user')) {
-      if (!db_result(db_query('SELECT COUNT(recipient) FROM {pm_block_user} WHERE author = %d AND recipient = %d', $iuid, $user->uid))) {
+        if (!db_result(db_query('SELECT COUNT(recipient) FROM {pm_block_user} WHERE author = %d AND recipient = %d', $iuid, $user->uid))) {
         db_query('INSERT INTO {pm_block_user} (author, recipient) VALUES (%d, %d)', $iuid, $user->uid);
-      }// endif db_result
+        }// endif db_result
     }// endif module_exists('pm_block_user')
 
     drupal_set_message(
-      bts('@username has been added to your ignore list. See your !privacy_preferences for more details.',
+        bts('@username has been added to your ignore list. See your !privacy_preferences for more details.',
         array(
-          '@username' => $otheraccount->boincuser_name,
-          '!privacy_preferences' => l(bts('privacy preferences', array(), NULL, 'boinc:ignore-user-add'), 'account/prefs/privacy'),
+            '@username' => $otheraccount->boincuser_name,
+            '!privacy_preferences' => l(bts('privacy preferences', array(), NULL, 'boinc:ignore-user-add'), 'account/prefs/privacy'),
         ),
         NULL, 'boinc:ignore-user-add'),
-      'status');
+        'status');
     drupal_goto();
-  }
-  else {
+    }
+    else {
     drupal_not_found();
-  }// endif iuid
+    }// endif iuid
 }
 
 /**
  * Remove user from user's ignore list.
  */
 function boincwork_ignore_user_remove_user($iuid = NULL) {
-  global $user;
-  $otheraccount = user_load($iuid);
+    global $user;
+    $otheraccount = user_load($iuid);
 
-  db_query('DELETE FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $iuid);
-  if (module_exists('pm_block_user')) {
+    db_query('DELETE FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $iuid);
+    if (module_exists('pm_block_user')) {
     db_query('DELETE FROM {pm_block_user} WHERE author = %d AND recipient = %d', $iuid, $user->uid);
-  }// endif module_exists
-  drupal_set_message(
+    }// endif module_exists
+    drupal_set_message(
     bts('@username has been removed from your ignore list. See your !privacy_preferences for more details.',
-      array(
+        array(
         '@username' => $otheraccount->boincuser_name,
         '!privacy_preferences' => l(bts('privacy preferences', array(), NULL, 'boinc:ignore-user-add'), 'account/prefs/privacy'),
-      ),
-      NULL, 'boinc:ignore-user-add'),
+        ),
+        NULL, 'boinc:ignore-user-add'),
     'status');
-  drupal_goto('account/prefs/privacy');
+    drupal_goto('account/prefs/privacy');
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1002,18 +1002,18 @@ 
  */
 function boincwork_load_privacyconsenttypes() {
 
-  db_set_active('boinc_rw');
-  $db_result = db_query("SELECT id,shortname,description FROM consent_type WHERE enabled=1 AND privacypref=1 ORDER by project_specific ASC");
-  db_set_active('drupal');
+    db_set_active('boinc_rw');
+    $db_result = db_query("SELECT id,shortname,description FROM consent_type WHERE enabled=1 AND privacypref=1 ORDER by project_specific ASC");
+    db_set_active('drupal');
 
-  if ($db_result) {
+    if ($db_result) {
     $consent_types = array();
     while ($result = db_fetch_array($db_result)) {
-      $consent_types[] = $result;
+        $consent_types[] = $result;
     }
     return $consent_types;
-  }
-  return array();
+    }
+    return array();
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1025,94 +1025,94 @@ 
  */
 function boincwork_set_default_venue($venue = '') {
 
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
 
-  if ($venue == 'generic') {
+    if ($venue == 'generic') {
     $venue = '';
-  }
+    }
 
-  db_set_active('boinc_rw');
-  db_query("
+    db_set_active('boinc_rw');
+    db_query("
     UPDATE user
     SET venue = '%s'
     WHERE id = %d",
     $venue, $account->boincuser_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
 }
 
 /**
  * Recursively validate submitted form values against a set of rules
  */
 function boincwork_validate_form($validation_rules, $values, $path = array()) {
-  foreach ($validation_rules as $field => $rules) {
+    foreach ($validation_rules as $field => $rules) {
     $parents = $path;
     if (is_array($values[$field])) {
-      // Process nested form elements
-      $parents[] = $field;
-      boincwork_validate_form($rules, $values[$field], $parents);
+        // Process nested form elements
+        $parents[] = $field;
+        boincwork_validate_form($rules, $values[$field], $parents);
     }
     else {
-      if ($parents) {
+        if ($parents) {
         // form_set_error() identifies nested form elements with '][' as a
         // delimiter between each parent and child element
         $parents[] = $field;
         $form_field = implode('][', $parents);
-      }
-      else {
+        }
+        else {
         $form_field = $field;
-      }
-      if (isset($rules['datatype']) AND !boincwork_validate_datatype($values[$field], $rules['datatype'])) {
+        }
+        if (isset($rules['datatype']) AND !boincwork_validate_datatype($values[$field], $rules['datatype'])) {
         form_set_error($form_field, bts('Invalid data type for @field', array('@field' => $field), NULL, 'boinc:account-preferences'));
-      }
-      if (isset($rules['min']) AND $values[$field] < $rules['min']) {
+        }
+        if (isset($rules['min']) AND $values[$field] < $rules['min']) {
         form_set_error($form_field, bts('Minimum value not met for @field', array('@field' => $field), NULL, 'boinc:account-preferences'));
-      }
-      if (isset($rules['max']) AND $values[$field] > $rules['max']) {
+        }
+        if (isset($rules['max']) AND $values[$field] > $rules['max']) {
         form_set_error($form_field, bts('Maximum value exceeded for @field', array('@field' => $field), NULL, 'boinc:account-preferences'));
-      }
+        }
+    }
     }
-  }
 }
 
 /**
  * Check that numeric data conforms to specifications
  */
 function boincwork_validate_datatype($data, $datatype = NULL) {
-  switch ($datatype) {
-  case 'float':
+    switch ($datatype) {
+    case 'float':
     if (!is_numeric($data)) {
-      return FALSE;
+        return FALSE;
     }
     $data += 0.0;
     if (!is_float($data)) {
-      return FALSE;
+        return FALSE;
     }
     break;
 
-  case 'integer':
+    case 'integer':
     if (!is_numeric($data)) {
-      return FALSE;
+        return FALSE;
     }
     $data += 0;
     if (!is_int($data)) {
-      return FALSE;
+        return FALSE;
     }
     break;
 
-  case 'text':
+    case 'text':
   default:
 
   }
-  return TRUE;
+    return TRUE;
 }
 
 /**
  * Format a number to be displayed using a maximum number of digits
  */
 function boincwork_format_stats($number, $max_digits = 4) {
-  $suffix = array(
+    $suffix = array(
     0 => '',
     1 => 'k',
     2 => 'M',
@@ -1122,94 +1122,94 @@ 
     6 => 'E',
     7 => 'Z',
     8 => 'Y'
-  );
-  if (!is_numeric($number)) $number = 0;
+    );
+    if (!is_numeric($number)) $number = 0;
 
-  $digits = floor(log($number, 10)) + 1;
-  $magnitude = 0;
-  $precision = 0;
-  if ($digits > $max_digits) {
+    $digits = floor(log($number, 10)) + 1;
+    $magnitude = 0;
+    $precision = 0;
+    if ($digits > $max_digits) {
     $magnitude = floor(($digits - ($max_digits - 3)) / 3);
     $precision = $max_digits - ($digits - ($magnitude * 3) + 1);
     $number = round($number / pow(1000, $magnitude), $precision);
-  }
-  $number = number_format($number, $precision) . (($magnitude) ? "{$suffix[$magnitude]}" : '');
+    }
+    $number = number_format($number, $precision) . (($magnitude) ? "{$suffix[$magnitude]}" : '');
 
-  return $number;
+    return $number;
 }
 
-  //------------------------------------------------------------------------------------------------
-  //  load_configuration(): Convert structured text/xml to array
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  load_configuration(): Convert structured text/xml to array
+    //------------------------------------------------------------------------------------------------
 
-  function load_configuration($text)
-  {
-      if (preg_match('/^\<\?xml .*\?\>$/i', $text)) return null;
-      if ($xml = text_to_xml($text)) return xml_to_array($xml);
-      return false;
-  }
+    function load_configuration($text)
+    {
+        if (preg_match('/^\<\?xml .*\?\>$/i', $text)) return null;
+        if ($xml = text_to_xml($text)) return xml_to_array($xml);
+        return false;
+    }
 
-  //------------------------------------------------------------------------------------------------
-  //  save_configuration(): Convert array to structured text/xml
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  save_configuration(): Convert array to structured text/xml
+    //------------------------------------------------------------------------------------------------
 
-  function save_configuration($array)
-  {
-      if ($xml = array_to_xml($array)) return xml_to_text($xml, false, true);
-      return false;
-  }
+    function save_configuration($array)
+    {
+        if ($xml = array_to_xml($array)) return xml_to_text($xml, false, true);
+        return false;
+    }
 
-  //------------------------------------------------------------------------------------------------
-  //  array_to_xml(): Take a multidimensional array and convert it to a structured
-  //  DOM XML object
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  array_to_xml(): Take a multidimensional array and convert it to a structured
+    //  DOM XML object
+    //------------------------------------------------------------------------------------------------
 
-  function array_to_xml($array, $dom = false, $parent_node = false) {
+    function array_to_xml($array, $dom = false, $parent_node = false) {
     $is_root = false;
     if (!$dom) $dom = new DomDocument('1.0');
     if (!$parent_node) {
-      $parent_node = $dom;
-      $is_root = true;
+        $parent_node = $dom;
+        $is_root = true;
     }
     // Created an intermediate array to attempt to sort by @position
     $ordered_array = array();
     $unordered_array = array();
     foreach ($array as $name => $value) {
-      if ($is_root) {
+        if ($is_root) {
         $unordered_array[] = $array;
         break;
-      }
-      if (is_array($value)) {
+        }
+        if (is_array($value)) {
         if (is_numeric(key($value))) {
-          foreach ($value as $item) {
+            foreach ($value as $item) {
             if (is_array($item) AND isset($item['@position'])) {
-              $ordered_array[$item['@position']] = array(
+                $ordered_array[$item['@position']] = array(
                 $name => $item
-              );
+                );
             }
             else {
-              $unordered_array[] = array(
+                $unordered_array[] = array(
                 $name => $item
-              );
+                );
+            }
             }
-          }
         }
         elseif (isset($value['@position'])) {
-          $ordered_array[$value['@position']] = array(
+            $ordered_array[$value['@position']] = array(
             $name => $value
-          );
+            );
         }
         else {
-          $unordered_array[] = array(
+            $unordered_array[] = array(
             $name => $value
-          );
+            );
         }
-      }
-      else {
+        }
+        else {
         $unordered_array[] = array(
-          $name => $value
+            $name => $value
         );
-      }
+        }
     }
 
     // Now append items without explicit positions at the end
@@ -1217,39 +1217,39 @@ 
 
     // Convert to XML...
     foreach ($primed_array as $item) {
-      list($name, $value) = each($item);
-      if (strcmp($name, '@attributes') == 0) {
+        list($name, $value) = each($item);
+        if (strcmp($name, '@attributes') == 0) {
         if (!is_array($value)) continue;
         foreach ($value as $attributeName => $attributeValue) {
-          $parent_node->setAttribute($attributeName, $attributeValue);
+            $parent_node->setAttribute($attributeName, $attributeValue);
         }
-      } elseif (strcmp($name, '@value') == 0) {
+        } elseif (strcmp($name, '@value') == 0) {
         if (isset($value)) $parent_node->nodeValue = $value;
-      } elseif (strcmp($name, '@position') == 0) {
+        } elseif (strcmp($name, '@position') == 0) {
         continue;
-      } else {
+        } else {
         if (is_numeric($name)) {
-          $name = $parent_node->tagName;
+            $name = $parent_node->tagName;
         }
         $current_item = $dom->createElement($name);
         if (is_array($value)) {
-          if (is_numeric(key($value))) {
+            if (is_numeric(key($value))) {
             $current_node = $parent_node->appendChild($current_item);
             $current_node = array_to_xml($value, $dom, $current_node);
             $child_count = $current_node->childNodes->length;
             for ($i = 0; $i < $child_count; $i++) {
-              $parent_node->appendChild($current_node->childNodes->item(0));
+                $parent_node->appendChild($current_node->childNodes->item(0));
             }
             $parent_node->removeChild($current_node);
-          } else {
+            } else {
             $current_node = $dom->appendChild($current_item);
             $parent_node->appendChild(array_to_xml($value, $dom, $current_node));
-          }
+            }
         } else {
-          if (isset($value)) $current_item->nodeValue = $value;
-          $parent_node->appendChild($current_item);
+            if (isset($value)) $current_item->nodeValue = $value;
+            $parent_node->appendChild($current_item);
+        }
         }
-      }
     }
     /*
     foreach ($array as $name => $value) {
@@ -1285,114 +1285,114 @@ 
       }
     }*/
     return $parent_node;
-  }
+    }
 
-  //------------------------------------------------------------------------------------------------
-  //  xml_to_text(): Convert an XML DOM object to string format
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  xml_to_text(): Convert an XML DOM object to string format
+    //------------------------------------------------------------------------------------------------
 
-  function xml_to_text($xml, $include_xml_declaration = true, $add_carriage_returns = false)
-  {
-      $xml->formatOutput = true;
-      $text = $xml->saveXML();
-      if (!$include_xml_declaration) {
+    function xml_to_text($xml, $include_xml_declaration = true, $add_carriage_returns = false)
+    {
+        $xml->formatOutput = true;
+        $text = $xml->saveXML();
+        if (!$include_xml_declaration) {
         $text = preg_replace('/<\?xml version=.*\?>\s*/i', '', $text, 1);
-      }
-      if ($add_carriage_returns) {;
+        }
+        if ($add_carriage_returns) {;
         $text = preg_replace('/\n/i', "\r\n", $text);
-      }
-      return trim($text);
-  }
+        }
+        return trim($text);
+    }
 
-  //------------------------------------------------------------------------------------------------
-  //  text_to_xml(): Convert an XML DOM object to string format
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  text_to_xml(): Convert an XML DOM object to string format
+    //------------------------------------------------------------------------------------------------
 
-  function text_to_xml($text) {
+    function text_to_xml($text) {
     $xml = new DomDocument();
     if ( !($xml->loadXML($text)) ) return false;
     return $xml;
-  }
+    }
 
 
-  //------------------------------------------------------------------------------------------------
-  //  xml_to_array(): Convert an XML DOM object to array format
-  //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //  xml_to_array(): Convert an XML DOM object to array format
+    //------------------------------------------------------------------------------------------------
 
-  function xml_to_array($xml) {
-      $node = $xml->firstChild; //$xml->first_child();
-      $result = '';
-      $index = 1;
-      $position = 0;
-      while (!is_null($node)) {
-          switch ($node->nodeType) {
-          case XML_TEXT_NODE:
+    function xml_to_array($xml) {
+        $node = $xml->firstChild; //$xml->first_child();
+        $result = '';
+        $index = 1;
+        $position = 0;
+        while (!is_null($node)) {
+            switch ($node->nodeType) {
+            case XML_TEXT_NODE:
               if (trim($node->nodeValue)  != '') $result = $node->nodeValue;
-              break;
-          case XML_ELEMENT_NODE:
+                break;
+            case XML_ELEMENT_NODE:
               $node_name = $node->nodeName;
-              $parent = $node->parentNode;
-              $sibling = $node->nextSibling;
-
-              // Determine if this node forms a set with siblings (share a node name)
-              while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->nextSibling;
-              if (!$sibling) {
-                  $sibling = $node->previousSibling;
-                  while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->previousSibling;
-              }
-
-              if ($sibling) {
-                  $result[$node_name][$index] = '';
-                  if ($node->childNodes) {
-                      $result[$node_name][$index] = xml_to_array($node) ;
-                  }
-                  if ($node->hasAttributes()) {
-                      $attributes = $node->attributes;
-                      if ($result[$node_name][$index] !== '' AND !is_array($result[$node_name][$index])) {
-                          $result[$node_name][$index] = array('@value' => $result[$node_name][$index]);
-                      }
-                      foreach ($attributes as $key => $attribute) {
-                          $result[$node_name][$index]['@attributes'][$attribute->name] = $attribute->value;
-                      }
-                  }
-                  // Retain the position of the element
-                  if (!is_array($result[$node_name][$index])) {
+                $parent = $node->parentNode;
+                $sibling = $node->nextSibling;
+
+                // Determine if this node forms a set with siblings (share a node name)
+                while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->nextSibling;
+                if (!$sibling) {
+                    $sibling = $node->previousSibling;
+                    while (($sibling) AND (($sibling->nodeType != XML_ELEMENT_NODE) OR ($sibling->nodeName != $node->nodeName))) $sibling = $sibling->previousSibling;
+                }
+
+                if ($sibling) {
+                    $result[$node_name][$index] = '';
+                    if ($node->childNodes) {
+                        $result[$node_name][$index] = xml_to_array($node) ;
+                    }
+                    if ($node->hasAttributes()) {
+                        $attributes = $node->attributes;
+                        if ($result[$node_name][$index] !== '' AND !is_array($result[$node_name][$index])) {
+                            $result[$node_name][$index] = array('@value' => $result[$node_name][$index]);
+                        }
+                        foreach ($attributes as $key => $attribute) {
+                            $result[$node_name][$index]['@attributes'][$attribute->name] = $attribute->value;
+                        }
+                    }
+                    // Retain the position of the element
+                    if (!is_array($result[$node_name][$index])) {
                     $result[$node_name][$index] = array(
-                      '@value' => $result[$node_name][$index]
+                        '@value' => $result[$node_name][$index]
                     );
-                  }
-                  $result[$node_name][$index]['@position'] = $position;
-                  $position++;
-                  $index++;
-              } else {
-                  $result[$node_name] = '';
-                  if ($node->childNodes) {
-                      $result[$node_name] = xml_to_array($node) ;
-                  }
-                  if ($node->hasAttributes()) {
-                      $attributes = $node->attributes;
-                      if ($result[$node_name] !== '' AND !is_array($result[$node_name])) {
-                          $result[$node_name] = array('@value' => $result[$node_name]);
-                      }
-                      foreach($attributes as $key => $attribute) {
-                          $result[$node_name]['@attributes'][$attribute->name] = $attribute->value;
-                      }
-                  }
-                  // Retain the position of the element
-                  if (!is_array($result[$node_name])) {
+                    }
+                    $result[$node_name][$index]['@position'] = $position;
+                    $position++;
+                    $index++;
+                } else {
+                    $result[$node_name] = '';
+                    if ($node->childNodes) {
+                        $result[$node_name] = xml_to_array($node) ;
+                    }
+                    if ($node->hasAttributes()) {
+                        $attributes = $node->attributes;
+                        if ($result[$node_name] !== '' AND !is_array($result[$node_name])) {
+                            $result[$node_name] = array('@value' => $result[$node_name]);
+                        }
+                        foreach($attributes as $key => $attribute) {
+                            $result[$node_name]['@attributes'][$attribute->name] = $attribute->value;
+                        }
+                    }
+                    // Retain the position of the element
+                    if (!is_array($result[$node_name])) {
                     $result[$node_name] = array(
-                      '@value' => $result[$node_name]
+                        '@value' => $result[$node_name]
                     );
-                  }
-                  $result[$node_name]['@position'] = $position;
-                  $position++;
-              }
-              break;
-          }
-          $node = $node->nextSibling;
-      }
-      return $result;
-  }
+                    }
+                    $result[$node_name]['@position'] = $position;
+                    $position++;
+                }
+                break;
+            }
+            $node = $node->nextSibling;
+        }
+        return $result;
+    }
 
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1400,172 +1400,172 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * Determine output for host list views when no hosts are found.
-  */
+ * Determine output for host list views when no hosts are found.
+ */
 function boincwork_views_host_list_empty_text($context = NULL) {
 
-  // Pull the BOINC user ID from the view arguments to get show_hosts
-  // preference for that user
-  require_boinc('boinc_db');
-  $view = views_get_current_view();
-  $account = user_load($view->args[0]);
-  $boincuser = BoincUser::lookup_id($account->boincuser_id);
+    // Pull the BOINC user ID from the view arguments to get show_hosts
+    // preference for that user
+    require_boinc('boinc_db');
+    $view = views_get_current_view();
+    $account = user_load($view->args[0]);
+    $boincuser = BoincUser::lookup_id($account->boincuser_id);
 
-  // Determine if hosts are associated at all or just hidden
-  $output = '';
-  if ($boincuser->show_hosts) {
+    // Determine if hosts are associated at all or just hidden
+    $output = '';
+    if ($boincuser->show_hosts) {
     switch($context) {
     case 'active':
       $output .=  '<h2>' . bts('No active computers', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user has no computers that have been'
-      . ' active in the last 30 days.', array(), NULL, 'boinc:host-list') . '</p>';
-      break;
+        $output .=  '<p>' . bts('This user has no computers that have been'
+        . ' active in the last 30 days.', array(), NULL, 'boinc:host-list') . '</p>';
+        break;
 
     case 'preferences':
       $output .=  '<h2>' . bts('No computers', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('There are no computers assigned to this'
-      . ' preference set.', array(), NULL, 'boinc:host-list') . '</p>';
-      break;
+        $output .=  '<p>' . bts('There are no computers assigned to this'
+        . ' preference set.', array(), NULL, 'boinc:host-list') . '</p>';
+        break;
 
     default:
       $output .=  '<h2>' . bts('Computers pending', array(), NULL, 'boinc:host-list') . '</h2>';
-      $output .=  '<p>' . bts('This user does not yet have any associated'
-      . ' computers. Computers will be displayed when they have earned their'
-      . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
+        $output .=  '<p>' . bts('This user does not yet have any associated'
+        . ' computers. Computers will be displayed when they have earned their'
+        . ' first credits.', array(), NULL, 'boinc:host-list') . '</p>';
     }
-  }
-  else {
+    }
+    else {
     $output .=  '<h2>' . bts('Computers hidden', array(), NULL, 'boinc:host-list') . '</h2>';
     $output .=  '<p>' . bts('This user has chosen not to show information'
     . ' about their computers.', array(), NULL, 'boinc:host-list') . '</p>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
-  * Determine output for task list views when no tasks are found.
-  */
+ * Determine output for task list views when no tasks are found.
+ */
 function boincwork_views_task_list_empty_text($context = NULL) {
 
-  //
-  $output = '';
-  switch($context) {
-  default:
+    //
+    $output = '';
+    switch($context) {
+    default:
     $output .=  '<h2>' . bts('No @type tasks', array('@type' => $context), NULL, 'boinc:task-list')
     . '</h2>';
     $output .=  '<p>' . bts('There are no tasks of this type on record', array(), NULL, 'boinc:task-list')
     . '</p>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
-  * Output links to perform host actions
-  */
+ * Output links to perform host actions
+ */
 function boincwork_host_action_links($host_id) {
-  $output = '';
-  if (boincwork_host_user_is_owner($host_id)) {
+    $output = '';
+    if (boincwork_host_user_is_owner($host_id)) {
     // Show merge hosts option
     $output = '<ul class="tab-list"><li class="first tab">';
     $output .= l(bts('Merge', array(), NULL, 'boinc:form-merge'), "host/{$host_id}/merge");
     $output .= '</li>';
     // If host has no tasks, allow the host to be deleted
     if (!boincwork_host_get_task_count($host_id)) {
-      $output .= '<li class="tab">';
-      $output .= l(bts('Delete', array(), NULL, 'boinc:form-delete'), "host/{$host_id}/delete",
+        $output .= '<li class="tab">';
+        $output .= l(bts('Delete', array(), NULL, 'boinc:form-delete'), "host/{$host_id}/delete",
         array(
-          'attributes' => array(
+            'attributes' => array(
             'onclick' => 'return confirm(\'' . bts('This will delete host @id'
-              . ' from your account forever. Are you sure this is OK?',
-              array('@id' => $host_id),
-              NULL, 'boinc:account-host-delete') . '\')'
-          )
+                . ' from your account forever. Are you sure this is OK?',
+                array('@id' => $host_id),
+                NULL, 'boinc:account-host-delete') . '\')'
+            )
         )
-      );
-      $output .= '</li>';
+        );
+        $output .= '</li>';
     }
     $output .= '</ul>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Get details for a given host
  */
 function boincwork_host_get_info($host_id) {
-  db_set_active('boinc_ro');
-  $host = db_fetch_object(db_query(
+    db_set_active('boinc_ro');
+    $host = db_fetch_object(db_query(
     "SELECT * FROM {host} WHERE id = '%d'",
     $host_id
-  ));
-  db_set_active('default');
-  return $host;
+    ));
+    db_set_active('default');
+    return $host;
 }
 
 /**
  * Get the number of tasks associated with a given host
  */
 function boincwork_host_get_task_count($host_id) {
-  db_set_active('boinc_ro');
-  $count = db_result(db_query(
+    db_set_active('boinc_ro');
+    $count = db_result(db_query(
     "SELECT COUNT(*) FROM {result} WHERE hostid = '%d'",
     $host_id
-  ));
-  db_set_active('default');
-  return $count;
+    ));
+    db_set_active('default');
+    return $count;
 }
 
 /**
  * Check whether a user is the owner of a host
  */
 function boincwork_host_user_is_owner($host_id, $uid = NULL) {
-  if (!$uid) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  $account = user_load($uid);
-  // Get host owner
-  db_set_active('boinc_ro');
-  $owner = db_result(db_query(
+    }
+    $account = user_load($uid);
+    // Get host owner
+    db_set_active('boinc_ro');
+    $owner = db_result(db_query(
     "SELECT userid FROM {host} WHERE id = '%d'",
     $host_id
-  ));
-  db_set_active('default');
-  return ($account->boincuser_id === $owner);
+    ));
+    db_set_active('default');
+    return ($account->boincuser_id === $owner);
 }
 
 /**
-  * Determine output for host last contact time
-  */
+ * Determine output for host last contact time
+ */
 function boincwork_host_last_contact($timestamp, $host_id = NULL, $context = NULL) {
-  $output = '---';
-  $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
-  $log = '';
-  if ($timestamp) {
+    $output = '---';
+    $root_log_dir = variable_get('boinc_host_sched_logs_dir', '');
+    $log = '';
+    if ($timestamp) {
     $output = date('j M Y G:i:s T', $timestamp);
-  }
-  if ($root_log_dir AND $host_id) {
+    }
+    if ($root_log_dir AND $host_id) {
     $subdir = substr($host_id, 0, -3) OR $subdir = 0;
     $log = implode('/', array($root_log_dir, $subdir, $host_id));
-  }
-  if ($log AND file_exists($log)) {
+    }
+    if ($log AND file_exists($log)) {
     $output = l($output, "host/{$host_id}/log");
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  *
  */
 function boincwork_host_venue_selector($host_id) {
-  $output = '';
-  if (function_exists('jump_quickly')) {
+    $output = '';
+    if (function_exists('jump_quickly')) {
     $path = "host/{$host_id}/set-venue";
     $venues = array(
-      "{$path}/generic" => bts('Generic', array(), NULL, 'boinc:account-preferences-location'),
-      "{$path}/home" => bts('Home', array(), NULL, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
-      "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location'),
-      "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location')
+        "{$path}/generic" => bts('Generic', array(), NULL, 'boinc:account-preferences-location'),
+        "{$path}/home" => bts('Home', array(), NULL, 'boinc:account-preferences-location:-1:ignoreoverwrite'),
+        "{$path}/work" => bts('Work', array(), NULL, 'boinc:account-preferences-location'),
+        "{$path}/school" => bts('School', array(), NULL, 'boinc:account-preferences-location')
     );
     variable_set('jump_use_js_venues-Array', 1);
     drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
@@ -1573,34 +1573,34 @@ 
     // Get current venue
     db_set_active('boinc_ro');
     $venue = db_result(db_query(
-      "SELECT venue FROM {host} WHERE id = '%d'",
-      $host_id
+        "SELECT venue FROM {host} WHERE id = '%d'",
+        $host_id
     ));
     db_set_active('default');
     $output .= jump_quickly($venues, 'venues', 1, "{$path}/{$venue}");
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
-  * Determine output for task reported time / deadline
-  */
+ * Determine output for task reported time / deadline
+ */
 function boincwork_task_time_reported($received_time = NULL, $deadline = NULL, $context = NULL) {
-  $output = '---';
-  if ($received_time OR $deadline) {
+    $output = '---';
+    if ($received_time OR $deadline) {
     $timestamp = ($received_time) ? $received_time : $deadline;
     $output = date('j M Y G:i:s T', $timestamp);
     // Add a wrapper to deadline text
     if (!$received_time) {
-      if (time() < $deadline) {
+        if (time() < $deadline) {
         $output = '<span class="on-time">' . $output . '</span>';
-      }
-      else {
+        }
+        else {
         $output = '<span class="past-due">' . $output . '</span>';
-      }
+        }
     }
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1631,345 +1631,345 @@ 
  *   Number of table row to display per page. Defaults to 20.
  */
 function boincwork_tasktable($category = 0, $queryid = 1, $tselect = NULL, $app_id = 0, $tablerows = 20) {
-  // Check type parameter, if not (0,2) then return an error.
-  if ( ($category!=0) AND ($category!=1) AND ($category!=2) ) {
+    // Check type parameter, if not (0,2) then return an error.
+    if ( ($category!=0) AND ($category!=1) AND ($category!=2) ) {
     watchdog('boincwork', 'task table called with invalid category = %category', array('%category' => $category), WATCHDOG_WARNING);
     return '';
-  }
+    }
 
-  require_boinc( array('util', 'result') );
+    require_boinc( array('util', 'result') );
 
-  global $language;
-  $locality=$language->language;
-  $nf = new NumberFormatter($locality, NumberFormatter::DECIMAL);
-  $nf->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, 0);
-  $nf->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, 0);
+    global $language;
+    $locality=$language->language;
+    $nf = new NumberFormatter($locality, NumberFormatter::DECIMAL);
+    $nf->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, 0);
+    $nf->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, 0);
 
-  $output = '';
+    $output = '';
 
-  $state_hnames = array(
+    $state_hnames = array(
     STATE_ALL => 'All',
     STATE_IN_PROGRESS => 'In progress',
     STATE_PENDING => 'Pending',
     STATE_VALID => 'Valid',
     STATE_INVALID => 'Invalid',
     STATE_ERROR => 'Error',
-  );
-  // Array (hash) to count total number of results/tasks, and their states.
-  $taskstates = array(
+    );
+    // Array (hash) to count total number of results/tasks, and their states.
+    $taskstates = array(
     STATE_ALL => 0,
     STATE_IN_PROGRESS => 0,
     STATE_PENDING => 0,
     STATE_VALID => 0,
     STATE_INVALID => 0,
     STATE_ERROR => 0,
-  );
-  // Array to hold pretty-print result data to be displayed in a table.
-  $resultdata = array();
-  // Arrays for applications. Form below uses $applications as parameter.
-  $application_map = array();
-  $application_select_count = array();
-  $applications = array();
-
-  // BOINC DB queries for results, application names
-  db_set_active('boinc_ro');
-
-  // Query to retreive all results, in order to calculate status for a
-  // host with application names for each result.
-  $sqlall = "SELECT user_friendly_name,"
-      ."r.appid as appid,"
-      ."r.server_state AS server_state,"
-      ."r.outcome AS outcome,"
-      ."r.client_state AS client_state,"
-      ."r.validate_state AS validate_state,"
-      ."r.exit_status AS exit_status "
-      ."FROM {result} AS r "
-      ."INNER JOIN {app} AS a "
-      ."ON r.appid=a.id ";
-
-  // Use userid, hostid, or workunitid
-  if ($category==0) {
+    );
+    // Array to hold pretty-print result data to be displayed in a table.
+    $resultdata = array();
+    // Arrays for applications. Form below uses $applications as parameter.
+    $application_map = array();
+    $application_select_count = array();
+    $applications = array();
+
+    // BOINC DB queries for results, application names
+    db_set_active('boinc_ro');
+
+    // Query to retreive all results, in order to calculate status for a
+    // host with application names for each result.
+    $sqlall = "SELECT user_friendly_name,"
+        ."r.appid as appid,"
+        ."r.server_state AS server_state,"
+        ."r.outcome AS outcome,"
+        ."r.client_state AS client_state,"
+        ."r.validate_state AS validate_state,"
+        ."r.exit_status AS exit_status "
+        ."FROM {result} AS r "
+        ."INNER JOIN {app} AS a "
+        ."ON r.appid=a.id ";
+
+    // Use userid, hostid, or workunitid
+    if ($category==0) {
     $sqlall .= " WHERE r.userid='%s' ";
-  }
-  elseif ($category==1) {
+    }
+    elseif ($category==1) {
     $sqlall .= " WHERE r.workunitid='%s' ";
-  }
-  elseif ($category==2) {
+    }
+    elseif ($category==2) {
     $sqlall .= " WHERE r.hostid='%s' ";
-  }
-  $sqlall .= " ORDER BY user_friendly_name";
-  $dbres_all = db_query($sqlall, $queryid);
-  db_set_active('default');
+    }
+    $sqlall .= " ORDER BY user_friendly_name";
+    $dbres_all = db_query($sqlall, $queryid);
+    db_set_active('default');
 
-  // Loop 1 of DB results
-  if ($dbres_all) {
+    // Loop 1 of DB results
+    if ($dbres_all) {
     while ($result = db_fetch_object($dbres_all)) {
-      $mystate = state_num($result);
-      if ( ($result->appid==$app_id) OR ($app_id==0) OR ($app_id==-1) ) {
+        $mystate = state_num($result);
+        if ( ($result->appid==$app_id) OR ($app_id==0) OR ($app_id==-1) ) {
         $taskstates[STATE_ALL]++;
         switch ($mystate) {
         case STATE_IN_PROGRESS:
           $taskstates[STATE_IN_PROGRESS]++;
-          break;
+            break;
         case STATE_PENDING:
           $taskstates[STATE_PENDING]++;
-          break;
+            break;
         case STATE_VALID:
           $taskstates[STATE_VALID]++;
-          break;
+            break;
         case STATE_INVALID:
           $taskstates[STATE_INVALID]++;
-          break;
+            break;
         case STATE_ERROR:
           $taskstates[STATE_ERROR]++;
-          break;
+            break;
         }
-      }// if app_id
+        }// if app_id
 
-      //map holds a map between app ids and user friendly names for all applications.
-      $application_map[$result->appid] = $result->user_friendly_name;
-      if ( ($mystate == $tselect) OR ($tselect==STATE_ALL) ) {
+        //map holds a map between app ids and user friendly names for all applications.
+        $application_map[$result->appid] = $result->user_friendly_name;
+        if ( ($mystate == $tselect) OR ($tselect==STATE_ALL) ) {
         //count of appids in the results.
         $application_select_count[$result->appid]++;
-      }// if mystate
+        }// if mystate
 
     }// while
-  }
-  else {
-  }
+    }
+    else {
+    }
 
-  // Entry for all applications.
-  $allcount = $application_select_count ? array_sum($application_select_count) : 0;
-  $applications[-1] = bts('Application', array(), NULL, 'boinc:task-table');
-  $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table') . ' (' . $allcount . ')';
-  // Create application filter from application_map and application_select_count.
-  foreach($application_map as $akey => $aname) {
+    // Entry for all applications.
+    $allcount = $application_select_count ? array_sum($application_select_count) : 0;
+    $applications[-1] = bts('Application', array(), NULL, 'boinc:task-table');
+    $applications[0] = bts('All applications', array(), NULL, 'boinc:task-table') . ' (' . $allcount . ')';
+    // Create application filter from application_map and application_select_count.
+    foreach($application_map as $akey => $aname) {
     $acount = 0;
     if ( $application_select_count and array_key_exists($akey, $application_select_count) ) {
-      $acount = $application_select_count[$akey];
+        $acount = $application_select_count[$akey];
     }
     $applications[$akey] = $aname . ' ('. $acount . ')';
-  }
-  // Header array for (sub) results table.
-  $resultheader = array(
+    }
+    // Header array for (sub) results table.
+    $resultheader = array(
     array(
-      'data' => bts('Task ID', array(), NULL, 'boinc:task-table'),
-      'field' => 'id',
+        'data' => bts('Task ID', array(), NULL, 'boinc:task-table'),
+        'field' => 'id',
     ),
     array(
-      'data' => bts('Workunit ID', array(), NULL, 'boinc:task-table'),
-      'field' => 'workunitid',
+        'data' => bts('Workunit ID', array(), NULL, 'boinc:task-table'),
+        'field' => 'workunitid',
     ),
     array(
-      'data' => bts('Computer', array(), NULL, 'boinc:task-table'),
-      'field' => 'hostid',
+        'data' => bts('Computer', array(), NULL, 'boinc:task-table'),
+        'field' => 'hostid',
     ),
     array(
-      'data' => bts('Sent', array(), NULL, 'boinc:task-table'),
-      'field' => 'sent_time',
+        'data' => bts('Sent', array(), NULL, 'boinc:task-table'),
+        'field' => 'sent_time',
     ),
     array(
-      'data' => bts('Time Reported or Deadline', array(), NULL, 'boinc:task-table')
+        'data' => bts('Time Reported or Deadline', array(), NULL, 'boinc:task-table')
     ),
     array(
-      'data' => bts('Status', array(), NULL, 'boinc:task-table')
+        'data' => bts('Status', array(), NULL, 'boinc:task-table')
     ),
     array(
-      'data' => bts('Run time', array(), NULL, 'boinc:task-table'),
-      'field' => 'elapsed_time',
+        'data' => bts('Run time', array(), NULL, 'boinc:task-table'),
+        'field' => 'elapsed_time',
     ),
     array(
-      'data' => bts('CPU time', array(), NULL, 'boinc:task-table'),
-      'field' => 'cpu_time',
+        'data' => bts('CPU time', array(), NULL, 'boinc:task-table'),
+        'field' => 'cpu_time',
     ),
     array(
-      'data' => bts('Granted Credit', array(), NULL, 'boinc:task-table'),
-      'field' => 'granted_credit',
+        'data' => bts('Granted Credit', array(), NULL, 'boinc:task-table'),
+        'field' => 'granted_credit',
     ),
     // Application is a column, but won't be added until after tablesort_sql().
-  );
-
-  // Query to retreive a subset of the total results for the results table.
-  db_set_active('boinc_ro');
-  $sqlsub = "SELECT r.id AS id,"
-      ."r.name AS name,"
-      ."r.workunitid AS workunitid,"
-      ."r.hostid as hostid,"
-      ."r.sent_time AS sent_time,"
-      ."r.received_time AS received_time,"
-      ."r.report_deadline AS report_deadline,"
-      ."r.server_state AS server_state,"
-      ."r.outcome AS outcome,"
-      ."r.client_state AS client_state,"
-      ."r.validate_state AS validate_state,"
-      ."r.exit_status AS exit_status,"
-      ."r.elapsed_time AS elapsed_time,"
-      ."r.cpu_time AS cpu_time,"
-      ."r.granted_credit AS granted_credit,"
-      ."r.appid AS appid,"
-      ."r.app_version_id AS app_version_id,"
-      ."a.user_friendly_name,"
-      ."av.version_num AS version_number,"
-      ."av.plan_class AS plan_class,"
-      ."pl.name AS platform "
-      ."FROM {result} AS r "
-      ."INNER JOIN {app} AS a "
-      ."ON r.appid=a.id "
-      ."LEFT JOIN {app_version} AS av "
-      ."ON r.app_version_id=av.id "
-      ."LEFT JOIN {platform} AS pl "
-      ."ON av.platformid=pl.id ";
-
-  // Build an array for the WHERE clauses. The individual clauses are
-  // placed into an array, and implode() is used to combine them into
-  // a WHERE statement for the sql query. If no such clauses are added
-  // to the array, then no WHERE statement will be included.
-  $sqlwhere = array();
-
-  // Use userid, hostid, or workunitid
-  if ($category==0) {
+    );
+
+    // Query to retreive a subset of the total results for the results table.
+    db_set_active('boinc_ro');
+    $sqlsub = "SELECT r.id AS id,"
+        ."r.name AS name,"
+        ."r.workunitid AS workunitid,"
+        ."r.hostid as hostid,"
+        ."r.sent_time AS sent_time,"
+        ."r.received_time AS received_time,"
+        ."r.report_deadline AS report_deadline,"
+        ."r.server_state AS server_state,"
+        ."r.outcome AS outcome,"
+        ."r.client_state AS client_state,"
+        ."r.validate_state AS validate_state,"
+        ."r.exit_status AS exit_status,"
+        ."r.elapsed_time AS elapsed_time,"
+        ."r.cpu_time AS cpu_time,"
+        ."r.granted_credit AS granted_credit,"
+        ."r.appid AS appid,"
+        ."r.app_version_id AS app_version_id,"
+        ."a.user_friendly_name,"
+        ."av.version_num AS version_number,"
+        ."av.plan_class AS plan_class,"
+        ."pl.name AS platform "
+        ."FROM {result} AS r "
+        ."INNER JOIN {app} AS a "
+        ."ON r.appid=a.id "
+        ."LEFT JOIN {app_version} AS av "
+        ."ON r.app_version_id=av.id "
+        ."LEFT JOIN {platform} AS pl "
+        ."ON av.platformid=pl.id ";
+
+    // Build an array for the WHERE clauses. The individual clauses are
+    // placed into an array, and implode() is used to combine them into
+    // a WHERE statement for the sql query. If no such clauses are added
+    // to the array, then no WHERE statement will be included.
+    $sqlwhere = array();
+
+    // Use userid, hostid, or workunitid
+    if ($category==0) {
     $sqlwhere[] = "r.userid = '%s'";
-  }
-  elseif ($category==1) {
+    }
+    elseif ($category==1) {
     $sqlwhere[] = "r.workunitid = '%s'";
-  }
-  elseif ($category==2) {
+    }
+    elseif ($category==2) {
     $sqlwhere[] = "r.hostid = '%s'";
-  }
+    }
 
-  // Append additional where clauses based on task selection.
-  switch ($tselect) {
-  case STATE_IN_PROGRESS:
+    // Append additional where clauses based on task selection.
+    switch ($tselect) {
+    case STATE_IN_PROGRESS:
     $sqlwhere[] = "r.server_state = 4";
     break;
-  case STATE_PENDING:
+    case STATE_PENDING:
     $sqlwhere[] = "(r.server_state = 5) AND (r.outcome = 1) AND (r.validate_state >= 0) AND (r.validate_state <= 0 OR r.validate_state >= 4) AND (r.validate_state <= 4)";
     break;
-  case STATE_VALID:
+    case STATE_VALID:
     $sqlwhere[] = "(r.server_state = 5) AND (r.outcome = 1) AND (r.validate_state = 1)";
     break;
-  case STATE_INVALID:
+    case STATE_INVALID:
     $sqlwhere[] = "(r.server_state = 5) AND ((r.outcome = 6) OR ((r.outcome = 1) AND ((r.validate_state = 2) OR (r.validate_state = 3) OR (r.validate_state = 5))))";
     break;
-  case STATE_ERROR:
+    case STATE_ERROR:
     $sqlwhere[] = "(r.server_state = 5) AND (r.outcome >= 3) AND (r.outcome <= 4 OR r.outcome >= 7) AND (r.outcome <= 7)";
     break;
-  default:
+    default:
   }
 
-  if (is_numeric($app_id) AND $app_id>0 ) {
+    if (is_numeric($app_id) AND $app_id>0 ) {
     $sqlwhere[] = "r.appid = '%s'";
     if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
     $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid, $app_id);
-  }
-  else {
+    }
+    else {
     if ($sqlwhere)  $sqlsub .= " WHERE " . implode(' AND ', $sqlwhere);
     $dbres_sub = pager_query( $sqlsub . tablesort_sql($resultheader), $tablerows, 0, NULL, $queryid);
-  }
-  db_set_active('default');
+    }
+    db_set_active('default');
 
-  // Loop 2 over DB results.
-  if ($dbres_sub) {
+    // Loop 2 over DB results.
+    if ($dbres_sub) {
     while ($result = db_fetch_object($dbres_sub)) {
-      // state_num() function changes $result object, clone $result
-      // object for use in state_num()
-      // check if state matches selection
-      if ( (state_num(clone $result) == $tselect) OR ($tselect==STATE_ALL) ) {
+        // state_num() function changes $result object, clone $result
+        // object for use in state_num()
+        // check if state matches selection
+        if ( (state_num(clone $result) == $tselect) OR ($tselect==STATE_ALL) ) {
         // create pretty result row
         $prettyresult = array(
-          array(
+            array(
             'data' => l($result->name, "task/{$result->id}"),
             'class' => 'task-name',
-          ),
-          l($result->workunitid, "workunit/{$result->workunitid}"),
-          l($result->hostid, "host/{$result->hostid}"),
-          date('j M Y G:i:s T', $result->sent_time),
-          boincwork_task_time_reported($result->received_time, $result->report_deadline),
-          state_string($result),
-          $nf->format($result->elapsed_time),
-          $nf->format($result->cpu_time),
-          $nf->format($result->granted_credit),
-          array(
+            ),
+            l($result->workunitid, "workunit/{$result->workunitid}"),
+            l($result->hostid, "host/{$result->hostid}"),
+            date('j M Y G:i:s T', $result->sent_time),
+            boincwork_task_time_reported($result->received_time, $result->report_deadline),
+            state_string($result),
+            $nf->format($result->elapsed_time),
+            $nf->format($result->cpu_time),
+            $nf->format($result->granted_credit),
+            array(
             'data' => $result->user_friendly_name . " " . pretty_application_version($result->app_version_id,$result->version_number, $result->plan_class, $result->platform),
             'class' => 'task-app',
-          ),
+            ),
         );
         $resultdata[] = array_values($prettyresult);
-      }
+        }
     }// while
-  }
-  else {
-  }
-  // Begin result navigation
+    }
+    else {
+    }
+    // Begin result navigation
 
-  // Set pathprefix based on type
-  if ($category==0) {
+    // Set pathprefix based on type
+    if ($category==0) {
     $pathprefix = 'account/tasks';
-  }
-  elseif ($category==1) {
+    }
+    elseif ($category==1) {
     $pathprefix = 'workunit/' . $queryid . '/tasks';
-  }
-  elseif ($category==2) {
+    }
+    elseif ($category==2) {
     $pathprefix = 'host/' . $queryid . '/tasks';
-  }
-  // Need an "All" tab as well, maps to app_id of zero.
-  $application_map[0] = bts('All', array(), NULL, 'boinc:task-table');
-  $stitems = array();
-  foreach ($taskstates as $state => $numstates) {
+    }
+    // Need an "All" tab as well, maps to app_id of zero.
+    $application_map[0] = bts('All', array(), NULL, 'boinc:task-table');
+    $stitems = array();
+    foreach ($taskstates as $state => $numstates) {
     $mypath = $pathprefix . '/' . $state . '/' . $app_id;
     if ($state==STATE_ALL) {
-      $ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+        $ltext = '<span class="tab task-app-name">' . bts('All', array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
     }
     else {
-      $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
+        $ltext = '<span class="tab">' . bts($state_hnames[$state], array(), NULL, 'boinc:task-table') . ' (' . $numstates . ')</span>';
     }
     $myitem = array(
-      'data' => l($ltext, $mypath, array('html' => TRUE) ),
+        'data' => l($ltext, $mypath, array('html' => TRUE) ),
     );
     if ($state==$tselect) {
-      $myitem['class'] = 'active';
+        $myitem['class'] = 'active';
     }
     $stitems[] = $myitem;
-  }
-  // Add reset button
-  $mypath = $pathprefix . '/0/0';
-  $ltext = '<span class="tab">' . bts('Reset', array(), NULL, 'boinc:task-table') . '</span>';
-  $stitems[] = array( 'data' => l($ltext, $mypath, array('html' => TRUE) ) );
+    }
+    // Add reset button
+    $mypath = $pathprefix . '/0/0';
+    $ltext = '<span class="tab">' . bts('Reset', array(), NULL, 'boinc:task-table') . '</span>';
+    $stitems[] = array( 'data' => l($ltext, $mypath, array('html' => TRUE) ) );
 
-  $output .= theme_item_list($stitems, NULL, 'ul' . ' class="tabs secondary clearfix"');
+    $output .= theme_item_list($stitems, NULL, 'ul' . ' class="tabs secondary clearfix"');
 
-  // Application select-drop down form
-  // Hack to place Application form into header
-  // App ID of zero maps to "-1" for drop-down box.
-  if ($app_id==0) {
+    // Application select-drop down form
+    // Hack to place Application form into header
+    // App ID of zero maps to "-1" for drop-down box.
+    if ($app_id==0) {
     $app_id=-1;
-  }
-  $resultheader[] = drupal_get_form('boincwork_selectapp_form', $applications, $app_id);
+    }
+    $resultheader[] = drupal_get_form('boincwork_selectapp_form', $applications, $app_id);
 
-  // Begin table of results
-  if ( is_array($resultheader) AND is_array($resultdata) ) {
+    // Begin table of results
+    if ( is_array($resultheader) AND is_array($resultdata) ) {
 
     // Take advantage of the fact that $category is the same as the row/column we want to remove.
     if ( ($category==1) OR ($category==2) ) {
-      unset($resultheader[$category]);
-      delete_col($resultdata, $category);
+        unset($resultheader[$category]);
+        delete_col($resultdata, $category);
     }
 
     $output .= theme_table($resultheader, $resultdata);
     if (count($resultdata) > 0) {
-      $output .= theme('pager');
+        $output .= theme('pager');
     }
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Function to delete a column from an array.
  */
 function delete_col(&$array, $offset) {
-  return array_walk($array, function (&$v) use ($offset) {
-     array_splice($v, $offset, 1);
-  });
+    return array_walk($array, function (&$v) use ($offset) {
+        array_splice($v, $offset, 1);
+    });
 }
 
 /**
@@ -1989,7 +1989,7 @@ 
  *  platform name, may be NULL
  */
 function pretty_application_version($appverid, $vernum, $plan_class, $plfm) {
-  switch ($appverid) {
+    switch ($appverid) {
     case ANON_PLATFORM_UNKNOWN:
       return "Anonymous platform";
     case ANON_PLATFORM_CPU:
@@ -2008,11 +2008,11 @@ 
       // that is not handled by the above case statements.
       if ($appverid < 0) {
         return "Unknown Anonymous platform";
-      }
-      else {
+        }
+        else {
         $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
         $prettyc = ($plan_class) ? "($av->plan_class)" : '';
         return "v$prettyv $prettyc $plfm";
-      }
-  }
+        }
+    }
 }

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/boinc/modules/boincwork/boincwork.admin.inc

Indentation +182 added lines, -182 removed lines

@@ -10,80 +10,80 @@ 
  * Allow configuration of general options for preference pages
  */
 function boincwork_admin_prefs_options_form(&$form_state) {
-  $form = array();
-  $form['beta'] = array(
+    $form = array();
+    $form['beta'] = array(
     '#type' => 'checkbox',
     '#title' => t('Allow users to opt in to test beta applications'),
     '#default_value' => variable_get('boinc_prefs_options_beta', 0),
     '#required' => TRUE
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Submit')
-  );
-  // Add the official mechanical things and return
-  //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
-  return $form;
+    );
+    // Add the official mechanical things and return
+    //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
+    return $form;
 }
 
 /**
-  * Handle validation of preference general settings form.
-  */
+ * Handle validation of preference general settings form.
+ */
 function boincwork_admin_prefs_options_form_validate($form, &$form_state) {
 }
 
 /**
-  * Handle submission of preference general settings form.
-  */
+ * Handle submission of preference general settings form.
+ */
 function boincwork_admin_prefs_options_form_submit($form, &$form_state) {
-  variable_set('boinc_prefs_options_beta', $form_state['values']['beta']);
-  drupal_set_message('Preference options have been updated.');
+    variable_set('boinc_prefs_options_beta', $form_state['values']['beta']);
+    drupal_set_message('Preference options have been updated.');
 }
 
 /**
  *
  */
 function boincwork_admin_prefs_upload_form(&$form_state) {
-  $form = array();
-  $form['prefs_xml'] = array(
+    $form = array();
+    $form['prefs_xml'] = array(
     '#type' => 'textarea',
     '#title' => t('Project specific preferences XML'),
     '#default_value' => variable_get('boinc_project_specific_prefs_config', "<project_specific_preferences>\n\n</project_specific_preferences>"),
     '#required' => TRUE
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Submit')
-  );
-  // Add the official mechanical things and return
-  //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
-  return $form;
+    );
+    // Add the official mechanical things and return
+    //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
+    return $form;
 }
 
 /**
-  * Handle validation of preference upload form.
-  */
+ * Handle validation of preference upload form.
+ */
 function boincwork_admin_prefs_upload_form_validate($form, &$form_state) {
 
-  $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
-  libxml_use_internal_errors(true);
-  $xml = new DomDocument();
-  $xml->loadXML($form_state['values']['prefs_xml'], LIBXML_NOBLANKS);
-  if (!$xml->schemaValidate($xsd)) {
+    $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
+    libxml_use_internal_errors(true);
+    $xml = new DomDocument();
+    $xml->loadXML($form_state['values']['prefs_xml'], LIBXML_NOBLANKS);
+    if (!$xml->schemaValidate($xsd)) {
     $errors = libxml_get_errors();
     $lines = explode("\r", $form_state['values']['prefs_xml']);
     drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
-      ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
+        ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
     form_set_error('upload', t('XML file failed validation'));
-  }
+    }
 }
 
 /**
-  * Handle submission of preference upload form.
-  */
+ * Handle submission of preference upload form.
+ */
 function boincwork_admin_prefs_upload_form_submit($form, &$form_state) {
-  variable_set('boinc_project_specific_prefs_config', $form_state['values']['prefs_xml']);
-  drupal_set_message('The XML has been validated and any changes to
+    variable_set('boinc_project_specific_prefs_config', $form_state['values']['prefs_xml']);
+    drupal_set_message('The XML has been validated and any changes to
       preferences are now in place.');
 }
 
@@ -91,14 +91,14 @@ 
  *
  */
 function boincwork_admin_prefs_presets_page($preset = 'standard') {
-  // Configure preference presets
-  if (function_exists('jump_quickly')) {
+    // Configure preference presets
+    if (function_exists('jump_quickly')) {
     $path = 'admin/boinc/prefs/presets';
     $preset_options = array(
-      "{$path}/standard" => t('Standard'),
-      "{$path}/maximum" => t('Maximum'),
-      "{$path}/green" => t('Green'),
-      "{$path}/minimum" => t('Minimum')
+        "{$path}/standard" => t('Standard'),
+        "{$path}/maximum" => t('Maximum'),
+        "{$path}/green" => t('Green'),
+        "{$path}/minimum" => t('Minimum')
     );
     variable_set('jump_use_js_presets-Array', 1);
     drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
@@ -106,15 +106,15 @@ 
     $output .= '<label>Preset:</label>';
     $output .= jump_quickly($preset_options, 'presets');
     $output .= '</div></div>';
-  }
-  $output .= drupal_get_form('boincwork_admin_prefs_presets_form', $preset);
-
-  $output .= '<div>';
-  $output .= bts('Usage: \'Save configuration\' will save the above preferences into the drupal database. These will be the preset computing (global) preferences that will fill in the preferences form once a user loads the Account Preferences page.', array(), NULL, 'boinc:admin-boinc-preference-presets');
-  $output .= '<p>';
-  $output .= bts('\'Save configuration with disk usage settings from config.xml\' will save the above preferences into the drupal database, but also load disk usage settings from the BOINC project\'s config.xml file. These will overwrite any disk usage settings you have placed above. Caution: A user\'s personal preferences will not change if you load the disk usage settings from config.xml here into the drupal database. They must change their preference settings manually.', array(), NULL, 'boinc:admin-boinc-preference-presets');
-  $output .= '</div>';
-  return $output;
+    }
+    $output .= drupal_get_form('boincwork_admin_prefs_presets_form', $preset);
+
+    $output .= '<div>';
+    $output .= bts('Usage: \'Save configuration\' will save the above preferences into the drupal database. These will be the preset computing (global) preferences that will fill in the preferences form once a user loads the Account Preferences page.', array(), NULL, 'boinc:admin-boinc-preference-presets');
+    $output .= '<p>';
+    $output .= bts('\'Save configuration with disk usage settings from config.xml\' will save the above preferences into the drupal database, but also load disk usage settings from the BOINC project\'s config.xml file. These will overwrite any disk usage settings you have placed above. Caution: A user\'s personal preferences will not change if you load the disk usage settings from config.xml here into the drupal database. They must change their preference settings manually.', array(), NULL, 'boinc:admin-boinc-preference-presets');
+    $output .= '</div>';
+    return $output;
 }
 
 /**
@@ -122,141 +122,141 @@ 
  */
 function boincwork_admin_prefs_presets_form(&$form_state, $preset = 'standard') {
 
-  // Check database for preset prefs
-  if (!variable_get('boincwork_preset_prefs', null))
+    // Check database for preset prefs
+    if (!variable_get('boincwork_preset_prefs', null))
     drupal_set_message(bts('No presets found in database, loading a default set of preferences for each preset. These will be saved to the database once you click \'Save configuration\'.', array(), NULL, 'boinc:admin-boinc-preference-presets'), 'status');
 
-  // Load a copy of the general prefs form
-  $form = boincwork_generalprefs_form($form_state, NULL, $preset);
-  if ($key = array_search('boincwork_generalprefs_form_submit', $form['#submit'])) {
+    // Load a copy of the general prefs form
+    $form = boincwork_generalprefs_form($form_state, NULL, $preset);
+    if ($key = array_search('boincwork_generalprefs_form_submit', $form['#submit'])) {
     unset($form['#submit'][$key]);
-  }
-  $form['#submit'][] = 'boincwork_admin_prefs_presets_form_submit';
-
-  // Just keep the necessary items
-  $form['processor'] = $form['prefs']['advanced']['processor'];
-  $form['storage'] = $form['prefs']['advanced']['storage'];
-  $form['network'] = $form['prefs']['advanced']['network'];
-  unset($form['prefs']);
-
-  // Tweak some things so it behaves a little better
-  $form['#tree'] = TRUE;
-  $form['processor']['#collapsible'] = TRUE;
-  $form['storage']['#collapsible'] = TRUE;
-  $form['network']['#collapsible'] = TRUE;
-
-  // Add a submit button and a hidden field to pass the preset
-  $form['submit'] = array(
+    }
+    $form['#submit'][] = 'boincwork_admin_prefs_presets_form_submit';
+
+    // Just keep the necessary items
+    $form['processor'] = $form['prefs']['advanced']['processor'];
+    $form['storage'] = $form['prefs']['advanced']['storage'];
+    $form['network'] = $form['prefs']['advanced']['network'];
+    unset($form['prefs']);
+
+    // Tweak some things so it behaves a little better
+    $form['#tree'] = TRUE;
+    $form['processor']['#collapsible'] = TRUE;
+    $form['storage']['#collapsible'] = TRUE;
+    $form['network']['#collapsible'] = TRUE;
+
+    // Add a submit button and a hidden field to pass the preset
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save configuration')
-  );
-  $form['saveuseconfigxml'] = array (
-      '#type' => 'submit',
-      '#value' => t('Save configuration with disk usage settings from config.xml'),
-      '#validate' => array('boincwork_admin_prefs_preset_saveuseconfigxml'),
-  );
-  $form['preset'] = array(
+    );
+    $form['saveuseconfigxml'] = array (
+        '#type' => 'submit',
+        '#value' => t('Save configuration with disk usage settings from config.xml'),
+        '#validate' => array('boincwork_admin_prefs_preset_saveuseconfigxml'),
+    );
+    $form['preset'] = array(
     '#type' => 'hidden',
     '#value' => $preset
-  );
+    );
 
-  // Add the official mechanical things and return
-  drupal_prepare_form('boincwork_admin_prefs_presets_form', $form, $form_state);
-  return $form;
+    // Add the official mechanical things and return
+    drupal_prepare_form('boincwork_admin_prefs_presets_form', $form, $form_state);
+    return $form;
 }
 
 /**
-  * Validate the preference presets form.
-  */
+ * Validate the preference presets form.
+ */
 function boincwork_admin_prefs_presets_form_validate($form, &$form_state) {
-  require_boinc('util');
-  $values = $form_state['values'];
-
-  // Verify all non-boolean user input values and notify form API of failures
-
-  // Processing preferences
-  if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', t('Invalid setting for') . " \"{$form['processor']['idle_time_to_run']['#title']} [x] {$form['processor']['idle_time_to_run']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', t('Invalid setting for') . " \"{$form['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['processor']['suspend_if_no_recent_input']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', t('Invalid setting for') . " \"{$form['processor']['suspend_cpu_usage']['#title']} [x] {$form['processor']['suspend_cpu_usage']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', t('Invalid setting for') . " \"{$form['processor']['start_hour']['#title']} [x] {$form['processor']['start_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', t('Invalid setting for') . " \"{$form['processor']['end_hour']['#title']} [x] {$form['processor']['end_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', t('Invalid setting for') . " \"{$form['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['processor']['cpu_scheduling_period_minutes']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', t('Invalid setting for') . " \"{$form['processor']['max_ncpus_pct']['#title']} [x] {$form['processor']['max_ncpus_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', t('Invalid setting for') . " \"{$form['processor']['cpu_usage_limit']['#title']} [x] {$form['processor']['cpu_usage_limit']['#field_suffix']}\"");
-
-  // Storage preferences
-  if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_gb']['#title']} [x] {$form['storage']['disk_max_used_gb']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', t('Invalid setting for') . " \"{$form['storage']['disk_min_free_gb']['#title']} [x] {$form['storage']['disk_min_free_gb']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_pct']['#title']} [x] {$form['storage']['disk_max_used_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', t('Invalid setting for') . " \"{$form['storage']['disk_interval']['#title']} [x] {$form['storage']['disk_interval']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['vm_max_used_pct']['#title']} [x] {$form['storage']['vm_max_used_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['storage']['ram_max_used_busy_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['storage']['ram_max_used_idle_pct']['#field_suffix']}\"");
-
-  // Network preferences
-  if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', t('Invalid setting for') . " \"{$form['network']['work_buf_min_days']['#title']} [x] {$form['network']['work_buf_min_days']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', t('Invalid setting for') . " \"{$form['network']['work_buf_additional_days']['#title']} [x] {$form['network']['work_buf_additional_days']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_down']['#title']} [x] {$form['network']['max_bytes_sec_down']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_up']['#title']} [x] {$form['network']['max_bytes_sec_up']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', t('Invalid setting for') . " \"{$form['network']['net_start_hour']['#title']} [x] {$form['network']['net_start_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', t('Invalid setting for') . " \"{$form['network']['net_end_hour']['#title']} [x] {$form['network']['net_end_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
+    require_boinc('util');
+    $values = $form_state['values'];
+
+    // Verify all non-boolean user input values and notify form API of failures
+
+    // Processing preferences
+    if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', t('Invalid setting for') . " \"{$form['processor']['idle_time_to_run']['#title']} [x] {$form['processor']['idle_time_to_run']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', t('Invalid setting for') . " \"{$form['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['processor']['suspend_if_no_recent_input']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', t('Invalid setting for') . " \"{$form['processor']['suspend_cpu_usage']['#title']} [x] {$form['processor']['suspend_cpu_usage']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', t('Invalid setting for') . " \"{$form['processor']['start_hour']['#title']} [x] {$form['processor']['start_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', t('Invalid setting for') . " \"{$form['processor']['end_hour']['#title']} [x] {$form['processor']['end_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', t('Invalid setting for') . " \"{$form['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['processor']['cpu_scheduling_period_minutes']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', t('Invalid setting for') . " \"{$form['processor']['max_ncpus_pct']['#title']} [x] {$form['processor']['max_ncpus_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', t('Invalid setting for') . " \"{$form['processor']['cpu_usage_limit']['#title']} [x] {$form['processor']['cpu_usage_limit']['#field_suffix']}\"");
+
+    // Storage preferences
+    if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_gb']['#title']} [x] {$form['storage']['disk_max_used_gb']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', t('Invalid setting for') . " \"{$form['storage']['disk_min_free_gb']['#title']} [x] {$form['storage']['disk_min_free_gb']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_pct']['#title']} [x] {$form['storage']['disk_max_used_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', t('Invalid setting for') . " \"{$form['storage']['disk_interval']['#title']} [x] {$form['storage']['disk_interval']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['vm_max_used_pct']['#title']} [x] {$form['storage']['vm_max_used_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['storage']['ram_max_used_busy_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['storage']['ram_max_used_idle_pct']['#field_suffix']}\"");
+
+    // Network preferences
+    if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', t('Invalid setting for') . " \"{$form['network']['work_buf_min_days']['#title']} [x] {$form['network']['work_buf_min_days']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', t('Invalid setting for') . " \"{$form['network']['work_buf_additional_days']['#title']} [x] {$form['network']['work_buf_additional_days']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_down']['#title']} [x] {$form['network']['max_bytes_sec_down']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_up']['#title']} [x] {$form['network']['max_bytes_sec_up']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', t('Invalid setting for') . " \"{$form['network']['net_start_hour']['#title']} [x] {$form['network']['net_start_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', t('Invalid setting for') . " \"{$form['network']['net_end_hour']['#title']} [x] {$form['network']['net_end_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
 }
 
 /**
-  * Handle post-validation submission of preference presets form.
-  */
+ * Handle post-validation submission of preference presets form.
+ */
 function boincwork_admin_prefs_presets_form_submit($form, &$form_state) {
-  $values = $form_state['values'];
-  $preset = $form_state['values']['preset'];
-
-  // Load baseline settings from configuration
-  $prefs = boincwork_get_preset_prefs($preset);
-
-  // Processing preferences
-  $prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
-  $prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
-  $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0: 1;
-  $prefs['idle_time_to_run'] = $values['processor']['idle_time_to_run'];
-  $prefs['suspend_if_no_recent_input'] = $values['processor']['suspend_if_no_recent_input'];
-  $prefs['suspend_cpu_usage'] = $values['processor']['suspend_cpu_usage'];
-  $prefs['start_hour'] = $values['processor']['start_hour'];
-  $prefs['end_hour'] = $values['processor']['end_hour'];
-  $prefs['leave_apps_in_memory'] = ($values['processor']['leave_apps_in_memory']) ? 1 : 0;
-  $prefs['cpu_scheduling_period_minutes'] = $values['processor']['cpu_scheduling_period_minutes'];
-  $prefs['max_ncpus_pct'] = $values['processor']['max_ncpus_pct'];
-  $prefs['cpu_usage_limit'] = $values['processor']['cpu_usage_limit'];
-
-  // Storage preferences
-  $prefs['disk_max_used_gb'] = $values['storage']['disk_max_used_gb'];
-  $prefs['disk_min_free_gb'] = $values['storage']['disk_min_free_gb'];
-  $prefs['disk_max_used_pct'] = $values['storage']['disk_max_used_pct'];
-  $prefs['disk_interval'] = $values['storage']['disk_interval'];
-  $prefs['vm_max_used_pct'] = $values['storage']['vm_max_used_pct'];
-  $prefs['ram_max_used_busy_pct'] = $values['storage']['ram_max_used_busy_pct'];
-  $prefs['ram_max_used_idle_pct'] = $values['storage']['ram_max_used_idle_pct'];
-
-  // Network preferences
-  $prefs['work_buf_min_days'] = $values['network']['work_buf_min_days'];
-  $prefs['work_buf_additional_days'] = $values['network']['work_buf_additional_days'];
-  $prefs['confirm_before_connecting'] = ($values['network']['confirm_before_connecting']) ? 1 : 0;
-  $prefs['hangup_if_dialed'] = ($values['network']['hangup_if_dialed']) ? 1 : 0;
-  $prefs['max_bytes_sec_down'] = $values['network']['max_bytes_sec_down']*1000;
-  $prefs['max_bytes_sec_up'] = $values['network']['max_bytes_sec_up']*1000;
-  $prefs['net_start_hour'] = $values['network']['net_start_hour'];
-  $prefs['net_end_hour'] = $values['network']['net_end_hour'];
-  $prefs['daily_xfer_limit_mb'] = $values['network']['daily_xfer_limit_mb'];
-  $prefs['daily_xfer_period_days'] = $values['network']['daily_xfer_period_days'];
-  $prefs['dont_verify_images'] = ($values['network']['dont_verify_images']) ? 1 : 0;
-
-  //Remove @attributes to match new format (see boincwork.forms.inc
-  //function boincwork_generalprefs_form)
-  unset($prefs['@attributes']['preset']);
-
-  // Update the configuration
-  boincwork_save_preset_prefs($prefs, $preset);
-  drupal_set_message(t('The "@name" preset has been updated.',
+    $values = $form_state['values'];
+    $preset = $form_state['values']['preset'];
+
+    // Load baseline settings from configuration
+    $prefs = boincwork_get_preset_prefs($preset);
+
+    // Processing preferences
+    $prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
+    $prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
+    $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0: 1;
+    $prefs['idle_time_to_run'] = $values['processor']['idle_time_to_run'];
+    $prefs['suspend_if_no_recent_input'] = $values['processor']['suspend_if_no_recent_input'];
+    $prefs['suspend_cpu_usage'] = $values['processor']['suspend_cpu_usage'];
+    $prefs['start_hour'] = $values['processor']['start_hour'];
+    $prefs['end_hour'] = $values['processor']['end_hour'];
+    $prefs['leave_apps_in_memory'] = ($values['processor']['leave_apps_in_memory']) ? 1 : 0;
+    $prefs['cpu_scheduling_period_minutes'] = $values['processor']['cpu_scheduling_period_minutes'];
+    $prefs['max_ncpus_pct'] = $values['processor']['max_ncpus_pct'];
+    $prefs['cpu_usage_limit'] = $values['processor']['cpu_usage_limit'];
+
+    // Storage preferences
+    $prefs['disk_max_used_gb'] = $values['storage']['disk_max_used_gb'];
+    $prefs['disk_min_free_gb'] = $values['storage']['disk_min_free_gb'];
+    $prefs['disk_max_used_pct'] = $values['storage']['disk_max_used_pct'];
+    $prefs['disk_interval'] = $values['storage']['disk_interval'];
+    $prefs['vm_max_used_pct'] = $values['storage']['vm_max_used_pct'];
+    $prefs['ram_max_used_busy_pct'] = $values['storage']['ram_max_used_busy_pct'];
+    $prefs['ram_max_used_idle_pct'] = $values['storage']['ram_max_used_idle_pct'];
+
+    // Network preferences
+    $prefs['work_buf_min_days'] = $values['network']['work_buf_min_days'];
+    $prefs['work_buf_additional_days'] = $values['network']['work_buf_additional_days'];
+    $prefs['confirm_before_connecting'] = ($values['network']['confirm_before_connecting']) ? 1 : 0;
+    $prefs['hangup_if_dialed'] = ($values['network']['hangup_if_dialed']) ? 1 : 0;
+    $prefs['max_bytes_sec_down'] = $values['network']['max_bytes_sec_down']*1000;
+    $prefs['max_bytes_sec_up'] = $values['network']['max_bytes_sec_up']*1000;
+    $prefs['net_start_hour'] = $values['network']['net_start_hour'];
+    $prefs['net_end_hour'] = $values['network']['net_end_hour'];
+    $prefs['daily_xfer_limit_mb'] = $values['network']['daily_xfer_limit_mb'];
+    $prefs['daily_xfer_period_days'] = $values['network']['daily_xfer_period_days'];
+    $prefs['dont_verify_images'] = ($values['network']['dont_verify_images']) ? 1 : 0;
+
+    //Remove @attributes to match new format (see boincwork.forms.inc
+    //function boincwork_generalprefs_form)
+    unset($prefs['@attributes']['preset']);
+
+    // Update the configuration
+    boincwork_save_preset_prefs($prefs, $preset);
+    drupal_set_message(t('The "@name" preset has been updated.',
     array('@name' => $preset)));
 }
 
@@ -265,26 +265,26 @@ 
  */
 function boincwork_save_preset_prefs($updated_prefs, $preset = 'standard') {
 
-  // Get the full configuration
-  $all_presets = boincwork_get_preset_prefs();
-  $all_presets = (array) $all_presets['general_preferences'];
+    // Get the full configuration
+    $all_presets = boincwork_get_preset_prefs();
+    $all_presets = (array) $all_presets['general_preferences'];
 
-  // Check for sane config
-  if (isset($all_presets['preset'])) {
+    // Check for sane config
+    if (isset($all_presets['preset'])) {
     if (!is_numeric(key($all_presets['preset']))) {
-      $all_presets['preset'] = array($all_presets['preset']);
+        $all_presets['preset'] = array($all_presets['preset']);
     }
     foreach ($all_presets['preset'] as $key => $old_preset) {
-      // Find the preset being updated and... update it
-      if (isset($old_preset['@attributes']['name']) AND $old_preset['@attributes']['name'] == $preset) {
+        // Find the preset being updated and... update it
+        if (isset($old_preset['@attributes']['name']) AND $old_preset['@attributes']['name'] == $preset) {
         $all_presets['preset'][$key] = $updated_prefs + $old_preset;
-      }
+        }
+    }
     }
-  }
 
-  // Convert prefs back to XML and save to database
-  $all_presets = array('general_preferences' => $all_presets);
-  variable_set('boincwork_preset_prefs', save_configuration($all_presets));
+    // Convert prefs back to XML and save to database
+    $all_presets = array('general_preferences' => $all_presets);
+    variable_set('boincwork_preset_prefs', save_configuration($all_presets));
 }
 
 /**

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

Indentation +574 added lines, -574 removed lines

@@ -26,82 +26,82 @@ 
  * Implementation of hook_menu()
  */
 function boincteam_menu() {
-  $items = array();
-  $items['community/teams/%/assume-foundership'] = array(
+    $items = array();
+    $items['community/teams/%/assume-foundership'] = array(
     'page callback' => 'boincteam_assume_foundership',
     'page arguments' => array(2),
     'access callback' => 'boincteam_is_member',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/join'] = array(
+    );
+    $items['community/teams/%/join'] = array(
     'page callback' => 'boincteam_join',
     'page arguments' => array(2),
     'access arguments' => array('join boincteam'),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/leave'] = array(
+    );
+    $items['community/teams/%/leave'] = array(
     'page callback' => 'boincteam_leave',
     'page arguments' => array(2),
     'access arguments' => array('join boincteam'),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/delete'] = array(
+    );
+    $items['community/teams/%/delete'] = array(
     'page callback' => 'boincteam_delete',
     'page arguments' => array(2),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/deny-foundership-request'] = array(
+    );
+    $items['community/teams/%/deny-foundership-request'] = array(
     'page callback' => 'boincteam_deny_foundership_request',
     'page arguments' => array(2),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/edit/admins/remove/%'] = array(
+    );
+    $items['community/teams/%/edit/admins/remove/%'] = array(
     'page callback' => 'boincteam_remove_admin',
     'page arguments' => array(2,6),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/edit/founder/set/%'] = array(
+    );
+    $items['community/teams/%/edit/founder/set/%'] = array(
     'page callback' => 'boincteam_set_founder',
     'page arguments' => array(2,6),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/edit/members/remove/%'] = array(
+    );
+    $items['community/teams/%/edit/members/remove/%'] = array(
     'page callback' => 'boincteam_remove_member',
     'page arguments' => array(2,6),
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/history/xml'] = array(
+    );
+    $items['community/teams/%/history/xml'] = array(
     'page callback' => 'boincteam_history_xml',
     'page arguments' => array(2),
     'access callback' => 'boincteam_is_admin',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/request-foundership'] = array(
+    );
+    $items['community/teams/%/request-foundership'] = array(
     'page callback' => 'boincteam_request_foundership',
     'page arguments' => array(2),
     'access callback' => 'boincteam_is_member',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK
-  );
-  $items['community/teams/%/user-name-autocomplete'] = array(
+    );
+    $items['community/teams/%/user-name-autocomplete'] = array(
     'page callback' => '_boincuser_user_name_autocomplete',
     'access callback' => 'boincteam_is_founder',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK,
-  );
-  $items['community/teams/%/message-all-members'] = array(
+    );
+    $items['community/teams/%/message-all-members'] = array(
     'title' => bts('Send Message to Team', array(), NULL, 'boinc:team-manage'),
     'description' => bts('Send Message to Team', array(), NULL, 'boinc:team-manage'),
     'page callback' => 'drupal_get_form',
@@ -109,8 +109,8 @@ 
     'access callback' => 'boincteam_is_admin',
     'access arguments' => array(2),
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/utility-team-delete'] = array(
+    );
+    $items['admin/boinc/utility-team-delete'] = array(
     'title' => 'Utility: Delete SPAM Teams',
     'description' => 'Utililities to help delete BOINC teams created by SPAMMERs.',
     'page callback' => 'drupal_get_form',
@@ -118,9 +118,9 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincteam.admin.inc',
-  );
+    );
 
-  return $items;
+    return $items;
 }
 
 /**
@@ -137,41 +137,41 @@ 
 
   See https://www.drupal.org/node/945102
 */
-  return array(
+    return array(
     'boincteam_utility_team_table' => array(
-      'arguments' => array('form' => NULL),
-      'file' => 'boincteam.admin.inc',
+        'arguments' => array('form' => NULL),
+        'file' => 'boincteam.admin.inc',
     ),
-  );
+    );
 }
 
 /**
 * Implementation of hook_views_api().
 */
 function boincteam_views_api() {
-  return array(
+    return array(
     'api' => 2.0,
     'path' => drupal_get_path('module', 'boincteam')
-  );
+    );
 }
 
 /**
  * Implementation of hook_perm()
  */
 function boincteam_perm() {
-  return array('join boincteam', 'create boincteam', 'manage boincteam');
+    return array('join boincteam', 'create boincteam', 'manage boincteam');
 }
 
 /**
  * Implementation of hook_cron()
  */
 function boincteam_cron() {
-  // Sync teams from BOINC DB every day to catch BOINC-wide team updates
-  $last_sync = variable_get('boincteam_last_sync', 0);
-  if ($last_sync < time() - 24*60*60) {
+    // Sync teams from BOINC DB every day to catch BOINC-wide team updates
+    $last_sync = variable_get('boincteam_last_sync', 0);
+    if ($last_sync < time() - 24*60*60) {
     boincteam_sync();
     variable_set('boincteam_last_sync', time());
-  }
+    }
 }
 
 /**
@@ -185,41 +185,41 @@ 
 * Implementation of hook_views_pre_execute().
 */
 function boincteam_views_pre_execute(&$view) {
-  /* Specific boinc_teams sub-views use the boinc readonly replica
+    /* Specific boinc_teams sub-views use the boinc readonly replica
    * DB. These sub-views defined below by their title. If additional
    * sub-views need to be added, add their title to the list of cases
    * below. If a sub-view needs to be reverted to use the master DB,
    * then remove it from the list of cases.
    */
-  if ($view->name == 'boinc_teams') {
+    if ($view->name == 'boinc_teams') {
     switch ($view->display[$view->current_display]->display_title) {
     case 'Top teams overview pane':
     case 'Top teams pane':
     case 'Page':
       $view->base_database = 'boinc_ro';
     }
-  }
+    }
 }
 
 /**
  * Implementation of hook_cron_queue_info()
  */
 function boincteam_cron_queue_info() {
-  $queues = array();
-  $queues['queue_teamdelete'] = array(
+    $queues = array();
+    $queues['queue_teamdelete'] = array(
     'worker callback' => 'boincteam_delete',
     'time' => 60,
-  );
+    );
 }
 
 /**
  * Implementation of hook_mail_alter()
  */
 function boincteam_mail_alter(&$message) {
-  if (isset($message['params']['boincteam_headers'])) {
+    if (isset($message['params']['boincteam_headers'])) {
     $message['headers']['Bcc'] = $message['params']['boincteam_headers']['Bcc'];
     $message['to'] = '';
-  }
+    }
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -231,49 +231,49 @@ 
  * assume the role of founder
  */
 function boincteam_assume_foundership($team_id) {
-  global $user;
-  $account = user_load($user->uid);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  $boincuser_id = $account->boincuser_id;
-
-  if (boincteam_foundership_transfer_ok($boincteam)) {
+    global $user;
+    $account = user_load($user->uid);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    $boincuser_id = $account->boincuser_id;
+
+    if (boincteam_foundership_transfer_ok($boincteam)) {
     if ($boincuser_id == $boincteam->ping_user) {
-      db_set_active('boinc_rw');
-      db_query("
+        db_set_active('boinc_rw');
+        db_query("
         UPDATE {team}
         SET userid = '%d', ping_user = '0', ping_time = '0'
         WHERE id = '%d'",
         $boincuser_id, $boincteam_id
-      );
-      db_set_active('default');
-      drupal_set_message(t('You are now the founder of @team', array(
+        );
+        db_set_active('default');
+        drupal_set_message(t('You are now the founder of @team', array(
         '@team' => $team->title
-      )));
-      watchdog('boincteam', 'User @user assumed foundership of team @nid',
+        )));
+        watchdog('boincteam', 'User @user assumed foundership of team @nid',
         array(
-          '@current_user' => $account->uid,
-          '@nid' => $team_id
+            '@current_user' => $account->uid,
+            '@nid' => $team_id
         ), WATCHDOG_NOTICE
-      );
+        );
     }
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('You are not allowed to assume foundership of this
       team.'
     ));
-  }
-  drupal_goto("community/teams/{$team_id}");
+    }
+    drupal_goto("community/teams/{$team_id}");
 }
 
 /**
  * Delete the team, if empty
  */
 function boincteam_delete($team_id) {
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id), TRUE);
-  if ($boincteam->nusers == 1) {
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id), TRUE);
+    if ($boincteam->nusers == 1) {
     require_boinc('team');
     $boincuser = boincuser_load();
     user_quit_team($boincuser);
@@ -282,35 +282,35 @@ 
     $team->uid = 0;
     node_save($team);
     drupal_set_message(t('@team has been removed.',
-      array('@team' => $boincteam->name)));
+        array('@team' => $boincteam->name)));
     drupal_goto('community/teams');
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('All members must be removed from @team before the
       team can be deleted.', array('@team' => $boincteam->name)), 'error');
     drupal_goto(strstr($_GET['q'], '/delete', TRUE));
-  }
+    }
 }
 
 /**
  * Deny a foundership transfer request
  */
 function boincteam_deny_foundership_request($team_id) {
-  $boincteam_id = boincteam_lookup_id($team_id);
-  // Remove the request from the BOINC database
-  db_set_active('boinc_rw');
-  db_query("
+    $boincteam_id = boincteam_lookup_id($team_id);
+    // Remove the request from the BOINC database
+    db_set_active('boinc_rw');
+    db_query("
     UPDATE {team}
     SET ping_user=0
     WHERE id = '%d'",
     $boincteam_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
 
-  drupal_set_message(t('The transfer request has been denied. No additional
+    drupal_set_message(t('The transfer request has been denied. No additional
     requests will be allowed until 90 days have passed since this request was
     made.'));
-  drupal_goto("community/teams/{$team_id}/edit/founder");
+    drupal_goto("community/teams/{$team_id}/edit/founder");
 }
 
 
@@ -318,62 +318,62 @@ 
  * Get the join date of a user
  */
 function boincteam_get_member_join_date($boincteam_id, $boincuser_id = NULL) {
-  if (!$boincuser_id) {
+    if (!$boincuser_id) {
     global $user;
     $account = user_load($user->uid);
     $boincuser_id = $account->boincuser_id;
-  }
-  db_set_active('boinc_rw');
-  $timestamp = db_result(db_query("
+    }
+    db_set_active('boinc_rw');
+    $timestamp = db_result(db_query("
     SELECT timestamp FROM {team_delta} WHERE
     userid = %d AND teamid = %d AND joining = 1
     ORDER BY timestamp DESC LIMIT 1",
     $boincuser_id, $boincteam_id
-  ));
-  db_set_active('default');
-  return $timestamp;
+    ));
+    db_set_active('default');
+    return $timestamp;
 }
 
 /**
  * Get the team type for display
  */
 function boincteam_get_type($team_id) {
-  //$vid = boincteam_get_vocabulary_by_name('Teams'); $team->vid = $vid;
-  $team = node_load($team_id);
-  $terms = taxonomy_node_get_terms($team);
-  if ($terms) {
+    //$vid = boincteam_get_vocabulary_by_name('Teams'); $team->vid = $vid;
+    $team = node_load($team_id);
+    $terms = taxonomy_node_get_terms($team);
+    if ($terms) {
     $term = reset($terms);
     return $term->name;
-  } else {
+    } else {
     return null;
-  }
+    }
 }
 
 /**
  * Access a vocabulary of terms by name
  */
 function boincteam_get_vocabulary_by_name($name) {
-  $vocabs = taxonomy_get_vocabularies('team');
-  foreach ($vocabs as $vocab) {
+    $vocabs = taxonomy_get_vocabularies('team');
+    foreach ($vocabs as $vocab) {
     if ($vocab->name == $name) return $vocab->vid;
-  }
-  return null;
+    }
+    return null;
 }
 
 /**
  * Output the XML of the team history
  */
 function boincteam_history_xml($team_id) {
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $team_history = array(
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $team_history = array(
     'actions' => array(
-      'action' => array(),
+        'action' => array(),
     ),
-  );
+    );
 
-  db_set_active('boinc_rw');
-  $result = db_query("
+    db_set_active('boinc_rw');
+    $result = db_query("
     SELECT
       td.userid AS id,
       u.name,
@@ -385,40 +385,40 @@ 
     WHERE td.teamid = %d
     ORDER BY timestamp ASC",
     $boincteam_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
 
-  while ($record = db_fetch_array($result)) {
+    while ($record = db_fetch_array($result)) {
     $team_history['actions']['action'][] = $record;
-  }
+    }
 
-  header('Content-type: text/xml');
-  echo xml_to_text(array_to_xml($team_history));
+    header('Content-type: text/xml');
+    echo xml_to_text(array_to_xml($team_history));
 }
 
 /**
  * Convert a BOINC team ID to a Drupal team ID
  */
 function boincteam_lookup_nid($boinc_id) {
-  $drupal_id = db_result(db_query("SELECT nid FROM {boincteam} WHERE team_id='%d'", $boinc_id));
-  return $drupal_id;
+    $drupal_id = db_result(db_query("SELECT nid FROM {boincteam} WHERE team_id='%d'", $boinc_id));
+    return $drupal_id;
 }
 
 /**
  * Convert a Drupal team ID to a BOINC team ID
  */
 function boincteam_lookup_id($nid) {
-  $boinc_id = db_result(db_query("SELECT team_id FROM {boincteam} WHERE nid = '%d'", $nid));
-  return $boinc_id;
+    $boinc_id = db_result(db_query("SELECT team_id FROM {boincteam} WHERE nid = '%d'", $nid));
+    return $boinc_id;
 }
 
 /**
  * Get a BOINC team object
  */
 function boincteam_load($boincteam_id, $full_object = FALSE) {
-  require_boinc(array('team'));
-  $team = BoincTeam::lookup_id($boincteam_id);
-  if ($team AND $full_object) {
+    require_boinc(array('team'));
+    $team = BoincTeam::lookup_id($boincteam_id);
+    if ($team AND $full_object) {
     $team->nusers = BoincUser::count("teamid={$team->id}");
     $team->nusers_worked = BoincUser::count("teamid={$team->id} and total_credit>0");
     $team->nusers_active = BoincUser::count("teamid={$team->id} and expavg_credit>0.1");
@@ -426,314 +426,314 @@ 
     $team->new_members = new_member_list($boincteam_id);
     $team->admins = admin_list($boincteam_id);
     $team->founder = BoincUser::lookup_id($team->userid);
-  }
-  return $team;
+    }
+    return $team;
 }
 
 /**
  * Check if a user is the team founder
  */
 function boincteam_is_founder($nid, $uid = NULL) {
-  if (!$uid) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  if (!boincteam_is_member($nid, $uid)) {
+    }
+    if (!boincteam_is_member($nid, $uid)) {
     return FALSE;
-  }
-  $team_id = boincteam_lookup_id($nid);
-  require_boinc('team');
-  return is_team_founder(boincuser_load($uid, TRUE), boincteam_load($team_id));
+    }
+    $team_id = boincteam_lookup_id($nid);
+    require_boinc('team');
+    return is_team_founder(boincuser_load($uid, TRUE), boincteam_load($team_id));
 }
 
 /**
  * Check if a user is a team admin
  */
 function boincteam_is_admin($nid, $uid = NULL) {
-  if (!$uid) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  if (!boincteam_is_member($nid, $uid)) {
+    }
+    if (!boincteam_is_member($nid, $uid)) {
     return FALSE;
-  }
-  $team_id = boincteam_lookup_id($nid);
-  require_boinc('team');
-  return is_team_admin(boincuser_load($uid, TRUE), boincteam_load($team_id));
+    }
+    $team_id = boincteam_lookup_id($nid);
+    require_boinc('team');
+    return is_team_admin(boincuser_load($uid, TRUE), boincteam_load($team_id));
 }
 
 /**
  * Check if a user is a team member
  */
 function boincteam_is_member($nid, $uid = NULL) {
-  if (!$uid) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  $account = user_load($uid);
-  return ($account->team == $nid);
+    }
+    $account = user_load($uid);
+    return ($account->team == $nid);
 }
 
 /**
  * Display any persistent team messages
  */
 function boincteam_show_messages() {
-  global $user;
-  $uid = $user->uid;
-  $account = user_load($uid);
-  if ($account->team) {
+    global $user;
+    $uid = $user->uid;
+    $account = user_load($uid);
+    if ($account->team) {
     if (boincteam_is_founder($account->team, $account->uid)) {
-      // Set a notice of any pending foundership requests
-      $boincteam_id = boincteam_lookup_id($account->team);
-      $boincteam = boincteam_load($boincteam_id);
-      if ($boincteam->ping_user > 0) {
+        // Set a notice of any pending foundership requests
+        $boincteam_id = boincteam_lookup_id($account->team);
+        $boincteam = boincteam_load($boincteam_id);
+        if ($boincteam->ping_user > 0) {
         $foundership_url = "community/teams/{$account->team}/edit/founder";
         if (substr($_GET['q'], 0, strlen($foundership_url)) != $foundership_url) {
-          drupal_set_message(
+            drupal_set_message(
             bts(
-              'A foundership transfer request has been made for your team. Please !respond.',
-              array('!respond' => l(bts('respond to the request', array(), NULL, 'boinc:team-founder-change'), $foundership_url)),
-              NULL, 'boinc:team-founder-change'),
+                'A foundership transfer request has been made for your team. Please !respond.',
+                array('!respond' => l(bts('respond to the request', array(), NULL, 'boinc:team-founder-change'), $foundership_url)),
+                NULL, 'boinc:team-founder-change'),
             'warning', FALSE
-          );
+            );
+        }
         }
-      }
     }
-  }
+    }
 }
 
 /**
  * Add a user to a team
  */
 function boincteam_join($team_id) {
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
 
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  if ($boincteam->joinable AND $account->team != $team_id) {
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    if ($boincteam->joinable AND $account->team != $team_id) {
     require_boinc('team');
     $boincuser = boincuser_load();
     if (user_join_team($boincteam, $boincuser)) {
-      drupal_set_message(t('You are now a member of @team!',
+        drupal_set_message(t('You are now a member of @team!',
         array('@team' => $boincteam->name)));
-      watchdog('boincteam', 'added user @uid to team @nid',
+        watchdog('boincteam', 'added user @uid to team @nid',
         array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
     }
     else {
-      // @todo - consider another rule/error event here
-      drupal_set_message(t('There was a problem joining @team, please try again
+        // @todo - consider another rule/error event here
+        drupal_set_message(t('There was a problem joining @team, please try again
         later', array('@team' => $boincteam->name)));
-      watchdog('boincteam', 'error adding user @uid to team @nid',
+        watchdog('boincteam', 'error adding user @uid to team @nid',
         array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_ERROR);
     }
-  }
-  drupal_goto("community/teams/{$team_id}");
+    }
+    drupal_goto("community/teams/{$team_id}");
 }
 
 /**
  * Leave a team
  */
 function boincteam_leave($team_id) {
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
 
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  if ($account->team == $team_id) {
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    if ($account->team == $team_id) {
     require_boinc('team');
     $boincuser = boincuser_load();
     user_quit_team($boincuser);
     drupal_set_message(t('You are no longer a member of @team.',
-      array('@team' => $boincteam->name)));
+        array('@team' => $boincteam->name)));
     watchdog('boincteam', 'removed user @uid from team @nid',
-      array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
-  }
-  else {
-      drupal_set_message(t('You are not a member of @team, so you cannot revoke
+        array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
+    }
+    else {
+        drupal_set_message(t('You are not a member of @team, so you cannot revoke
         your membership to it.', array('@team' => $boincteam->name)));
-  }
-  drupal_goto("community/teams/{$team_id}");
+    }
+    drupal_goto("community/teams/{$team_id}");
 }
 
 /**
  * Remove team admin status from a user
  */
 function boincteam_remove_admin($team_id, $user_id) {
-  global $user;
-  $account = user_load($user_id);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincuser_id = $account->boincuser_id;
+    global $user;
+    $account = user_load($user_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincuser_id = $account->boincuser_id;
 
-  if (boincteam_is_admin($team_id, $account->uid)) {
+    if (boincteam_is_admin($team_id, $account->uid)) {
     // Update the team in the BOINC db
     db_set_active('boinc_rw');
     db_query("
       DELETE FROM {team_admin} WHERE
         teamid = '%d' AND userid = '%d'",
-      $boincteam_id,
-      $boincuser_id
+        $boincteam_id,
+        $boincuser_id
     );
     db_set_active('default');
     drupal_set_message(t('@user is no longer an admin of @team.',
-      array(
+        array(
         '@user' => $account->boincuser_name,
         '@team' => $team->title
-      )
+        )
     ));
     watchdog('boincteam', 'User @current_user removed admin status for user
       @uid from team @nid',
-      array(
+        array(
         '@current_user' => $user->uid,
         '@uid' => $account->uid,
         '@nid' => $team_id
-      ), WATCHDOG_NOTICE);
-  }
-  drupal_goto("community/teams/{$team_id}/edit/admins");
+        ), WATCHDOG_NOTICE);
+    }
+    drupal_goto("community/teams/{$team_id}/edit/admins");
 }
 
 /**
  * Remove a user from a team
  */
 function boincteam_remove_member($team_id, $user_id) {
-  global $user;
-  $account = user_load($user_id);
+    global $user;
+    $account = user_load($user_id);
 
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  if ($account->team == $team_id) {
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    if ($account->team == $team_id) {
     require_boinc('team');
     $boincuser = boincuser_load($user_id, TRUE);
     user_quit_team($boincuser);
     drupal_set_message(t('@user has been removed from @team.',
-      array(
+        array(
         '@user' => $account->boincuser_name,
         '@team' => $boincteam->name
-      )
+        )
     ));
     watchdog('boincteam', 'User @current_user removed user @uid from team @nid',
-      array(
+        array(
         '@current_user' => $user->uid,
         '@uid' => $account->uid,
         '@nid' => $team_id
-      ), WATCHDOG_NOTICE);
-  }
-  else {
-      drupal_set_message(t('@user is not a member of @team, so you cannot
+        ), WATCHDOG_NOTICE);
+    }
+    else {
+        drupal_set_message(t('@user is not a member of @team, so you cannot
         revoke the membership.', array(
-          '@user' => $account->boincuser_name,
-          '@team' => $boincteam->name
+            '@user' => $account->boincuser_name,
+            '@team' => $boincteam->name
         )
-      ));
-  }
-  drupal_goto("community/teams/{$team_id}/edit/members");
+        ));
+    }
+    drupal_goto("community/teams/{$team_id}/edit/members");
 }
 
 /**
  * Request a foundership transfer
  */
 function boincteam_request_foundership($team_id) {
-  global $user;
-  $account = user_load($user->uid);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  $boincuser_id = $account->boincuser_id;
-
-  if (boincteam_is_founder($team_id, $account->uid)) {
+    global $user;
+    $account = user_load($user->uid);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    $boincuser_id = $account->boincuser_id;
+
+    if (boincteam_is_founder($team_id, $account->uid)) {
     // Shouldn't even be here...
     drupal_set_message(t('@user is already the team founder.',
-      array(
+        array(
         '@user' => $account->boincuser_name
-      )
+        )
     ), 'warning');
-  }
-  elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
+    }
+    elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
     // It hasn't been long enough since the last transfer request
     drupal_set_message(t('A foundership change was requested during the last 90
       days, so new requests are not allowed. Please try again later.'
     ), 'warning');
-  }
-  elseif (boincteam_is_member($team_id, $account->uid)) {
+    }
+    elseif (boincteam_is_member($team_id, $account->uid)) {
     // Log the transfer request
     db_set_active('boinc_rw');
     db_query("
       UPDATE {team}
       SET ping_user = '%d', ping_time='%d'
       WHERE id = '%d'",
-      $boincuser_id, time(), $boincteam_id
+        $boincuser_id, time(), $boincteam_id
     );
     db_set_active('default');
     drupal_set_message(t('You have requested foundership of @team. The current
       founder has 60 days to respond to this request.',
-      array(
+        array(
         '@team' => $team->title
-      )
+        )
     ));
     watchdog('boincteam', 'User @user requested foundership of team @nid',
-      array(
+        array(
         '@current_user' => $account->uid,
         '@nid' => $team_id
-      ), WATCHDOG_NOTICE);
-  }
-  drupal_goto("community/teams/{$team_id}");
+        ), WATCHDOG_NOTICE);
+    }
+    drupal_goto("community/teams/{$team_id}");
 }
 
 /**
  * Transfer foundership to another team member
  */
 function boincteam_set_founder($team_id, $user_id) {
-  global $user;
-  $account = user_load($user_id);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincuser_id = $account->boincuser_id;
+    global $user;
+    $account = user_load($user_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincuser_id = $account->boincuser_id;
 
-  if (boincteam_is_member($team_id, $account->uid)) {
+    if (boincteam_is_member($team_id, $account->uid)) {
     // Update the team in the BOINC db
     db_set_active('boinc_rw');
     db_query("
       UPDATE {team}
       SET userid = '%d', ping_user=0
       WHERE id = '%d'",
-      $boincuser_id, $boincteam_id
+        $boincuser_id, $boincteam_id
     );
     db_set_active('default');
     drupal_set_message(t('Foundership of @team has been transfered to @user.',
-      array(
+        array(
         '@user' => $account->boincuser_name,
         '@team' => $team->title
-      )
+        )
     ));
     watchdog('boincteam', 'User @current_user transferred foundership of team
       @nid to user @uid',
-      array(
+        array(
         '@current_user' => $user->uid,
         '@uid' => $account->uid,
         '@nid' => $team_id
-      ), WATCHDOG_NOTICE);
-  }
-  drupal_goto("community/teams/{$team_id}");
+        ), WATCHDOG_NOTICE);
+    }
+    drupal_goto("community/teams/{$team_id}");
 }
 
 /**
  * See if a new foundership transfer request is allowed
  */
 function boincteam_new_foundership_transfer_request_ok($team_id) {
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  $now = time();
-  if ($boincteam->ping_user <= 0) {
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    $now = time();
+    if ($boincteam->ping_user <= 0) {
     if ($boincteam->ping_time < $now - 60 * (24*60*60)) {
-      return TRUE;
+        return TRUE;
     }
     return FALSE;
-  }
-  if ($boincteam->ping_time < $now - 90 * (24*60*60)) {
+    }
+    if ($boincteam->ping_time < $now - 90 * (24*60*60)) {
     return TRUE;
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
@@ -755,18 +755,18 @@ 
  * Check if a user has an active foundership request with a team
  */
 function boincteam_user_requested_foundership($team_id, $user_id = NULL) {
-  if (!$user_id) {
+    if (!$user_id) {
     global $user;
     $user_id = $user->uid;
-  }
-  $account = user_load($user_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
+    }
+    $account = user_load($user_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
 
-  if ($boincteam->ping_user == $account->boincuser_id) {
+    if ($boincteam->ping_user == $account->boincuser_id) {
     // Be sure the request is still active
     return !boincteam_new_foundership_transfer_request_ok($team_id);
-  }
+    }
 }
 
 
@@ -778,125 +778,125 @@ 
  * General info about team admins
  */
 function boincteam_about_admins_panel() {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('About team admins', array(), NULL, 'boinc:team-admins-panel') . '</h2>';
-  $output .= '<div>';
-  $output .= '<p>' . bts('Team admins can:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('Edit team information', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts("View the team's join / quit history", array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Moderate the team forum', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Remove members from the team', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Disband a team if it has no members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '<div>';
-  $output .= '<p>' . bts('Team admins cannot:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('Change the team founder', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Remove members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '  <li>' . bts('Add / Remove team admins', array(), NULL, 'boinc:team-admins-panel') . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '<p>' . bts('If a team admin quits the team, they cease to be a'
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('About team admins', array(), NULL, 'boinc:team-admins-panel') . '</h2>';
+    $output .= '<div>';
+    $output .= '<p>' . bts('Team admins can:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('Edit team information', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts("View the team's join / quit history", array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts('Moderate the team forum', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts('Remove members from the team', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts('Disband a team if it has no members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    $output .= '<div>';
+    $output .= '<p>' . bts('Team admins cannot:', array(), NULL, 'boinc:team-admins-panel') . '</p>';
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('Change the team founder', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts('Remove members', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '  <li>' . bts('Add / Remove team admins', array(), NULL, 'boinc:team-admins-panel') . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    $output .= '<p>' . bts('If a team admin quits the team, they cease to be a'
     . ' team admin. We recommend only selecting people you know and trust', array(), NULL, 'boinc:team-admins-panel')
     . '</p>';
-  return $output;
+    return $output;
 }
 
 /**
  * General info about changing the team founder
  */
 function boincteam_about_founder_panel() {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Changing the team founder', array(), NULL, 'boinc:team-founder-panel')
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Changing the team founder', array(), NULL, 'boinc:team-founder-panel')
     . '</h2>';
-  $output .= '<div>';
-  $output .= '<p>' . bts('Notes about changes in foundership:', array(), NULL, 'boinc:team-founder-panel') . '</p>';
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('Any member of the team is eligible', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '  <li>' . bts('Current founder becomes a normal user', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '<div>';
-  $output .= '<p>' . bts('Foundership can be requested by team members:', array(), NULL, 'boinc:team-founder-panel')
+    $output .= '<div>';
+    $output .= '<p>' . bts('Notes about changes in foundership:', array(), NULL, 'boinc:team-founder-panel') . '</p>';
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('Any member of the team is eligible', array(), NULL, 'boinc:team-founder-panel') . '</li>';
+    $output .= '  <li>' . bts('Current founder becomes a normal user', array(), NULL, 'boinc:team-founder-panel') . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    $output .= '<div>';
+    $output .= '<p>' . bts('Foundership can be requested by team members:', array(), NULL, 'boinc:team-founder-panel')
     . '</p>';
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('One request is allowed at a time', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '  <li>' . bts('It must be 60 days since any previous request', array(), NULL, 'boinc:team-founder-panel')
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('One request is allowed at a time', array(), NULL, 'boinc:team-founder-panel') . '</li>';
+    $output .= '  <li>' . bts('It must be 60 days since any previous request', array(), NULL, 'boinc:team-founder-panel')
     . '</li>';
-  $output .= '  <li>' . bts('Any active request must be older than 90 days', array(), NULL, 'boinc:team-founder-panel')
+    $output .= '  <li>' . bts('Any active request must be older than 90 days', array(), NULL, 'boinc:team-founder-panel')
     . '</li>';
-  $output .= '  <li>' . bts('Current founder has 60 days to respond to a'
+    $output .= '  <li>' . bts('Current founder has 60 days to respond to a'
     . ' request', array(), NULL, 'boinc:team-founder-panel') . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  return $output;
+    $output .= '</ul>';
+    $output .= '</div>';
+    return $output;
 }
 
 /**
  * Link to create a new team
  */
 function boincteam_create_team_link_panel() {
-  global $user;
-  $account = user_load($user->uid);
-  $unrestricted_role = array_search('verified contributor', user_roles(true));
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create a new team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
-  $output .= '<p>' . bts('If you cannot find a team that is right for you, you'
+    global $user;
+    $account = user_load($user->uid);
+    $unrestricted_role = array_search('verified contributor', user_roles(true));
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Create a new team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
+    $output .= '<p>' . bts('If you cannot find a team that is right for you, you'
     . ' can create a team.', array(), NULL, 'boinc:create-team-panel') . '</p>';
-  $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">';
-  if (isset($account->roles[$unrestricted_role])) {
+    $output .= '<ul class="tab-list">';
+    $output .= '  <li class="first last tab">';
+    if (isset($account->roles[$unrestricted_role])) {
     $output .= l(bts('Create new team', array(), NULL, 'boinc:create-team-panel'), 'community/teams/add');
-  } elseif ($account->uid <= 0) {
+    } elseif ($account->uid <= 0) {
     $output .= l(
-      bts('Login to create a new team', array(), NULL, 'boinc:create-team-panel'),
-      'user/login',
-      array('query' => drupal_get_destination())
+        bts('Login to create a new team', array(), NULL, 'boinc:create-team-panel'),
+        'user/login',
+        array('query' => drupal_get_destination())
     );
-  } else {
+    } else {
     $min_credit_needed = variable_get('boinc_comment_min_credit', 0);
     $credit_needed = $min_credit_needed - $account->boincuser_total_credit;
     $output .= '[';
     if ($credit_needed == 1) {
-      $output .= bts('You must earn 1 more credit!', array(), NULL, 'boinc:create-team-panel');
+        $output .= bts('You must earn 1 more credit!', array(), NULL, 'boinc:create-team-panel');
     }
     else {
-      $output .= bts('You must earn @count more credits!',
+        $output .= bts('You must earn @count more credits!',
         array('@count' => $credit_needed),
-	NULL, 'boinc:create-team-panel'
-      );
+    NULL, 'boinc:create-team-panel'
+        );
     }
     $output .= ']';
-  }
-  $output .= '  </li>';
-  $output .= '</ul>';
-  return $output;
+    }
+    $output .= '  </li>';
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * Create team form
  */
 function boincteam_create_team_panel() {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create a team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
-  $output .= drupal_get_form('boincteam_create_form');
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Create a team', array(), NULL, 'boinc:create-team-panel') . '</h2>';
+    $output .= drupal_get_form('boincteam_create_form');
 
-  return $output;
+    return $output;
 }
 
 /**
  * Link to user's team
  */
 function boincteam_dashboard_panel($uid = NULL) {
-  global $user;
-  if (!$uid) {
+    global $user;
+    if (!$uid) {
     $uid = $user->uid;
-  }
-  $output = '';
-  $account = user_load($uid);
-  if ($account->team) {
+    }
+    $output = '';
+    $account = user_load($uid);
+    if ($account->team) {
     $team = boincteam_load(boincteam_lookup_id($account->team));
     $output .= '<h2 class="pane-title">' . bts('Team', array(), NULL, 'boinc:team-dashboard') . '</h2>';
     $output .= '<div class="stats">';
@@ -915,254 +915,254 @@ 
     $output .= '  <label>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': </label>';
     $output .= '  <span>' . number_format($team->total_credit, 0) . '</span>';
     $output .= '</div>' . "\n";
-  }
-  else if ($user->uid == $account->uid) {
+    }
+    else if ($user->uid == $account->uid) {
     $output .= '<h2 class="pane-title">' . bts('Team (None)', array(), NULL, 'boinc:team-dashboard') . '</h2>';
     $output .= '<ul class="tab-list action-list">';
     $output .= '<li class="tab primary">';
     $output .= l(bts('Join a Team', array(), NULL, 'boinc:team-dashboard'), 'community/teams');
     $output .= '</li>';
     $output .= '</ul>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Edit team form
  */
 function boincteam_edit_team_panel($team_id) {
-  $team = node_load($team_id);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . $team->title . '</h2>';
-  $output .= drupal_get_form('boincteam_edit_form', $team_id);
+    $team = node_load($team_id);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . $team->title . '</h2>';
+    $output .= drupal_get_form('boincteam_edit_form', $team_id);
 
-  return $output;
+    return $output;
 }
 
 /**
  * Link to join a team
  */
 function boincteam_join_team_panel($team_id) {
-  $team = node_load($team_id);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Join team', array(), NULL, 'boinc:join-team-panel') . '</h2>';
-  $output .= '<p>' . bts('Click here to become a member of @this_team',
+    $team = node_load($team_id);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Join team', array(), NULL, 'boinc:join-team-panel') . '</h2>';
+    $output .= '<p>' . bts('Click here to become a member of @this_team',
     array('@this_team' =>$team->title), NULL, 'boinc:join-team-panel') . '</p>';
-  $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">' .
+    $output .= '<ul class="tab-list">';
+    $output .= '  <li class="first last tab">' .
     l(bts('Join this team', array(), NULL, 'boinc:join-team-panel'), "community/teams/{$team_id}/join") . '</li>';
-  $output .= '</ul>';
-  return $output;
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * Link to leave a team
  */
 function boincteam_leave_team_panel($team_id) {
-  $team = node_load($team_id);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Leave team', array(), NULL, 'boinc:leave-team-panel') . '</h2>';
-  $output .= '<p>' . bts('Click here to revoke your membership with'
+    $team = node_load($team_id);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Leave team', array(), NULL, 'boinc:leave-team-panel') . '</h2>';
+    $output .= '<p>' . bts('Click here to revoke your membership with'
     . ' @this_team', array('@this_team' =>$team->title), NULL, 'boinc:leave-team-panel') . '</p>';
-  $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">' .
+    $output .= '<ul class="tab-list">';
+    $output .= '  <li class="first last tab">' .
     l(bts('Leave this team', array(), NULL, 'boinc:leave-team-panel'), "community/teams/{$team_id}/leave") . '</li>';
-  $output .= '</ul>';
-  return $output;
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * General info about team admins
  */
 function boincteam_manage_admins_panel_header($team_id) {
-  $output = '';
-  $output .= '<h4>' . bts('Add team admin', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
-  $output .= drupal_get_form('boincteam_add_admin_form', $team_id);
-  $output .= '<div class="clearfix"></div>';
-  $output .= '<h4>' . bts('Current team admins', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
+    $output = '';
+    $output .= '<h4>' . bts('Add team admin', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
+    $output .= drupal_get_form('boincteam_add_admin_form', $team_id);
+    $output .= '<div class="clearfix"></div>';
+    $output .= '<h4>' . bts('Current team admins', array(), NULL, 'boinc:team-manage-admins') . '</h4>';
 
-  return $output;
+    return $output;
 }
 
 /**
  * Team management tools
  */
 function boincteam_management_panel($team_id) {
-  $is_founder = boincteam_is_founder($team_id);
-  $team = node_load($team_id);
+    $is_founder = boincteam_is_founder($team_id);
+    $team = node_load($team_id);
 
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Manage team', array(), NULL, 'boinc:team-manage') . '</h2>';
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Manage team', array(), NULL, 'boinc:team-manage') . '</h2>';
 
-  // PM all members
-  if (module_exists('privatemsg')) {
+    // PM all members
+    if (module_exists('privatemsg')) {
     $output .= '<div class="form-item">';
     $output .= '  <ul class="tab-list action-list">';
     $output .= '    <li class="first tab primary">' .
-      l('Send message to team', "community/teams/{$team_id}/message-all-members") . '</li>';
+        l('Send message to team', "community/teams/{$team_id}/message-all-members") . '</li>';
     $output .= '  </ul>';
     $output .= '  <div class="description">';
     $output .=   bts('Contact all team members using e-mail.', array(), NULL, 'boinc:team-manage');
     $output .= '  </div>';
     $output .= '</div>';
-  }
+    }
 
-  // Team forum
-  if (module_exists('boincteam_forum')) {
+    // Team forum
+    if (module_exists('boincteam_forum')) {
     if ($is_founder) {
-      // Determine whether to create a forum or edit the existing forum
-      // (multiple forums per team could be supported in the future)
-      $team_forum_link_path = 'add';
-      $team_forums = boincteam_forum_list();
-      if ($team_forums) {
+        // Determine whether to create a forum or edit the existing forum
+        // (multiple forums per team could be supported in the future)
+        $team_forum_link_path = 'add';
+        $team_forums = boincteam_forum_list();
+        if ($team_forums) {
         $team_forum = reset($team_forums);
         $team_forum_link_path = "{$team_forum->tfid}/edit";
-      }
-      $output .= '<div class="form-item">';
-      $output .= '  <ul class="tab-list action-list">';
-      $output .= '    <li class="first tab primary">' .
+        }
+        $output .= '<div class="form-item">';
+        $output .= '  <ul class="tab-list action-list">';
+        $output .= '    <li class="first tab primary">' .
         l(bts('Manage team message board', array(), NULL, 'boinc:team-manage'),
-          "community/teams/{$team_id}/forum/{$team_forum_link_path}"
+            "community/teams/{$team_id}/forum/{$team_forum_link_path}"
         );
-      $output .= '    </li>';
-      $output .= '  <div class="description">';
-      $output .=   bts('Create or manage message board', array(), NULL, 'boinc:team-manage');
-      $output .= '  </div>';
-      $output .= '</div>';
+        $output .= '    </li>';
+        $output .= '  <div class="description">';
+        $output .=   bts('Create or manage message board', array(), NULL, 'boinc:team-manage');
+        $output .= '  </div>';
+        $output .= '</div>';
+    }
     }
-  }
 
-  // Team history
-  $output .= '<div class="form-item">';
-  $output .= '  <label>' . bts('View change history', array(), NULL, 'boinc:team-manage') . '</label>';
-  $output .= '  <ul class="tab-list">';
-  $output .= '    <li class="first tab primary">' .
+    // Team history
+    $output .= '<div class="form-item">';
+    $output .= '  <label>' . bts('View change history', array(), NULL, 'boinc:team-manage') . '</label>';
+    $output .= '  <ul class="tab-list">';
+    $output .= '    <li class="first tab primary">' .
     l('HTML', "community/teams/{$team_id}/history") . '</li>';
-  $output .= '    <li class="last tab primary">' .
+    $output .= '    <li class="last tab primary">' .
     l('XML', "community/teams/{$team_id}/history/xml") . '</li>';
-  $output .= '  </ul>';
-  $output .= '  <div class="description">';
-  $output .=   bts('See member activity', array(), NULL, 'boinc:team-manage');
-  $output .= '  </div>';
-  $output .= '</div>';
+    $output .= '  </ul>';
+    $output .= '  <div class="description">';
+    $output .=   bts('See member activity', array(), NULL, 'boinc:team-manage');
+    $output .= '  </div>';
+    $output .= '</div>';
 
-  $output .= '<div class="form-item">';
-  $output .= '  <ul class="tab-list action-list">';
+    $output .= '<div class="form-item">';
+    $output .= '  <ul class="tab-list action-list">';
 
-  // Edit team information
-  $output .= '    <li class="first tab primary">' .
+    // Edit team information
+    $output .= '    <li class="first tab primary">' .
     l(bts('Edit team info', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/info") . '</li>';
 
-  // Member list
-  $output .= '    <li class="tab primary">' .
+    // Member list
+    $output .= '    <li class="tab primary">' .
     l(bts('View member list', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/members") . '</li>';
 
-  // Remove members
-  $output .= '    <li class="tab primary">' .
+    // Remove members
+    $output .= '    <li class="tab primary">' .
     l(bts('Remove members', array(), NULL, 'boinc:team-admins-panel'), "community/teams/{$team_id}/edit/members") . '</li>';
 
-  if ($is_founder) {
+    if ($is_founder) {
 
     // Change founder
     $output .= '    <li class="tab primary">' .
-      l(bts('Change founder', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/founder") . '</li>';
+        l(bts('Change founder', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/founder") . '</li>';
 
-      // Manage admins
+        // Manage admins
     $output .= '    <li class="tab primary">' .
-      l(bts('Manage team admins', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/admins") . '</li>';
+        l(bts('Manage team admins', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/edit/admins") . '</li>';
 
     // Delete the team
     $output .= '    <li class="last tab primary">' .
-      l(bts('Remove team', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/delete") . '</li>';
-  }
+        l(bts('Remove team', array(), NULL, 'boinc:team-manage'), "community/teams/{$team_id}/delete") . '</li>';
+    }
 
-  $output .= '  </ul>';
-  $output .= '</div>';
+    $output .= '  </ul>';
+    $output .= '</div>';
 
-  return $output;
+    return $output;
 }
 
 /**
  * Link to user's team
  */
 function boincteam_member_link_panel() {
-  global $user;
-  $account = user_load($user->uid);
-  $team = node_load($account->team);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('My team', array(), NULL, 'boinc:account-team-panel') . '</h2>';
-  $output .= '<p>' . bts('You are a member of @team.',
+    global $user;
+    $account = user_load($user->uid);
+    $team = node_load($account->team);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('My team', array(), NULL, 'boinc:account-team-panel') . '</h2>';
+    $output .= '<p>' . bts('You are a member of @team.',
     array('@team' => $team->title), NULL, 'boinc:account-team-panel') . '</p>';
-  $output .= '<ul class="tab-list">';
-  $output .= '  <li class="first last tab">' .
+    $output .= '<ul class="tab-list">';
+    $output .= '  <li class="first last tab">' .
     l(bts('View my team', array(), NULL, 'boinc:account-team-panel'), "community/teams/{$account->team}") . '</li>';
-  $output .= '</ul>';
-  return $output;
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * Link to request foundership transfer of a team
  */
 function boincteam_request_foundership_panel($team_id) {
-  global $user;
-  $account = user_load($user->uid);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  $boincuser_id = $account->boincuser_id;
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Request foundership', array(), NULL, 'boinc:team-request-foundership') . '</h2>';
+    global $user;
+    $account = user_load($user->uid);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    $boincuser_id = $account->boincuser_id;
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Request foundership', array(), NULL, 'boinc:team-request-foundership') . '</h2>';
 
-  if (boincteam_user_requested_foundership($team_id)) {
+    if (boincteam_user_requested_foundership($team_id)) {
     $deadline = boincteam_foundership_transfer_ok_time($boincteam);
     $days_to_deadline = ceil(($deadline - time()) / (24*60*60));
     $request_age = 60 - $days_to_deadline;
     $days_to_respond = 30 + $days_to_deadline;
     if (time() > $deadline) {
-      $output .= '<p>';
-      if ($request_age == 1) {
+        $output .= '<p>';
+        if ($request_age == 1) {
         $output .= bts('1 day has elapsed since your request and'
-          . ' the founder has not responded.', array(), NULL, 'boinc:team-request-foundership');
-      }
-      else {
+            . ' the founder has not responded.', array(), NULL, 'boinc:team-request-foundership');
+        }
+        else {
         $output .= bts('@count days have elapsed since your request and'
-          . ' the founder has not responded.',
-          array('@count' => $request_age),
-          NULL, 'boinc:team-request-foundership');
-      }
-      $output .= ' ';
-      if ($days_to_respond == 1) {
+            . ' the founder has not responded.',
+            array('@count' => $request_age),
+            NULL, 'boinc:team-request-foundership');
+        }
+        $output .= ' ';
+        if ($days_to_respond == 1) {
         $output .= bts('You now have 1 day to assume foundership before'
-          . ' another team member may submit a request.', array(), NULL, 'boinc:team-request-foundership');
-      }
-      else {
+            . ' another team member may submit a request.', array(), NULL, 'boinc:team-request-foundership');
+        }
+        else {
         $output .= bts('You now have @count days to assume foundership before'
-          . ' another team member may submit a request.',
-          array('@count' => $days_to_respond),
-          NULL, 'boinc:team-request-foundership');
-      }
-      $output .= '</p>';
-      $output .= '<ul class="tab-list">';
-      $output .= '  <li class="first last tab">' .
+            . ' another team member may submit a request.',
+            array('@count' => $days_to_respond),
+            NULL, 'boinc:team-request-foundership');
+        }
+        $output .= '</p>';
+        $output .= '<ul class="tab-list">';
+        $output .= '  <li class="first last tab">' .
         l(bts('Assume foundership', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/assume-foundership") . '</li>';
-      $output .= '</ul>';
+        $output .= '</ul>';
     }
     else {
-      $output .= '<p>';
-      if ($days_to_deadline == 1) {
+        $output .= '<p>';
+        if ($days_to_deadline == 1) {
         $output .= bts('The team founder has 1 day to respond to your'
-          . ' transfer request.',
-          NULL, 'boinc:team-request-foundership');
-      }
-      else {
+            . ' transfer request.',
+            NULL, 'boinc:team-request-foundership');
+        }
+        else {
         $output .= bts('The team founder has @count days to respond to your'
-          . ' transfer request.', array('@count' => $days_to_deadline),
-          NULL, 'boinc:team-request-foundership');
-      }
-      $output .= '</p>';
+            . ' transfer request.', array('@count' => $days_to_deadline),
+            NULL, 'boinc:team-request-foundership');
+        }
+        $output .= '</p>';
     }
-  }
-  elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
+    }
+    elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
     // If this user does not have a transfer request pending, but new requests
     // are not allowed, set the deadline to 90 days instead of 60 (as the user
     // who made the request has 30 additional days to assume foundership if
@@ -1171,131 +1171,131 @@ 
     $days_to_deadline = ceil(($deadline - time()) / (24*60*60)) + 30;
     $output .= '<p>';
     $output .= bts('A team foundership change was already requested recently.'
-      . ' Only one request is allowed within a period of 90 days.',
-      NULL, 'boinc:team-request-foundership');
+        . ' Only one request is allowed within a period of 90 days.',
+        NULL, 'boinc:team-request-foundership');
     if ($days_to_deadline == 1) {
-      $output .= ' (' . bts('1 day remaining', array(), NULL, 'boinc:team-request-foundership') . ')';
+        $output .= ' (' . bts('1 day remaining', array(), NULL, 'boinc:team-request-foundership') . ')';
     }
     else {
-      $output .= ' (' . bts('@count days remaining',
+        $output .= ' (' . bts('@count days remaining',
         array('@count' => $days_to_deadline),
         NULL, 'boinc:team-request-foundership') . ')';
     }
     $output .= '</p>';
-  }
-  else {
+    }
+    else {
     $output .= '<p>' . bts('If the team founder is not active and you want to'
-      . ' assume the role of founder, click below to request foundership of'
-      . ' @this_team.',
-      array('@this_team' =>$team->title), NULL, 'boinc:team-request-foundership') . '</p>';
+        . ' assume the role of founder, click below to request foundership of'
+        . ' @this_team.',
+        array('@this_team' =>$team->title), NULL, 'boinc:team-request-foundership') . '</p>';
     $output .= '<ul class="tab-list">';
     $output .= '  <li class="first last tab">' .
-      l(bts('Initiate request', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/request-foundership") . '</li>';
+        l(bts('Initiate request', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/request-foundership") . '</li>';
     $output .= '</ul>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Respond to foundership transfer requests for a team
  */
 function boincteam_request_foundership_response_panel($team_id) {
-  global $user;
-  $account = user_load($user->uid);
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
-  $boincteam = boincteam_load($boincteam_id);
-  $boincuser_id = $account->boincuser_id;
-  $output = '';
+    global $user;
+    $account = user_load($user->uid);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
+    $boincteam = boincteam_load($boincteam_id);
+    $boincuser_id = $account->boincuser_id;
+    $output = '';
 
-  if ($boincteam->ping_user) {
+    if ($boincteam->ping_user) {
     if ($boincteam->ping_user < 0) {
-      $member = user_load(boincuser_lookup_uid(-$boincteam->ping_user));
-      $output .= '<h2 class="pane-title">' . bts('Obsolete transfer request', array(), NULL, 'boinc:team-request-foundership-response')
+        $member = user_load(boincuser_lookup_uid(-$boincteam->ping_user));
+        $output .= '<h2 class="pane-title">' . bts('Obsolete transfer request', array(), NULL, 'boinc:team-request-foundership-response')
         . '</h2>';
-      $output .= '<p>' . bts('Team member @name requested team foundership on'
+        $output .= '<p>' . bts('Team member @name requested team foundership on'
         . ' @date, but then left the team. This request is now canceled.',
         array(
-          '@name' => $member->boincuser_name,
-          '@date' => date('j M Y', $boincteam->ping_time),
+            '@name' => $member->boincuser_name,
+            '@date' => date('j M Y', $boincteam->ping_time),
         ),
         NULL, 'boinc:team-request-foundership-response') . '</p>';
-      // Automatically cancel the request
-      db_set_active('boinc_rw');
-      db_query("
+        // Automatically cancel the request
+        db_set_active('boinc_rw');
+        db_query("
         UPDATE {team}
         SET ping_user=0
         WHERE id = '%d'",
         $boincteam_id
-      );
-      db_set_active('default');
+        );
+        db_set_active('default');
     }
     else {
-      $member = user_load(boincuser_lookup_uid($boincteam->ping_user));
-      $output .= '<h2 class="pane-title">' . bts('Respond to transfer request', array(), NULL, 'boinc:team-request-foundership-response')
+        $member = user_load(boincuser_lookup_uid($boincteam->ping_user));
+        $output .= '<h2 class="pane-title">' . bts('Respond to transfer request', array(), NULL, 'boinc:team-request-foundership-response')
         . '</h2>';
-      $output .= '<p>' . bts('Team member @name has requested team foundership.'
+        $output .= '<p>' . bts('Team member @name has requested team foundership.'
         . ' This may be because you left the team or have not had contact with'
         . ' the team for a long time.', array(
-          '@name' => $member->boincuser_name,
+            '@name' => $member->boincuser_name,
         )
-      , array(), NULL, 'boinc:team-request-foundership-response') . '</p>';
-      $output .= '<p>' . bts("If you don't decline the request by @date, @name"
+        , array(), NULL, 'boinc:team-request-foundership-response') . '</p>';
+        $output .= '<p>' . bts("If you don't decline the request by @date, @name"
         . ' will have the option of assuming team foundership. (note: To'
         . ' accept the request, assign foundership to @name using the form'
         . ' below)',
         array(
-          '@name' => $member->boincuser_name,
-          '@date' => date('j M Y', boincteam_foundership_transfer_ok_time($boincteam)),
+            '@name' => $member->boincuser_name,
+            '@date' => date('j M Y', boincteam_foundership_transfer_ok_time($boincteam)),
         ),
         NULL, 'boinc:team-request-foundership-response') . '</p>';
-      $output .= '<ul class="tab-list">';
-      $output .= '  <li class="first last tab">' .
+        $output .= '<ul class="tab-list">';
+        $output .= '  <li class="first last tab">' .
         l(bts('Deny request', array(), NULL, 'boinc:team-request-foundership-response'), "community/teams/{$team_id}/deny-foundership-request") . '</li>';
-      $output .= '</ul>';
+        $output .= '</ul>';
     }
-  }
-  return $output;
+    }
+    return $output;
 }
 
 function boincteam_search_panel() {
-  $output = '';
-  if (module_exists('global_search_teams_solr')) {
+    $output = '';
+    if (module_exists('global_search_teams_solr')) {
     $output .= '<h2 class="pane-title">' . bts('Search teams', array(), NULL, 'boinc:search-team') . '</h2>';
     //$output .= '<p>' . bts('Render a search form here.', array(), NULL, 'boinc:search-team') . '</p>';
     $output .= '<p>' . boincteam_search_view() . '</p>';
-  }
-  return $output;
+    }
+    return $output;
 }
 
 function boincteam_search_view($type = 'team') {
-  // Get the team search form
-  $search_page = apachesolr_search_page_load('team_search');
-  module_load_include('inc', 'apachesolr_search', 'apachesolr_search.pages');
-  return drupal_get_form('apachesolr_search_custom_page_search_form', $search_page);
+    // Get the team search form
+    $search_page = apachesolr_search_page_load('team_search');
+    module_load_include('inc', 'apachesolr_search', 'apachesolr_search.pages');
+    return drupal_get_form('apachesolr_search_custom_page_search_form', $search_page);
 }
 
 /**
  * General info about the concept of teams
  */
 function boincteam_topic_overview_panel() {
-  $site_name =  variable_get('site_name', 'Drupal-BOINC');
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Teams', array(), NULL, 'boinc:team-general-info') . '</h2>';
-  $output .= '<div class="">';
-  $output .= '<p>' . bts('@project participants may form teams. You may belong'
+    $site_name =  variable_get('site_name', 'Drupal-BOINC');
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Teams', array(), NULL, 'boinc:team-general-info') . '</h2>';
+    $output .= '<div class="">';
+    $output .= '<p>' . bts('@project participants may form teams. You may belong'
     . ' to only one team. You can join or quit a team at any time. To join a'
     . ' team, visit its team page and click "Join this team". Each team has a'
     . ' founder who may:', array('@project' => $site_name), NULL, 'boinc:team-general-info') . '</p>';
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('Private Message all team members', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts("edit the team's name and description", array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts('add or remove team admins', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts('remove members from the team', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '  <li>' . bts('disband a team if it has no members', array(), NULL, 'boinc:team-general-info') . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  return $output;
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('Private Message all team members', array(), NULL, 'boinc:team-general-info') . '</li>';
+    $output .= '  <li>' . bts("edit the team's name and description", array(), NULL, 'boinc:team-general-info') . '</li>';
+    $output .= '  <li>' . bts('add or remove team admins', array(), NULL, 'boinc:team-general-info') . '</li>';
+    $output .= '  <li>' . bts('remove members from the team', array(), NULL, 'boinc:team-general-info') . '</li>';
+    $output .= '  <li>' . bts('disband a team if it has no members', array(), NULL, 'boinc:team-general-info') . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    return $output;
 }
 
 /**
@@ -1323,50 +1323,50 @@ 
  * Link to view a team
  */
 function boincteam_view_team_panel($team_id) {
-  $team = node_load($team_id);
-  if ($team->type != "team") {
+    $team = node_load($team_id);
+    if ($team->type != "team") {
     return;
-  }
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id), TRUE);
-  $founder = user_load(get_drupal_id($boincteam->userid));
-  $new_members = array();
-  if ($boincteam->new_members) {
+    }
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id), TRUE);
+    $founder = user_load(get_drupal_id($boincteam->userid));
+    $new_members = array();
+    if ($boincteam->new_members) {
     foreach ($boincteam->new_members as $member) {
-      $account = user_load(get_drupal_id($member->id));
-      $new_members[] = l($account->boincuser_name, "account/{$account->uid}");
+        $account = user_load(get_drupal_id($member->id));
+        $new_members[] = l($account->boincuser_name, "account/{$account->uid}");
     }
-  }
-  $output = '';
-  $output .= '<h2 class="pane-title">' . $boincteam->name . '</h2>';
-  $output .= '<div>';
-  $output .= '<div class="left-column">';
-  $output .= '<ul class="stats">';
-  $output .= '  <li>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': ' . number_format($boincteam->total_credit, 0) . '</li>';
-  $output .= '  <li>' . bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC') . ': ' . number_format($boincteam->expavg_credit, 2) . '</li>';
-  $output .= '  <li>' . bts('Country', array(), NULL, 'boinc:country-of-origin') . ': ' . $boincteam->country . '</li>';
-  $output .= '  <li>' . bts('Type', array(), NULL, 'boinc:view-team-info') . ': ' . boincteam_get_type($team_id) . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '<div class="right-column">';
-  $output .= '<ul class="stats">';
-  $output .= '  <li>' . bts('Founder', array(), NULL, 'boinc:view-team-info') . ': ' . l($founder->boincuser_name, "account/{$founder->uid}") . '</li>';
-  $output .= '  <li>' . bts('New members in last day', array(), NULL, 'boinc:view-team-info') . ': ' . implode('&middot;', $new_members) . '</li>';
-  $output .= '  <li>' . bts('Total members', array(), NULL, 'boinc:view-team-info') . ': ' . l($boincteam->nusers, "community/teams/{$team_id}/members") . '</li>';
-  $output .= '  <li>' . bts('Active members', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_active . '</li>';
-  $output .= '  <li>' . bts('Members with credit', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_worked . '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  $output .= '</div>';
-  $output .= '<div class="clearfix"></div>';
-  if ($boincteam->url) {
+    }
+    $output = '';
+    $output .= '<h2 class="pane-title">' . $boincteam->name . '</h2>';
+    $output .= '<div>';
+    $output .= '<div class="left-column">';
+    $output .= '<ul class="stats">';
+    $output .= '  <li>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': ' . number_format($boincteam->total_credit, 0) . '</li>';
+    $output .= '  <li>' . bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC') . ': ' . number_format($boincteam->expavg_credit, 2) . '</li>';
+    $output .= '  <li>' . bts('Country', array(), NULL, 'boinc:country-of-origin') . ': ' . $boincteam->country . '</li>';
+    $output .= '  <li>' . bts('Type', array(), NULL, 'boinc:view-team-info') . ': ' . boincteam_get_type($team_id) . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    $output .= '<div class="right-column">';
+    $output .= '<ul class="stats">';
+    $output .= '  <li>' . bts('Founder', array(), NULL, 'boinc:view-team-info') . ': ' . l($founder->boincuser_name, "account/{$founder->uid}") . '</li>';
+    $output .= '  <li>' . bts('New members in last day', array(), NULL, 'boinc:view-team-info') . ': ' . implode('&middot;', $new_members) . '</li>';
+    $output .= '  <li>' . bts('Total members', array(), NULL, 'boinc:view-team-info') . ': ' . l($boincteam->nusers, "community/teams/{$team_id}/members") . '</li>';
+    $output .= '  <li>' . bts('Active members', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_active . '</li>';
+    $output .= '  <li>' . bts('Members with credit', array(), NULL, 'boinc:view-team-info') . ': ' . $boincteam->nusers_worked . '</li>';
+    $output .= '</ul>';
+    $output .= '</div>';
+    $output .= '</div>';
+    $output .= '<div class="clearfix"></div>';
+    if ($boincteam->url) {
     $output .= '<div class="stats">';
     $output .= bts('Website', array(), NULL, 'boinc:website-of-user-or-team') . ': ' . l("http://{$boincteam->url}", "http://{$boincteam->url}");
     $output .= '</div>';
-  }
-  if ($team->body) {
+    }
+    if ($team->body) {
     $output .= '<h3>' . bts('Description', array(), NULL, 'boinc:team-description') . '</h3>';
     $output .= check_markup($team->body, $team->format);
     $output .= '</div>';
-  }
-  return $output;
+    }
+    return $output;
 }

drupal/sites/default/boinc/modules/boincteam/includes/boincteam_forum.forms.inc

Indentation +99 added lines, -99 removed lines

@@ -14,84 +14,84 @@ 
  * The definition of the create team form
  */
 function boincteam_forum_create_form(&$form_state) {
-  $form = array();
+    $form = array();
 
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
 
-  $default = array(
+    $default = array(
     'title' => '',
     'min_time_between_posts' => '',
     'min_total_credit_to_post' => '',
     'min_avg_credit_to_post' => '',
     'public' => 0,
     'description' => '',
-  );
+    );
 
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
 
-  // Form elements
-  $form['title'] = array(
+    // Form elements
+    $form['title'] = array(
     '#title' => bts('Message board title', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['title'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['min_time_between_posts'] = array(
+    );
+    $form['min_time_between_posts'] = array(
     '#title' => bts('Minimum time between posts', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_time_between_posts'],
     '#size' => 12,
     '#description' => bts('seconds', array(), NULL, 'boinc:unit-of-time'),
-  );
-  $form['min_total_credit_to_post'] = array(
+    );
+    $form['min_total_credit_to_post'] = array(
     '#title' => bts('Minimum total credit to post', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_total_credit_to_post'],
     '#size' => 12,
-  );
-  $form['min_avg_credit_to_post'] = array(
+    );
+    $form['min_avg_credit_to_post'] = array(
     '#title' => bts('Minimum avg credit to post', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_avg_credit_to_post'],
     '#size' => 12,
-  );
-  $form['public'] = array(
+    );
+    $form['public'] = array(
     '#title' => bts('Allow public to read board?', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['public'],
-  );
-  $form['description'] = array(
+    );
+    $form['description'] = array(
     '#title' => bts('Description', array(), NULL, 'boinc:team-forum-create/edit:-1:ignoreoverwrite'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
-  );
+    );
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Create message board', array(), NULL, 'boinc:team-forum-create/edit'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/forum/add', TRUE)) . '</li>'
-  );
+    );
 
-  $form['#redirect'] = "community/teams/{$account->team}";
+    $form['#redirect'] = "community/teams/{$account->team}";
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -99,33 +99,33 @@ 
  */
 function boincteam_forum_create_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
+    $values = $form_state['values'];
 
-  if (!$values['title']) {
+    if (!$values['title']) {
     form_set_error('name', bts('Message board title is required.', array(), NULL, 'boinc:team-forum-create/edit'));
-  }
-  if (!is_numeric($values['min_time_between_posts']) OR
+    }
+    if (!is_numeric($values['min_time_between_posts']) OR
       $values['min_time_between_posts'] < 0) {
     form_set_error('min_time_between_posts',
-      bts('Please set the minimum time required between posts.', array(), NULL, 'boinc:team-forum-create/edit')
+        bts('Please set the minimum time required between posts.', array(), NULL, 'boinc:team-forum-create/edit')
     );
-  }
-  if (!is_numeric($values['min_total_credit_to_post']) OR
+    }
+    if (!is_numeric($values['min_total_credit_to_post']) OR
       $values['min_total_credit_to_post'] < 0) {
     form_set_error('min_total_credit_to_post',
-      bts('Please set the minimum total credit that a user'
+        bts('Please set the minimum total credit that a user'
         . ' must earn in order to post to this message board.',
         array(), NULL, 'boinc:team-forum-create/edit')
     );
-  }
-  if (!is_numeric($values['min_avg_credit_to_post']) OR
+    }
+    if (!is_numeric($values['min_avg_credit_to_post']) OR
       $values['min_avg_credit_to_post'] < 0) {
     form_set_error('min_avg_credit_to_post',
-      bts('Please set the minimum average credit that a user'
+        bts('Please set the minimum average credit that a user'
         . ' is required to have in order to post to this message board.',
         array(), NULL, 'boinc:team-forum-create/edit')
     );
-  }
+    }
 }
 
 /**
@@ -133,13 +133,13 @@ 
  */
 function boincteam_forum_create_form_submit($form, &$form_state) {
 
-  $values = $form_state['values'];
+    $values = $form_state['values'];
 
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
 
-  // Add the team forum to the db
-  db_query("
+    // Add the team forum to the db
+    db_query("
     INSERT INTO {boincteam_forum} SET
       nid = %d,
       title = '%s',
@@ -157,9 +157,9 @@ 
     (int) $values['min_avg_credit_to_post'],
     ($values['public']) ? 1 : 0,
     $values['description']
-  );
+    );
 
-  drupal_set_message(t('Message board "@forum" has been created.',
+    drupal_set_message(t('Message board "@forum" has been created.',
     array('@forum' => $values['title'])));
 }
 
@@ -171,84 +171,84 @@ 
  * The definition of the edit team forum form
  */
 function boincteam_forum_edit_form(&$form_state, $tfid) {
-  $form = array();
-  $boincteam_forum = boincteam_forum_load($tfid);
+    $form = array();
+    $boincteam_forum = boincteam_forum_load($tfid);
 
-  $form_state['storage']['tfid'] = $tfid;
+    $form_state['storage']['tfid'] = $tfid;
 
-  $default = array(
+    $default = array(
     'title' => $boincteam_forum->title,
     'min_time_between_posts' => $boincteam_forum->min_time_between_posts,
     'min_total_credit_to_post' => $boincteam_forum->min_total_credit_to_post,
     'min_avg_credit_to_post' => $boincteam_forum->min_avg_credit_to_post,
     'public' => ($boincteam_forum->public) ? 1 : 0,
     'description' => $boincteam_forum->description,
-  );
+    );
 
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
 
-  // Form elements
-  $form['title'] = array(
+    // Form elements
+    $form['title'] = array(
     '#title' => bts('Message board title', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['title'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['min_time_between_posts'] = array(
+    );
+    $form['min_time_between_posts'] = array(
     '#title' => bts('Minimum time between posts', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_time_between_posts'],
     '#size' => 12,
     '#description' => bts('seconds', array(), NULL, 'boinc:unit-of-time'),
-  );
-  $form['min_total_credit_to_post'] = array(
+    );
+    $form['min_total_credit_to_post'] = array(
     '#title' => bts('Minimum total credit to post', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_total_credit_to_post'],
     '#size' => 12,
-  );
-  $form['min_avg_credit_to_post'] = array(
+    );
+    $form['min_avg_credit_to_post'] = array(
     '#title' => bts('Minimum avg credit to post', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['min_avg_credit_to_post'],
     '#size' => 12,
-  );
-  $form['public'] = array(
+    );
+    $form['public'] = array(
     '#title' => bts('Allow public to read board?', array(), NULL, 'boinc:team-forum-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['public'],
-  );
-  $form['description'] = array(
+    );
+    $form['description'] = array(
     '#title' => bts('Description', array(), NULL, 'boinc:team-forum-create/edit:-1:ignoreoverwrite'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
-  );
+    );
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save message board', array(), NULL, 'boinc:team-forum-create/edit'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/forum', TRUE)) . '</li>'
-  );
+    );
 
-  $form['#redirect'] = "community/teams/{$boincteam_forum->nid}";
+    $form['#redirect'] = "community/teams/{$boincteam_forum->nid}";
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -256,33 +256,33 @@ 
  */
 function boincteam_forum_edit_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
+    $values = $form_state['values'];
 
-  if (!$values['title']) {
+    if (!$values['title']) {
     form_set_error('name', bts('Message board title is required.', array(), NULL, 'boinc:team-forum-create/edit'));
-  }
-  if (!is_numeric($values['min_time_between_posts']) OR
+    }
+    if (!is_numeric($values['min_time_between_posts']) OR
       $values['min_time_between_posts'] < 0) {
     form_set_error('min_time_between_posts',
-      bts('Please set the minimum time required between posts.', array(), NULL, 'boinc:team-forum-create/edit')
+        bts('Please set the minimum time required between posts.', array(), NULL, 'boinc:team-forum-create/edit')
     );
-  }
-  if (!is_numeric($values['min_total_credit_to_post']) OR
+    }
+    if (!is_numeric($values['min_total_credit_to_post']) OR
       $values['min_total_credit_to_post'] < 0) {
     form_set_error('min_total_credit_to_post',
-      bts('Please set the minimum total credit that a user'
+        bts('Please set the minimum total credit that a user'
         . ' must earn in order to post to this message board.',
         array(), NULL, 'boinc:team-forum-create/edit')
     );
-  }
-  if (!is_numeric($values['min_avg_credit_to_post']) OR
+    }
+    if (!is_numeric($values['min_avg_credit_to_post']) OR
       $values['min_avg_credit_to_post'] < 0) {
     form_set_error('min_avg_credit_to_post',
-      bts('Please set the minimum average credit that a user'
+        bts('Please set the minimum average credit that a user'
         . ' is required to have in order to post to this message board.',
         array(), NULL, 'boinc:team-forum-create/edit')
     );
-  }
+    }
 }
 
 /**
@@ -290,11 +290,11 @@ 
  */
 function boincteam_forum_edit_form_submit($form, &$form_state) {
 
-  $tfid = $form_state['storage']['tfid'];
-  $values = $form_state['values'];
+    $tfid = $form_state['storage']['tfid'];
+    $values = $form_state['values'];
 
-  // Update the team forum in the db
-  db_query("
+    // Update the team forum in the db
+    db_query("
     UPDATE {boincteam_forum} SET
       title = '%s',
       min_time_between_posts = '%d',
@@ -311,11 +311,11 @@ 
     ($values['public']) ? 1 : 0,
     $values['description'],
     $tfid
-  );
+    );
 
-  drupal_set_message(t('Details for message board "@forum" have been updated.',
+    drupal_set_message(t('Details for message board "@forum" have been updated.',
     array('@forum' => $values['title'])));
 
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }

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

Indentation +73 added lines, -73 removed lines

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

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

Indentation +333 added lines, -333 removed lines

@@ -14,9 +14,9 @@ 
  * The definition of the create team form
  */
 function boincteam_create_form(&$form_state) {
-  $form = array();
+    $form = array();
 
-  $default = array(
+    $default = array(
     'name' => '',
     'name_html' => '',
     'website' => '',
@@ -24,105 +24,105 @@ 
     'country' => 0,
     'joinable' => TRUE,
     'description' => '',
-  );
+    );
 
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
 
-  // Vocabulary based option sets
-  $form['type_options'] = array(
+    // Vocabulary based option sets
+    $form['type_options'] = array(
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
-  );
-  $vocabs = taxonomy_get_vocabularies(NULL);
-  foreach ($vocabs as $vocab) {
+    );
+    $vocabs = taxonomy_get_vocabularies(NULL);
+    foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
       $team_types = taxonomy_get_tree($vocab->vid);
-      if (module_exists('internationalization')) {
+        if (module_exists('internationalization')) {
         $team_types = i18ntaxonomy_localize_terms($team_types);
-      }
-      foreach ($team_types as $team_type) {
+        }
+        foreach ($team_types as $team_type) {
         $form['type_options']['#value'][$team_type->tid] = $team_type->name;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
-  $form['country_options'] = array(
+    }
+    $form['country_options'] = array(
     '#type' => 'value',
     '#value' => boinccore_get_country_list(),
-  );
+    );
 
-  // Form elements
-  $form['name'] = array(
+    // Form elements
+    $form['name'] = array(
     '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['name_html'] = array(
+    );
+    $form['name_html'] = array(
     '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
     '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
-  );
-  $form['website'] = array(
+    );
+    $form['website'] = array(
     '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
     '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
-  );
-  $form['type'] = array(
+    );
+    $form['type'] = array(
     '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
-  );
-  $form['country'] = array(
+    );
+    $form['country'] = array(
     '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
-  );
-  $form['joinable'] = array(
+    );
+    $form['joinable'] = array(
     '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['joinable'],
     '#size' => 34,
-  );
-  $form['description'] = array(
+    );
+    $form['description'] = array(
     '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
     '#description' => NULL,
-  );
-  $form['format'] = filter_form();
+    );
+    $form['format'] = filter_form();
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save team', array(), NULL, 'boinc:team-form-save'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -130,41 +130,41 @@ 
  */
 function boincteam_create_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
-  $name = $values['name'];
+    $values = $form_state['values'];
+    $name = $values['name'];
 
-  if (!$name) {
+    if (!$name) {
     form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+    }
+    else {
     require_boinc('boinc_db');
     if (BoincTeam::lookup_name($name)) {
-      form_set_error('name', bts('A team named "@name" already exists.',
+        form_set_error('name', bts('A team named "@name" already exists.',
         array('@name' => $name), NULL, 'boinc:team-create/edit'));
     }
-  }
+    }
 
-  if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
+    if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
     form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
-  }
+    }
 }
 
 /**
  * The create team submit handler
  */
 function boincteam_create_form_submit($form, &$form_state) {
-  global $user;
-  $account = user_load($user->uid);
-  $values = $form_state['values'];
-  //drupal_set_message('<pre>' . print_r($values,true) . '</pre>');
+    global $user;
+    $account = user_load($user->uid);
+    $values = $form_state['values'];
+    //drupal_set_message('<pre>' . print_r($values,true) . '</pre>');
 
-  $input_format = !empty($values['format']) ? $values['format'] : 4;
-  $values['description'] = check_markup($values['description'], $input_format);
+    $input_format = !empty($values['format']) ? $values['format'] : 4;
+    $values['description'] = check_markup($values['description'], $input_format);
 
-  // Create the team in the BOINC db
+    // Create the team in the BOINC db
 
-  require_boinc(array('user','team'));
-  $boinc_team = make_team(
+    require_boinc(array('user','team'));
+    $boinc_team = make_team(
     $account->boincuser_id,
     $values['name'],
     $values['website'],
@@ -172,27 +172,27 @@ 
     $values['name_html'],
     $values['description'],
     $values['country']
-  );
+    );
 
-  if ($boinc_team) {
+    if ($boinc_team) {
     $boinc_user = BoincUser::lookup_id($account->boincuser_id);
     user_join_team($boinc_team, $boinc_user);
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT)));
     rules_invoke_event('boincteam_create_team_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
       reason.', 'error');
     return FALSE;
-  }
+    }
 
-  // Create the team node in Drupal
+    // Create the team node in Drupal
 
-  $teaser = node_teaser($values['description']);
-  $created_time = time();
-  $input_format = variable_get('filter_default_format', 1);
+    $teaser = node_teaser($values['description']);
+    $created_time = time();
+    $input_format = variable_get('filter_default_format', 1);
 
-  $node = array(
+    $node = array(
     'type' => 'team',
     'title' => $values['name'],
     'body' => $values['description'],
@@ -206,21 +206,21 @@ 
     'moderate' => 0,
     'sticky' => 0,
     'format' => $input_format
-  );
+    );
 
-  // Use pathauto function, if available, to clean up the path
-  if (module_exists('pathauto')) {
+    // Use pathauto function, if available, to clean up the path
+    if (module_exists('pathauto')) {
     module_load_include('inc', 'pathauto', 'pathauto');
     $node['path'] = pathauto_cleanstring($values['name']);
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Teams cannot be created at this time. The @project administrators have been notified.', array('@project' => PROJECT)));
     rules_invoke_event('boincteam_create_team_nopathauto_error', $values['name'], variable_get('boinc_admin_mailing_list_subject_tag', ''));
     watchdog('BOINC team', 'BOINC teams require the Pathauto module. Teams
       cannot be created.', 'error');
-  }
+    }
 
-  /*
+    /*
   // Add special organic group properties
   $node['og_description'] = strip_tags($boincteam->description);
   $node['og_selective'] = OG_OPEN;
@@ -229,26 +229,26 @@ 
   $node['og_private'] = 0;
   */
 
-  $node = (object) $node; // node_save requires an object form
+    $node = (object) $node; // node_save requires an object form
 
-  /*
+    /*
   $node->field_description[]['value'] = $boincteam->description;
   $node->field_url[]['value'] = $boincteam->url;
   $node->field_country[]['value'] = $boincteam->country;
   */
 
-  $node->taxonomy[] = taxonomy_get_term($values['type']);
+    $node->taxonomy[] = taxonomy_get_term($values['type']);
 
-  // Save the team node
-  node_save($node);
+    // Save the team node
+    node_save($node);
 
-  // Save the team IDs to a BOINC <--> Drupal reference table.
-  db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boinc_team->id, $node->nid);
+    // Save the team IDs to a BOINC <--> Drupal reference table.
+    db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boinc_team->id, $node->nid);
 
-  drupal_set_message(t('Team "@name" has been created.',
+    drupal_set_message(t('Team "@name" has been created.',
     array('@name' => $values['name'])));
 
-  $form_state['redirect'] = "community/teams/{$node->nid}";
+    $form_state['redirect'] = "community/teams/{$node->nid}";
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -259,17 +259,17 @@ 
  * The definition of the edit team form
  */
 function boincteam_edit_form(&$form_state, $team_id) {
-  $form = array();
+    $form = array();
 
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id));
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id));
 
-  $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
+    $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
 
-  $form_state['storage']['team_id'] = $team_id;
-  $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
+    $form_state['storage']['team_id'] = $team_id;
+    $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
 
-  $default = array(
+    $default = array(
     'name' => $boincteam->name,
     'name_html' => $boincteam->name_html,
     'website' => $boincteam->url,
@@ -277,79 +277,79 @@ 
     'country' => $boincteam->country,
     'joinable' => $boincteam->joinable,
     'description' => $boincteam->description,
-  );
+    );
 
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), 0 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
-  );
+    );
 
-  // Vocabulary based option sets
-  $form['type_options'] = array(
+    // Vocabulary based option sets
+    $form['type_options'] = array(
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type', array(), NULL, 'boinc:form-choose'))
-  );
-  $vocabs = taxonomy_get_vocabularies(NULL);
-  foreach ($vocabs as $vocab) {
+    );
+    $vocabs = taxonomy_get_vocabularies(NULL);
+    foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
       $team_types = taxonomy_get_tree($vocab->vid);
-      if (module_exists('internationalization')) {
+        if (module_exists('internationalization')) {
         $team_types = i18ntaxonomy_localize_terms($team_types);
-      }
-      foreach ($team_types as $team_type) {
+        }
+        foreach ($team_types as $team_type) {
         $form['type_options']['#value'][$team_type->tid] = $team_type->name;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
-  $form['country_options'] = array(
+    }
+    $form['country_options'] = array(
     '#type' => 'value',
     '#value' => boinccore_get_country_list(),
-  );
+    );
 
-  // Form elements
-  $form['name'] = array(
+    // Form elements
+    $form['name'] = array(
     '#title' => bts('Team name', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags', array(), NULL, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['name_html'] = array(
+    );
+    $form['name_html'] = array(
     '#title' => bts('Team name -- HTML version (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
     '#description' => bts('You may use limited HTML tags', array(), NULL, 'boinc:team-form-help'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['website'] = array(
+    );
+    $form['website'] = array(
     '#title' => bts('Team website (optional)', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
     '#description' => bts("Displayed on the team's page", array(), NULL, 'boinc:team-create/edit'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['type'] = array(
+    );
+    $form['type'] = array(
     '#title' => bts('Type of team', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
     '#disabled' => $is_boinc_wide,
-  );
-  $form['country'] = array(
+    );
+    $form['country'] = array(
     '#title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
     '#disabled' => $is_boinc_wide,
-  );
-  $form['joinable'] = array(
+    );
+    $form['joinable'] = array(
     '#title' => bts('Accept new members?', array(), NULL, 'boinc:team-create/edit'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
@@ -357,49 +357,49 @@ 
     '#default_value' => $default['joinable'],
     '#size' => 34,
     '#disabled' => $is_boinc_wide,
-  );
-  if (!$is_boinc_wide) {
+    );
+    if (!$is_boinc_wide) {
     $form['description'] = array(
-      '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
-      '#type' => 'textarea',
-      '#default_value' => $default['description'],
-      '#size' => 5,
-      '#description' => NULL,
+        '#title' => bts('Description of team', array(), NULL, 'boinc:team-create/edit'),
+        '#type' => 'textarea',
+        '#default_value' => $default['description'],
+        '#size' => 5,
+        '#description' => NULL,
     );
     $form['format'] = filter_form();
 
     // Form control
     $form['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">'
+        '#value' => '<ul class="form-control tab-list">'
     );
     $form['submit'] = array(
-      '#prefix' => '<li class="first tab">',
-      '#type' => 'submit',
-      '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
-      '#suffix' => '</li>',
+        '#prefix' => '<li class="first tab">',
+        '#type' => 'submit',
+        '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
+        '#suffix' => '</li>',
     );
     $form['form control tabs'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
     );
-  }
-  else {
+    }
+    else {
     $form['description'] = array(
-      '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
-      '#value' => $default['description'],
-      '#suffix' => '</div>',
+        '#prefix' => '<div class="form-item"><label>' . bts('Description', array(), NULL, 'boinc:team-description') . ':</label></div><div class="form-item">',
+        '#value' => $default['description'],
+        '#suffix' => '</div>',
     );
     drupal_set_message(
-      bts('This is a BOINC-wide team. Changes can be made at the !site.',
+        bts('This is a BOINC-wide team. Changes can be made at the !site.',
         array('!site' => l(bts('BOINC-wide teams site', array(), NULL, 'boinc:link-to-BOINC-wide-teams-Website'),
-          'http://boinc.berkeley.edu/teams/'
+            'http://boinc.berkeley.edu/teams/'
         )),
         NULL, 'boinc:team-edit-warning-message'),
-      'warning');
-  }
+        'warning');
+    }
 
-  $form['#redirect'] = "community/teams/{$team_id}";
+    $form['#redirect'] = "community/teams/{$team_id}";
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -407,32 +407,32 @@ 
  */
 function boincteam_edit_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
-  $name = $values['name'];
+    $values = $form_state['values'];
+    $name = $values['name'];
 
-  if ($form_state['storage']['is_boinc_wide']) {
+    if ($form_state['storage']['is_boinc_wide']) {
     form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.', array(), NULL, 'boinc:team-create/edit'));
-  }
-  else {
+    }
+    else {
     if (!$name) {
-      form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
+        form_set_error('name', bts('Team name is required.', array(), NULL, 'boinc:team-create/edit'));
     }
     else {
-      $team = node_load($form_state['storage']['team_id']);
-      if ($name != $team->title) {
+        $team = node_load($form_state['storage']['team_id']);
+        if ($name != $team->title) {
         // If changing the name ("title" in Drupal terms), check that the new name is available
         require_boinc('boinc_db');
         if (BoincTeam::lookup_name($name)) {
-          form_set_error('name', bts('A team named "@name" already exists.',
+            form_set_error('name', bts('A team named "@name" already exists.',
             array('@name' => $name), NULL, 'boinc:team-create/edit'));
         }
-      }
+        }
     }
 
     if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
-      form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+        form_set_error('type', bts('Please select a team type.', array(), NULL, 'boinc:team-create/edit'));
+    }
     }
-  }
 }
 
 /**
@@ -440,18 +440,18 @@ 
  */
 function boincteam_edit_form_submit($form, &$form_state) {
 
-  $team_id = $form_state['storage']['team_id'];
-  $values = $form_state['values'];
+    $team_id = $form_state['storage']['team_id'];
+    $values = $form_state['values'];
 
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
 
-  $input_format = !empty($values['format']) ? $values['format'] : 4;
-  $values['description'] = check_markup($values['description'], $input_format);
+    $input_format = !empty($values['format']) ? $values['format'] : 4;
+    $values['description'] = check_markup($values['description'], $input_format);
 
-  // Update the team in the BOINC db
-  db_set_active('boinc_rw');
-  db_query("
+    // Update the team in the BOINC db
+    db_set_active('boinc_rw');
+    db_query("
     UPDATE {team} SET
       name = '%s',
       name_lc = '%s',
@@ -471,32 +471,32 @@ 
     $values['country'],
     $values['joinable'],
     $boincteam_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
 
-  // Update the team node in Drupal
+    // Update the team node in Drupal
 
-  $team->title = $values['name'];
-  $team->body = $values['description'];
-  $team->teaser = node_teaser($values['description']);
+    $team->title = $values['name'];
+    $team->body = $values['description'];
+    $team->teaser = node_teaser($values['description']);
 
-  /*
+    /*
   $node->field_description[]['value'] = $boincteam->description;
   $node->field_url[]['value'] = $boincteam->url;
   $node->field_country[]['value'] = $boincteam->country;
   */
 
-  // Replace any existing taxonomy with the new one
-  $team->taxonomy = array(taxonomy_get_term($values['type']));
+    // Replace any existing taxonomy with the new one
+    $team->taxonomy = array(taxonomy_get_term($values['type']));
 
-  // Save the team node
-  node_save($team);
+    // Save the team node
+    node_save($team);
 
-  drupal_set_message(t('Details for "@team" have been updated.',
+    drupal_set_message(t('Details for "@team" have been updated.',
     array('@team' => $values['name'])));
 
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }
 
 
@@ -508,44 +508,44 @@ 
  * The definition of the add team admin form
  */
 function boincteam_add_admin_form(&$form_state, $team_id) {
-  $form = array();
+    $form = array();
 
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id));
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id));
 
-  $form_state['storage']['team_id'] = $team_id;
+    $form_state['storage']['team_id'] = $team_id;
 
-  $default = array(
+    $default = array(
     'username' => '',
-  );
+    );
 
-  // Form elements
-  $form['username'] = array(
+    // Form elements
+    $form['username'] = array(
     '#title' => bts('Enter BOINC username', array(), NULL, 'boinc:team--add-admin'),
     '#description' => bts('The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.'),
     '#type' => 'textfield',
     '#default_value' => $default['username'],
     '#size' => 34,
     '#autocomplete_path' => "community/teams/${team_id}/user-name-autocomplete",
-  );
+    );
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Add', array(), NULL, 'boinc:form-add'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
-  );
+    );
 
-  //$form['#redirect'] = "community/teams/{$team_id}";
+    //$form['#redirect'] = "community/teams/{$team_id}";
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -553,45 +553,45 @@ 
  */
 function boincteam_add_admin_form_validate($form, &$form_state) {
 
-  $team_id = $form_state['storage']['team_id'];
-  $values = $form_state['values'];
-  $team = node_load($team_id);
+    $team_id = $form_state['storage']['team_id'];
+    $values = $form_state['values'];
+    $team = node_load($team_id);
 
-  if (!$values['username']) {
+    if (!$values['username']) {
     form_set_error('username', bts('BOINC username is required.', array(), NULL, 'boinc:team-add-admin'));
-  }
-  else {
+    }
+    else {
     // Load user account associated with username
     $account = boincuser_privatemsg_name_lookup($values['username']);
     // Validate the account
     if ((!$account) OR ($account->team != $team_id)) {
-      form_set_error('username', bts('There is no user on your team with name @username.',
+        form_set_error('username', bts('There is no user on your team with name @username.',
         array(
-          '@username' => $account->boincuser_name
+            '@username' => $account->boincuser_name
         ),
-      NULL, 'boinc:team-add-admin'));
+        NULL, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_founder($team_id, $account->uid)) {
-      form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
+        form_set_error('username', bts('@user is the founder of @team! Team founder already have all admin privileges.',
         array(
-          '@user' => $account->boincuser_name,
-          '@team' => $team->title,
+            '@user' => $account->boincuser_name,
+            '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
     }
     elseif (boincteam_is_admin($team_id, $account->uid)) {
-      form_set_error('username', bts('@user is already an admin of @team.',
+        form_set_error('username', bts('@user is already an admin of @team.',
         array(
-          '@user' => $account->boincuser_name,
-          '@team' => $team->title,
+            '@user' => $account->boincuser_name,
+            '@team' => $team->title,
         ),
         NULL, 'boinc:team-add-admin'));
     }
     else {
-      $form_state['storage']['boincuser_id'] = $account->boincuser_id;
-      $form_state['storage']['boincuser_name'] = $account->boincuser_name;
+        $form_state['storage']['boincuser_id'] = $account->boincuser_id;
+        $form_state['storage']['boincuser_name'] = $account->boincuser_name;
+    }
     }
-  }
 }
 
 /**
@@ -599,17 +599,17 @@ 
  */
 function boincteam_add_admin_form_submit($form, &$form_state) {
 
-  $team_id = $form_state['storage']['team_id'];
-  $boincuser_id = $form_state['storage']['boincuser_id'];
-  $user_name = $form_state['storage']['boincuser_name'];
-  $values = $form_state['values'];
+    $team_id = $form_state['storage']['team_id'];
+    $boincuser_id = $form_state['storage']['boincuser_id'];
+    $user_name = $form_state['storage']['boincuser_name'];
+    $values = $form_state['values'];
 
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
 
-  // Update the team in the BOINC db
-  db_set_active('boinc_rw');
-  db_query("
+    // Update the team in the BOINC db
+    db_set_active('boinc_rw');
+    db_query("
     INSERT INTO {team_admin} SET
       teamid = '%d',
       userid = '%d',
@@ -617,17 +617,17 @@ 
     $boincteam_id,
     $boincuser_id,
     time()
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
 
-  // Could assign a role in Drupal here, as needed
+    // Could assign a role in Drupal here, as needed
 
 
-  drupal_set_message(t('@user has been added as an admin.',
+    drupal_set_message(t('@user has been added as an admin.',
     array('@user' => $user_name)));
 
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -639,80 +639,80 @@ 
  * Send all team members an email message function
  */
 function boincteam_sendmessagetoteam(&$form_state, $team_id) {
-  global $user;
-  $form = array();
+    global $user;
+    $form = array();
 
-  if (isset($form_state['values'])) {
+    if (isset($form_state['values'])) {
     $subject   = $form_state['values']['subject'];
     $body      = $form_state['values']['body'];
-  }
-  else {
+    }
+    else {
     $subject   = '';
     $body      = '';
-  }
+    }
 
-  // Title
-  $mytitle = bts('Send E-mail To All Team Members', array(), NULL, 'boinc:team-message-form');
-  drupal_set_title($mytitle);
+    // Title
+    $mytitle = bts('Send E-mail To All Team Members', array(), NULL, 'boinc:team-message-form');
+    drupal_set_title($mytitle);
 
-  $form['emailteam']['header'] = array(
+    $form['emailteam']['header'] = array(
     '#value'              => '<h1>' . $mytitle . '</h1>',
     '#weight'             => '-10',
     '#prefix'             => "<div id='sendmessageteammembers-header'>",
     '#suffix'             => "</div>",
-  );
+    );
 
-  $form['emailteam']['instructions'] = array(
+    $form['emailteam']['instructions'] = array(
     '#value'              => bts('This will send an email to all team members. If a team member has opt-ed out of notification e-mails, they will not receive your message. At the bottom of your message, there will be a link allowing team members to send you a Direct Message. This link is added automatically, you do not need to add it below in the Message box. Your email address will not be shown to the recipients.', array(), NULL, 'boinc:team-message-form'),
     '#weight'             => '-8',
     '#prefix'             => "<div id='sendmessageteammembers-instructions'>",
     '#suffix'             => "</div>",
-  );
+    );
 
-  // Subject
-  $form['emailteam']['subject'] = array(
+    // Subject
+    $form['emailteam']['subject'] = array(
     '#type'               => 'textfield',
     '#title'              => bts('Subject', array(), NULL, 'boinc:team-message-form'),
     '#size'               => 50,
     '#maxlength'          => 255,
     '#default_value'      => $subject,
     '#weight'             => -5,
-  );
+    );
 
-  // Body
-  $form['emailteam']['body'] = array(
+    // Body
+    $form['emailteam']['body'] = array(
     '#type'               => 'textarea',
     '#title'              => bts('Message', array(), NULL, 'boinc:team-message-form'),
     '#rows'               => 8,
     '#weight'             => 0,
     '#default_value'      => $body,
     '#resizable'          => TRUE,
-  );
+    );
 
-  // checkbox for 'sent to self'
-  $form['emailteam']['selfsend'] = array(
+    // checkbox for 'sent to self'
+    $form['emailteam']['selfsend'] = array(
     '#type'    => 'checkbox',
     '#title'   => bts('Check this box if you wish to be sent a copy of your message to your email address.', array(), NULL, 'boinc:team-message-form'),
     '#weight'  => 10,
     '#prefix'  => '<div class="clearfix" id="confirm-checkbox">',
     '#suffix'  => '</div>',
-  );
+    );
 
-  // Add a captcha to form
-  if (module_exists('captcha')) {
+    // Add a captcha to form
+    if (module_exists('captcha')) {
     $form['register_captcha'] = array(
         '#type' => 'captcha',
         '#weight' => 1000,
     );
-  }
+    }
 
-  // form buttons
-  $form['emailteam']['form control tabs prefix'] = array(
+    // form buttons
+    $form['emailteam']['form control tabs prefix'] = array(
     '#value'  => '<ul class="form-control tab-list">',
     '#weight' => 1000,
-  );
+    );
 
-  $form['emailteam']['submit'] = array(
+    $form['emailteam']['submit'] = array(
     '#type'               => 'submit',
     '#value'              => bts('Send message', array(), NULL, 'boinc:form-submit'),
     '#submit'             => array('boincteam_sendmessagetoteam_submit'),
@@ -720,133 +720,133 @@ 
     '#weight'             => 1001,
     '#prefix'             => '<li class="first tab">',
     '#suffix'             => '</li>'
-  );
+    );
 
-  $title = bts('Cancel', array(), NULL, 'boinc:form-cancel');
-  $url = "community/teams/{$team_id}";
-  $form['emailteam']['cancel'] = array(
+    $title = bts('Cancel', array(), NULL, 'boinc:form-cancel');
+    $url = "community/teams/{$team_id}";
+    $form['emailteam']['cancel'] = array(
     '#value'              => l($title, $url, array('attributes' => array('id' => 'edit-cancel'))),
     '#weight'             => 1005,
     '#prefix'             => '<li class="tab">',
     '#suffix'             => '</li>'
-  );
+    );
 
-  $form['emailteam']['form control tabs suffix'] = array(
+    $form['emailteam']['form control tabs suffix'] = array(
     '#value'  => '</ul>',
     '#weight' => 1010,
-  );
+    );
 
-  // Add team id information to form_state
-  $form['_team_id'] = array(
+    // Add team id information to form_state
+    $form['_team_id'] = array(
     '#type'  => 'value',
     '#value' => $team_id,
-  );
+    );
 
-  // Add sender user object to form_state
-  $form['_senderuid'] = array(
+    // Add sender user object to form_state
+    $form['_senderuid'] = array(
     '#type'  => 'value',
     '#value' => $user->uid,
-  );
+    );
 
-  // redirect after sending message
-  $form['#redirect'] = "community/teams/{$team_id}";
+    // redirect after sending message
+    $form['#redirect'] = "community/teams/{$team_id}";
 
-  return $form;
+    return $form;
 }
 
 /**
  * Send all team members validation handler
  */
 function boincteam_sendmessagetoteam_validate($form, &$form_state) {
-  $message = $form_state['values'];
-  $message['timestamp'] = time();
-  // Avoid subjects which only consist of a space as these can not be clicked.
-  $message['subject'] = trim($message['subject']);
+    $message = $form_state['values'];
+    $message['timestamp'] = time();
+    // Avoid subjects which only consist of a space as these can not be clicked.
+    $message['subject'] = trim($message['subject']);
 
-  $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, TRUE, TRUE));
-  if (empty($message['subject']) && !empty($trimed_body)) {
+    $trimed_body = trim(truncate_utf8(strip_tags($message['body']), 50, TRUE, TRUE));
+    if (empty($message['subject']) && !empty($trimed_body)) {
     $message['subject'] = $trimed_body;
     $form_state['values']['subject'] = $message['subject'];
-  }
+    }
 
-  // Check subject line
-  $message['subject'] = trim($message['subject']);
-  if (empty($message['subject'])) {
+    // Check subject line
+    $message['subject'] = trim($message['subject']);
+    if (empty($message['subject'])) {
     form_set_error('subject',
-      bts('Not allowed to send a message without subject', array(), NULL, 'boinc:team-message-form')
+        bts('Not allowed to send a message without subject', array(), NULL, 'boinc:team-message-form')
     );
-  }
+    }
 
-  // Check body
-  if ( ($message['body'] === NULL || $message['body'] === '') ) {
+    // Check body
+    if ( ($message['body'] === NULL || $message['body'] === '') ) {
     form_set_error('body',
-      bts('Not allowed to send an empty message.', array(), NULL, 'boinc:team-message-form')
+        bts('Not allowed to send an empty message.', array(), NULL, 'boinc:team-message-form')
     );
-  }
+    }
 
-  // Check team id
-  if (empty($message['_team_id'])) {
+    // Check team id
+    if (empty($message['_team_id'])) {
     form_set_error('team_id',
-      bts('Error, no team_id supplied.', array(), NULL, 'boinc:team-message-form')
+        bts('Error, no team_id supplied.', array(), NULL, 'boinc:team-message-form')
     );
-  }
+    }
 
-  $form_state['validated_built_message'] = $message;
+    $form_state['validated_built_message'] = $message;
 }
 
 /**
  * Send all team members submit handler
  */
 function boincteam_sendmessagetoteam_submit($form, &$form_state) {
-  module_load_include('inc', 'rules', 'modules/system.rules');
-  global $base_url;
-  global $base_path;
-
-  $suid = $form_state['values']['_senderuid'];
-  $account = user_load(array('uid' => $suid ));
-  $site_url = $base_url . $base_path . "messages/new/" . $suid;
-
-  // Form is validated, now send to all team members. Lookup boinc
-  // id of all team members, and then use user_load() to load user
-  // object. Send message using email.
-  //
-  $boinc_id = boincteam_lookup_id($form_state['values']['_team_id']);
-  // Email addresses, with those who have opt-ed out of notification
-  // emails removed.
-  $member_emails = _boincteam_emails($boinc_id);
-  // Remove sender's email address, unless selfsend is true.
-  if ( !$form_state['values']['selfsend'] ) {
+    module_load_include('inc', 'rules', 'modules/system.rules');
+    global $base_url;
+    global $base_path;
+
+    $suid = $form_state['values']['_senderuid'];
+    $account = user_load(array('uid' => $suid ));
+    $site_url = $base_url . $base_path . "messages/new/" . $suid;
+
+    // Form is validated, now send to all team members. Lookup boinc
+    // id of all team members, and then use user_load() to load user
+    // object. Send message using email.
+    //
+    $boinc_id = boincteam_lookup_id($form_state['values']['_team_id']);
+    // Email addresses, with those who have opt-ed out of notification
+    // emails removed.
+    $member_emails = _boincteam_emails($boinc_id);
+    // Remove sender's email address, unless selfsend is true.
+    if ( !$form_state['values']['selfsend'] ) {
     $pos = array_search($account->mail, $member_emails);
     unset($member_emails[$pos]);
-  }
+    }
 
-  // Add link at bottom of body
-  $mybody = $form_state['validated_built_message']['body'];
-  $mybody .= "\n\n"
-      . "To reply to the sender using a Direct Message (DM), please use this link:\n"
-      . "${site_url}";
+    // Add link at bottom of body
+    $mybody = $form_state['validated_built_message']['body'];
+    $mybody .= "\n\n"
+        . "To reply to the sender using a Direct Message (DM), please use this link:\n"
+        . "${site_url}";
 
-  // Transform HTML body into plain text
-  $mybody = drupal_html_to_text($mybody);
+    // Transform HTML body into plain text
+    $mybody = drupal_html_to_text($mybody);
 
-  $emailsettings = array(
+    $emailsettings = array(
     'from'    => '',
     'to'      => "webmaster@{$base_url}",
     'boincteam_headers' => array(
-      'Bcc'     => implode(', ', $member_emails),
+        'Bcc'     => implode(', ', $member_emails),
     ),
     'subject' => $form_state['validated_built_message']['subject'],
     'message' => $mybody,
-  );
-  rules_action_mail($emailsettings);
+    );
+    rules_action_mail($emailsettings);
 
-  $om = bts(
+    $om = bts(
     'Sent your email message to !number team members.',
     array( '!number' => count($member_emails) ),
     'NULL',
     'boinc:team-message-sent'
-  );
-  drupal_set_message($om, 'info');
+    );
+    drupal_set_message($om, 'info');
 
-  $form_state['redirect'] = "community/teams/{$form_state['values']['_team_id']}";
+    $form_state['redirect'] = "community/teams/{$form_state['values']['_team_id']}";
 }