BOINC / boinc

drupal/sites/default/boinc/modules/boincuser/boincuser_delete/boincuser_delete.module

Indentation +263 added lines, -263 removed lines

@@ -19,15 +19,15 @@ 
  * Implementation of hook_perm().
  */
 function boincuser_delete_perm() {
-  return array('delete own account');
+    return array('delete own account');
 }
 
 /**
  * Implementation of hook_menu().
  */
 function boincuser_delete_menu() {
-  $items = array();
-  $items['admin/boinc/user_delete'] = array(
+    $items = array();
+    $items['admin/boinc/user_delete'] = array(
     'title' => t('Preferences: BOINC user delete'),
     'description' => t('Configure the BOINC user delete action.'),
     'page callback' => 'drupal_get_form',
@@ -35,9 +35,9 @@ 
     'access arguments' => array('administer users'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincuser_delete.admin.inc',
-  );
+    );
 
-  $items['admin/boinc/user_delete/%'] = array(
+    $items['admin/boinc/user_delete/%'] = array(
     'title' => t('Admin delete user'),
     'description' => t('Deletes a user as an admin'),
     'page callback' => 'drupal_get_form',
@@ -45,9 +45,9 @@ 
     'access arguments' => array('administer users'),
     'type' => MENU_CALLBACK,
     'file' => 'boincuser_delete.admin.inc',
-  );
+    );
 
-  $items['user/%user/deleteconfirm/%'] = array(
+    $items['user/%user/deleteconfirm/%'] = array(
     'title' => t('Final confirmation for account deletion'),
     'description' => t('Final confirmation for account deletion'),
     'page callback' => 'drupal_get_form',
@@ -55,9 +55,9 @@ 
     'access callback' => 'boincuser_delete_access',
     'access arguments' => array(1),
     'type' => MENU_CALLBACK,
-  );
+    );
 
-  $items['user/%user/odeleteconfirm/%'] = array(
+    $items['user/%user/odeleteconfirm/%'] = array(
     'title' => t('Final confirmation for account deletion'),
     'description' => t('Final confirmation for account deletion'),
     'page callback' => 'drupal_get_form',
@@ -65,204 +65,204 @@ 
     'access callback' => 'boincuser_delete_access',
     'access arguments' => array(1),
     'type' => MENU_CALLBACK,
-  );
+    );
 
-  return $items;
+    return $items;
 }
 
 /**
  * Checks whether a user can delete an account.
  */
 function boincuser_delete_access($account) {
-  global $user;
-  return ((user_access('administer users') || (user_access('delete own account') && $account->uid == $user->uid)) && $account->uid > 0);
+    global $user;
+    return ((user_access('administer users') || (user_access('delete own account') && $account->uid == $user->uid)) && $account->uid > 0);
 }
 
 /**
  * Implementation of hook_menu_alter().
  */
 function boincuser_delete_menu_alter(&$callbacks) {
-  $callbacks['user/%user/delete']['access callback'] = 'boincuser_delete_access';
-  $callbacks['user/%user/delete']['access arguments'] = array(1);
-  $callbacks['user/%user/delete']['type'] = MENU_CALLBACK;
+    $callbacks['user/%user/delete']['access callback'] = 'boincuser_delete_access';
+    $callbacks['user/%user/delete']['access arguments'] = array(1);
+    $callbacks['user/%user/delete']['type'] = MENU_CALLBACK;
 }
 
 /**
  * Implementation of hook_form_alter().
  */
 function boincuser_delete_form_alter(&$form, $form_state, $form_id) {
-  global $user;
+    global $user;
 
-  switch($form_id) {
+    switch($form_id) {
     case 'user_profile_form':
       if ( user_access('delete own account') AND ($form['#uid'] == $user->uid) AND (arg(3)=='') ) {
         $form['delete'] = array(
-          '#type' => 'submit',
-          '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
-          '#weight' => 1009,
-          '#submit' => array('user_edit_delete_submit'),
-          '#prefix' => '<li class="tab">',
-          '#suffix' => '</li>',
+            '#type' => 'submit',
+            '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
+            '#weight' => 1009,
+            '#submit' => array('user_edit_delete_submit'),
+            '#prefix' => '<li class="tab">',
+            '#suffix' => '</li>',
         );
-      }
-      else if ( user_access('administer users') ) {
+        }
+        else if ( user_access('administer users') ) {
         $form['delete'] = array(
-          '#type' => 'submit',
-          '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
-          '#weight' => 1009,
-          '#submit' => array('_boincuser_delete_goto_admindelete'),
-          '#prefix' => '<li class="tab">',
-          '#suffix' => '</li>',
+            '#type' => 'submit',
+            '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
+            '#weight' => 1009,
+            '#submit' => array('_boincuser_delete_goto_admindelete'),
+            '#prefix' => '<li class="tab">',
+            '#suffix' => '</li>',
         );
-      }
-      else {
+        }
+        else {
         unset($form['delete']);
-      }
-      break;
+        }
+        break;
     case 'user_confirm_delete':
 
       $disable_delete = FALSE;
-      // If email address was changed less than 7 days (7 * 86400 s)
-      // ago, it cannot be changed again.
-      $duration = TOKEN_DURATION_ONE_WEEK;
-      if (($form['_account']['#value']->boincuser_email_addr_change_time + $duration) > time()) {
+        // If email address was changed less than 7 days (7 * 86400 s)
+        // ago, it cannot be changed again.
+        $duration = TOKEN_DURATION_ONE_WEEK;
+        if (($form['_account']['#value']->boincuser_email_addr_change_time + $duration) > time()) {
         drupal_set_message(
-          bts("INFO: Your email address was changed within the past seven (7) days. You may not delete your account until after !time.",
+            bts("INFO: Your email address was changed within the past seven (7) days. You may not delete your account until after !time.",
             array(
-              '!time' => date('F j, Y \a\t G:i T', $form['_account']['#value']->boincuser_email_addr_change_time + $duration),
+                '!time' => date('F j, Y \a\t G:i T', $form['_account']['#value']->boincuser_email_addr_change_time + $duration),
             ), NULL, 'boinc:account-credentials-change')
         , 'info');
         $disable_delete = TRUE;
-      }
+        }
 
-      // Configure radio options
-      $common_acts = bts("All your posts and comments will be attributed to the Anonymous User. Your user profile will be deleted. Your host information will be deleted. And you will be removed from any team you are a member of.", array(), NULL, 'boinc:delete-user-account');
+        // Configure radio options
+        $common_acts = bts("All your posts and comments will be attributed to the Anonymous User. Your user profile will be deleted. Your host information will be deleted. And you will be removed from any team you are a member of.", array(), NULL, 'boinc:delete-user-account');
 
-      $deleteoptions = array(
+        $deleteoptions = array(
         'boincuser_delete_softdelete' => bts('<b>Soft delete</b> your account. Your account will be disabled. ', array(), NULL, 'boinc:delete-user-account'),
         'boincuser_delete_delete' => bts('<b>Delete</b> your account. ', array(), NULL, 'boinc:delete-user-account'),
-      );
+        );
 
-      $dtypes = variable_get('boincuser_delete_type', 'user_decides');
-      // Unset the other option if dtype is set. i.e., if dtype is set
-      // to soft delete, unset the hard delete option.  Likewise, add
-      // the 'common_acts' sentences to the option that remains.
-      switch ($dtypes) {
+        $dtypes = variable_get('boincuser_delete_type', 'user_decides');
+        // Unset the other option if dtype is set. i.e., if dtype is set
+        // to soft delete, unset the hard delete option.  Likewise, add
+        // the 'common_acts' sentences to the option that remains.
+        switch ($dtypes) {
         case 'soft_obfuscate':
           unset($deleteoptions['boincuser_delete_delete']);
-          $deleteoptions['boincuser_delete_softdelete'] .= $common_acts;
-          break;
+            $deleteoptions['boincuser_delete_softdelete'] .= $common_acts;
+            break;
         case 'hard_wipe':
           unset($deleteoptions['boincuser_delete_softdelete']);
-          $deleteoptions['boincuser_delete_delete'] .= $common_acts;
-          break;
-      }
+            $deleteoptions['boincuser_delete_delete'] .= $common_acts;
+            break;
+        }
 
-      $question = 'Are you sure you want to delete the account <em>' . htmlspecialchars($form['_account']['#value']->boincuser_name) . '</em>?';
-      drupal_set_title($question);
+        $question = 'Are you sure you want to delete the account <em>' . htmlspecialchars($form['_account']['#value']->boincuser_name) . '</em>?';
+        drupal_set_title($question);
 
-      unset($form['description']);
+        unset($form['description']);
 
-      $form['main'] = array(
+        $form['main'] = array(
         '#type' => 'fieldset',
         '#weight' => 1,
-      );
+        );
 
-      $form['main']['fs1'] = array(
+        $form['main']['fs1'] = array(
         '#type' => 'fieldset',
         '#title' => bts('Instructions', array(), NULL, 'boinc:delete-user-account'),
         '#weight' => 10,
         '#collapsible' => TRUE,
         '#collapsed' => TRUE,
-      );
-      $form['main']['fs1']['help'] = array(
+        );
+        $form['main']['fs1']['help'] = array(
         '#value' => bts(
-          "<p>In order to delete your account, you must provide your password below. You will then be sent an email to the email address on record, with a one-time token that expires in 24-hours. Clicking on this link will bring you to a second form where you must enter your password again. After doing so your account will be deleted.</p>" .
-          "<p>If necessary, you may !link first before deleting your account. But you must wait <b>seven (7) days</b> after an email address change before you may delete your account.</p>",
-          array(
+            "<p>In order to delete your account, you must provide your password below. You will then be sent an email to the email address on record, with a one-time token that expires in 24-hours. Clicking on this link will bring you to a second form where you must enter your password again. After doing so your account will be deleted.</p>" .
+            "<p>If necessary, you may !link first before deleting your account. But you must wait <b>seven (7) days</b> after an email address change before you may delete your account.</p>",
+            array(
             '!link' => l(bts('change your email address', array(), NULL, 'boinc:delete-user-account'), '/account/info/edit'),
-          ), NULL, 'boinc:delete-user-account'),
+            ), NULL, 'boinc:delete-user-account'),
         '#weight' => 11,
         '#prefix' => "<div id='delete-instructions'>",
         '#suffix' => "</div>",
-      );
+        );
 
-      if ($dtypes == 'user_decides') {
+        if ($dtypes == 'user_decides') {
         $form['main']['common'] = array(
-          '#value'  => bts('All choices: ', array(), NULL, 'boinc:delete-user-account') . $common_acts . '<p>' . bts('Disabled means some of your personal data, such as your username and email address, are kept on our systems. Choose \'delete your account\' if you want all personal data to be removed.', array(), NULL, 'boinc:delete-user-account'),
-          '#prefix' => "<div id='delete-instructions'>",
-          '#suffix' => "</div>",
-          '#weight' => 20,
+            '#value'  => bts('All choices: ', array(), NULL, 'boinc:delete-user-account') . $common_acts . '<p>' . bts('Disabled means some of your personal data, such as your username and email address, are kept on our systems. Choose \'delete your account\' if you want all personal data to be removed.', array(), NULL, 'boinc:delete-user-account'),
+            '#prefix' => "<div id='delete-instructions'>",
+            '#suffix' => "</div>",
+            '#weight' => 20,
         );
-      }
+        }
 
-      $form['main']['user_delete_action'] = array(
+        $form['main']['user_delete_action'] = array(
         '#type' => 'radios',
         '#options' => $deleteoptions,
         '#weight' => 21,
-      );
-      if ($disable_delete) {
+        );
+        if ($disable_delete) {
         $form['main']['user_delete_action']['#disabled'] = TRUE;
-      }
+        }
 
-      // Password field
-      if (!$disable_delete) {
+        // Password field
+        if (!$disable_delete) {
         $form['main']['current_pass'] = array(
-          '#type' => 'password',
-          '#title' => bts('Enter your password to delete your account', array(), NULL, 'boinc:delete-user-account'),
-          '#size' => 17,
-          '#attributes' => array(
+            '#type' => 'password',
+            '#title' => bts('Enter your password to delete your account', array(), NULL, 'boinc:delete-user-account'),
+            '#size' => 17,
+            '#attributes' => array(
             'autocomplete' => 'off',
-          ),
-          '#prefix' => "<div id='delete-password-field'>",
-          '#suffix' => "</div>",
-          '#weight' => 25,
+            ),
+            '#prefix' => "<div id='delete-password-field'>",
+            '#suffix' => "</div>",
+            '#weight' => 25,
         );
-      }
+        }
 
-      $form['separator_bottom'] = array(
+        $form['separator_bottom'] = array(
         '#value' => '<div class="separator buttons"></div>',
         '#weight' => 999,
-      );
+        );
 
-      // Configure the action buttons
-      $uid = $form['_account']['#value']->uid;
-      $form['actions']['#weight'] = 1000;
-      $form['actions']['form control tabs prefix'] = array(
+        // Configure the action buttons
+        $uid = $form['_account']['#value']->uid;
+        $form['actions']['#weight'] = 1000;
+        $form['actions']['form control tabs prefix'] = array(
         '#value' => '<ul class="form-control tab-list">',
         '#weight' => 1001,
-      );
-
-      unset($form['actions']['#prefix']);
-      unset($form['actions']['#suffix']);
-      $form['actions']['submit']['#prefix'] = '<li class="first tab">';
-      $form['actions']['submit']['#suffix'] = '</li>';
-      $form['actions']['submit']['#value'] = bts('Submit', array(), NULL, 'boinc:form-submit');
-      $form['actions']['submit']['#weight'] = 1002;
-      if ($disable_delete) {
+        );
+
+        unset($form['actions']['#prefix']);
+        unset($form['actions']['#suffix']);
+        $form['actions']['submit']['#prefix'] = '<li class="first tab">';
+        $form['actions']['submit']['#suffix'] = '</li>';
+        $form['actions']['submit']['#value'] = bts('Submit', array(), NULL, 'boinc:form-submit');
+        $form['actions']['submit']['#weight'] = 1002;
+        if ($disable_delete) {
         $form['actions']['submit']['#disabled'] = TRUE;
         $form['actions']['submit']['#value'] = '';
-      }
+        }
 
-      $form['actions']['cancel']['#prefix'] = '<li class="tab">';
-      $form['actions']['cancel']['#suffix'] = '</li>';
-      $form['actions']['cancel']['#weight'] = 1003;
-      $form['actions']['cancel']['#value'] = l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'account/info/edit');
-      if ($disable_delete) {
+        $form['actions']['cancel']['#prefix'] = '<li class="tab">';
+        $form['actions']['cancel']['#suffix'] = '</li>';
+        $form['actions']['cancel']['#weight'] = 1003;
+        $form['actions']['cancel']['#value'] = l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'account/info/edit');
+        if ($disable_delete) {
         $form['actions']['cancel']['#prefix'] = '<li class="first tab">';
-      }
+        }
 
-      $form['actions']['form control tabs suffix'] = array(
+        $form['actions']['form control tabs suffix'] = array(
         '#value' => '</ul>',
         '#weight' => 1010,
-      );
+        );
 
-      $form['#redirect'] = 'account/' . $uid;
-      $form['#validate'] = array('boincuser_delete_validate');
-      $form['#submit'] = array('boincuser_delete_submit');
-      break;
+        $form['#redirect'] = 'account/' . $uid;
+        $form['#validate'] = array('boincuser_delete_validate');
+        $form['#submit'] = array('boincuser_delete_submit');
+        break;
 
-  } // switch
+    } // switch
 }
 
 
@@ -273,24 +273,24 @@ 
  * password.
  */
 function boincuser_delete_validate($form, &$form_state) {
-  require_boinc('boinc_db');
+    require_boinc('boinc_db');
 
-  if ($form_state['values']['user_delete_action'] == '') {
+    if ($form_state['values']['user_delete_action'] == '') {
     form_set_error('user_delete_action', bts('Please select an action to perform using the radio buttons.', array(), NULL, 'boinc:delete-user-account'));
-  }
+    }
 
-  // check BOINC user exists
-  $account = $form_state['values']['_account'];
-  $boinc_user = boincuser_load($account->uid, TRUE);
-  if (!$boinc_user) {
+    // check BOINC user exists
+    $account = $form_state['values']['_account'];
+    $boinc_user = boincuser_load($account->uid, TRUE);
+    if (!$boinc_user) {
     return form_set_error('current_pass',
-      bts('There was a problem deleting your account. Please contact the site administrators.', array(), NULL, 'boinc:delete-user-account')
+        bts('There was a problem deleting your account. Please contact the site administrators.', array(), NULL, 'boinc:delete-user-account')
     );
-  }
+    }
 
-  if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
+    if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
     return true;
-  }
+    }
 }
 
 /**
@@ -301,39 +301,39 @@ 
  * to delete the account.
  */
 function boincuser_delete_submit($form, &$form_state) {
-  require_boinc('token');
-  global $user;
+    require_boinc('token');
+    global $user;
 
-  $uid = $form_state['values']['_account']->uid;
-  $account = user_load(array('uid' => $uid));
+    $uid = $form_state['values']['_account']->uid;
+    $account = user_load(array('uid' => $uid));
 
-  if (!$account) {
+    if (!$account) {
     drupal_set_message(bts('ERROR: The user account @uid does not exist.', array('@uid' => $uid), array(), NULL, 'delete-user-account'), 'error');
     watchdog('user', 'Attempted to cancel non-existing user account UID: %uid.', array('%uid' => $uid), WATCHDOG_ERROR);
     return;
-  }
-
-  global $base_url;
-  global $base_path;
-  module_load_include('inc', 'rules', 'modules/system.rules');
-  $site_name = variable_get('site_name', 'Drupal-BOINC');
-  $site_url = $base_url . $base_path . "user/login";
-
-  // Perform the requested operation
-  $op = $form_state['values']['user_delete_action'];
-  // create token with 1 day/24 hour expiration
-  $mytoken = create_token($account->boincuser_id, 'D', 24*60*60);
-  switch ($op) {
+    }
+
+    global $base_url;
+    global $base_path;
+    module_load_include('inc', 'rules', 'modules/system.rules');
+    $site_name = variable_get('site_name', 'Drupal-BOINC');
+    $site_url = $base_url . $base_path . "user/login";
+
+    // Perform the requested operation
+    $op = $form_state['values']['user_delete_action'];
+    // create token with 1 day/24 hour expiration
+    $mytoken = create_token($account->boincuser_id, 'D', 24*60*60);
+    switch ($op) {
     case 'boincuser_delete_softdelete':
       $myurl = "${base_url}/user/{$account->uid}/odeleteconfirm/$mytoken";
-      break;
+        break;
     case 'boincuser_delete_delete':
       $myurl = "${base_url}/user/{$account->uid}/deleteconfirm/$mytoken";
-      break;
-  }
+        break;
+    }
 
-  $mysubject = "Instructions for account deletion at {$site_name}";
-  $mymessage = ''
+    $mysubject = "Instructions for account deletion at {$site_name}";
+    $mymessage = ''
     . "{$account->boincuser_name},\n"
     . "\n"
     . "We have received a request to DELETE your user account at "
@@ -355,25 +355,25 @@ 
     . "\n"
     . "{$site_name} support team";
 
-  // Create array for sending email to user to notify account is being
-  // disabled/deleted. Then send email.
-  $settings = array(
+    // Create array for sending email to user to notify account is being
+    // disabled/deleted. Then send email.
+    $settings = array(
     'from' => '',
     'subject' => $mysubject,
     'message' => $mymessage,
-  );
-  rules_action_mail_to_user($account, $settings);
+    );
+    rules_action_mail_to_user($account, $settings);
 
-  drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'),'info');
+    drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'),'info');
 
-  $redirect = variable_get('boincuser_delete_redirect', '<front>');
-  // Redirect
-  if (!empty($redirect)) {
+    $redirect = variable_get('boincuser_delete_redirect', '<front>');
+    // Redirect
+    if (!empty($redirect)) {
     drupal_goto($redirect);
-  }
-  else {
+    }
+    else {
     drupal_goto();
-  }
+    }
 }
 
 
@@ -385,88 +385,88 @@ 
  * The final confirmation form for the user to delete their account.
  */
 function boincuser_delete_finalconfirmation(&$form_state, $token) {
-  require_boinc('token');
+    require_boinc('token');
 
-  global $user;
-  $form = array();
+    global $user;
+    $form = array();
 
-  // check BOINC user exists
-  $account = user_load(array('uid' => $user->uid));
-  $uid = $user->uid;
-  $boincid = $account->boincuser_id;
-  // check $token is valid
-  if (!is_valid_token($boincid, $token, 'D')) {
+    // check BOINC user exists
+    $account = user_load(array('uid' => $user->uid));
+    $uid = $user->uid;
+    $boincid = $account->boincuser_id;
+    // check $token is valid
+    if (!is_valid_token($boincid, $token, 'D')) {
     drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your account be deleted.',
     array(
-      '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
+        '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
     ),
     NULL, 'boinc:delete-user-account'), 'error');
     drupal_goto();
-  }
+    }
 
-  // Attach account to this form.
-  $form['_account'] = array('#type' => 'value', '#value' => $account);
+    // Attach account to this form.
+    $form['_account'] = array('#type' => 'value', '#value' => $account);
 
-  // This form is for hard/wipe delete
-  $form['_action'] = array('#type' => 'value', '#value' => 'hard_wipe');
+    // This form is for hard/wipe delete
+    $form['_action'] = array('#type' => 'value', '#value' => 'hard_wipe');
 
-  // Instructions
-  $form['main']['fs1'] = array(
+    // Instructions
+    $form['main']['fs1'] = array(
     '#type' => 'fieldset',
     '#title' => bts('Instructions', array(), NULL, 'boinc:delete-user-account'),
     '#weight' => 10,
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
-  $form['main']['fs1']['instructions1'] = array(
+    );
+    $form['main']['fs1']['instructions1'] = array(
     '#value' => '<p>'.
     bts('You are one-step away from deleting your account. Enter your password in the textbox below and click submit. This action is irreversable: once you delete your account, there is no way un-delete.', array(), NULL, 'boinc:delete-user-account').
     '</p>',
     '#prefix' => "<div id='delete-instructions'>",
     '#suffix' => "</div>",
-  );
+    );
 
-  $form['main']['fs1']['instructions2'] = array(
+    $form['main']['fs1']['instructions2'] = array(
     '#value' => '<p>'.
     bts('If you wish to cancel, click cancel and you will be taken to your account dashboard.', array(), NULL, 'boinc:delete-user-account').
     '</p>',
     '#prefix' => "<div id='delete-instructions'>",
     '#suffix' => "</div>",
-  );
+    );
 
-  // Password field
-  $form['main']['current_pass'] = array(
+    // Password field
+    $form['main']['current_pass'] = array(
     '#type' => 'password',
     '#title' => bts('Enter your password to delete your account', array(), NULL, 'boinc:delete-user-account'),
     '#size' => 17,
     '#attributes' => array(
-      'autocomplete' => 'off',
+        'autocomplete' => 'off',
     ),
     '#weight' => 25,
-  );
+    );
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -474,133 +474,133 @@ 
  * the soft/obfuscate method.
  */
 function boincuser_delete_softdelconfirmation(&$form_state, $token) {
-  require_boinc('token');
+    require_boinc('token');
 
-  global $user;
-  $form = array();
+    global $user;
+    $form = array();
 
-  // check BOINC user exists
-  $account = user_load(array('uid' => $user->uid));
-  $uid = $user->uid;
-  $boincid = $account->boincuser_id;
+    // check BOINC user exists
+    $account = user_load(array('uid' => $user->uid));
+    $uid = $user->uid;
+    $boincid = $account->boincuser_id;
 
-  // check $token is valid
-  if (!is_valid_token($boincid, $token, 'D')) {
+    // check $token is valid
+    if (!is_valid_token($boincid, $token, 'D')) {
     drupal_set_message(bts('ERROR: You have supplied an incorrect (most likely expired) token. Please obtain a new token by !link your account be deleted.',
     array(
-      '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
+        '!link' => l(bts('re-requesting', array(), NULL, 'boinc:delete-user-account'), "/user/${uid}/delete"),
     ),
     NULL, 'boinc:delete-user-account'), 'error');
     drupal_goto();
-  }
+    }
 
-  // Attach account to this form.
-  $form['_account'] = array('#type' => 'value', '#value' => $account);
+    // Attach account to this form.
+    $form['_account'] = array('#type' => 'value', '#value' => $account);
 
-  // This form is for hard/wipe delete
-  $form['_action'] = array('#type' => 'value', '#value' => 'soft_obfuscate');
+    // This form is for hard/wipe delete
+    $form['_action'] = array('#type' => 'value', '#value' => 'soft_obfuscate');
 
-  // Instructions
-  $form['main']['fs1'] = array(
+    // Instructions
+    $form['main']['fs1'] = array(
     '#type' => 'fieldset',
     '#title' => bts('Instructions', array(), NULL, 'boinc:delete-user-account'),
     '#weight' => 10,
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
-  $form['main']['fs1']['instructions1'] = array(
+    );
+    $form['main']['fs1']['instructions1'] = array(
     '#value' => '<p>'.
     bts('You are one-step away from deleting your account. Enter your password in the textbox below and click submit. This action is irreversable: once you delete your account, there is no way un-delete.', array(), NULL, 'boinc:delete-user-account').
     '</p>',
     '#prefix' => "<div id='delete-instructions'>",
     '#suffix' => "</div>",
-  );
+    );
 
-  $form['main']['fs1']['instructions2'] = array(
+    $form['main']['fs1']['instructions2'] = array(
     '#value' => '<p>'.
     bts('If you wish to cancel, click cancel and you will be taken to your account dashboard.', array(), NULL, 'boinc:delete-user-account').
     '</p>',
     '#prefix' => "<div id='delete-instructions'>",
     '#suffix' => "</div>",
-  );
+    );
 
-  // Password field
-  $form['main']['current_pass'] = array(
+    // Password field
+    $form['main']['current_pass'] = array(
     '#type' => 'password',
     '#title' => bts('Enter your password to delete your account', array(), NULL, 'boinc:delete-user-account'),
     '#size' => 17,
     '#attributes' => array(
-      'autocomplete' => 'off',
+        'autocomplete' => 'off',
     ),
     '#weight' => 25,
-  );
+    );
 
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Submit', array(), NULL, 'boinc:form-submit'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
+    );
 
-  //set validation and submit to the functions below
-  $form['#validate'][] = 'boincuser_delete_finalconfirmation_validate';
-  $form['#submit'][] = 'boincuser_delete_finalconfirmation_submit';
-  return $form;
+    //set validation and submit to the functions below
+    $form['#validate'][] = 'boincuser_delete_finalconfirmation_validate';
+    $form['#submit'][] = 'boincuser_delete_finalconfirmation_submit';
+    return $form;
 }
 
 /**
  * Validation for final confirmation
  */
 function boincuser_delete_finalconfirmation_validate($form, &$form_state) {
-  $account = $form_state['values']['_account'];
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+    $account = $form_state['values']['_account'];
+    $boinc_user = BoincUser::lookup_id($account->boincuser_id);
 
-  if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
+    if (_boincuser_delete_validatepasswd($boinc_user, $form_state['values']['current_pass'])) {
     return true;
-  }
+    }
 }
 
 /**
  * Submit for final confirmation
  */
 function boincuser_delete_finalconfirmation_submit($form, &$form_state) {
-  global $user;
+    global $user;
 
-  // Delete the user
-  $account = $form_state['values']['_account'];
-  $action = $form_state['values']['_action'];
-  _boincuser_delete_deleteuser($account, $action);
+    // Delete the user
+    $account = $form_state['values']['_account'];
+    $action = $form_state['values']['_action'];
+    _boincuser_delete_deleteuser($account, $action);
 
-  // Destroy the current session:
-  session_destroy();
-  // Only variables can be passed by reference workaround.
-  $null = NULL;
-  user_module_invoke('logout', $null, $user);
+    // Destroy the current session:
+    session_destroy();
+    // Only variables can be passed by reference workaround.
+    $null = NULL;
+    user_module_invoke('logout', $null, $user);
 
-  // Load the anonymous user
-  $user = drupal_anonymous_user();
+    // Load the anonymous user
+    $user = drupal_anonymous_user();
 
-  $redirect = variable_get('boincuser_delete_redirect', '<front>');
-  // Redirect
-  if (!empty($redirect)) {
+    $redirect = variable_get('boincuser_delete_redirect', '<front>');
+    // Redirect
+    if (!empty($redirect)) {
     drupal_goto($redirect);
-  }
-  else {
+    }
+    else {
     drupal_goto();
-  }
+    }
 
 }

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

Indentation +241 added lines, -241 removed lines

@@ -11,12 +11,12 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 if (!function_exists('user_load_by_mail')) {
-  /**
-   * user_load_by_mail will be broken out of user_load
-   */
-  function user_load_by_mail($mail) {
+    /**
+     * user_load_by_mail will be broken out of user_load
+     */
+    function user_load_by_mail($mail) {
     return user_load(array('mail' => $mail));
-  }
+    }
 }
  
 
@@ -28,14 +28,14 @@ 
  * Get an image object from a given file and cck field
  */ 
 function get_cck_image_object($image_path, $field_name, $content_type, $ignore_resolution = FALSE) {
-  $field = content_fields($field_name, $content_type); 
-  $validators = array_merge(filefield_widget_upload_validators($field), imagefield_widget_upload_validators($field));
-  if ($ignore_resolution) {
+    $field = content_fields($field_name, $content_type); 
+    $validators = array_merge(filefield_widget_upload_validators($field), imagefield_widget_upload_validators($field));
+    if ($ignore_resolution) {
     unset($validators['filefield_validate_image_resolution']);
-  }
-  $target_path = filefield_widget_file_path($field);
-  // Create the image object
-  return field_file_save_file($image_path, $validators, $target_path, FILE_EXISTS_REPLACE);
+    }
+    $target_path = filefield_widget_file_path($field);
+    // Create the image object
+    return field_file_save_file($image_path, $validators, $target_path, FILE_EXISTS_REPLACE);
 }
 
 
@@ -47,73 +47,73 @@ 
  * 
  */
 function boincuser_check_credit_requirements() {
-  global $user;
-  if (!$user->uid) {
+    global $user;
+    if (!$user->uid) {
     return FALSE;
-  }
-  $account = user_load($user->uid);
-  $min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
-  $community_role = array_search('community member', user_roles(true));
-  $unrestricted_role = array_search('verified contributor', user_roles(true));
+    }
+    $account = user_load($user->uid);
+    $min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
+    $community_role = array_search('community member', user_roles(true));
+    $unrestricted_role = array_search('verified contributor', user_roles(true));
   
-  // Set user roles based on current penalty status...
-  if ($account->boincuser_penalty_expiration > time()) {
+    // Set user roles based on current penalty status...
+    if ($account->boincuser_penalty_expiration > time()) {
     drupal_set_message(bts(
-      'You are banned from community participation until @date',
-      array('@date' => format_date($account->boincuser_penalty_expiration))
+        'You are banned from community participation until @date',
+        array('@date' => format_date($account->boincuser_penalty_expiration))
     ), 'warning', FALSE);
     if (isset($account->roles[$community_role])) {
-      // Remove from the community role, if not already
-      unset($account->roles[$community_role]);
+        // Remove from the community role, if not already
+        unset($account->roles[$community_role]);
     }
     if (isset($account->roles[$unrestricted_role])) {
-      // Likewise, revoke extra privileges
-      unset($account->roles[$unrestricted_role]);
+        // Likewise, revoke extra privileges
+        unset($account->roles[$unrestricted_role]);
     }
     user_save($account, array('roles' => $account->roles));
-  }
-  else {
+    }
+    else {
     if (!isset($account->roles[$community_role])) {
-      // The user should be a 'community member' role. If the user was
-      // previously banned, this will restore that role.
-      $account->roles[$community_role] = 'community member';
-      user_save($account, array('roles' => $account->roles));
+        // The user should be a 'community member' role. If the user was
+        // previously banned, this will restore that role.
+        $account->roles[$community_role] = 'community member';
+        user_save($account, array('roles' => $account->roles));
     }
 
     // ... and total credit.
     if ($account->boincuser_total_credit >= $min_credit_to_post) {
-      if (!isset($account->roles[$unrestricted_role])) {
+        if (!isset($account->roles[$unrestricted_role])) {
         // This user is now above the credit threshold and is allowed full
         // privileges
         $account->roles[$unrestricted_role] = 'verified contributor';
         user_save($account, array('roles' => $account->roles));
-      }
+        }
     }
     else {
-      drupal_set_message(bts(
+        drupal_set_message(bts(
         'You must earn @count more credits to be able to post comments on this site and create or modify your user profile.',
         array('@count' => $min_credit_to_post - $account->boincuser_total_credit)
-      ), 'warning', FALSE);
-      if (isset($account->roles[$unrestricted_role])) {
+        ), 'warning', FALSE);
+        if (isset($account->roles[$unrestricted_role])) {
         // Either the threshold has been raised or credits have been revoked;
         // this user no longer qualifies for full privileges
         unset($account->roles[$unrestricted_role]);
         user_save($account, array('roles' => $account->roles));
-      }
+        }
     }
 
-  }
+    }
 }
 
 /**
  * Get the cid of the first comment the user has not seen on a given node
  */
 function boincuser_get_first_unread_comment_id($nid, $uid = NULL) {
-  if (!$uid) {
+    if (!$uid) {
     global $user;
     $uid = $user->uid;
-  }
-  return db_result(db_query("
+    }
+    return db_result(db_query("
     SELECT c.cid
     FROM {node} n
     INNER JOIN {comments} c ON c.nid = n.nid
@@ -124,40 +124,40 @@ 
     ORDER BY c.timestamp ASC
     LIMIT 1",
     $uid, $nid
-  ));
+    ));
 }
 
 /**
  * Choose and set the user of the day
  */
 function boincuser_select_user_of_the_day() {
-  // First get a list of users with recent credit
-  db_set_active('boinc_rw');
-  $users_with_credit = db_query("
+    // First get a list of users with recent credit
+    db_set_active('boinc_rw');
+    $users_with_credit = db_query("
     SELECT
       id
     FROM {user} u
     JOIN {profile} p ON p.userid = u.id
     WHERE expavg_credit > 1
     ORDER BY uotd_time ASC, RAND()"
-  );
-  db_set_active('default');
-  $active_users = array();
-  while ($user_with_credit = db_fetch_object($users_with_credit)) {
+    );
+    db_set_active('default');
+    $active_users = array();
+    while ($user_with_credit = db_fetch_object($users_with_credit)) {
     $active_users[] = $user_with_credit->id;
-  }
-  $active_users = implode(',', $active_users);
-  // Limit to users who have never been user of the day, if there are any
-  $never_been_picked = db_result(db_query("
+    }
+    $active_users = implode(',', $active_users);
+    // Limit to users who have never been user of the day, if there are any
+    $never_been_picked = db_result(db_query("
     SELECT COUNT(*)
     FROM {boincuser} bu
     WHERE bu.uotd_time = 0
     " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '')
-  ));
-  $new_uotd_uid = 0;
-  while (!$new_uotd_uid) {
+    ));
+    $new_uotd_uid = 0;
+    while (!$new_uotd_uid) {
     // Select a user of the day randomly from the pool
-      $new_uotd_uid = db_result(db_query("
+        $new_uotd_uid = db_result(db_query("
       SELECT
         n.uid
       FROM {node} n
@@ -171,31 +171,31 @@ 
       LIMIT 1"
     ));
     if (!$new_uotd_uid) {
-      // Can't find a user with a profile; remove constraints on the pool
-      if ($never_been_picked) {
+        // Can't find a user with a profile; remove constraints on the pool
+        if ($never_been_picked) {
         // Allow users who have been previously selected
         $never_been_picked = FALSE;
-      }
-      elseif ($active_users) {
+        }
+        elseif ($active_users) {
         // Allow users who are not even active (getting desperate)
         $active_users = FALSE;
-      }
-      else {
+        }
+        else {
         // Process failed...
         return FALSE;
-      }
+        }
     }
-  }
-  $uotd = user_load($new_uotd_uid);
-  if ($uotd->uid) {
+    }
+    $uotd = user_load($new_uotd_uid);
+    if ($uotd->uid) {
     db_query("
       UPDATE {boincuser}
       SET uotd_time = '%d'
       WHERE uid = '%d'",
-      time(), $uotd->uid
+        time(), $uotd->uid
     );
-  }
-  return $uotd;
+    }
+    return $uotd;
 }
 
 
@@ -213,71 +213,71 @@ 
  * new and prev email.
  */
 function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) {
-  require_boinc('token');
-  module_load_include('inc', 'rules', 'modules/system.rules');
+    require_boinc('token');
+    module_load_include('inc', 'rules', 'modules/system.rules');
 
-  global $base_url;
-  $site_name = variable_get('site_name', 'Drupal-BOINC');
+    global $base_url;
+    $site_name = variable_get('site_name', 'Drupal-BOINC');
 
-  if (is_null($new_email)) {
+    if (is_null($new_email)) {
     $new_email = $account->mail;
-  }
-  if (is_null($prev_email)) {
+    }
+    if (is_null($prev_email)) {
     $prev_email = $account->boincuser_previous_email_addr;
-  }
-
-  // @todo - set constant in drupal, or use BOINC contsants
-  $duration = TOKEN_DURATION_ONE_WEEK;
-  $changedate = date('F j, Y \a\t G:i T', time());
-  $newdate = date('F j, Y \a\t G:i T', $account->boincuser_email_addr_change_time + $duration);
-  $token = create_token($account->boincuser_id, TOKEN_TYPE_CHANGE_EMAIL, $duration);
-  if ($adminuser) {
+    }
+
+    // @todo - set constant in drupal, or use BOINC contsants
+    $duration = TOKEN_DURATION_ONE_WEEK;
+    $changedate = date('F j, Y \a\t G:i T', time());
+    $newdate = date('F j, Y \a\t G:i T', $account->boincuser_email_addr_change_time + $duration);
+    $token = create_token($account->boincuser_id, TOKEN_TYPE_CHANGE_EMAIL, $duration);
+    if ($adminuser) {
     $graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
-      . "on {$changedate}. If you need to reverse this change, please look for "
-      . "an email send to the email address: {$prev_email}.\n";
-  }
-  else {
+        . "on {$changedate}. If you need to reverse this change, please look for "
+        . "an email send to the email address: {$prev_email}.\n";
+    }
+    else {
     $graf1 = "Your email address was changed from {$prev_email} to {$new_email} "
-      . "on {$changedate}. You will not be able to change your email address "
-      . "until {$newdate}. If you need to reverse this change, please look for "
-      . "an email send to the email address: {$prev_email}.\n";
-  }
-
-  // Send email #1 to current address
-  $mysubject = "Notification of email change at {$site_name}";
-  $mymessage = ''
-      . "{$account->boincuser_name},\n"
-      . "\n"
-      . $graf1
-      . "\n"
-      . "Thanks, \n"
-      . "{$site_name} support team\n";
-
-  $settings = array(
+        . "on {$changedate}. You will not be able to change your email address "
+        . "until {$newdate}. If you need to reverse this change, please look for "
+        . "an email send to the email address: {$prev_email}.\n";
+    }
+
+    // Send email #1 to current address
+    $mysubject = "Notification of email change at {$site_name}";
+    $mymessage = ''
+        . "{$account->boincuser_name},\n"
+        . "\n"
+        . $graf1
+        . "\n"
+        . "Thanks, \n"
+        . "{$site_name} support team\n";
+
+    $settings = array(
     'from' => '',
     'to' => $new_email,
     'subject' => $mysubject,
     'message' => $mymessage,
-  );
-  rules_action_mail_to_user($account, $settings);
-
-  // Send email #2 to previous address.
-  $mymessage = ''
-      . "Your email address has been changed. If you did not intend to take this action, then please click this link to reverse this change, or copy-and-paste the link into your browser location bar. You will need to change your password as well.\n"
-      . "\n"
-      . "{$base_url}/user/{$account->uid}/recoveremail/{$token}\n"
-      . "\n"
-      . "Thanks, \n"
-      . "{$site_name} support team\n";
-
-  $settings = array(
+    );
+    rules_action_mail_to_user($account, $settings);
+
+    // Send email #2 to previous address.
+    $mymessage = ''
+        . "Your email address has been changed. If you did not intend to take this action, then please click this link to reverse this change, or copy-and-paste the link into your browser location bar. You will need to change your password as well.\n"
+        . "\n"
+        . "{$base_url}/user/{$account->uid}/recoveremail/{$token}\n"
+        . "\n"
+        . "Thanks, \n"
+        . "{$site_name} support team\n";
+
+    $settings = array(
     'from' => '',
     'to' => $prev_email,
     'subject' => $mysubject,
     'message' => $mymessage,
-  );
+    );
 
-  rules_action_mail($settings);
+    rules_action_mail($settings);
 }
 
 /**
@@ -287,32 +287,32 @@ 
  *
  */
 function create_proper_drupalname($requested_name) {
-  if (!$requested_name) {
+    if (!$requested_name) {
     // If the name is empty, set it
     $requested_name = 'anonymous';
-  }
-  $same_name_tally = 1;
-
-  // Remove extra spaces
-  $name2 = preg_replace("/ {2,}/", " ", trim($requested_name));
-  // Remove any non-valid characters
-  $cleaned_name = preg_replace('/[^a-zA-Z0-9_ \.-]/s', '_', $name2);
-  // Truncate name
-  $name_length = strlen($cleaned_name);
-  if ($name_length > 56) {
+    }
+    $same_name_tally = 1;
+
+    // Remove extra spaces
+    $name2 = preg_replace("/ {2,}/", " ", trim($requested_name));
+    // Remove any non-valid characters
+    $cleaned_name = preg_replace('/[^a-zA-Z0-9_ \.-]/s', '_', $name2);
+    // Truncate name
+    $name_length = strlen($cleaned_name);
+    if ($name_length > 56) {
     // Name is limited to 60 characters, but we want to leave space to add a
     // tally if needed (for users with duplicate names); Limit to 56 chars and
     // replace the middle of the string with "..." if too long
     $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length-56)+3);
-  }
+    }
 
-  // Determine if there are duplicate names, if so append a number to end.
-  $unique_name = $cleaned_name;
-  while (db_result(db_query("SELECT uid FROM {users} WHERE name = '{$unique_name}' LIMIT 1"))) {
+    // Determine if there are duplicate names, if so append a number to end.
+    $unique_name = $cleaned_name;
+    while (db_result(db_query("SELECT uid FROM {users} WHERE name = '{$unique_name}' LIMIT 1"))) {
     $same_name_tally++;
     $unique_name = "{$cleaned_name}_{$same_name_tally}";
-  }
-  return $unique_name;
+    }
+    return $unique_name;
 }
 
 
@@ -326,9 +326,9 @@ 
  *
  */
 function boincuser_check_termsofuse($user) {
-  require_boinc('consent');
-  $boinc_user = boincuser_load($user->uid, TRUE);
-  return check_user_consent($boinc_user, CONSENT_TYPE_ENROLL);
+    require_boinc('consent');
+    $boinc_user = boincuser_load($user->uid, TRUE);
+    return check_user_consent($boinc_user, CONSENT_TYPE_ENROLL);
 }
 
 /**
@@ -339,27 +339,27 @@ 
  *
  */
 function boincuser_consentto_termsofuse($user) {
-  require_boinc('consent');
-  $boinc_user = boincuser_load($user->uid, TRUE);
+    require_boinc('consent');
+    $boinc_user = boincuser_load($user->uid, TRUE);
 
-  list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
-  if ($checkct) {
+    list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
+    if ($checkct) {
     $rc1 = consent_to_a_policy($boinc_user, $ctid, 1, 0, 'Webform', time());
     if (!$rc1) {
-      drupal_set_message(
+        drupal_set_message(
         bts("ERROR: Database error when attempting to INSERT into table consent with ID=@id. Please contact site administrators.",
         array('@id' => $boinc_user->id),
         'NULL', 'boinc:consent-termsofuse'),
-      'error');
+        'error');
     }
     return $rc1;
-  }
-  else {
+    }
+    else {
     drupal_set_message(
-      bts('ERROR: Consent type for enrollment not found. Please contact site administrators.', array(), 'NULL', 'boinc:consent-termsofuse'),
+        bts('ERROR: Consent type for enrollment not found. Please contact site administrators.', array(), 'NULL', 'boinc:consent-termsofuse'),
     'error');
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
@@ -368,16 +368,16 @@ 
  */
 function _boincuser_ignore_paths($path, $paths_to_ignore) {
 
-  foreach ($paths_to_ignore as $pi) {
+    foreach ($paths_to_ignore as $pi) {
     // @todo Currently this function uses {} as PHP regexp
     // delimiters. Curly brace is not really allowed un URLs, but a
     // more robust function would first check for these curly braces
     // in the path_to_ignore patterms, just in case.
     if (preg_match('{' . $pi . '}', $path)) {
-      return TRUE;
+        return TRUE;
     }
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
@@ -385,20 +385,20 @@ 
  * Drupal's recover email path.
  */
 function _boincuser_redirect_recover_email() {
-  $params = array(
+    $params = array(
     'boincid' => isset($_GET['id']) ? $_GET['id'] : '',
     'token' => isset($_GET['token']) ? $_GET['token'] : ''
-  );
+    );
 
-  // If boincid or token is not present, then go to the home page.
-  if (empty($params['boincid']) or empty($params['token'])) {
+    // If boincid or token is not present, then go to the home page.
+    if (empty($params['boincid']) or empty($params['token'])) {
     $redirect = '';
-  }
-  else {
+    }
+    else {
     $uid = boincuser_lookup_uid($params['boincid']);
     $redirect = "/user/${uid}/recoveremail/${params['token']}";
-  }
-  drupal_goto($redirect);
+    }
+    drupal_goto($redirect);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -409,17 +409,17 @@ 
  * Require BOINC library
  */
 function require_boinc($libraries) {
-  if ($include_dir = boinc_get_path('html_inc')) {
+    if ($include_dir = boinc_get_path('html_inc')) {
     $working_dir = getcwd();
     chdir($include_dir);
     if (!is_array($libraries)) {
-      $libraries = array($libraries);
+        $libraries = array($libraries);
     }
     foreach ($libraries as $library) {
-      require_once("{$library}.inc");
+        require_once("{$library}.inc");
     }
     chdir($working_dir);
-  }
+    }
 }
 
 /**
@@ -427,7 +427,7 @@ 
  * The path from the BOINC html root must be included (e.g. user/file.php)
  */
 function include_boinc($file) {
-  if ($include_dir = boinc_get_path()) {
+    if ($include_dir = boinc_get_path()) {
     $include_dir .= '/html';
     $workingDir = getcwd();
     $path = dirname($file);
@@ -435,84 +435,84 @@ 
     chdir("{$include_dir}/{$path}");
     include($file);
     chdir($workingDir);
-  }
+    }
 }
 
 /**
  * Get the BOINC include path
  */
 function boinc_get_path($type = 'root') {
-  $dir = "boinc_{$type}_dir";
-  if ($include_dir = variable_get("boinc_{$type}_dir", '')) {
+    $dir = "boinc_{$type}_dir";
+    if ($include_dir = variable_get("boinc_{$type}_dir", '')) {
     return $include_dir;
-  }
-  else {
+    }
+    else {
     // Don't show errors on blacklisted pages
     $page_blacklist = array(
-      'admin/boinc/environment'
+        'admin/boinc/environment'
     );
     if (!in_array($_GET['q'], $page_blacklist)) {
-      watchdog('boincuser', 'The BOINC environment is not configured. Please
+        watchdog('boincuser', 'The BOINC environment is not configured. Please
           !configure_it', array('!configure_it' => l(t('configure it now'),
             'admin/boinc/environment')), WATCHDOG_WARNING);
-      if (user_access('administer site configuration')) {
+        if (user_access('administer site configuration')) {
         drupal_set_message(t('The BOINC environment is not configured. Please
           !configure_it', array('!configure_it' => l(t('configure it now'),
             'admin/boinc/environment'))), 'warning', FALSE);
-      }
-      else {
+        }
+        else {
         drupal_set_message(t('There is a problem with the site. Please contact
           the system administrator.'), 'error', FALSE);
-      }
-      // Redirect home to display the error message and avoid fatal errors
-      // (unless on a blacklisted page)
-      $redirect_blacklist = array(
+        }
+        // Redirect home to display the error message and avoid fatal errors
+        // (unless on a blacklisted page)
+        $redirect_blacklist = array(
         'admin/settings/performance',
         'admin/boinc/environment',
         'home',
         ''
-      );
-      if (!in_array($_GET['q'], $redirect_blacklist)) {
+        );
+        if (!in_array($_GET['q'], $redirect_blacklist)) {
         drupal_goto('');
-      }
+        }
     }
     else {
-      // Clear the messages on the environment config page
-      drupal_get_messages();
+        // Clear the messages on the environment config page
+        drupal_get_messages();
     }
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
  * Get the configured scheduler tags
  */
 function boinc_get_scheduler_tags() {
-  // Don't generate messages for blacklisted pages
-  $page_blacklist = array(
+    // Don't generate messages for blacklisted pages
+    $page_blacklist = array(
     'admin/boinc/environment',
     'admin/boinc/scheduler'
-  );
-  if ($url_config = variable_get('boinc_scheduler_urls', '')) {
+    );
+    if ($url_config = variable_get('boinc_scheduler_urls', '')) {
     return explode("\r\n", $url_config);
-  }
-  elseif (!in_array($_GET['q'], $page_blacklist)) {
+    }
+    elseif (!in_array($_GET['q'], $page_blacklist)) {
     watchdog('boincuser', 'The BOINC scheduling server settings are not yet
         configured. Please !verify for the settings to become effective.',
-          array('!verify' => l(t('verify the default values') . ' <strong>' . 
+            array('!verify' => l(t('verify the default values') . ' <strong>' . 
             t('and') . '</strong> ' . t('save the configuration'),
             'admin/boinc/scheduler', array('html' => TRUE))
-          ), WATCHDOG_WARNING);
+            ), WATCHDOG_WARNING);
     if (user_access('administer site configuration')) {
-      drupal_set_message(t('The BOINC scheduling server settings are not yet
+        drupal_set_message(t('The BOINC scheduling server settings are not yet
           configured. Please !verify for the settings to become effective',
             array('!verify' => l(t('verify the default values') . ' <strong>' . 
-              t('and') . '</strong> ' . t('save the configuration'),
-              'admin/boinc/scheduler', array('html' => TRUE))
+                t('and') . '</strong> ' . t('save the configuration'),
+                'admin/boinc/scheduler', array('html' => TRUE))
             )), 'warning', FALSE);
     }
-  }
-  return array();
+    }
+    return array();
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -524,41 +524,41 @@ 
  * Determine if a BOINC ID matches the logged in user
  */
 function is_current_boinc_user($boinc_id) {
-  global $user;
-  if (!$user->uid) {
+    global $user;
+    if (!$user->uid) {
     return FALSE;
-  }
-  // boincuser_id is not stored in the global user, so load a new instance
-  $drupuser = user_load($user->uid);
-  return ($boinc_id == $drupuser->boincuser_id);
+    }
+    // boincuser_id is not stored in the global user, so load a new instance
+    $drupuser = user_load($user->uid);
+    return ($boinc_id == $drupuser->boincuser_id);
 }
 
 /**
  * Convert a BOINC ID to a Drupal ID
  */
 function boincuser_lookup_uid($boinc_id) {
-  $drupal_id = db_result(db_query("SELECT uid FROM {boincuser} WHERE boinc_id='%d'", $boinc_id));
-  return $drupal_id;
+    $drupal_id = db_result(db_query("SELECT uid FROM {boincuser} WHERE boinc_id='%d'", $boinc_id));
+    return $drupal_id;
 }
 function get_drupal_id($boinc_id) {
-  return boincuser_lookup_uid($boinc_id);
+    return boincuser_lookup_uid($boinc_id);
 }
 
 /**
  * Get a BOINC user object
  */
 function boincuser_load($user_id = NULL, $is_drupal_id = FALSE) {
-  if (!$user_id) {
+    if (!$user_id) {
     global $user;
     $user_id = $user->uid;
     $is_drupal_id = TRUE;
-  }
-  if ($is_drupal_id) {
+    }
+    if ($is_drupal_id) {
     $account = user_load($user_id);
     $user_id = $account->boincuser_id;
-  }
-  require_boinc('boinc_db');
-  return BoincUser::lookup_id($user_id);
+    }
+    require_boinc('boinc_db');
+    return BoincUser::lookup_id($user_id);
 }
 
 /**
@@ -568,10 +568,10 @@ 
  * page, delete button.
  */
 function _boincuser_node_profile_delete_submit($form, &$form_state) {
-  $node = $form['#node'];
-  $deleteurl = 'node/'. $node->nid .'/delete';
-  $afterq = 'destination=account';
-  drupal_goto($deleteurl, $afterq);
+    $node = $form['#node'];
+    $deleteurl = 'node/'. $node->nid .'/delete';
+    $afterq = 'destination=account';
+    drupal_goto($deleteurl, $afterq);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -582,8 +582,8 @@ 
  * Wrapper for boinc_version() function
  */
 function get_boinc_version($x) {
-  require_boinc('host');
-  return function_exists('boinc_version') ? boinc_version($x) : 'err!';
+    require_boinc('host');
+    return function_exists('boinc_version') ? boinc_version($x) : 'err!';
 }
   
 
@@ -592,14 +592,14 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * Generate the friend block header
-  */
+ * Generate the friend block header
+ */
 function boincuser_views_friends_block_header($context = null) {
-  // Get the friend count for the user being viewed
-  $view = views_get_current_view();
-  $account_id = $view->args[0];
-  $friend_count = flag_friend_get_friend_count($account_id);
-  return '<h2 class="pane-title">' . bts('Friends (@count)', 
+    // Get the friend count for the user being viewed
+    $view = views_get_current_view();
+    $account_id = $view->args[0];
+    $friend_count = flag_friend_get_friend_count($account_id);
+    return '<h2 class="pane-title">' . bts('Friends (@count)', 
     array('@count' => $friend_count)) . '</h2>';
 }
 
@@ -608,13 +608,13 @@ 
  * database.
  */
 function _boincuser_user_name_autocomplete($string) {
-  $matches = array();
-  db_set_active('boinc_ro');
-  $result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10);
-  db_set_active('default');
-  while ($user = db_fetch_object($result)) {
-      $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')';
-  }
-
-  drupal_json((object)$matches);
+    $matches = array();
+    db_set_active('boinc_ro');
+    $result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10);
+    db_set_active('default');
+    while ($user = db_fetch_object($result)) {
+        $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')';
+    }
+
+    drupal_json((object)$matches);
 }

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

Indentation +863 added lines, -863 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;
+                $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;
-              }
+                // 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])) {
+                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/all/features/boinc_standard/boinc_standard.features.inc

Indentation +1047 added lines, -1047 removed lines

@@ -4,38 +4,38 @@ 
  * Implementation of hook_ctools_plugin_api().
  */
 function boinc_standard_ctools_plugin_api() {
-  list($module, $api) = func_get_args();
-  if ($module == "input_formats" && $api == "input_formats") {
+    list($module, $api) = func_get_args();
+    if ($module == "input_formats" && $api == "input_formats") {
     return array("version" => 1);
-  }
-  elseif ($module == "page_manager" && $api == "pages_default") {
+    }
+    elseif ($module == "page_manager" && $api == "pages_default") {
     return array("version" => 1);
-  }
-  elseif ($module == "panels_mini" && $api == "panels_default") {
+    }
+    elseif ($module == "panels_mini" && $api == "panels_default") {
     return array("version" => 1);
-  }
-  elseif ($module == "strongarm" && $api == "strongarm") {
+    }
+    elseif ($module == "strongarm" && $api == "strongarm") {
     return array("version" => 1);
-  }
-  elseif ($module == "wysiwyg" && $api == "wysiwyg") {
+    }
+    elseif ($module == "wysiwyg" && $api == "wysiwyg") {
     return array("version" => 2);
-  }
+    }
 }
 
 /**
  * Implementation of hook_flag_default_flags().
  */
 function boinc_standard_flag_default_flags() {
-  $flags = array();
-  // Exported flag: "Comment Abuse".
-  $flags['abuse_comment'] = array(
+    $flags = array();
+    // Exported flag: "Comment Abuse".
+    $flags['abuse_comment'] = array(
     'content_type' => 'comment',
     'title' => 'Comment Abuse',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Report',
     'flag_long' => 'Report this content as offensive.',
@@ -46,31 +46,31 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'access_author' => '',
     'show_on_comment' => 1,
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Node Abuse".
-  $flags['abuse_node'] = array(
+    );
+    // Exported flag: "Node Abuse".
+    $flags['abuse_node'] = array(
     'content_type' => 'node',
     'title' => 'Node Abuse',
     'global' => FALSE,
     'types' => array(
-      '0' => 'forum',
-      '1' => 'profile',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'profile',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'Report',
     'flag_long' => 'Report this content as offensive.',
@@ -81,12 +81,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_page' => 1,
@@ -96,12 +96,12 @@ 
     'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "User Abuse".
-  $flags['abuse_user'] = array(
+    );
+    // Exported flag: "User Abuse".
+    $flags['abuse_user'] = array(
     'content_type' => 'user',
     'title' => 'User Abuse',
     'global' => '0',
@@ -115,12 +115,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'confirm',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => '2',
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => '2',
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_profile' => TRUE,
@@ -129,19 +129,19 @@ 
     'unflag_confirmation' => 'Are you sure you want to remove your report of this user?',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  // Exported flag: "Subscriptions".
-  $flags['subscriptions'] = array(
+    );
+    // Exported flag: "Subscriptions".
+    $flags['subscriptions'] = array(
     'content_type' => 'node',
     'title' => 'Subscriptions',
     'global' => '0',
     'types' => array(
-      '0' => 'forum',
-      '1' => 'news',
-      '2' => 'team_forum',
+        '0' => 'forum',
+        '1' => 'news',
+        '2' => 'team_forum',
     ),
     'flag_short' => 'subscribe',
     'flag_long' => 'Subscribe to this topic',
@@ -152,12 +152,12 @@ 
     'unflag_denied_text' => '',
     'link_type' => 'toggle',
     'roles' => array(
-      'flag' => array(
+        'flag' => array(
         '0' => 2,
-      ),
-      'unflag' => array(
+        ),
+        'unflag' => array(
         '0' => 2,
-      ),
+        ),
     ),
     'weight' => 0,
     'show_on_page' => 1,
@@ -167,11 +167,11 @@ 
     'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
-      '0' => 'name',
+        '0' => 'name',
     ),
     'api_version' => 2,
-  );
-  return $flags;
+    );
+    return $flags;
 
 }
 
@@ -179,2146 +179,2146 @@ 
  * Implementation of hook_node_info().
  */
 function boinc_standard_node_info() {
-  $items = array(
+    $items = array(
     'page' => array(
-      'name' => t('Page'),
-      'module' => 'features',
-      'description' => t('A <em>page</em>, similar in form to a <em>story</em>, is a simple method for creating and displaying information that rarely changes, such as an "About us" section of a website. By default, a <em>page</em> entry does not allow visitor comments and is not featured on the site\'s initial home page.'),
-      'has_title' => '1',
-      'title_label' => t('Title'),
-      'has_body' => '1',
-      'body_label' => t('Body'),
-      'min_word_count' => '0',
-      'help' => '',
+        'name' => t('Page'),
+        'module' => 'features',
+        'description' => t('A <em>page</em>, similar in form to a <em>story</em>, is a simple method for creating and displaying information that rarely changes, such as an "About us" section of a website. By default, a <em>page</em> entry does not allow visitor comments and is not featured on the site\'s initial home page.'),
+        'has_title' => '1',
+        'title_label' => t('Title'),
+        'has_body' => '1',
+        'body_label' => t('Body'),
+        'min_word_count' => '0',
+        'help' => '',
     ),
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implementation of hook_rules_defaults().
  */
 function boinc_standard_rules_defaults() {
-  return array(
+    return array(
     'rules' => array(
-      'rules_comment_converted_to_new_forum_topic_by_moderator_or_admin' => array(
+        'rules_comment_converted_to_new_forum_topic_by_moderator_or_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_boinccore_comment_convert',
         '#label' => 'Comment is converted to new forum topic by moderator or admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Comment at [:global:site-name] converted to new forum topic',
-              'message' => "Comment has been converted to new forum topic by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Comment at [:global:site-name] converted to new forum topic',
+                'message' => "Comment has been converted to new forum topic by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'user',
                     '1' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_comment_deleted_by_admin' => array(
+        ),
+        'rules_comment_deleted_by_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_comment_delete',
         '#label' => 'Comment deleted by admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'moderator notification',
-          '1' => 'boinc_standard',
+            '0' => 'moderator notification',
+            '1' => 'boinc_standard',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Comment deleted at [:global:site-name] by admin',
-              'message' => "Comment to [node:type] topic '[node:title]' deleted by admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Comment deleted at [:global:site-name] by admin',
+                'message' => "Comment to [node:type] topic '[node:title]' deleted by admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_comment_edited_by_moderator_or_admin' => array(
+        ),
+        'rules_comment_edited_by_moderator_or_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_comment_update',
         '#label' => 'Comment is edited by moderator or admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#negate' => 1,
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'Compare two users: acting user (who edited the comment) is NOT the comment author',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'Compare two users: acting user (who edited the comment) is NOT the comment author',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user1' => array(
-                  'type' => 'user',
-                  'label' => 'User account 1',
+                    'type' => 'user',
+                    'label' => 'User account 1',
                 ),
                 'user2' => array(
-                  'type' => 'user',
-                  'label' => 'User account 2',
+                    'type' => 'user',
+                    'label' => 'User account 2',
+                ),
                 ),
-              ),
-              'module' => 'User',
+                'module' => 'User',
             ),
             '#name' => 'rules_condition_user_comparison',
             '#settings' => array(
-              '#argument map' => array(
+                '#argument map' => array(
                 'user1' => 'user',
                 'user2' => 'comment_author',
-              ),
+                ),
             ),
             '#type' => 'condition',
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Comment edited at [:global:site-name] by moderator or admin',
-              'message' => "Comment has been edited by moderator/admin [user:display-name]\r\n\r\nLink: <?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Comment edited at [:global:site-name] by moderator or admin',
+                'message' => "Comment has been edited by moderator/admin [user:display-name]\r\n\r\nLink: <?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'comment',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_comment_is_published_unhidden_by_moderator_or_admin' => array(
+        ),
+        'rules_comment_is_published_unhidden_by_moderator_or_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_boinccore_comment_unhidden',
         '#label' => 'Comment is unhidden by moderator or admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'condition',
             '#settings' => array(
-              '#argument map' => array(
+                '#argument map' => array(
                 'user1' => 'user',
                 'user2' => 'comment_author',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_comparison',
             '#info' => array(
-              'label' => 'Compare two users: acting user (who unhid the comment) is NOT the comment author',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'Compare two users: acting user (who unhid the comment) is NOT the comment author',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user1' => array(
-                  'type' => 'user',
-                  'label' => 'User account 1',
+                    'type' => 'user',
+                    'label' => 'User account 1',
                 ),
                 'user2' => array(
-                  'type' => 'user',
-                  'label' => 'User account 2',
+                    'type' => 'user',
+                    'label' => 'User account 2',
+                ),
                 ),
-              ),
-              'module' => 'User',
+                'module' => 'User',
             ),
             '#negate' => 1,
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Comment at [:global:site-name] unhidden by moderator or admin',
-              'message' => "Comment has been unhidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Comment at [:global:site-name] unhidden by moderator or admin',
+                'message' => "Comment has been unhidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'comment',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_comment_is_unpublished_hidden_by_moderator_or_admin' => array(
+        ),
+        'rules_comment_is_unpublished_hidden_by_moderator_or_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_comment_unpublish',
         '#label' => 'Comment is hidden by moderator or admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#weight' => 0.0,
             '#negate' => 1,
             '#info' => array(
-              'label' => 'Compare two users: acting user (who hid the comment) is NOT the comment author',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'Compare two users: acting user (who hid the comment) is NOT the comment author',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user1' => array(
-                  'type' => 'user',
-                  'label' => 'User account 1',
+                    'type' => 'user',
+                    'label' => 'User account 1',
                 ),
                 'user2' => array(
-                  'type' => 'user',
-                  'label' => 'User account 2',
+                    'type' => 'user',
+                    'label' => 'User account 2',
+                ),
                 ),
-              ),
-              'module' => 'User',
+                'module' => 'User',
             ),
             '#name' => 'rules_condition_user_comparison',
             '#type' => 'condition',
             '#settings' => array(
-              '#argument map' => array(
+                '#argument map' => array(
                 'user1' => 'user',
                 'user2' => 'comment_author',
-              ),
+                ),
+            ),
             ),
-          ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Comment at [:global:site-name] hidden by moderator or admin',
-              'message' => "Comment has been hidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Comment at [:global:site-name] hidden by moderator or admin',
+                'message' => "Comment has been hidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'comment',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_is_edited_by_moderator_or_admin' => array(
+        ),
+        'rules_forum_topic_is_edited_by_moderator_or_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic is edited by moderator or admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#weight' => 0.0,
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
+                ),
                 ),
-              ),
-              'module' => 'User',
+                'module' => 'User',
             ),
-          ),
-          '1' => array(
+            ),
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#info' => array(
+                '#weight' => 0.0,
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#settings' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#type' => 'condition',
+                '#type' => 'condition',
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
             ),
-          ),
-          '2' => array(
+            ),
+            '2' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: content changed',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: content changed',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return ($node->body != $node_unchanged->body);',
-              'vars' => array(
+                'code' => 'return ($node->body != $node_unchanged->body);',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] edited by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been edited by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] edited by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been edited by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_is_hidden_by_moderator_admin' => array(
+        ),
+        'rules_forum_topic_is_hidden_by_moderator_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic is hidden by moderator/admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
+                ),
                 ),
-              ),
-              'module' => 'User',
+                'module' => 'User',
             ),
             '#weight' => 0.0,
-          ),
-          '1' => array(
+            ),
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#type' => 'condition',
-              '#settings' => array(
+                '#weight' => 0.0,
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
+                ),
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
+            ),
             ),
-          ),
-          '3' => array(
+            '3' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node content unchanged',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node content unchanged',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return $node->body == $node_unchanged->body;',
-              'vars' => array(
+                'code' => 'return $node->body == $node_unchanged->body;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
-          '4' => array(
+            ),
+            '4' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node status changed to hidden',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node status changed to hidden',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#type' => 'condition',
             '#settings' => array(
-              'code' => 'return $node_unchanged->status == 1 && $node->status == 0;',
-              'vars' => array(
+                'code' => 'return $node_unchanged->status == 1 && $node->status == 0;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] hidden by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been hidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] hidden by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been hidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_is_moved_to_a_different_forum_by_moderator_or_admin' => array(
+        ),
+        'rules_forum_topic_is_moved_to_a_different_forum_by_moderator_or_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic is moved to a different forum by moderator or admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#weight' => 0.0,
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
                 ),
-              ),
-              'module' => 'User',
+                ),
+                'module' => 'User',
+            ),
             ),
-          ),
-          '1' => array(
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#info' => array(
+                '#weight' => 0.0,
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#settings' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
                 ),
-              ),
-              '#type' => 'condition',
+                ),
+                '#type' => 'condition',
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
             ),
-          ),
-          '2' => array(
+            ),
+            '2' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node moved to new forum parent',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node moved to new forum parent',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return ($node->tid != $node_unchanged->tid);',
-              'vars' => array(
+                'code' => 'return ($node->tid != $node_unchanged->tid);',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] moved by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been moved by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] moved by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been moved by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_is_unhidden_by_moderator_admin' => array(
+        ),
+        'rules_forum_topic_is_unhidden_by_moderator_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic is unhidden by moderator/admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
                 ),
-              ),
-              'module' => 'User',
+                ),
+                'module' => 'User',
             ),
             '#weight' => 0.0,
-          ),
-          '1' => array(
+            ),
+            '1' => array(
             '#type' => 'OR',
             '0' => array(
-              '#info' => array(
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#settings' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#type' => 'condition',
-              '#weight' => 0.0,
+                '#type' => 'condition',
+                '#weight' => 0.0,
             ),
             '#weight' => 0.0,
             '1' => array(
-              '#weight' => 0.0,
-              '#info' => array(
+                '#weight' => 0.0,
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#settings' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#type' => 'condition',
+                '#type' => 'condition',
             ),
-          ),
-          '3' => array(
+            ),
+            '3' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'code' => 'return $node->body == $node_unchanged->body;',
-              'vars' => array(
+                'code' => 'return $node->body == $node_unchanged->body;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#info' => array(
-              'label' => 'PHP code: node content is unchanged',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node content is unchanged',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
-          '4' => array(
+            ),
+            '4' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'code' => 'return $node_unchanged->status == 0 && $node->status == 1;',
-              'vars' => array(
+                'code' => 'return $node_unchanged->status == 0 && $node->status == 1;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#info' => array(
-              'label' => 'PHP code: node status changed to unhidden',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node status changed to unhidden',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] unhidden by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been unhidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] unhidden by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been unhidden by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_locked_by_moderator_admin' => array(
+        ),
+        'rules_forum_topic_locked_by_moderator_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic locked by moderator/admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
+                ),
                 ),
-              ),
-              'module' => 'User',
+                'module' => 'User',
             ),
             '#weight' => 0.0,
-          ),
-          '1' => array(
+            ),
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#type' => 'condition',
-              '#settings' => array(
+                '#weight' => 0.0,
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
+                ),
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
+            ),
             ),
-          ),
-          '3' => array(
+            '3' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node content unchanged',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node content unchanged',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return $node->body == $node_unchanged->body;',
-              'vars' => array(
+                'code' => 'return $node->body == $node_unchanged->body;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
-          '4' => array(
+            ),
+            '4' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node locked',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node locked',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#type' => 'condition',
             '#settings' => array(
-              'code' => 'return $node_unchanged->comment == 2 && $node->comment == 1;',
-              'vars' => array(
+                'code' => 'return $node_unchanged->comment == 2 && $node->comment == 1;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] locked by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been locked by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] locked by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been locked by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_marked_sticky_by_moderator_admin' => array(
+        ),
+        'rules_forum_topic_marked_sticky_by_moderator_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic marked sticky by moderator/admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
                 ),
-              ),
-              'module' => 'User',
+                ),
+                'module' => 'User',
             ),
             '#weight' => 0.0,
-          ),
-          '1' => array(
+            ),
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#type' => 'condition',
-              '#settings' => array(
+                '#weight' => 0.0,
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
+                ),
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
             ),
-          ),
-          '3' => array(
+            ),
+            '3' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node content unchanged',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node content unchanged',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return $node->body == $node_unchanged->body;',
-              'vars' => array(
+                'code' => 'return $node->body == $node_unchanged->body;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
-          '4' => array(
+            ),
+            '4' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node made sticky',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node made sticky',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#type' => 'condition',
             '#settings' => array(
-              'code' => 'return $node_unchanged->sticky == 0 && $node->sticky == 1;',
-              'vars' => array(
+                'code' => 'return $node_unchanged->sticky == 0 && $node->sticky == 1;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
-              ),
+                ),
+            ),
             ),
-          ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] marked sticky by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been marked sticky by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] marked sticky by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been marked sticky by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_marked_unsticky_by_moderator_admin' => array(
+        ),
+        'rules_forum_topic_marked_unsticky_by_moderator_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic marked unsticky by moderator/admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
+                ),
                 ),
-              ),
-              'module' => 'User',
+                'module' => 'User',
             ),
             '#weight' => 0.0,
-          ),
-          '1' => array(
+            ),
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#type' => 'condition',
-              '#settings' => array(
+                '#weight' => 0.0,
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
+                ),
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
+            ),
             ),
-          ),
-          '3' => array(
+            '3' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node content unchanged',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node content unchanged',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return $node->body == $node_unchanged->body;',
-              'vars' => array(
+                'code' => 'return $node->body == $node_unchanged->body;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
-          '4' => array(
+            ),
+            '4' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node made sticky',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node made sticky',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#type' => 'condition',
             '#settings' => array(
-              'code' => 'return $node_unchanged->sticky == 1 && $node->sticky == 0;',
-              'vars' => array(
+                'code' => 'return $node_unchanged->sticky == 1 && $node->sticky == 0;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] marked unsticky by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been marked unsticky by moderator/admin [user:display-name].\r\n\\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] marked unsticky by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been marked unsticky by moderator/admin [user:display-name].\r\n\\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_nenamed_title_by_moderator_or_admin' => array(
+        ),
+        'rules_forum_topic_nenamed_title_by_moderator_or_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic renamed title by moderator or admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#weight' => 0.0,
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
                 ),
-              ),
-              'module' => 'User',
+                ),
+                'module' => 'User',
+            ),
             ),
-          ),
-          '1' => array(
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#info' => array(
+                '#weight' => 0.0,
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#settings' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
                 ),
-              ),
-              '#type' => 'condition',
+                ),
+                '#type' => 'condition',
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
+                ),
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
             ),
-          ),
-          '2' => array(
+            ),
+            '2' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: title changed',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: title changed',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return ($node->title != $node_unchanged->title);',
-              'vars' => array(
+                'code' => 'return ($node->title != $node_unchanged->title);',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
+            ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] renamed by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has its title renamed by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] renamed by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has its title renamed by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_forum_topic_unlocked_by_moderator_admin' => array(
+        ),
+        'rules_forum_topic_unlocked_by_moderator_admin' => array(
         '#type' => 'rule',
         '#set' => 'event_node_update',
         '#label' => 'Forum topic unlocked by moderator/admin',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'boinc_standard',
-          '1' => 'moderator notification',
+            '0' => 'boinc_standard',
+            '1' => 'moderator notification',
         ),
         '#status' => 'default',
         '#conditions' => array(
-          '0' => array(
+            '0' => array(
             '#type' => 'condition',
             '#settings' => array(
-              'roles' => array(
+                'roles' => array(
                 '0' => 3519698132,
                 '1' => 1271379760,
-              ),
-              'operation' => 'OR',
-              '#argument map' => array(
+                ),
+                'operation' => 'OR',
+                '#argument map' => array(
                 'user' => 'user',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_user_hasrole',
             '#info' => array(
-              'label' => 'User has role(s): administrator or moderator',
-              'label callback' => FALSE,
-              'arguments' => array(
+                'label' => 'User has role(s): administrator or moderator',
+                'label callback' => FALSE,
+                'arguments' => array(
                 'user' => array(
-                  'type' => 'user',
-                  'label' => 'User',
+                    'type' => 'user',
+                    'label' => 'User',
                 ),
-              ),
-              'module' => 'User',
+                ),
+                'module' => 'User',
             ),
             '#weight' => 0.0,
-          ),
-          '1' => array(
+            ),
+            '1' => array(
             '#weight' => 0.0,
             '0' => array(
-              '#weight' => 0.0,
-              '#type' => 'condition',
-              '#settings' => array(
+                '#weight' => 0.0,
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'forum' => 'forum',
+                    'forum' => 'forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
+                ),
             ),
             '#type' => 'OR',
             '1' => array(
-              '#type' => 'condition',
-              '#settings' => array(
+                '#type' => 'condition',
+                '#settings' => array(
                 'type' => array(
-                  'team_forum' => 'team_forum',
+                    'team_forum' => 'team_forum',
                 ),
                 '#argument map' => array(
-                  'node' => 'node',
+                    'node' => 'node',
                 ),
-              ),
-              '#name' => 'rules_condition_content_is_type',
-              '#info' => array(
+                ),
+                '#name' => 'rules_condition_content_is_type',
+                '#info' => array(
                 'label' => 'Updated content is Team forum topic',
                 'arguments' => array(
-                  'node' => array(
+                    'node' => array(
                     'type' => 'node',
                     'label' => 'Content',
-                  ),
+                    ),
                 ),
                 'module' => 'Node',
-              ),
-              '#weight' => 0.0,
+                ),
+                '#weight' => 0.0,
             ),
-          ),
-          '3' => array(
+            ),
+            '3' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node content unchanged',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node content unchanged',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#settings' => array(
-              'code' => 'return $node->body == $node_unchanged->body;',
-              'vars' => array(
+                'code' => 'return $node->body == $node_unchanged->body;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'condition',
-          ),
-          '4' => array(
+            ),
+            '4' => array(
             '#weight' => 0.0,
             '#info' => array(
-              'label' => 'PHP code: node unlocked',
-              'label callback' => FALSE,
-              'module' => 'PHP',
-              'eval input' => array(
+                'label' => 'PHP code: node unlocked',
+                'label callback' => FALSE,
+                'module' => 'PHP',
+                'eval input' => array(
                 '0' => 'code',
-              ),
+                ),
             ),
             '#name' => 'rules_condition_custom_php',
             '#type' => 'condition',
             '#settings' => array(
-              'code' => 'return $node_unchanged->comment == 1 && $node->comment == 2;',
-              'vars' => array(
+                'code' => 'return $node_unchanged->comment == 1 && $node->comment == 2;',
+                'vars' => array(
                 '0' => 'node',
                 '1' => 'node_unchanged',
-              ),
-              '#eval input' => array(
+                ),
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'code' => array(
+                    'code' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
-              ),
+                ),
+            ),
             ),
-          ),
         ),
         '#actions' => array(
-          '0' => array(
+            '0' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Forum topic at [:global:site-name] unlocked by moderator/admin',
-              'message' => "[node:type] topic '[node:title]' has been unlocked by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Forum topic at [:global:site-name] unlocked by moderator/admin',
+                'message' => "[node:type] topic '[node:title]' has been unlocked by moderator/admin [user:display-name].\r\n\r\nLink: <?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'node',
                     '1' => 'user',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_comment_reported' => array(
+        ),
+        'rules_offensive_comment_reported' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_comment',
         '#label' => 'Offensive comment reported',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'moderator notification',
-          '1' => 'boinc_standard',
+            '0' => 'moderator notification',
+            '1' => 'boinc_standard',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '1' => array(
+            '1' => array(
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of offensive [node:type] comment at [:global:site-name]',
-              'message' => "[flagging_user:display-name] has reported the following comment on [node:type] content as being offensive or inappropriate for the [:global:site-name] site:\r\n\r\n<?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]\r\n\r\nTotal reports of this comment: [comment:flag-abuse-comment-count]",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Report of offensive [node:type] comment at [:global:site-name]',
+                'message' => "[flagging_user:display-name] has reported the following comment on [node:type] content as being offensive or inappropriate for the [:global:site-name] site:\r\n\r\n<?php print url('<front>', array('absolute' => TRUE, 'language' => 'en')); ?>/goto/comment/[comment:comment-cid]\r\n\r\nTotal reports of this comment: [comment:flag-abuse-comment-count]",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'node',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'comment',
                     '2' => 'node',
                     '3' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#type' => 'action',
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_content_reported' => array(
+        ),
+        'rules_offensive_content_reported' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_node',
         '#label' => 'Offensive content reported',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'moderator notification',
-          'boinc_standard' => 'boinc_standard',
+            '0' => 'moderator notification',
+            'boinc_standard' => 'boinc_standard',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '1' => array(
+            '1' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of offensive [node:type] content at [:global:site-name]',
-              'message' => "[flagging_user:display-name] has reported the following [node:type] content as being offensive or inappropriate for the [:global:site-name] site:\r\n\r\n<?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>\r\n\r\nTotal reports of this content: [node:flag-abuse-node-count]",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Report of offensive [node:type] content at [:global:site-name]',
+                'message' => "[flagging_user:display-name] has reported the following [node:type] content as being offensive or inappropriate for the [:global:site-name] site:\r\n\r\n<?php print url('node/' . \$node->nid, array('absolute' => TRUE, 'language' => 'en')); ?>\r\n\r\nTotal reports of this content: [node:flag-abuse-node-count]",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => 'node',
                     '1' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'node',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(
+                    'message' => array(
                     '0' => 'node',
-                  ),
+                    ),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
-      'rules_offensive_user_reported' => array(
+        ),
+        'rules_offensive_user_reported' => array(
         '#type' => 'rule',
         '#set' => 'event_flag_flagged_abuse_user',
         '#label' => 'Offensive user reported',
         '#active' => 1,
         '#weight' => '0',
         '#categories' => array(
-          '0' => 'moderator notification',
-          'boinc_standard' => 'boinc_standard',
+            '0' => 'moderator notification',
+            'boinc_standard' => 'boinc_standard',
         ),
         '#status' => 'default',
         '#conditions' => array(),
         '#actions' => array(
-          '1' => array(
+            '1' => array(
             '#type' => 'action',
             '#settings' => array(
-              'from' => '',
-              'subject' => 'Report of offensive user at [:global:site-name]',
-              'message' => "[flagging_user:display-name] has reported [account:display-name] for inappropriate behavior:\r\n\r\n<?php print url(\'<front>\', array(\'absolute\' => TRUE, \'language\' => \'en\')); ?>/account/[account:uid]\r\n\r\nTotal current reports of this user: [account:flag-abuse-user-count]",
-              '#eval input' => array(
+                'from' => '',
+                'subject' => 'Report of offensive user at [:global:site-name]',
+                'message' => "[flagging_user:display-name] has reported [account:display-name] for inappropriate behavior:\r\n\r\n<?php print url(\'<front>\', array(\'absolute\' => TRUE, \'language\' => \'en\')); ?>/account/[account:uid]\r\n\r\nTotal current reports of this user: [account:flag-abuse-user-count]",
+                '#eval input' => array(
                 'token_rules_input_evaluator' => array(
-                  'subject' => array(
+                    'subject' => array(
                     '0' => ':global',
-                  ),
-                  'message' => array(
+                    ),
+                    'message' => array(
                     '0' => 'flagging_user',
                     '1' => 'account',
                     '2' => ':global',
-                  ),
-                  'from' => array(
+                    ),
+                    'from' => array(
                     '0' => ':global',
-                  ),
+                    ),
                 ),
                 'rules_input_evaluator_php' => array(
-                  'message' => array(),
+                    'message' => array(),
+                ),
                 ),
-              ),
             ),
             '#name' => 'boinccore_rules_action_mail_to_moderators',
             '#info' => array(
-              'label' => 'Notify moderators via email',
-              'module' => 'BOINC core',
-              'eval input' => array(
+                'label' => 'Notify moderators via email',
+                'module' => 'BOINC core',
+                'eval input' => array(
                 '0' => 'subject',
                 '1' => 'message',
                 '2' => 'from',
-              ),
+                ),
             ),
             '#weight' => 0.0,
-          ),
+            ),
         ),
         '#version' => 6003,
-      ),
+        ),
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_views_api().
  */
 function boinc_standard_views_api() {
-  return array(
+    return array(
     'api' => '2',
-  );
+    );
 }

html/user/get_project_config.php

Indentation +4 added lines, -4 removed lines

@@ -86,11 +86,11 @@ 
 }
 
 if ($disable_account_creation || defined('INVITE_CODES')) {
-	echo "    <account_creation_disabled/>\n";
+    echo "    <account_creation_disabled/>\n";
 }
 
 if (defined('INVITE_CODES')) {
-	echo "    <invite_code_required/>\n";
+    echo "    <invite_code_required/>\n";
 }
 
 echo "    <min_passwd_length>$min_passwd_length</min_passwd_length>\n";
@@ -113,9 +113,9 @@ 
 // the terms_of_use.txt file in the project base directory.
 //
 if (defined('TERMSOFUSE_FILE')) {
-  $tou_file = TERMSOFUSE_FILE;
+    $tou_file = TERMSOFUSE_FILE;
 } else {
-  $tou_file =  "../../terms_of_use.txt";
+    $tou_file =  "../../terms_of_use.txt";
 }
 if (file_exists($tou_file)) {
     $terms_of_use = trim(file_get_contents($tou_file));

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

Indentation +949 added lines, -949 removed lines

@@ -15,16 +15,16 @@ 
  * The structure of the general preferences form
  */
 function boincwork_generalprefs_form(&$form_state, $venue, $prefs_preset = null, $advanced = FALSE) {
-  $form = array();
-  $prefs = null;
-  $established = TRUE;
+    $form = array();
+    $prefs = null;
+    $established = TRUE;
   
-  // Enable AHAH form support for dynamically updating content based on preset
-  ahah_helper_register($form, $form_state);
+    // Enable AHAH form support for dynamically updating content based on preset
+    ahah_helper_register($form, $form_state);
   
-  if (!$prefs_preset) {
+    if (!$prefs_preset) {
     if (isset($form_state['storage']['prefs']['preset'])) {
-      $prefs_preset = $form_state['storage']['prefs']['preset'];
+        $prefs_preset = $form_state['storage']['prefs']['preset'];
     }
     
     // Load preferences from BOINC account
@@ -32,7 +32,7 @@ 
     
     // Take note if this is not an established preference set on the account
     if (isset($prefs['@attributes']['cleared'])) {
-      $established = FALSE;
+        $established = FALSE;
     }
     
     // Determine if a preset is selected or if these are custom settings
@@ -47,45 +47,45 @@ 
             $prefs_preset = $prefs['preset']['@value'];
         }
     }// if !$prefs_preset
-  }
-  // Extract mod_time tag if present, because it will be erased with
-  // boincwork_get_preset_prefs() below.
-  $mod_time = null;
-  if (isset($prefs['mod_time']['@value'])) {
-      $mod_time = $prefs['mod_time']['@value'];
-  }
-
-  if (isset($form_state['storage']['wip'])) {
-      switch ($prefs_preset) {
-      case 'standard':
+    }
+    // Extract mod_time tag if present, because it will be erased with
+    // boincwork_get_preset_prefs() below.
+    $mod_time = null;
+    if (isset($prefs['mod_time']['@value'])) {
+        $mod_time = $prefs['mod_time']['@value'];
+    }
+
+    if (isset($form_state['storage']['wip'])) {
+        switch ($prefs_preset) {
+        case 'standard':
       case 'maximum':
       case 'green':
       case 'minimum':
           $prefs = boincwork_get_preset_prefs($prefs_preset);
-          break;
-      case 'custom':
+            break;
+        case 'custom':
       default:
           // Just keeps prefs as they are
           unset($prefs['preset']);
-          break;
-      }// switch
-  } else {
-      $form_state['storage']['wip'] = TRUE;
-      if ( !in_array($prefs_preset, array('standard','maximum','green','minimum','custom')) ) {
-          if ($established) {
-              $prefs_preset = 'custom';
-          } else {
-              $prefs_preset = 'standard';
-              $prefs = boincwork_get_preset_prefs($prefs_preset);
-          }// if $established
-      }// if $prefs_preset
-  }// if WIP
-  
-  // This set of preferences is used in the form if no preferences
-  // have been set above, in variable $prefs.
-  require_boinc(array('db', 'prefs'));
-  $disk_space_config = get_disk_space_config();
-  $default = array(
+            break;
+        }// switch
+    } else {
+        $form_state['storage']['wip'] = TRUE;
+        if ( !in_array($prefs_preset, array('standard','maximum','green','minimum','custom')) ) {
+            if ($established) {
+                $prefs_preset = 'custom';
+            } else {
+                $prefs_preset = 'standard';
+                $prefs = boincwork_get_preset_prefs($prefs_preset);
+            }// if $established
+        }// if $prefs_preset
+    }// if WIP
+  
+    // This set of preferences is used in the form if no preferences
+    // have been set above, in variable $prefs.
+    require_boinc(array('db', 'prefs'));
+    $disk_space_config = get_disk_space_config();
+    $default = array(
     'preset' => $prefs_preset,
     // Processing...
     'run_on_batteries' => 0,
@@ -120,385 +120,385 @@ 
     'daily_xfer_limit_mb' => 0,
     'daily_xfer_period_days' => 0,
     'dont_verify_images' => 0
-  );
-  foreach ($default as $name => $value) {
+    );
+    foreach ($default as $name => $value) {
     if (isset($prefs[$name])) {
-      if (is_array($prefs[$name])) {
+        if (is_array($prefs[$name])) {
         if (isset($prefs[$name]['@value'])) {
-          $default[$name] = $prefs[$name]['@value'];
+            $default[$name] = $prefs[$name]['@value'];
+        }
         }
-      }
-      else {
+        else {
         $default[$name] = $prefs[$name];
-      }
+        }
+    }
     }
-  }
 
-  // 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['hour_options'] = array(
+    );
+    $form['hour_options'] = array(
     '#type' => 'value',
     '#value' => array('0:00','1:00','2:00','3:00','4:00', 
-     '5:00','6:00','7:00','8:00','9:00','10:00','11:00', 
-     '12:00','13:00','14:00','15:00','16:00','17:00',
-     '18:00','19:00','20:00','21:00','22:00','23:00')
-  );
-  
-  // Identify preference sets that are established to distinguish what has been
-  // saved to the database from what is just showing default values
-  $form['#established'] = $established;
+        '5:00','6:00','7:00','8:00','9:00','10:00','11:00', 
+        '12:00','13:00','14:00','15:00','16:00','17:00',
+        '18:00','19:00','20:00','21:00','22:00','23:00')
+    );
+  
+    // Identify preference sets that are established to distinguish what has been
+    // saved to the database from what is just showing default values
+    $form['#established'] = $established;
    
-  // Set up the preference container for AHAH
-  $form['prefs'] = array(
+    // Set up the preference container for AHAH
+    $form['prefs'] = array(
     '#title' => '',
     '#type' => 'fieldset',
     '#prefix' => '<div id="prefs-wrapper">', // This is our wrapper div.
     '#attributes' => array('class' => 'ahah-container'),
     '#suffix' => '</div>',
     '#tree'   => TRUE
-  );
-  //$form['prefs']['debug'] = array('#value' => '<pre>' . print_r($form_state, true) . '</pre>');
+    );
+    //$form['prefs']['debug'] = array('#value' => '<pre>' . print_r($form_state, true) . '</pre>');
   
-  // Hidden elements
-  $form['prefs']['modified'] = array(
+    // Hidden elements
+    $form['prefs']['modified'] = array(
     '#type' => 'hidden',
     '#value' => $mod_time
-  );
-  $form['prefs']['venue'] = array(
+    );
+    $form['prefs']['venue'] = array(
     '#type' => 'hidden',
     '#value' => $venue
-  );
+    );
   
-  $form['prefs']['separator_top'] = array(
+    $form['prefs']['separator_top'] = array(
     '#value' => '<div class="separator"></div>'
-  );
+    );
   
-  // Simplified selectors
-  $form['prefs']['preset'] = array(
-      '#title' => bts('Presets', array(), NULL, 'boinc:account-preferences-preset:-1:for a user to choose a computing or project preference preset.'),
+    // Simplified selectors
+    $form['prefs']['preset'] = array(
+        '#title' => bts('Presets', array(), NULL, 'boinc:account-preferences-preset:-1:for a user to choose a computing or project preference preset.'),
     '#type' => 'radios',
     '#description' => ' ',
     '#options' => array(
-      'standard' => bts('Standard', array(), NULL, 'boinc:account-preferences-preset'),
-      'maximum' => bts('Maximum', array(), NULL, 'boinc:account-preferences-preset'),
-      'green' => bts('Green', array(), NULL, 'boinc:account-preferences-preset'),
-      'minimum' => bts('Minimum', array(), NULL, 'boinc:account-preferences-preset'),
-      'custom' => bts('Custom', array(), NULL, 'boinc:account-preferences-preset')
+        'standard' => bts('Standard', array(), NULL, 'boinc:account-preferences-preset'),
+        'maximum' => bts('Maximum', array(), NULL, 'boinc:account-preferences-preset'),
+        'green' => bts('Green', array(), NULL, 'boinc:account-preferences-preset'),
+        'minimum' => bts('Minimum', array(), NULL, 'boinc:account-preferences-preset'),
+        'custom' => bts('Custom', array(), NULL, 'boinc:account-preferences-preset')
     ),
     '#prefix' => '<div class="simple-form-controls">',
     '#suffix' => '</div>',
     '#default_value' => $default['preset'],
     '#ahah' => array(
-      'event' => 'change',
-      'path' => ahah_helper_path(array('prefs')),
-      'wrapper' => 'prefs-wrapper'
+        'event' => 'change',
+        'path' => ahah_helper_path(array('prefs')),
+        'wrapper' => 'prefs-wrapper'
     )
-  );
-  $form['prefs']['select preset'] = array(
+    );
+    $form['prefs']['select preset'] = array(
     '#type'  => 'submit',
     '#value' => bts('Update preset', array(), NULL, 'boinc:account-preferences-preset'),
     '#submit' => array('ahah_helper_generic_submit'),
     // The 'no-js' class only displays this button if javascript is disabled
     '#attributes' => array('class' => 'no-js'),
-  );
+    );
   
-  // Advanced preferences
-  $form['prefs']['advanced'] = array(
+    // Advanced preferences
+    $form['prefs']['advanced'] = array(
     '#title' => bts('Advanced settings', array(), NULL, 'boinc:account-preferences-option'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => TRUE,
     '#collapsed' => !$advanced,
     '#attributes' => array('class' => 'advanced-settings'),
-  );
+    );
   
-  // Processing preferences
+    // Processing preferences
   
-  $form['prefs']['advanced']['anchor'] = array(
+    $form['prefs']['advanced']['anchor'] = array(
     '#value' => '<a name="advanced"></a>'
-  );
+    );
   
-  $form['prefs']['advanced']['separator_top'] = array(
+    $form['prefs']['advanced']['separator_top'] = array(
     '#value' => '<div class="separator"></div>'
-  );
+    );
   
-  $form['prefs']['advanced']['processor'] = array(
+    $form['prefs']['advanced']['processor'] = array(
     '#title' => bts('Processor usage', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => FALSE,
     '#collapsed' => FALSE
-  );
-  $form['prefs']['advanced']['processor']['run_on_batteries'] = array(
+    );
+    $form['prefs']['advanced']['processor']['run_on_batteries'] = array(
     '#title' => bts('Suspend when computer is on battery?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#description' => bts('Suspends computing on portables when running on battery power.', array(), NULL, 'boinc:account-preferences-computing'),
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => ($default['run_on_batteries']) ? 0 : 1 // intentional inversion of setting
-  );
-  $form['prefs']['advanced']['processor']['run_if_user_active'] = array(
+    );
+    $form['prefs']['advanced']['processor']['run_if_user_active'] = array(
     '#title' => bts('Suspend when computer is in use?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#description' => bts("Suspends computing and file transfers when you're using the computer.", array(), NULL, 'boinc:account-preferences-computing'),
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => ($default['run_if_user_active']) ? 0 : 1 // intentional inversion of setting
-  );
-  $form['prefs']['advanced']['processor']['run_gpu_if_user_active'] = array(
+    );
+    $form['prefs']['advanced']['processor']['run_gpu_if_user_active'] = array(
     '#title' => bts('Suspend GPU computing when computer is in use?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#description' => bts("Suspends GPU computing when you're using the computer.", array(), NULL, 'boinc:account-preferences-computing'),
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => ($default['run_gpu_if_user_active']) ? 0 : 1 // intentional inversion of setting
-  );
-  $form['prefs']['advanced']['processor']['idle_time_to_run'] = array(
-      '#title' => bts('"In use" means mouse/keyboard input in last', array(), NULL, 'boinc:account-preferences-computing'),
+    );
+    $form['prefs']['advanced']['processor']['idle_time_to_run'] = array(
+        '#title' => bts('"In use" means mouse/keyboard input in last', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('minutes', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['idle_time_to_run'],
     '#size' => 1,
     '#description' => bts('This determines when the computer is considered "in use".', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['processor']['suspend_if_no_recent_input'] = array(
+    );
+    $form['prefs']['advanced']['processor']['suspend_if_no_recent_input'] = array(
     '#title' => bts('Suspend when no mouse/keyboard input in last', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('minutes', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['suspend_if_no_recent_input'],
     '#size' => 1,
     '#description' => bts('This allows some computers to enter low-power mode when not in use.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['processor']['suspend_cpu_usage'] = array(
+    );
+    $form['prefs']['advanced']['processor']['suspend_cpu_usage'] = array(
     '#title' => bts('Suspend when non-BOINC CPU usage is above', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => '%',
     '#default_value' => $default['suspend_cpu_usage'],
     '#size' => 1,
     '#description' => bts('Suspend computing when your computer is busy running other programs.', array(), NULL, 'boinc:account-preferences-computing'),
-  );
-  $form['prefs']['advanced']['processor']['hour_label'] = array(
+    );
+    $form['prefs']['advanced']['processor']['hour_label'] = array(
     '#value' => '<div class="form-item"><label>' . bts('Compute only between:', array(), NULL, 'boinc:account-preferences-computing') . '</label></div>'
-  );
-  $form['prefs']['advanced']['processor']['start_hour'] = array(
+    );
+    $form['prefs']['advanced']['processor']['start_hour'] = array(
     '#type' => 'select',
     '#options' => $form['hour_options']['#value'],
     '#default_value' => $default['start_hour']
-  );
-  $form['prefs']['advanced']['processor']['hour_delimiter'] = array(
+    );
+    $form['prefs']['advanced']['processor']['hour_delimiter'] = array(
     '#value' => '<span>' . bts('and', array(), NULL, 'boinc:account-preference') . '</span>'
-  );
-  $form['prefs']['advanced']['processor']['end_hour'] = array(
+    );
+    $form['prefs']['advanced']['processor']['end_hour'] = array(
     '#type' => 'select',
     '#options' => $form['hour_options']['#value'],
     '#default_value' => $default['end_hour']
-  );
-  $form['prefs']['advanced']['processor']['hour_description'] = array(
+    );
+    $form['prefs']['advanced']['processor']['hour_description'] = array(
     '#value' => '<div class="form-item slim"><div class="description">' . bts('Compute only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing') . '</div></div>'
-  );
-  $form['prefs']['advanced']['processor']['leave_apps_in_memory'] = array(
+    );
+    $form['prefs']['advanced']['processor']['leave_apps_in_memory'] = array(
     '#title' => bts('Leave non-GPU tasks in memory while suspended?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['leave_apps_in_memory'],
     '#description' => bts('If "Yes", suspended tasks stay in memory, and resume with no work lost. If "No", suspended tasks are removed from memory, and resume from their last checkpoint.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes'] = array(
+    );
+    $form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes'] = array(
     '#title' => bts('Switch between tasks every', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('minutes', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['cpu_scheduling_period_minutes'],
     '#size' => 1,
     '#description' => bts('If you run several projects, BOINC may switch between them this often.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['processor']['max_ncpus_pct'] = array(
+    );
+    $form['prefs']['advanced']['processor']['max_ncpus_pct'] = array(
     '#title' => bts('Use at most', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of the processors', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['max_ncpus_pct'],
     '#size' => 1,
     '#description' => bts('Keep some CPUs free for other applications. Example: 75% means use 6 cores on an 8-core CPU.', array(), NULL, 'boinc:account-preferences-computing'),
-  );
-  $form['prefs']['advanced']['processor']['cpu_usage_limit'] = array(
+    );
+    $form['prefs']['advanced']['processor']['cpu_usage_limit'] = array(
     '#title' => bts('Use at most', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of the CPU time', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['cpu_usage_limit'],
     '#size' => 1,
     '#description' => bts('Suspend/resume computing every few seconds to reduce CPU temperature and energy usage. Example: 75% means compute for 3 seconds, wait for 1 second, and repeat.', array(), NULL, 'boinc:account-preferences-computing')
-  );
+    );
   
-  // Disk and memory preferences
-  $form['prefs']['advanced']['storage'] = array(
+    // Disk and memory preferences
+    $form['prefs']['advanced']['storage'] = array(
     '#title' => bts('Disk and memory usage', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => FALSE,
     '#collapsed' => FALSE
-  );
-  $form['prefs']['advanced']['storage']['disk_max_used_gb'] = array(
+    );
+    $form['prefs']['advanced']['storage']['disk_max_used_gb'] = array(
     '#title' => bts('Disk: use no more than', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'GB',
     '#default_value' => $default['disk_max_used_gb'],
     '#size' => 1,
     '#description' => bts('Limit the total amount of disk space used by BOINC.', array(), NULL, 'boinc:account-preferences-computing'),
-  ); 
-  $form['prefs']['advanced']['storage']['disk_min_free_gb'] = array(
+    ); 
+    $form['prefs']['advanced']['storage']['disk_min_free_gb'] = array(
     '#title' => bts('Disk: leave at least', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'GB free',
     '#default_value' => $default['disk_min_free_gb'],
     '#size' => 1,
     '#description' => bts('Limit disk usage to leave this much free space on the volume where BOINC stores data.', array(), NULL, 'boinc:account-preferences-computing'),
-  );
-  $form['prefs']['advanced']['storage']['disk_max_used_pct'] = array(
+    );
+    $form['prefs']['advanced']['storage']['disk_max_used_pct'] = array(
     '#title' => bts('Disk: use no more than', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['disk_max_used_pct'],
     '#size' => 1,
     '#description' => bts('Limit the percentage of disk space used by BOINC on the volume where it stores data.', array(), NULL, 'boinc:account-preferences-computing')
-  ); 
-  $form['prefs']['advanced']['storage']['disk_interval'] = array(
+    ); 
+    $form['prefs']['advanced']['storage']['disk_interval'] = array(
     '#title' => bts('Request tasks to checkpoint at most every', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('seconds', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['disk_interval'],
     '#size' => 1,
     '#description' => bts('This controls how often tasks save their state to disk, so that later they can be continued from that point.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['storage']['vm_max_used_pct'] = array(
+    );
+    $form['prefs']['advanced']['storage']['vm_max_used_pct'] = array(
     '#title' => bts('Page/swap file: use at most', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['vm_max_used_pct'],
     '#size' => 1,
     '#description' => bts('Limit the swap space (page file) used by BOINC.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['storage']['ram_max_used_busy_pct'] = array(
+    );
+    $form['prefs']['advanced']['storage']['ram_max_used_busy_pct'] = array(
     '#title' => bts('Memory: when computer is in use, use at most', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['ram_max_used_busy_pct'],
     '#size' => 1,
     '#description' => bts("Limit the memory used by BOINC when you're using the computer.", array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['storage']['ram_max_used_idle_pct'] = array(
+    );
+    $form['prefs']['advanced']['storage']['ram_max_used_idle_pct'] = array(
     '#title' => bts('Memory: when computer is not in use, use at most', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('% of total', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['ram_max_used_idle_pct'],
     '#size' => 1,
     '#description' => bts("Limit the memory used by BOINC when you're not using the computer.", array(), NULL, 'boinc:account-preferences-computing')
-  );
+    );
   
-  // Network preferences
-  $form['prefs']['advanced']['network'] = array(
+    // Network preferences
+    $form['prefs']['advanced']['network'] = array(
     '#title' => bts('Network usage', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => FALSE,
     '#collapsed' => FALSE
-  );
-  $form['prefs']['advanced']['network']['work_buf_min_days'] = array(
+    );
+    $form['prefs']['advanced']['network']['work_buf_min_days'] = array(
     '#title' => bts('Store at least', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('days of work', array(), NULL, 'boinc:account-preferences-computing'),
     '#default_value' => $default['work_buf_min_days'],
     '#size' => 1,
     '#description' => bts('Store at least enough tasks to keep the computer busy for this long.', array(), NULL, 'boinc:account-preferences-computing')
-  ); 
-  $form['prefs']['advanced']['network']['work_buf_additional_days'] = array(
+    ); 
+    $form['prefs']['advanced']['network']['work_buf_additional_days'] = array(
     '#title' => bts('Store up to an additional', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => bts('days', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['work_buf_additional_days'],
     '#size' => 1,
     '#description' => bts('Store additional tasks above the minimum level.  Determines how much work is requested when contacting a project.', array(), NULL, 'boinc:account-preferences-computing')
-  ); 
-  $form['prefs']['advanced']['network']['confirm_before_connecting'] = array(
+    ); 
+    $form['prefs']['advanced']['network']['confirm_before_connecting'] = array(
     '#title' => bts('Confirm before connecting to Internet?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['confirm_before_connecting'],
     '#description' => bts('Useful only if you have a modem, ISDN or VPN connection.', array(), NULL, 'boinc:account-preferences-computing')
-  ); 
-  $form['prefs']['advanced']['network']['hangup_if_dialed'] = array(
+    ); 
+    $form['prefs']['advanced']['network']['hangup_if_dialed'] = array(
     '#title' => bts('Disconnect when done?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['hangup_if_dialed'],
     '#description' => bts('Useful only if you have a modem, ISDN or VPN connection.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['network']['max_bytes_sec_down'] = array(
+    );
+    $form['prefs']['advanced']['network']['max_bytes_sec_down'] = array(
     '#title' => bts('Limit download rate to', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'Kbytes/sec',
     '#default_value' => $default['max_bytes_sec_down']/1000,
     '#size' => 1,
     '#description' => bts('Limit the download rate of file transfers.', array(), NULL, 'boinc:account-preferences-computing')
-  ); 
-  $form['prefs']['advanced']['network']['max_bytes_sec_up'] = array(
+    ); 
+    $form['prefs']['advanced']['network']['max_bytes_sec_up'] = array(
     '#title' => bts('Limit upload rate to', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'Kbytes/sec',
     '#default_value' => $default['max_bytes_sec_up']/1000,
     '#size' => 1,
     '#description' => bts('Limit the upload rate of file transfers.', array(), NULL, 'boinc:account-preferences-computing')
-  );
-  $form['prefs']['advanced']['network']['hour_label'] = array(
+    );
+    $form['prefs']['advanced']['network']['hour_label'] = array(
     '#value' => '<div class="form-item"><label>' . bts('Transfer files only between', array(), NULL, 'boinc:account-preferences-computing') . '</label></div>'
-  );
-  $form['prefs']['advanced']['network']['net_start_hour'] = array(
+    );
+    $form['prefs']['advanced']['network']['net_start_hour'] = array(
     '#type' => 'select',
     '#options' => $form['hour_options']['#value'],
     '#default_value' => $default['net_start_hour']
-  );
-  $form['prefs']['advanced']['network']['hour_delimiter'] = array(
+    );
+    $form['prefs']['advanced']['network']['hour_delimiter'] = array(
     '#value' => '<span>' . bts('and', array(), NULL, 'boinc:account-preference') . '</span>'
-  );
-  $form['prefs']['advanced']['network']['net_end_hour'] = array(
+    );
+    $form['prefs']['advanced']['network']['net_end_hour'] = array(
     '#type' => 'select',
     '#options' => $form['hour_options']['#value'],
     '#default_value' => $default['net_end_hour']
-  );
-  $form['prefs']['advanced']['network']['hour_description'] = array(
+    );
+    $form['prefs']['advanced']['network']['hour_description'] = array(
     '#value' => '<div class="form-item slim"><div class="description">' . bts('Transfer files only during a particular period each day.', array(), NULL, 'boinc:account-preferences-computing') . '</div></div>'
-  ); 
-  $form['prefs']['advanced']['network']['daily_xfer_limit_mb'] = array(
+    ); 
+    $form['prefs']['advanced']['network']['daily_xfer_limit_mb'] = array(
     '#title' => bts('Limit usage to', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'textfield',
     '#field_suffix' => 'Mbytes',
     '#default_value' => $default['daily_xfer_limit_mb'],
     '#size' => 1
-  ); 
-  $form['prefs']['advanced']['network']['daily_xfer_period_days'] = array(
+    ); 
+    $form['prefs']['advanced']['network']['daily_xfer_period_days'] = array(
     '#field_prefix' => 'every',
     '#type' => 'textfield',
     '#field_suffix' => bts('days', array(), NULL, 'boinc:unit-of-time'),
     '#default_value' => $default['daily_xfer_period_days'],
     '#size' => 1,
     '#description' => bts('Example: BOINC should transfer at most 2000 MB of data every 30 days.', array(), NULL, 'boinc:account-preferences-computing'),
-  ); 
-  $form['prefs']['advanced']['network']['dont_verify_images'] = array(
+    ); 
+    $form['prefs']['advanced']['network']['dont_verify_images'] = array(
     '#title' => bts('Skip data verification for image files?', array(), NULL, 'boinc:account-preferences-computing'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['dont_verify_images'],
     '#description' => bts('Only select "Yes" if your Internet provider modifies image files. Skipping verification reduces the security of BOINC.', array(), NULL, 'boinc:account-preferences-computing')
-  );
+    );
   
-  // The "fancy radios" are made via javascript on document load. In order for
-  // these to work with AHAH, we need this crazy setTimeout() call.
-  $form['prefs']['fancy-radios'] = array(
+    // The "fancy radios" are made via javascript on document load. In order for
+    // these to work with AHAH, we need this crazy setTimeout() call.
+    $form['prefs']['fancy-radios'] = array(
     '#value' => '
       <script>
         setTimeout(
@@ -509,177 +509,177 @@ 
           300
         )
       </script>'
-  );
-  $form['prefs']['view advanced'] = array(
+    );
+    $form['prefs']['view advanced'] = array(
     '#type' => 'hidden',
     '#value' => 1
-  );
+    );
   
-  $form['prefs']['separator_bottom'] = array(
+    $form['prefs']['separator_bottom'] = array(
     '#value' => '<div class="separator buttons"></div>'
-  );
+    );
   
-  // Form control
-  $form['prefs']['form control tabs prefix'] = array(
+    // Form control
+    $form['prefs']['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['prefs']['submit'] = array(
+    );
+    $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
     '#suffix' => '</li>'
-  );
-  $form['prefs']['form control tabs'] = array(
+    );
+    $form['prefs']['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), drupal_get_path_alias("account/prefs/computing/edit")) . '</li>'
-  );
-  if ($venue AND $venue != 'generic') {
+    );
+    if ($venue AND $venue != 'generic') {
     global $base_path;
     $form['prefs']['form control tabs']['#value'] .= '<li class="tab">' . 
-      l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$venue}",
+        l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/computing/clear/{$venue}",
         array(
-          'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/computing/combined')),
-          'attributes' => array(
+            'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/computing/combined')),
+            'attributes' => array(
             'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the @name preference set. Are you sure?',
-              array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
-          )
+                array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
+            )
         )
-      ) . '</li>';
-  }
-  $form['prefs']['view control'] = array(
+        ) . '</li>';
+    }
+    $form['prefs']['view control'] = array(
     '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/computing/combined') . '</li>'
-  );
-  $form['prefs']['form control tabs suffix'] = array(
+    );
+    $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
-  );
-  $form['#submit'][] = 'boincwork_generalprefs_form_submit';
+    );
+    $form['#submit'][] = 'boincwork_generalprefs_form_submit';
   
-  return $form;
+    return $form;
 }
 
 /**
-  * Validate the general preferences form.
-  */
+ * Validate the general preferences form.
+ */
 function boincwork_generalprefs_form_validate($form, &$form_state) {
-  require_boinc('util');
-  $values = $form_state['values']['prefs']['advanced'];
-  
-  //drupal_set_message('<pre>' . print_r($form_state['values'], true) . '</pre>');
-  // 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', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['idle_time_to_run']['#title']} [x] {$form['prefs']['advanced']['processor']['idle_time_to_run']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['start_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['start_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['end_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['end_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['max_ncpus_pct']['#title']} [x] {$form['prefs']['advanced']['processor']['max_ncpus_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_usage_limit']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_usage_limit']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-
-  // Storage preferences
-  if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_gb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_min_free_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_min_free_gb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_interval']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_interval']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['vm_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['vm_max_used_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-
-  // Network preferences
-  if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_min_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_min_days']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_additional_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_additional_days']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_down']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_down']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_up']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_up']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_start_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_start_hour']['#field_suffix']}"), NULL, 'boinc:account-prefrences-computing'));
-  if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_end_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_end_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
-  if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    require_boinc('util');
+    $values = $form_state['values']['prefs']['advanced'];
+  
+    //drupal_set_message('<pre>' . print_r($form_state['values'], true) . '</pre>');
+    // 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', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['idle_time_to_run']['#title']} [x] {$form['prefs']['advanced']['processor']['idle_time_to_run']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_if_no_recent_input']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#title']} [x] {$form['prefs']['advanced']['processor']['suspend_cpu_usage']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['start_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['start_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['end_hour']['#title']} [x] {$form['prefs']['advanced']['processor']['end_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_scheduling_period_minutes']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['max_ncpus_pct']['#title']} [x] {$form['prefs']['advanced']['processor']['max_ncpus_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['processor']['cpu_usage_limit']['#title']} [x] {$form['prefs']['advanced']['processor']['cpu_usage_limit']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+
+    // Storage preferences
+    if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_gb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_min_free_gb']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_min_free_gb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_max_used_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['disk_interval']['#title']} [x] {$form['prefs']['advanced']['storage']['disk_interval']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['vm_max_used_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['vm_max_used_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_busy_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['prefs']['advanced']['storage']['ram_max_used_idle_pct']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+
+    // Network preferences
+    if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_min_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_min_days']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['work_buf_additional_days']['#title']} [x] {$form['prefs']['advanced']['network']['work_buf_additional_days']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_down']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_down']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['max_bytes_sec_up']['#title']} [x] {$form['prefs']['advanced']['network']['max_bytes_sec_up']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_start_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_start_hour']['#field_suffix']}"), NULL, 'boinc:account-prefrences-computing'));
+    if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['net_end_hour']['#title']} [x] {$form['prefs']['advanced']['network']['net_end_hour']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
+    if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', bts('Invalid setting for "%preference"', array('%preference' => "{$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#title']} [x] {$form['prefs']['advanced']['network']['daily_xfer_limit_mb']['#field_suffix']}"), NULL, 'boinc:account-preferences-computing'));
 }
 
 /**
-  * Handle post-validation submission of general preferences form.
-  */
+ * Handle post-validation submission of general preferences form.
+ */
 function boincwork_generalprefs_form_submit($form, &$form_state) {
-  global $user;
-  $account = user_load($user->uid);
-  
-  $values = $form_state['values']['prefs']['advanced'];
-  $venue = $form_state['values']['prefs']['venue'];
-  $preset = $form_state['values']['prefs']['preset'];
-  
-  // Load preferences from BOINC account
-  $prefs = boincwork_load_prefs('general', $venue);
-  
-  // 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;
-
-  // transform old way to store the preset into new way
-  // ideally this should already have happened in boincwork_generalprefs_form()
-  if (isset($prefs['@attributes']['preset'])) {
+    global $user;
+    $account = user_load($user->uid);
+  
+    $values = $form_state['values']['prefs']['advanced'];
+    $venue = $form_state['values']['prefs']['venue'];
+    $preset = $form_state['values']['prefs']['preset'];
+  
+    // Load preferences from BOINC account
+    $prefs = boincwork_load_prefs('general', $venue);
+  
+    // 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;
+
+    // transform old way to store the preset into new way
+    // ideally this should already have happened in boincwork_generalprefs_form()
+    if (isset($prefs['@attributes']['preset'])) {
     $prefs['preset'] = $prefs['@attributes']['preset'];
     unset($prefs['@attributes']['preset']);
-  }
-  // Save the preset selection (or lack thereof)
-  if (!$preset OR $preset == 'custom') {
+    }
+    // Save the preset selection (or lack thereof)
+    if (!$preset OR $preset == 'custom') {
     $prefs['preset'] = 'custom';
-  }
-  else {
+    }
+    else {
     $prefs['preset'] = $preset;
-  }
+    }
   
-  // If this is a new preference set, be sure to unset the "cleared" attribute
-  if (isset($prefs['@attributes']['cleared'])) {
+    // If this is a new preference set, be sure to unset the "cleared" attribute
+    if (isset($prefs['@attributes']['cleared'])) {
     unset($prefs['@attributes']['cleared']);
-  }
+    }
   
-  // Update database
-  $result = boincwork_save_prefs($prefs, 'general', $venue);
+    // Update database
+    $result = boincwork_save_prefs($prefs, 'general', $venue);
   
-  if (!$result) {
+    if (!$result) {
     watchdog('boincwork', 'Error updating global prefs for user @id: @message', array('@id' => $account->id, '@message' => mysqli_error()), WATCHDOG_ERROR);
     drupal_set_message(t('Your changes could not be saved. Please contact support!'), 'error');
-  }
-  elseif (!drupal_get_messages('status', FALSE)) {
+    }
+    elseif (!drupal_get_messages('status', FALSE)) {
     // Show this message if the set wasn't created automatically (in which case
     // there is a message tailored to that) {
     drupal_set_message(t('Your preferences have been updated.
       Client-related preferences will take effect when your computer 
       communicates with @project or you issue the "Update"
       command from the BOINC client.', array('@project' => PROJECT)));
-  }
+    }
 }
 
 
@@ -691,88 +691,88 @@ 
  * Find compatible hosts for merging
  */
 function boincwork_host_get_compatible_hosts($host_id) {
-  require_boinc('host');
-  global $user;
-  $account = user_load($user->uid);
-  $compatible_hosts = array();
-  $host_count = 0;
-  db_set_active('boinc_ro');
-  $current_host = db_fetch_object(db_query("
+    require_boinc('host');
+    global $user;
+    $account = user_load($user->uid);
+    $compatible_hosts = array();
+    $host_count = 0;
+    db_set_active('boinc_ro');
+    $current_host = db_fetch_object(db_query("
     SELECT id, domain_name, create_time, total_credit, rpc_time, os_name,
       p_vendor, p_model
     FROM {host}
     WHERE userid = '%d' AND id = '%d'",
     $account->boincuser_id, $host_id
-  ));
-  db_set_active('default');
-  $current_host->task_count = boincwork_host_get_task_count($current_host->id);
-  $current_host->is_new = !$current_host->total_credit AND !$current_host->task_count;
-  // Get the list of all other hosts owned by this user for comparison
-  db_set_active('boinc_ro');
-  $all_other_hosts = db_query("
+    ));
+    db_set_active('default');
+    $current_host->task_count = boincwork_host_get_task_count($current_host->id);
+    $current_host->is_new = !$current_host->total_credit AND !$current_host->task_count;
+    // Get the list of all other hosts owned by this user for comparison
+    db_set_active('boinc_ro');
+    $all_other_hosts = db_query("
     SELECT id, domain_name, create_time, total_credit, rpc_time, os_name,
       p_vendor, p_model
     FROM {host}
     WHERE userid = '%d' AND id <> '%d'",
     $account->boincuser_id, $host_id
-  );
-  db_set_active('default');
-  // Compare all hosts to see if any are plausible duplicates
-  while ($other_host = db_fetch_object($all_other_hosts)) {
+    );
+    db_set_active('default');
+    // Compare all hosts to see if any are plausible duplicates
+    while ($other_host = db_fetch_object($all_other_hosts)) {
     // First, disqualify if hosts were active at the same time
     if (!$current_host->is_new) {
-      $other_host->task_count = boincwork_host_get_task_count($other_host->id);
-      $other_host->is_new = !$other_host->total_credit AND !$other_host->task_count;
-      if (!$other_host->is_new) {
+        $other_host->task_count = boincwork_host_get_task_count($other_host->id);
+        $other_host->is_new = !$other_host->total_credit AND !$other_host->task_count;
+        if (!$other_host->is_new) {
         // If both hosts being compared are not new, see if times overlap
         if (!times_disjoint($current_host, $other_host)) {
-          // Hosts were active at the same time; can't be a duplicate
-          continue;
+            // Hosts were active at the same time; can't be a duplicate
+            continue;
+        }
         }
-      }
     }
     // Next, disqualify if hosts have different OS platforms
     if (!os_compatible($current_host, $other_host)) {
-      // Hosts have different OS platforms; not really a duplicate
-      continue;
+        // Hosts have different OS platforms; not really a duplicate
+        continue;
     }
     // Finally, disqualify if hosts have different CPUs
     if (!cpus_compatible($current_host, $other_host)) {
-      // CPUs don't match; not a duplicate
-      continue;
+        // CPUs don't match; not a duplicate
+        continue;
     }
     // If not disqualified, this host is available for merging
     $hosts[] = $other_host;
     $host_count++;
     if ($host_count == 500) {
-      // This is enough!
-      break;
+        // This is enough!
+        break;
     }
-  }
-  return $hosts;
+    }
+    return $hosts;
 }
 
 /**
  * Perform the database updates to merge the old host into the new host
  */
 function boincwork_host_merge($old_host, $new_host, &$message = NULL) {
-  // Decay the average credit of the two hosts
-  require_boinc('credit');
-  $now = time();
-  update_average($now, 0, 0, $old_host->expavg_credit, $old_host->expavg_time);
-  update_average($now, 0, 0, $new_host->expavg_credit, $new_host->expavg_time);
-  
-  // Update the database:
-  // - add credit from old host to new host
-  // - change results to refer to the new host
-  // - put old host in "zombie" state (userid=0, rpc_seqno=[new_host_id])
-  
-  $total_credit = $old_host->total_credit + $new_host->total_credit;
-  $recent_credit = $old_host->expavg_credit + $new_host->expavg_credit;
-  
-  // Move credit from the old host to the new host
-  db_set_active('boinc_rw');
-  $credit_updated = db_query("
+    // Decay the average credit of the two hosts
+    require_boinc('credit');
+    $now = time();
+    update_average($now, 0, 0, $old_host->expavg_credit, $old_host->expavg_time);
+    update_average($now, 0, 0, $new_host->expavg_credit, $new_host->expavg_time);
+  
+    // Update the database:
+    // - add credit from old host to new host
+    // - change results to refer to the new host
+    // - put old host in "zombie" state (userid=0, rpc_seqno=[new_host_id])
+  
+    $total_credit = $old_host->total_credit + $new_host->total_credit;
+    $recent_credit = $old_host->expavg_credit + $new_host->expavg_credit;
+  
+    // Move credit from the old host to the new host
+    db_set_active('boinc_rw');
+    $credit_updated = db_query("
     UPDATE {host}
     SET
       total_credit = '%d',
@@ -780,34 +780,34 @@ 
       expavg_time = '%d'
     WHERE id = '%d'",
     $total_credit, $recent_credit, $now, $new_host->id
-  );
-  db_set_active('default');
-  if (!$credit_updated) {
+    );
+    db_set_active('default');
+    if (!$credit_updated) {
     if ($message !== NULL) {
-      $message = bts('Could not update credit', array(), NULL, 'boinc:account-host-merge');
+        $message = bts('Could not update credit', array(), NULL, 'boinc:account-host-merge');
     }
     return FALSE;
-  }
+    }
   
-  // Move results from the old host to the new host
-  db_set_active('boinc_rw');
-  $results_updated = db_query("
+    // Move results from the old host to the new host
+    db_set_active('boinc_rw');
+    $results_updated = db_query("
     UPDATE {result}
     SET hostid = '%d'
     WHERE hostid = '%d'",
     $new_host->id, $old_host->id
-  );
-  db_set_active('default');
-  if (!$results_updated) {
+    );
+    db_set_active('default');
+    if (!$results_updated) {
     if ($message !== NULL) {
-      $message = bts('Could not update results', array(), NULL, 'boinc:account-host-merge');
+        $message = bts('Could not update results', array(), NULL, 'boinc:account-host-merge');
     }
     return FALSE;
-  }
+    }
   
-  // Retire the old host
-  db_set_active('boinc_rw');
-  $old_host_retired = db_query("
+    // Retire the old host
+    db_set_active('boinc_rw');
+    $old_host_retired = db_query("
     UPDATE {host}
     SET
       total_credit = '0',
@@ -816,16 +816,16 @@ 
       rpc_seqno = '%d'
     WHERE id = '%d'",
     $new_host->id, $old_host->id
-  );
-  db_set_active('default');
-  if (!$old_host_retired) {
+    );
+    db_set_active('default');
+    if (!$old_host_retired) {
     if ($message !== NULL) {
-      $message = bts('Could not retire old computer', array(), NULL, 'boinc:account-host-merge');
+        $message = bts('Could not retire old computer', array(), NULL, 'boinc:account-host-merge');
     }
     return FALSE;
-  }
+    }
   
-  return TRUE;
+    return TRUE;
 }
 
 /**
@@ -833,75 +833,75 @@ 
  */
 function boincwork_host_merge_form(&$form_state, $host_id) {
 
-  if (!boincwork_host_user_is_owner($host_id)) {
+    if (!boincwork_host_user_is_owner($host_id)) {
     drupal_goto("host/{$host_id}");
-  }
+    }
   
-  $form = array();
-  $form_state['storage']['current_host_id'] = $host_id;
-  $current_host = boincwork_host_get_info($host_id);
+    $form = array();
+    $form_state['storage']['current_host_id'] = $host_id;
+    $current_host = boincwork_host_get_info($host_id);
   
-  // Get hosts that could be merged with this one
-  $hosts = boincwork_host_get_compatible_hosts($host_id);
+    // Get hosts that could be merged with this one
+    $hosts = boincwork_host_get_compatible_hosts($host_id);
   
-  if (!$hosts) {
+    if (!$hosts) {
     drupal_set_message(t('There are no computers eligible for merging with this
       one'), 'warning'
     );
     drupal_goto("host/{$host_id}");
-  }
+    }
   
-  $form['overview'] = array(
+    $form['overview'] = array(
     '#value' => '<p>' . bts('Sometimes BOINC assigns separate identities to'
-      . ' the same computer by mistake. You can correct this by merging old'
-      . ' identities with the newest one.', array(), NULL, 'boinc:account-host-merge') . '</p>'
-      . '<p>'
-      . bts('Check the computers that are the same as @name'
-      . ' (created on @date at @time with computer ID @id)',
+        . ' the same computer by mistake. You can correct this by merging old'
+        . ' identities with the newest one.', array(), NULL, 'boinc:account-host-merge') . '</p>'
+        . '<p>'
+        . bts('Check the computers that are the same as @name'
+        . ' (created on @date at @time with computer ID @id)',
         array(
-          '@name' => $current_host->domain_name,
-          '@date' => date('j M Y', $current_host->create_time),
-          '@time' => date('G:i:s T', $current_host->create_time),
-          '@id' => $current_host->id,
+            '@name' => $current_host->domain_name,
+            '@date' => date('j M Y', $current_host->create_time),
+            '@time' => date('G:i:s T', $current_host->create_time),
+            '@id' => $current_host->id,
         ),
         NULL, 'boinc:account-host-merge') . '</p>',
-  );
+    );
   
-  $options = array();
-  foreach ($hosts as $host) {
+    $options = array();
+    foreach ($hosts as $host) {
     $options[$host->id] = array(
-      $host->domain_name,
-      date('j M Y G:i:s T', $host->create_time),
-      $host->id,
+        $host->domain_name,
+        date('j M Y G:i:s T', $host->create_time),
+        $host->id,
     );
-  }
+    }
   
-  $form['merge'] = array(
+    $form['merge'] = array(
     '#title' => '',
     '#type' => 'tableselect',
     '#header' => array(bts('Name', array(), NULL, 'boinc:details:-1:name-of-the-host-or-task-or-workunit-etc-being-viewed-ignoreoverwrite'), bts('Created', array(), NULL, 'boinc:host-details'), bts('Computer ID', array(), NULL, 'boinc:host-list')),
     '#options' => $options,
-  );
+    );
   
-  $form['prefs']['separator_bottom'] = array(
-  //  '#value' => '<div class="separator buttons"></div>'
-  );
+    $form['prefs']['separator_bottom'] = array(
+    //  '#value' => '<div class="separator buttons"></div>'
+    );
   
-  // Form control
-  $form['prefs']['form control tabs prefix'] = array(
+    // Form control
+    $form['prefs']['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['prefs']['submit'] = array(
+    );
+    $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Merge', array(), NULL, 'boinc:form-merge'),
     '#suffix' => '</li>'
-  );
-  $form['prefs']['form control tabs'] = array(
+    );
+    $form['prefs']['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "host/{$host_id}") . '</li>'
-  );
+    );
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -914,76 +914,76 @@ 
  * Handle submission of the merge host form
  */
 function boincwork_host_merge_form_submit($form, &$form_state) {
-  $merged = array();
-  $errors = array();
-  $current_host_id = $form_state['storage']['current_host_id'];
-  $current_host = boincwork_host_get_info($current_host_id);
-  $selected_hosts = array_filter($form_state['values']['merge']);
+    $merged = array();
+    $errors = array();
+    $current_host_id = $form_state['storage']['current_host_id'];
+    $current_host = boincwork_host_get_info($current_host_id);
+    $selected_hosts = array_filter($form_state['values']['merge']);
   
-  foreach ($selected_hosts as $host_id) {
+    foreach ($selected_hosts as $host_id) {
     // Attempt to merge each host, noting the results
     $message = '';
     $old_host = boincwork_host_get_info($host_id);
     if (boincwork_host_merge($old_host, $current_host, $message)) {
-      $merged[$old_host->id] = $old_host->id;
-      $current_host = boincwork_host_get_info($current_host_id);
+        $merged[$old_host->id] = $old_host->id;
+        $current_host = boincwork_host_get_info($current_host_id);
     }
     else {
-      $errors[$old_host->id] = $message;
+        $errors[$old_host->id] = $message;
+    }
     }
-  }
   
-  if ($merged) {
+    if ($merged) {
     // Generate a natural language list of IDs that were merged
     $oxford_comma = ',';
     $conjunction = bts('and', array(), NULL, 'boinc:account-preference');
     $list = array_keys($merged);
     $last = array_pop($list);
     if ($list) {
-      if (count($merged) == 2) {
+        if (count($merged) == 2) {
         $oxford_comma = '';
-      }
-      $list = implode(', ', $list) . $oxford_comma . ' ' . $conjunction . ' ' . $last;
+        }
+        $list = implode(', ', $list) . $oxford_comma . ' ' . $conjunction . ' ' . $last;
     }
     else {
-      $list = $last;
+        $list = $last;
     }
     if (count($merged) == 1) {
-      drupal_set_message(bts(
+        drupal_set_message(bts(
         'Computer @old_id has been merged successfully into @id.',
         array(
-          '@old_id' => $list,
-          '@id' => $current_host_id
+            '@old_id' => $list,
+            '@id' => $current_host_id
         ),
         NULL, 'boinc:account-host-merge'));
     }
     else {
-      drupal_set_message(bts(
+        drupal_set_message(bts(
         'Computers @old_ids have been merged successfully into @id.',
         array(
-          '@old_ids' => $list,
-          '@id' => $current_host_id
+            '@old_ids' => $list,
+            '@id' => $current_host_id
         ),
         NULL, 'boinc:account-host-merge'));
     }
-  }
+    }
   
-  if ($errors) {
+    if ($errors) {
     // Report any hosts that failed to merge
     foreach ($errors as $id => $error) {
-      drupal_set_message(
+        drupal_set_message(
         bts('Computer @old_id failed to merge: @message',
-          array(
+            array(
             '@old_id' => $id,
             '@message' => $error,
-          ),
-          NULL, 'boinc:account-host-merge'),
+            ),
+            NULL, 'boinc:account-host-merge'),
         'warning'
-      );
+        );
+    }
     }
-  }
   
-  drupal_goto("host/{$current_host_id}");
+    drupal_goto("host/{$current_host_id}");
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -995,44 +995,44 @@ 
  */
 function boincwork_projectprefs_form(&$form_state, $venue) {
   
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
   
-  $established = TRUE;
+    $established = TRUE;
   
-  // Get availability of special BOINC preferences
-  require_boinc(array('util'));
-  $app_types = get_app_types();
+    // Get availability of special BOINC preferences
+    require_boinc(array('util'));
+    $app_types = get_app_types();
   
-  // Load any existing preferences from BOINC account
-  $prefs = boincwork_load_prefs('project', $venue);
+    // Load any existing preferences from BOINC account
+    $prefs = boincwork_load_prefs('project', $venue);
   
-  // Take note if this is not an established preference set on the account
-  if (isset($prefs['@attributes']['cleared'])) {
+    // Take note if this is not an established preference set on the account
+    if (isset($prefs['@attributes']['cleared'])) {
     $established = FALSE;
-  }
+    }
 
-  // Extract modified tag if present
-  $modified = NULL;
-  if (isset($prefs['modified']['@value'])) {
+    // Extract modified tag if present
+    $modified = NULL;
+    if (isset($prefs['modified']['@value'])) {
     $modified = $prefs['modified']['@value'];
-  }
+    }
 
-  $venue_is_default = FALSE;
-  if ($account->boincuser_default_pref_set) {
+    $venue_is_default = FALSE;
+    if ($account->boincuser_default_pref_set) {
     if ($account->boincuser_default_pref_set == $venue) {
-      $venue_is_default = TRUE;
+        $venue_is_default = TRUE;
     }
-  }
-  elseif (!$venue OR $venue == 'generic') {
+    }
+    elseif (!$venue OR $venue == 'generic') {
     $venue_is_default = TRUE;
-  }
-  else {
+    }
+    else {
     $venue_is_default = FALSE;
-  }
+    }
   
-  // Define form defaults
-  $default = array(
+    // Define form defaults
+    $default = array(
     'resource_share' => 100,
     'no_cpu' => 0,
     'no_cuda' => 0,
@@ -1040,333 +1040,333 @@ 
     'no_intel_gpu' => 0,
     'default_venue' => $venue_is_default,
     'allow_beta_work' => $prefs['allow_beta_work'],
-  );
-  foreach ($default as $name => $value) {
+    );
+    foreach ($default as $name => $value) {
     if (isset($prefs[$name])) {
-      if (is_array($prefs[$name])) {
+        if (is_array($prefs[$name])) {
         if (isset($prefs[$name]['@value'])) {
-          $default[$name] = $prefs[$name]['@value'];
+            $default[$name] = $prefs[$name]['@value'];
         }
-      }
-      else {
+        }
+        else {
         $default[$name] = $prefs[$name];
-      }
+        }
+    }
     }
-  }
   
-  // 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'))
-  );
+    );
   
-  // Identify preference sets that are established to distinguish what has been
-  // saved to the database from what is just showing default values
-  $form['#established'] = $established;
+    // Identify preference sets that are established to distinguish what has been
+    // saved to the database from what is just showing default values
+    $form['#established'] = $established;
   
-  // Top level form options
-  $form['#tree'] = TRUE;
+    // Top level form options
+    $form['#tree'] = TRUE;
   
-  // Hidden elements
-  $form['modified'] = array(
+    // Hidden elements
+    $form['modified'] = array(
     '#type' => 'hidden',
     '#value' => $modified,
-  );
-  $form['venue'] = array(
+    );
+    $form['venue'] = array(
     '#type' => 'hidden',
     '#value' => $venue,
-  );
+    );
   
-  $form['separator_top'] = array(
+    $form['separator_top'] = array(
     '#value' => '<div class="separator"></div>'
-  );
+    );
   
-  // Common project preferences  
-  $form['resource'] = array(
+    // Common project preferences  
+    $form['resource'] = array(
     '#title' => bts('Resource settings', array(), NULL, 'boinc:account-preferences-project'),
     '#type' => 'fieldset',
     '#description' => null,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  $form['resource']['resource_share'] = array(
+    );
+    $form['resource']['resource_share'] = array(
     '#title' => bts('Resource share', array(), NULL, 'boinc:account-preferences-project'),
     '#type' => 'textfield',
     '#default_value' => $default['resource_share'],
     '#size' => 5,
     '#description' => bts("Determines the proportion of your computer's resources allocated to this project. Example: if you participate in two BOINC projects with resource shares of 100 and 200, the first will get 1/3 of your resources and the second will get 2/3.", array(), NULL, 'boinc:account-preferences-project')
-  );
-  if ($app_types->count > 1) {
+    );
+    if ($app_types->count > 1) {
     if ($app_types->cpu) {
-      $form['resource']['no_cpu'] = array(
+        $form['resource']['no_cpu'] = array(
         '#title' => bts('Use CPU', array(), NULL, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_cpu'] ? 0 : 1,
         '#description' => bts('Request CPU-only tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     if ($app_types->cuda) {
-      $form['resource']['no_cuda'] = array(
+        $form['resource']['no_cuda'] = array(
         '#title' => bts('Use NVIDIA GPU', array(), NULL, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_cuda'] ? 0 : 1,
         '#description' => bts('Request NVIDIA GPU tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     if ($app_types->ati) {
-      $form['resource']['no_ati'] = array(
+        $form['resource']['no_ati'] = array(
         '#title' => bts('Use AMD GPU', array(), NULL, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_ati'] ? 0 : 1,
         '#description' => bts('Request AMD GPU tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
-      );
+        );
     }
     if ($app_types->intel_gpu) {
-      $form['resource']['no_intel_gpu'] = array(
+        $form['resource']['no_intel_gpu'] = array(
         '#title' => bts('Use INTEL GPU', array(), NULL, 'boinc:account-preferences-project'),
         '#type' => 'radios',
         '#options' => $form['boolean_options']['#value'],
         '#attributes' => array('class' => 'fancy'),
         '#default_value' => $default['no_intel_gpu'] ? 0 : 1,
         '#description' => bts('Request Intel GPU tasks from this project.', array(), NULL, 'boinc:account-preferences-project')
-      );
+        );
+    }
     }
-  }
   
-  if (variable_get('boinc_prefs_options_beta', FALSE)) {
+    if (variable_get('boinc_prefs_options_beta', FALSE)) {
     $form['beta'] = array(
-      '#title' => bts('Beta settings', array(), NULL, 'boinc:account-preferences-project'),
-      '#type' => 'fieldset',
-      '#description' => null,
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE
+        '#title' => bts('Beta settings', array(), NULL, 'boinc:account-preferences-project'),
+        '#type' => 'fieldset',
+        '#description' => null,
+        '#collapsible' => TRUE,
+        '#collapsed' => FALSE
     );
     $form['beta']['allow_beta_work'] = array(
-      '#title' => bts('Run test applications?', array(), NULL, 'boinc:account-preferences-project'),
-      '#type' => 'radios',
-      '#options' => $form['boolean_options']['#value'],
-      '#attributes' => array('class' => 'fancy'),
-      '#default_value' => ($default['allow_beta_work']) ? 1 : 0,
-      '#description' => bts('This helps us develop applications, but may cause jobs to fail on your computer', array(), NULL, 'boinc:account-preferences-project')
+        '#title' => bts('Run test applications?', array(), NULL, 'boinc:account-preferences-project'),
+        '#type' => 'radios',
+        '#options' => $form['boolean_options']['#value'],
+        '#attributes' => array('class' => 'fancy'),
+        '#default_value' => ($default['allow_beta_work']) ? 1 : 0,
+        '#description' => bts('This helps us develop applications, but may cause jobs to fail on your computer', array(), NULL, 'boinc:account-preferences-project')
     );
-  }
+    }
   
-  // Add project specific prefs to the form
-  boincwork_add_project_specific_prefs($form, $prefs);
+    // Add project specific prefs to the form
+    boincwork_add_project_specific_prefs($form, $prefs);
   
-  // Set whether to use this preference set by default for new computers
-  $form['default_set'] = array(
+    // Set whether to use this preference set by default for new computers
+    $form['default_set'] = array(
     '#title' => bts('Default set', array(), NULL, 'boinc:account-preferences-project'),
     '#type' => 'fieldset',
     '#description' => null,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  $form['default_set']['default_venue'] = array(
+    );
+    $form['default_set']['default_venue'] = array(
     '#title' => bts('Set used for new computers', array(), NULL, 'boinc:account-preferences-project'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['default_venue'] ? 1 : 0,
     '#description' => ''
-  );
+    );
   
-  $form['prefs']['separator_bottom'] = array(
+    $form['prefs']['separator_bottom'] = array(
     '#value' => '<div class="separator buttons"></div>'
-  );
+    );
   
-  // Form control
-  $form['prefs']['form control tabs prefix'] = array(
+    // Form control
+    $form['prefs']['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['prefs']['submit'] = array(
+    );
+    $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
     '#suffix' => '</li>'
-  );
-  $form['prefs']['form control tabs'] = array(
+    );
+    $form['prefs']['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
-  );
-  if ($venue AND $venue != 'generic') {
+    );
+    if ($venue AND $venue != 'generic') {
     global $base_path;
     $form['prefs']['form control tabs']['#value'] .= '<li class="tab">' . 
-      l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$venue}",
+        l(bts('Clear', array(), NULL, 'boinc:form-clear'), "account/prefs/project/clear/{$venue}",
         array(
-          'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/project/combined')),
-          'attributes' => array(
+            'query' => 'destination=' . urlencode(drupal_get_path_alias('account/prefs/project/combined')),
+            'attributes' => array(
             'onclick' => 'return confirm(\'' . bts('This will remove all of your settings from the @name preference set. Are you sure?',
-              array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
-          )
+                array('@name' => $venue), NULL, 'boinc:account-preferences') . '\')'
+            )
         )
-      ) . '</li>';
-  }
-  $form['prefs']['view control'] = array(
-      '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project/combined') . '</li>'
-  );
-  $form['prefs']['form control tabs suffix'] = array(
+        ) . '</li>';
+    }
+    $form['prefs']['view control'] = array(
+        '#value' => '<li class="first alt tab">' . l('(' . bts('Show comparison view', array(), NULL, 'boinc:account-preferences') . ')', 'account/prefs/project/combined') . '</li>'
+    );
+    $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
-  );
+    );
   
-  return $form;
+    return $form;
 }
 
 /**
  * Add project specific preferences to the project preferences form
  */
 function boincwork_add_project_specific_prefs(&$form, $prefs) {
-  // Load project specific preferences from XML config
-  $xml = boincwork_get_project_specific_config();
+    // Load project specific preferences from XML config
+    $xml = boincwork_get_project_specific_config();
   
-  // Respect the order of the top level elements
-  $ordered_array = array();
-  $unordered_array = array();
-  foreach ($xml['project_specific_preferences'] as $type => $element) {
+    // Respect the order of the top level elements
+    $ordered_array = array();
+    $unordered_array = array();
+    foreach ($xml['project_specific_preferences'] as $type => $element) {
     if (is_array($element) AND is_numeric(key($element))) {
-      foreach ($element as $ordered_element) {
+        foreach ($element as $ordered_element) {
         if (isset($ordered_element['@position'])) {
-          $ordered_array[$ordered_element['@position']] = array($type => $ordered_element);
+            $ordered_array[$ordered_element['@position']] = array($type => $ordered_element);
         }
         else {
-          $unordered_array[] = array($type => $ordered_element);
+            $unordered_array[] = array($type => $ordered_element);
+        }
         }
-      }
     }
     elseif (isset($element['@position'])) {
-      $ordered_array[$element['@position']] = array($type => $element);
+        $ordered_array[$element['@position']] = array($type => $element);
     }
     else {
-      $unordered_array[] = array($type => $element);
+        $unordered_array[] = array($type => $element);
+    }
     }
-  }
-  ksort($ordered_array);
-  $primed_array = array_merge($ordered_array, $unordered_array);
-  $xml = array('project_specific_preferences' => $primed_array);
+    ksort($ordered_array);
+    $primed_array = array_merge($ordered_array, $unordered_array);
+    $xml = array('project_specific_preferences' => $primed_array);
     
-  foreach ($xml['project_specific_preferences'] as $wrapped_element) {
+    foreach ($xml['project_specific_preferences'] as $wrapped_element) {
     $type = key($wrapped_element);
     $element= reset($wrapped_element);
     boincwork_generate_prefs_element($form, $type, $element, $prefs['project_specific']);
-  }
+    }
 }
 
 /**
-  * Validate the project preferences form.
-  */
+ * Validate the project preferences form.
+ */
 function boincwork_projectprefs_form_validate($form, &$form_state) {
   
-  // Verify all text user input values and notify form API of failures
-  $validation_rules = array(
+    // Verify all text user input values and notify form API of failures
+    $validation_rules = array(
     'resource' => array(
-      'resource_share' => array(
+        'resource_share' => array(
         'datatype' => 'integer',
         'min' => 0
-      ),
+        ),
     ),
-  );
+    );
   
-  // Add validation rules for project specific settings
-  $validation_rules += boincwork_get_project_specific_config_validation_rules();
+    // Add validation rules for project specific settings
+    $validation_rules += boincwork_get_project_specific_config_validation_rules();
   
-  // Perform validation
-  boincwork_validate_form($validation_rules, $form_state['values']);
+    // Perform validation
+    boincwork_validate_form($validation_rules, $form_state['values']);
   
-  // Check for app validation
-  if (isset($validation_rules['apps'])) {
+    // Check for app validation
+    if (isset($validation_rules['apps'])) {
     if (isset($validation_rules['apps']['minimum selected'])
         AND $validation_rules['apps']['minimum selected'] > 0) {
-      $apps_selected = 0;
-      foreach ($validation_rules['apps']['list'] as $app) {
+        $apps_selected = 0;
+        foreach ($validation_rules['apps']['list'] as $app) {
         if ($form_state['values']['applications'][$app]) $apps_selected++;
-      }
-      if ($apps_selected < $validation_rules['apps']['minimum selected']) {
+        }
+        if ($apps_selected < $validation_rules['apps']['minimum selected']) {
         form_set_error(
-          'applications',
-          bts('At least one application must be selected', array(), NULL, 'boinc:account-preferences-project')
+            'applications',
+            bts('At least one application must be selected', array(), NULL, 'boinc:account-preferences-project')
         );
-      }
-      if ($apps_selected == count($validation_rules['apps']['list'])) {
+        }
+        if ($apps_selected == count($validation_rules['apps']['list'])) {
         foreach ($validation_rules['apps']['list'] as $app) {
-          unset($form_state['values']['applications'][$app]);
+            unset($form_state['values']['applications'][$app]);
         }
         $form_state['storage']['all apps selected'] = TRUE;
-      }
+        }
+    }
     }
-  }
 }
 
 /**
-  * Handle post-validation submission of project preferences form.
-  */
+ * Handle post-validation submission of project preferences form.
+ */
 function boincwork_projectprefs_form_submit($form, &$form_state) {
-  global $user;
-  global $site_name;
+    global $user;
+    global $site_name;
   
-  require_boinc(array('util'));
-  $app_types = get_app_types();
+    require_boinc(array('util'));
+    $app_types = get_app_types();
   
-  $account = user_load($user->uid);
-  $edit = $form_state['values'];
-  $venue = $edit['venue'];
+    $account = user_load($user->uid);
+    $edit = $form_state['values'];
+    $venue = $edit['venue'];
   
-  // Load preferences from BOINC account
-  $prefs = boincwork_load_prefs('project', $venue);
+    // Load preferences from BOINC account
+    $prefs = boincwork_load_prefs('project', $venue);
   
-  // Resource preferences
-  $prefs['resource_share'] = $edit['resource']['resource_share'];
-  if ($app_types->count > 1) {
+    // Resource preferences
+    $prefs['resource_share'] = $edit['resource']['resource_share'];
+    if ($app_types->count > 1) {
     if ($app_types->cpu) $prefs['no_cpu'] = ($edit['resource']['no_cpu']) ? 0 : 1;
     if ($app_types->cuda) $prefs['no_cuda'] = ($edit['resource']['no_cuda']) ? 0 : 1;
     if ($app_types->ati) $prefs['no_ati'] = ($edit['resource']['no_ati']) ? 0 : 1;
     if ($app_types->intel_gpu) $prefs['no_intel_gpu'] = ($edit['resource']['no_intel_gpu']) ? 0 : 1;
-  }
+    }
   
-  // Beta preferences
-  if (variable_get('boinc_prefs_options_beta', FALSE)) {
+    // Beta preferences
+    if (variable_get('boinc_prefs_options_beta', FALSE)) {
     $prefs['allow_beta_work'] = ($edit['beta']['allow_beta_work']) ? 1 : 0;
-  }
+    }
   
-  // Load project specific preferences from XML config
-  $xml = boincwork_get_project_specific_config();
-  $updated_prefs = array(
+    // Load project specific preferences from XML config
+    $xml = boincwork_get_project_specific_config();
+    $updated_prefs = array(
     'project_specific' => boincwork_format_project_specific_prefs_data($edit)
-  );
-  $prefs = $updated_prefs + $prefs;
+    );
+    $prefs = $updated_prefs + $prefs;
   
-  // Don't specify apps if all are selected
-  if (isset($form_state['storage']['all apps selected'])) {
+    // Don't specify apps if all are selected
+    if (isset($form_state['storage']['all apps selected'])) {
     unset($prefs['project_specific']['app_id']);
     unset($form_state['storage']['all apps selected']);
-  }
+    }
   
-  // If this is a new preference set, be sure to unset the "cleared" attribute
-  if (isset($prefs['@attributes']['cleared'])) {
+    // If this is a new preference set, be sure to unset the "cleared" attribute
+    if (isset($prefs['@attributes']['cleared'])) {
     unset($prefs['@attributes']['cleared']);
-  }
+    }
   
-  // Save preferences back to the BOINC account
-  $result = boincwork_save_prefs($prefs, 'project', $venue);
+    // Save preferences back to the BOINC account
+    $result = boincwork_save_prefs($prefs, 'project', $venue);
   
-  // Update the user's default preference set
-  if ($edit['default_set']['default_venue']) {
+    // Update the user's default preference set
+    if ($edit['default_set']['default_venue']) {
     boincwork_set_default_venue($venue);
-  }
-  elseif ($venue == $account->boincuser_default_pref_set) {
+    }
+    elseif ($venue == $account->boincuser_default_pref_set) {
     // User has cleared out the default venue setting
     boincwork_set_default_venue();
-  }
+    }
   
-  if (!$result) {
+    if (!$result) {
     watchdog('boincwork', 'Error updating project prefs for user @id: @message', array('@id' => $user->id, '@message' => mysqli_error()), WATCHDOG_ERROR);
     drupal_set_message(t('Your changes could not be saved. Please contact support!'), 'error');
-  }
-  elseif (!drupal_get_messages('status', FALSE)) {
+    }
+    elseif (!drupal_get_messages('status', FALSE)) {
     // Show this message if the set wasn't created automatically (in which case
     // there is a message tailored to that)
     drupal_set_message(t('Your preferences have been updated.
@@ -1374,53 +1374,53 @@ 
         communicates with @project or you issue the "Update"
         command from the BOINC client.', 
         array('@project' => $site_name)));
-  }
+    }
 }
 
 /**
  * The structure of the community preferences form
  */
 function communityprefs_form(&$form_state) {
-  global $user;
-  $account = user_load($user->uid);
-  $form = array();
-  
-  // Pull in some elements from the profile form
-  $profile_form_state = array();
-  $profile = new stdClass();
-  $profile->type = 'profile';
-  $profile->language = '';
-  if ($profile_nid = content_profile_profile_exists($profile, $account->uid)) {
+    global $user;
+    $account = user_load($user->uid);
+    $form = array();
+  
+    // Pull in some elements from the profile form
+    $profile_form_state = array();
+    $profile = new stdClass();
+    $profile->type = 'profile';
+    $profile->language = '';
+    if ($profile_nid = content_profile_profile_exists($profile, $account->uid)) {
     $profile_node = node_load($profile_nid);
     $form_state['storage']['profile_node'] = $profile_node;
     module_load_include('inc', 'node', 'node.pages');    
     $profile_form = drupal_retrieve_form('profile_node_form', $profile_form_state, $profile_node);
     drupal_prepare_form('profile_node_form', $profile_form, $profile_form_state);
-  }
+    }
   
-  // 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'))
-  );
+    );
   
-  $default = array(
+    $default = array(
     'pm_send_notification' => '', // This is set already in pm_email_notify_user
     'friend_notification' => isset($account->friend_notification) ? $account->friend_notification : 0,
     'comments_per_page' => (isset($account->comments_per_page) AND $account->comments_per_page) ? $account->comments_per_page : variable_get('comment_default_per_page_forum', 50),
     'comments_order' => (isset($account->sort) AND $account->sort) ? $account->sort : variable_get('comment_default_order_forum', COMMENT_ORDER_OLDEST_FIRST),
-  );
+    );
   
-  // General options
-  $form['general'] = array(
+    // General options
+    $form['general'] = array(
     '#type' => 'fieldset',
     '#title' => bts('General settings', array(), NULL, 'boinc:account-preferences-community'),
     '#weight' => 0,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  // Add the BOINC user name (non-unique, user editable)
-  $form['general']['boincuser_name'] = array(
+    );
+    // Add the BOINC user name (non-unique, user editable)
+    $form['general']['boincuser_name'] = array(
     '#type' => 'textfield',
     '#title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
     '#default_value' => $account->boincuser_name,
@@ -1428,252 +1428,252 @@ 
     '#required' => TRUE,
     '#description' => '',
     '#size' => 40
-  );
-  // Time zone
-  if (variable_get('configurable_timezones', 1)) {
+    );
+    // Time zone
+    if (variable_get('configurable_timezones', 1)) {
     $zones = _system_zonelist();
     $form['general']['timezone'] = array(
-      '#type' => 'select',
-      '#title' => bts('Time zone', array(), NULL, 'boinc:account-preferences-community'),
-      '#default_value' => ($account->timezone !== NULL) ? $account->timezone : variable_get('date_default_timezone', 0),
-      '#options' => $zones,
-      '#description' => '',
+        '#type' => 'select',
+        '#title' => bts('Time zone', array(), NULL, 'boinc:account-preferences-community'),
+        '#default_value' => ($account->timezone !== NULL) ? $account->timezone : variable_get('date_default_timezone', 0),
+        '#options' => $zones,
+        '#description' => '',
     );
-  }
+    }
   
-  // Notification options
-  $form['notifications'] = array(
+    // Notification options
+    $form['notifications'] = array(
     '#type' => 'fieldset',
     '#title' => bts('Notification settings', array(), NULL, 'boinc:account-preferences-community'),
     '#weight' => 5,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  // Pull in private message notification handling and tweak the form
-  $pm_notify = pm_email_notify_user('form', $edit, $account, 'account');
-  $form['notifications']['pm_send_notifications'] = array_replace(
+    );
+    // Pull in private message notification handling and tweak the form
+    $pm_notify = pm_email_notify_user('form', $edit, $account, 'account');
+    $form['notifications']['pm_send_notifications'] = array_replace(
     $pm_notify['enable_pm_mail']['pm_send_notifications'],
     array(
-      '#type' => 'radios',
-      '#title' => bts('Receive email notification for private messages?', array(), NULL, 'boinc:account-preferences-community'),
-      '#description' => ' ',
-      '#options' => $form['boolean_options']['#value'],
-      '#attributes' => array('class' => 'fancy')
+        '#type' => 'radios',
+        '#title' => bts('Receive email notification for private messages?', array(), NULL, 'boinc:account-preferences-community'),
+        '#description' => ' ',
+        '#options' => $form['boolean_options']['#value'],
+        '#attributes' => array('class' => 'fancy')
     )
-  );
-  $form['notifications']['friend_notification'] = array(
+    );
+    $form['notifications']['friend_notification'] = array(
     '#type' => 'radios',
     '#title' => bts('Receive email notification for friend requests?', array(), NULL, 'boinc:account-preferences-community'),
     '#description' => ' ',
     '#options' => array(0 => bts('yes', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-no'), -1 => bts('no', array(), NULL, 'boinc:form-yes-no:-1:binary-form-option-pairs-with-yes')),
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['friend_notification']
-  );
+    );
   
-  // Internationalization options
-  if (module_exists('internationalization')) {
+    // Internationalization options
+    if (module_exists('internationalization')) {
     $languages = language_list('enabled');
     $languages = $languages[1];
     $names = array();
     foreach ($languages as $langcode => $item) {
-      $name = t($item->name);
-      $names[check_plain($langcode)] = check_plain($name . ($item->native != $name ? ' ('. $item->native .')' : ''));
+        $name = t($item->name);
+        $names[check_plain($langcode)] = check_plain($name . ($item->native != $name ? ' ('. $item->native .')' : ''));
     }
     $form['locale'] = array(
-      '#type' => 'fieldset',
-      '#title' => bts('Language settings', array(), NULL, 'boinc:account-preferences-community'),
-      '#weight' => 10,
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE,
+        '#type' => 'fieldset',
+        '#title' => bts('Language settings', array(), NULL, 'boinc:account-preferences-community'),
+        '#weight' => 10,
+        '#collapsible' => TRUE,
+        '#collapsed' => FALSE,
     );
 
     // Get language negotiation settings.
     $mode = variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE);
     $user_preferred_language = user_preferred_language($account);
     $form['locale']['language'] = array(
-      '#type' => 'select',
-      '#title' => bts('Language', array(), NULL, 'boinc:account-preferences-community'),
-      '#default_value' => check_plain($user_preferred_language->language),
-      '#options' => $names,
-      '#description' => ($mode == LANGUAGE_NEGOTIATION_PATH) ? bts("This account's default language for e-mails and preferred language for site presentation.", array(), NULL, 'boinc:account-preferences-community') : bts("This account's default language for e-mails.", array(), NULL, 'boinc:account-preferences-community'),
+        '#type' => 'select',
+        '#title' => bts('Language', array(), NULL, 'boinc:account-preferences-community'),
+        '#default_value' => check_plain($user_preferred_language->language),
+        '#options' => $names,
+        '#description' => ($mode == LANGUAGE_NEGOTIATION_PATH) ? bts("This account's default language for e-mails and preferred language for site presentation.", array(), NULL, 'boinc:account-preferences-community') : bts("This account's default language for e-mails.", array(), NULL, 'boinc:account-preferences-community'),
     );
-  }
+    }
   
-  // Avatar options
-  $form['gravatar'] = array(
+    // Avatar options
+    $form['gravatar'] = array(
     '#type' => 'item',
     '#value' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, it will be used for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), NULL, 'boinc:account-preferences-community'),
     '#description' => bts('Your Gravatar will not be shown if you upload a user picture.', array(), NULL, 'boinc:account-preferences-community'),
-  );
-  if (user_access('disable own gravatar', $account)) {
+    );
+    if (user_access('disable own gravatar', $account)) {
     $form['gravatar'] = array(
-      '#type' => 'checkbox',
-      '#title' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, use it for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), NULL, 'boinc:account-preferences-community'),
-      '#description' => bts('Gravatar will not be shown if an avatar is uploaded.', array(), NULL, 'boinc:account-preferences-community'),
-      '#default_value' => isset($account->gravatar) ? $account->gravatar : 0,
-      '#disabled' => !empty($account->picture),
-    );
-  }
-  $form['gravatar']['#weight'] = 15;
-  $form['gravatar']['#prefix'] = '<fieldset class="collapsible"><legend><a href="#">' . bts('Avatar settings', array(), NULL, 'boinc:account-preferences-community') . '</a></legend>';
-  // Upload an avatar (pulled from profile_node_form):
-  if (!empty($profile_form['field_image'])) {
+        '#type' => 'checkbox',
+        '#title' => bts('If you have a <a href="@gravatar-check">valid Gravatar</a> associated with your e-mail address, use it for your user picture.', array('@gravatar-check' => 'http://en.gravatar.com/site/check/' . $account->mail), NULL, 'boinc:account-preferences-community'),
+        '#description' => bts('Gravatar will not be shown if an avatar is uploaded.', array(), NULL, 'boinc:account-preferences-community'),
+        '#default_value' => isset($account->gravatar) ? $account->gravatar : 0,
+        '#disabled' => !empty($account->picture),
+    );
+    }
+    $form['gravatar']['#weight'] = 15;
+    $form['gravatar']['#prefix'] = '<fieldset class="collapsible"><legend><a href="#">' . bts('Avatar settings', array(), NULL, 'boinc:account-preferences-community') . '</a></legend>';
+    // Upload an avatar (pulled from profile_node_form):
+    if (!empty($profile_form['field_image'])) {
     $form['field_image'] = $profile_form['field_image'];
-  }
-  else {
+    }
+    else {
     $form['field_image'] = array(
-      '#value' => '<div class="form-item">'
+        '#value' => '<div class="form-item">'
         . '<label class="placeholder">'
         . bts('This is not available until your profile is set up.', array(), NULL, 'boinc:account-preferences-community')
         . '</label>'
         . l(bts('Create a profile', array(), NULL, 'boinc:account-preferences-community'), 'account/profile/edit', array('attributes' => array('class' => 'form-link')))
         . '</div>',
     );
-  }
-  $form['field_image'][0]['#title'] = bts('Upload an avatar', array(), NULL, 'boinc:account-preferences-community');
-  $form['field_image']['#weight'] = 20;
-  $form['field_image']['#suffix'] = '</fieldset>';
+    }
+    $form['field_image'][0]['#title'] = bts('Upload an avatar', array(), NULL, 'boinc:account-preferences-community');
+    $form['field_image']['#weight'] = 20;
+    $form['field_image']['#suffix'] = '</fieldset>';
   
-  // Forum options
-  $form['forums'] = array(
+    // Forum options
+    $form['forums'] = array(
     '#type' => 'fieldset',
     '#title' => bts('Forum settings', array(), NULL, 'boinc:account-preferences-community'),
     '#weight' => 25,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  $form['forums']['comments_per_page'] = array(
+    );
+    $form['forums']['comments_per_page'] = array(
     '#type' => 'select',
     '#title' => bts('In discussion topics, show at most @comments_per_page', array('@comments_per_page' => ''), NULL, 'boinc:account-preferences-community'),
     '#options' => array(10 => 10, 20 => 20, 30 => 30, 50 => 50, 100 => 100),
     '#default_value' => $default['comments_per_page']
-  );
-  // Can't have a typical Drupal form suffix on a select box?
-  $form['forums']['comments_per_page_suffix'] = array(
+    );
+    // Can't have a typical Drupal form suffix on a select box?
+    $form['forums']['comments_per_page_suffix'] = array(
     '#value' => '<span>' . bts('comments per page', array(), NULL, 'boinc:account-preferences-community') . '</span>'
-  );
-  $form['forums']['comments_order'] = array(
+    );
+    $form['forums']['comments_order'] = array(
     '#type' => 'select',
     '#title' => bts('Sort comments in discussions', array(), NULL, 'boinc:account-preferences-community'),
     '#options' => array(1 => bts('Newest post first', array(), NULL, 'boinc:account-preferences-community'), 2 => bts('Oldest post first', array(), NULL, 'boinc:account-preferences-community')),
     '#default_value' => $default['comments_order']
-  );
-  // Signature (pulled from user_edit_form):
-  if (variable_get('user_signatures', 0) && module_exists('comment')) {
+    );
+    // Signature (pulled from user_edit_form):
+    if (variable_get('user_signatures', 0) && module_exists('comment')) {
     $form['forums']['signature'] = array(
-      '#type' => 'textarea',
-      '#title' => bts('Signature', array(), NULL, 'boinc:account-preferences-community'),
-      '#description' => bts('Your signature will be publicly displayed at the end of your comments.', array(), NULL, 'boinc:account-preferences-community'),
-      '#default_value' => $account->signature
-      );
+        '#type' => 'textarea',
+        '#title' => bts('Signature', array(), NULL, 'boinc:account-preferences-community'),
+        '#description' => bts('Your signature will be publicly displayed at the end of your comments.', array(), NULL, 'boinc:account-preferences-community'),
+        '#default_value' => $account->signature
+        );
     // Prevent a "validation error" message when the user attempts to save with a default value they
     // do not have access to.
     if (!filter_access($account->signature_format) && empty($_POST)) {
-      drupal_set_message(t("The signature input format has been set to a format you don't have access to. It will be changed to a format you have access to when you save this page."));
-      $edit['signature_format'] = FILTER_FORMAT_DEFAULT;
+        drupal_set_message(t("The signature input format has been set to a format you don't have access to. It will be changed to a format you have access to when you save this page."));
+        $edit['signature_format'] = FILTER_FORMAT_DEFAULT;
     }
     $form['forums']['signature_format'] = filter_form($account->signature_format, NULL, array('signature_format'));
     // Optionally hide signatures from comments
     $form['forums']['hide_signatures'] = array(
-      '#type' => 'radios',
-      '#title' => bts('Hide signatures in forums', array(), NULL, 'boinc:account-preferences-community'),
-      '#description' => ' ',
-      '#options' => $form['boolean_options']['#value'],
-      '#attributes' => array('class' => 'fancy'),
-      '#default_value' => isset($account->hide_signatures) ? $account->hide_signatures : 0,
+        '#type' => 'radios',
+        '#title' => bts('Hide signatures in forums', array(), NULL, 'boinc:account-preferences-community'),
+        '#description' => ' ',
+        '#options' => $form['boolean_options']['#value'],
+        '#attributes' => array('class' => 'fancy'),
+        '#default_value' => isset($account->hide_signatures) ? $account->hide_signatures : 0,
     );
-  }
+    }
 
-  //Bottom separator
-  $form['separator_bottom'] = array(
+    //Bottom separator
+    $form['separator_bottom'] = array(
     '#value' => '<div class="separator buttons"></div>',
     '#weight' => 999,
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">',
     '#weight' => 1001,
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
     '#suffix' => '</li>',
     '#weight' => 1002,
-  );
-  $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>',
     '#weight' => 1003,
-  );
-  $form['form control tabs suffix'] = array(
+    );
+    $form['form control tabs suffix'] = array(
     '#value' => '</ul>',
     '#weight' => 1004,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 /**
-  * Handle validation submission of community preferences form.
-  */
+ * Handle validation submission of community preferences form.
+ */
 function communityprefs_form_validate($form, &$form_state) {
-  // require_boinc();
-  global $user;
-  $account = user_load($user->uid);
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
-  $edit = $form_state['values'];
+    // require_boinc();
+    global $user;
+    $account = user_load($user->uid);
+    $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+    $edit = $form_state['values'];
 
-  if ($edit['boincuser_name'] != $boinc_user->name) {
+    if ($edit['boincuser_name'] != $boinc_user->name) {
     $blacklist1 = preg_split('/\r\n|\r|\n/', variable_get('boinc_weboptions_blacklisted_usernames', "admin\nadministrator\nmoderator"));
     $blacklist2 = array();
     if (is_array($blacklist1)) {
-      $blacklist2 = array_map('strtolower', $blacklist1);
+        $blacklist2 = array_map('strtolower', $blacklist1);
     }
     if (in_array(strtolower($edit['boincuser_name']), $blacklist2)) {
-      form_set_error('boincuser_name',
+        form_set_error('boincuser_name',
         bts('You may not use username @blname, as that name is not allowed. Please choose another name.',
             array('@blname' => $edit['boincuser_name']),
             NULL, 'boinc:account-preferences-community'));
-      return false;
+        return false;
+    }
     }
-  }
 
-  return true;
+    return true;
 }
 
 /**
-  * Handle post-validation submission of community preferences form.
-  */
+ * Handle post-validation submission of community preferences form.
+ */
 function communityprefs_form_submit($form, &$form_state) {
-  require_boinc('boinc_db');
-  global $user;
-  $account = user_load($user->uid);
-  $boinc_user = BoincUser::lookup_id($account->boincuser_id);
-  $edit = $form_state['values'];
-  $profile_node = $form_state['storage']['profile_node'];
-  
-  // Display name
-  if ($edit['boincuser_name'] != $boinc_user->name) {
+    require_boinc('boinc_db');
+    global $user;
+    $account = user_load($user->uid);
+    $boinc_user = BoincUser::lookup_id($account->boincuser_id);
+    $edit = $form_state['values'];
+    $profile_node = $form_state['storage']['profile_node'];
+  
+    // Display name
+    if ($edit['boincuser_name'] != $boinc_user->name) {
     $boincuser_name = $edit['boincuser_name'];
     $result = $boinc_user->update(
         "name='{$boincuser_name}'"
     );
-  }
+    }
   
-  // Private message settings
-  pm_email_notify_user('submit', $edit, $user);
+    // Private message settings
+    pm_email_notify_user('submit', $edit, $user);
   
-  // Avatar settings - only set if profile_node exists.
-  if ($profile_node) {
+    // Avatar settings - only set if profile_node exists.
+    if ($profile_node) {
     if (!$edit['field_image']) $edit['field_image'] = array();
     $profile_node->field_image = $edit['field_image'];
     node_save($profile_node);
     // Flush this from the node cache or changes won't show up immediately!
     $profile_node = node_load($profile_node->nid, NULL, TRUE);
-  }
+    }
 
-  // All other settings
-  $settings = array(
+    // All other settings
+    $settings = array(
     'signature' => $edit['signature'],
     'signature_format' => $edit['signature_format'],
     'timezone' => $edit['timezone'],
@@ -1682,183 +1682,183 @@ 
     'hide_signatures' => $edit['hide_signatures'],
     'sort' => $edit['comments_order'],
     'gravatar' => $edit['gravatar'],
-  );
-  if (module_exists('internationalization')) {
+    );
+    if (module_exists('internationalization')) {
     $settings['language'] = $edit['language'];
     global $language;
     if ($user->language != $edit['language']) {
-      global $base_url;
-      if ($edit['language'] != language_default('language')) {
+        global $base_url;
+        if ($edit['language'] != language_default('language')) {
         $form_state['redirect'] = $base_url . '/' . $edit['language'] . '/' . $_GET['q'];
-      }
-      else {
+        }
+        else {
         $form_state['redirect'] = $base_url . '/' . $_GET['q'];
-      }
+        }
     }
-  }
-  user_save($user, $settings);
+    }
+    user_save($user, $settings);
   
-  drupal_set_message(bts('Your community preferences have been updated.', array(), NULL, 'boinc:account-preferences-community'));
+    drupal_set_message(bts('Your community preferences have been updated.', array(), NULL, 'boinc:account-preferences-community'));
   
-  // Form will not redirect if storage is set; not good if language changes
-  unset($form_state['storage']);
+    // Form will not redirect if storage is set; not good if language changes
+    unset($form_state['storage']);
 }
 
 /**
  * The structure of the privacy preferences form
  */
 function boincwork_privacyprefs_form(&$form_state) {
-  require_boinc(array('user', 'prefs', 'util', 'consent'));
+    require_boinc(array('user', 'prefs', 'util', 'consent'));
   
-  global $user;
-  $account = user_load($user->uid);
-  $boincuser = BoincUser::lookup_id($account->boincuser_id);
+    global $user;
+    $account = user_load($user->uid);
+    $boincuser = BoincUser::lookup_id($account->boincuser_id);
   
-  // Load preferences from BOINC account
-  $prefs = boincwork_load_prefs('project');
+    // Load preferences from BOINC account
+    $prefs = boincwork_load_prefs('project');
   
-  //if (!$prefs AND !$initialize_if_empty) return null;
+    //if (!$prefs AND !$initialize_if_empty) return null;
 
-  $privacy_consent_types = boincwork_load_privacyconsenttypes();
+    $privacy_consent_types = boincwork_load_privacyconsenttypes();
   
-  // Define form defaults
-  $default = array(
+    // Define form defaults
+    $default = array(
     'privacy' => array(
-      'send_email' => ($boincuser->send_email) ? 1 : 0,
-      'show_hosts' => ($boincuser->show_hosts) ? 1 : 0
+        'send_email' => ($boincuser->send_email) ? 1 : 0,
+        'show_hosts' => ($boincuser->show_hosts) ? 1 : 0
     )
-  );
+    );
   
-  // 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['privacy'] = array(
+    $form['privacy'] = array(
     '#title' => bts('Privacy settings', array(), NULL, 'boinc:account-preferences-privacy'),
     '#type' => 'fieldset',
     '#description' => null,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE
-  );
-  $form['privacy']['send_email'] = array(
+    );
+    $form['privacy']['send_email'] = array(
     '#title' => bts('Is it OK for @project and your team (if any) to email you?', array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:account-preferences-privacy'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['privacy']['send_email']
-  );
-  $form['privacy']['show_hosts'] = array(
+    );
+    $form['privacy']['show_hosts'] = array(
     '#title' => bts('Should @project show your computers on its web site?', array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:account-preferences-privacy'),
     '#description' => bts('At times, you may be asked to enable this option in order to receive help from the forums. Advanced users may need to be able to inspect your computers\' information in order to help diagnose any problems.', array(), NULL, 'boinc:account-preferences-privacy'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['privacy']['show_hosts']
-  );
+    );
 
-  // Loop over privacy consent types and create form question for each
-  // option that deals with privacy.
-  foreach ($privacy_consent_types as $ct) {
+    // Loop over privacy consent types and create form question for each
+    // option that deals with privacy.
+    foreach ($privacy_consent_types as $ct) {
 
     $currstate = (check_user_consent($boincuser, $ct['shortname'])) ? 1 : 0 ;
     // Set name to 'privacyconsent_SHORTNAME', which can be parsed
     // later in the submit function.
     $form['privacy']['privacyconsent_'.$ct['shortname']] = array(
-      '#title' => bts($ct['description'], array(), NULL, 'boinc:account-preferences-privacy'),
-      '#type' => 'radios',
-      '#options' => $form['boolean_options']['#value'],
-      '#attributes' => array('class' => 'fancy'),
-      '#default_value' => $currstate,
+        '#title' => bts($ct['description'], array(), NULL, 'boinc:account-preferences-privacy'),
+        '#type' => 'radios',
+        '#options' => $form['boolean_options']['#value'],
+        '#attributes' => array('class' => 'fancy'),
+        '#default_value' => $currstate,
     );
-  }
+    }
 
-  // Ignore and block users
-  if (module_exists('ignore_user')) {
+    // Ignore and block users
+    if (module_exists('ignore_user')) {
     $form['ignoreblock'] = array(
-      '#title' => bts('Ignore Users', array(), NULL, 'boinc:account-preferences-privacy'),
-      '#type' => 'fieldset',
-      '#description' => bts('<p>You may ignore users in the forums and block users from sending you private messages.<p>', array(), NULL, 'boinc:ignore-user-help'),
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE
+        '#title' => bts('Ignore Users', array(), NULL, 'boinc:account-preferences-privacy'),
+        '#type' => 'fieldset',
+        '#description' => bts('<p>You may ignore users in the forums and block users from sending you private messages.<p>', array(), NULL, 'boinc:ignore-user-help'),
+        '#collapsible' => TRUE,
+        '#collapsed' => FALSE
     );
 
     // Table for ignored users
     $form['ignoreblock']['current_ignore_section'] = array(
-      '#type' => 'item',
-      '#value' => bts('Current users on your Ignore List', array(), NULL, 'boinc:ignore-user-list'),
-      '#prefix' => '<h4>',
-      '#suffix' => '</h4>',
-      '#weight' => -20,
+        '#type' => 'item',
+        '#value' => bts('Current users on your Ignore List', array(), NULL, 'boinc:ignore-user-list'),
+        '#prefix' => '<h4>',
+        '#suffix' => '</h4>',
+        '#weight' => -20,
     );
 
     $ignored_users = _ignore_user_ignored_users();
     foreach ($ignored_users as $ignored_user) {
-      $form['ignoreblock']['username'][$ignored_user['iuid']] = array(
+        $form['ignoreblock']['username'][$ignored_user['iuid']] = array(
         '#value' => $ignored_user['username'],
-      );
-      $form['ignoreblock']['delete'][$ignored_user['iuid']] = array(
+        );
+        $form['ignoreblock']['delete'][$ignored_user['iuid']] = array(
         '#value' => l(
-          bts('delete', array(), NULL, 'boinc:ignore-user-delete-button'),
-          'account/prefs/privacy/ignore_user/remove/'. $ignored_user['iuid'],
-          array()
+            bts('delete', array(), NULL, 'boinc:ignore-user-delete-button'),
+            'account/prefs/privacy/ignore_user/remove/'. $ignored_user['iuid'],
+            array()
         ),
-      );
+        );
     }
     $form['ignoreblock']['pager'] = array('#value' => theme('pager', NULL, 10, 0));
 
     // Sub-form to add user to ignore list
     $form['ignoreblock']['add_ignore_user_section'] = array(
-      '#type' => 'item',
-      '#value' => bts('Add user to Ignore List', array(), NULL, 'boinc:ignore-user-add'),
-      '#prefix' => '<h4>',
-      '#suffix' => '</h4>',
-      '#weight' => 10,
+        '#type' => 'item',
+        '#value' => bts('Add user to Ignore List', array(), NULL, 'boinc:ignore-user-add'),
+        '#prefix' => '<h4>',
+        '#suffix' => '</h4>',
+        '#weight' => 10,
     );
 
     $form['ignoreblock']['addusername_toignorelist'] = array(
-      '#type' => 'textfield',
-      '#title' => bts('Username', array(), NULL, 'boinc:ignore-user-searchbox'),
-      '#description' => bts('To lookup a username start typing in the search box. A list of usernames will appear as you type. The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.', array(), NULL, 'boinc:ignore-user-searchbox-help'),
-      '#weight' => 11,
-      '#size' => 50,
-      '#autocomplete_path' => 'boincuser/autocomplete',
+        '#type' => 'textfield',
+        '#title' => bts('Username', array(), NULL, 'boinc:ignore-user-searchbox'),
+        '#description' => bts('To lookup a username start typing in the search box. A list of usernames will appear as you type. The number appearing in the suffix is the BOINC id. You can find a user\'s BOINC id on their user profile page.', array(), NULL, 'boinc:ignore-user-searchbox-help'),
+        '#weight' => 11,
+        '#size' => 50,
+        '#autocomplete_path' => 'boincuser/autocomplete',
     );
 
     $form['ignoreblock']['addusername_submit'] = array(
-      '#type' => 'submit',
-      '#value' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
-      '#submit' => array('_boincwork_ignore_list_form_submit'),
-      '#weight' => 12,
-      '#attributes' => array('class' => 'add_ignore_user'),
+        '#type' => 'submit',
+        '#value' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
+        '#submit' => array('_boincwork_ignore_list_form_submit'),
+        '#weight' => 12,
+        '#attributes' => array('class' => 'add_ignore_user'),
     );
-  }// endif module_exists
+    }// endif module_exists
 
-  $form['prefs']['separator_bottom'] = array(
+    $form['prefs']['separator_bottom'] = array(
     '#value' => '<div class="separator buttons"></div>'
-  );
+    );
   
-  // Form control
-  $form['prefs']['form control tabs prefix'] = array(
+    // Form control
+    $form['prefs']['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['prefs']['submit'] = array(
+    );
+    $form['prefs']['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save changes', array(), NULL, 'boinc:form-save'),
     '#validate' => array('boincwork_privacyprefs_form_validate'),
     '#submit' => array('boincwork_privacyprefs_form_submit'),
     '#suffix' => '</li>'
-  );
-  $form['prefs']['form control tabs'] = array(
+    );
+    $form['prefs']['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>'
-  );
-  $form['prefs']['form control tabs suffix'] = array(
+    );
+    $form['prefs']['form control tabs suffix'] = array(
     '#value' => '</ul>'
-  );
+    );
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -1866,93 +1866,93 @@ 
  */
 function theme_boincwork_privacyprefs_form($form) {
 
-  $output = '';
-  $output .= drupal_render($form['privacy']);
+    $output = '';
+    $output .= drupal_render($form['privacy']);
 
-  $header = array(
+    $header = array(
     bts('Username', array(), NULL, 'boinc:ignore-user-list'),
     bts('Operations', array(), NULL, 'boinc:ignore-user-list')
-  );
+    );
 
-  $rows = array();
-  if (isset($form['ignoreblock']['username']) && is_array($form['ignoreblock']['username'])) {
+    $rows = array();
+    if (isset($form['ignoreblock']['username']) && is_array($form['ignoreblock']['username'])) {
     foreach (element_children($form['ignoreblock']['username']) as $key) {
-      $row = array();
-      $row[] = drupal_render($form['ignoreblock']['username'][$key]);
-      $row[] = drupal_render($form['ignoreblock']['delete'][$key]);
-      $rows[] = $row;
+        $row = array();
+        $row[] = drupal_render($form['ignoreblock']['username'][$key]);
+        $row[] = drupal_render($form['ignoreblock']['delete'][$key]);
+        $rows[] = $row;
+    }
     }
-  }
-  else {
+    else {
     $rows[] = array(
-      array(
+        array(
         'data' => bts('You have not added any users to your Ignore List.', array(), NULL, 'boinc:ignore-user-list'),
         'colspan' => '2',
-      )
+        )
     );
-  }
+    }
 
-  $attr = array('class' => 'ignore_user');
-  $form['ignoreblock']['current_list']['ignored_users']['#value'] = theme('table', $header, $rows, $attr);
-  $output .= drupal_render($form['current_list']);
+    $attr = array('class' => 'ignore_user');
+    $form['ignoreblock']['current_list']['ignored_users']['#value'] = theme('table', $header, $rows, $attr);
+    $output .= drupal_render($form['current_list']);
 
-  if ($form['pager']['#value']) {
+    if ($form['pager']['#value']) {
     $output .= drupal_render($form['pager']);
-  }
+    }
 
-  $output .= drupal_render($form);
+    $output .= drupal_render($form);
 
-  return $output;
+    return $output;
 }
 
 /**
-  * Validate the privacy preferences form.
-  */
+ * Validate the privacy preferences form.
+ */
 function boincwork_privacyprefs_form_validate($form, &$form_state) {
-  require_boinc('util');
+    require_boinc('util');
   
-  // Verify all non-boolean user input values and notify form API of failures
-  // ... currently there are no non-boolean values!
+    // Verify all non-boolean user input values and notify form API of failures
+    // ... currently there are no non-boolean values!
 }
 
 /**
-  * Handle post-validation submission of privacy preferences form.
-  */
+ * Handle post-validation submission of privacy preferences form.
+ */
 function boincwork_privacyprefs_form_submit($form, &$form_state) {
-  require_boinc(array('user', 'prefs', 'consent'));
+    require_boinc(array('user', 'prefs', 'consent'));
 
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
 
-  // Load BOINC account
-  $boincuser = BoincUser::lookup_id($account->boincuser_id);
+    // Load BOINC account
+    $boincuser = BoincUser::lookup_id($account->boincuser_id);
   
-  // Privacy preferences
-  $boincuser->send_email = ($form_state['values']['send_email']) ? true : false;
-  $boincuser->show_hosts = ($form_state['values']['show_hosts']) ? true : false;
+    // Privacy preferences
+    $boincuser->send_email = ($form_state['values']['send_email']) ? true : false;
+    $boincuser->show_hosts = ($form_state['values']['show_hosts']) ? true : false;
 
-  // Privacy consent options, extract the 'privacyconsent_SHORTNAME'
-  // from values array, and loop over them; each is checked with
-  // check_consent_type(). Also check the current state of the option
-  // in the database. If the form value is a new state, then set it.
-  $result = preg_grep("/^privacyconsent/", array_keys($form_state['values']));
-  $privacyconsent_prefs = array_intersect_key($form_state['values'], array_flip($result));
-  foreach ($privacyconsent_prefs as $name => $newstate) {
+    // Privacy consent options, extract the 'privacyconsent_SHORTNAME'
+    // from values array, and loop over them; each is checked with
+    // check_consent_type(). Also check the current state of the option
+    // in the database. If the form value is a new state, then set it.
+    $result = preg_grep("/^privacyconsent/", array_keys($form_state['values']));
+    $privacyconsent_prefs = array_intersect_key($form_state['values'], array_flip($result));
+    foreach ($privacyconsent_prefs as $name => $newstate) {
     $subname = explode('_', $name)[1];
     $currstate = (check_user_consent($boincuser, $subname)) ? 1 : 0 ;
     list($checkct, $ctid) = check_consent_type($subname);
     if ($checkct && ($currstate != $newstate)) {
-      consent_to_a_policy($boincuser, $ctid, $newstate, 0, 'Webform', time());
+        consent_to_a_policy($boincuser, $ctid, $newstate, 0, 'Webform', time());
+    }
     }
-  }
 
-  //project_prefs_update($boincuser, $main_prefs);
+    //project_prefs_update($boincuser, $main_prefs);
   
-  db_set_active('boinc_rw');
-  db_query("UPDATE user SET send_email = '{$boincuser->send_email}', show_hosts = '{$boincuser->show_hosts}' WHERE id = '{$boincuser->id}'");
-  db_set_active('default');
+    db_set_active('boinc_rw');
+    db_query("UPDATE user SET send_email = '{$boincuser->send_email}', show_hosts = '{$boincuser->show_hosts}' WHERE id = '{$boincuser->id}'");
+    db_set_active('default');
   
-  drupal_set_message(t('Your privacy preferences have been updated.'));
+    drupal_set_message(t('Your privacy preferences have been updated.'));
 }
 
 /**
@@ -1960,14 +1960,14 @@ 
  * ignore list.
  */
 function _boincwork_ignore_list_form_submit($form, $form_state) {
-  boincwork_ignore_user_add_user_username($form_state['values']['addusername_toignorelist']);
-  drupal_set_message(
+    boincwork_ignore_user_add_user_username($form_state['values']['addusername_toignorelist']);
+    drupal_set_message(
     bts('@username has been added to your ignore list. See your !privacy_preferences for more details.',
-      array(
+        array(
         '@username' => $form_state['values']['addusername_toignorelist'],
         '!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');
 }
 
@@ -1976,37 +1976,37 @@ 
  */
 function boincwork_selectapp_form(&$form_state, $apps, $current_app) {
 
-  $form['selectapp'] = array(
+    $form['selectapp'] = array(
     '#type' => 'select',
     '#attributes' => array(
-      'class' => 'task-app-filter',
-      'onchange' => 'this.form.submit();',
+        'class' => 'task-app-filter',
+        'onchange' => 'this.form.submit();',
     ),
     '#default_value' => $current_app,
     '#options' => $apps,
     '#post_render' => array('_boincwork_selectapp_form_callback'),
-  );
+    );
 
-  // Class task-app-filter-submit for this form is used in
-  // theming. CSS sets 'display:none' if javascript is present. Thus
-  // only non-js users/browsers will see the Apply Filter button.
-  $form['submit'] = array(
+    // Class task-app-filter-submit for this form is used in
+    // theming. CSS sets 'display:none' if javascript is present. Thus
+    // only non-js users/browsers will see the Apply Filter button.
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => bts('Apply Filter', array(), NULL, 'boinc:form-save'),
     '#attributes' => array('class' => 'js-hide',),
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
  * Submit function for select appliacation form.
  */
 function boincwork_selectapp_form_submit($form, &$form_state) {
-  $myargs = arg();
-  array_pop($myargs);
-  $newpath = implode('/', $myargs ) . '/' . $form['selectapp']['#value'];
-  $form_state['redirect'] = $newpath;
+    $myargs = arg();
+    array_pop($myargs);
+    $newpath = implode('/', $myargs ) . '/' . $form['selectapp']['#value'];
+    $form_state['redirect'] = $newpath;
 }
 
 /**
@@ -2016,7 +2016,7 @@ 
  * 'title' for the Application drop down box.
  */
 function _boincwork_selectapp_form_callback($theContent, $theElement) {
-  $disabled = '<option value="-1" disabled hidden';
-  $newContent = preg_replace('/<option value="-1"/', $disabled, $theContent);
-  return $newContent;
+    $disabled = '<option value="-1" disabled hidden';
+    $newContent = preg_replace('/<option value="-1"/', $disabled, $theContent);
+    return $newContent;
 }

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

Indentation +1726 added lines, -1726 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;
+        );
+        $node['tid'] = $tid;
       
-      // Save the topic node
-      $node = (object) $node; // node_save requires an object form
-      node_save($node);
-      taxonomy_node_save($node, array($tid));
-      $success = ($node->nid) ? TRUE : FALSE;
-      if ($success) {
+        // Save the topic node
+        $node = (object) $node; // node_save requires an object form
+        node_save($node);
+        taxonomy_node_save($node, array($tid));
+        $success = ($node->nid) ? TRUE : FALSE;
+        if ($success) {
         $success = db_query('
           INSERT INTO {boincimport_temp_topic} (topic_id, post_id, nid)
           VALUES (%d, %d, %d)', $topic->id, $post->id, $node->nid
         );
         if ($success) {
-          // Hack to keep the topics in correct order
-          $success = db_query('UPDATE {node_comment_statistics} SET last_comment_timestamp = %d WHERE nid = %d', $node->created, $node->nid);
-          if (!$success) {
+            // Hack to keep the topics in correct order
+            $success = db_query('UPDATE {node_comment_statistics} SET last_comment_timestamp = %d WHERE nid = %d', $node->created, $node->nid);
+            if (!$success) {
             $error_detail = 'topic imported, but failed to set last comment timestamp';
-          }
+            }
         }
         else {
-          $error_detail = 'topic node saved, but failed to link in boincimport_temp_topic table';
+            $error_detail = 'topic node saved, but failed to link in boincimport_temp_topic table';
         }
-      }
-      else {
+        }
+        else {
         $error_detail = 'failed to save topic node to database';
-      }
+        }
     }
     
     // See if the import worked
     $message = '';
     if ($success) {
-      // Store some result for post-processing in the finished callback.
-      $context['results']['success'][] = $topic->id;
-      $message = "Successfully imported topic {$topic->id}";
+        // Store some result for post-processing in the finished callback.
+        $context['results']['success'][] = $topic->id;
+        $message = "Successfully imported topic {$topic->id}";
     }
     elseif ($duplicate) {
-      $context['results']['duplicate'][] = $topic->id;
-      $message = "Topic {$topic->id} was already imported";
+        $context['results']['duplicate'][] = $topic->id;
+        $message = "Topic {$topic->id} was already imported";
     }
     elseif (!$post) {
-      $context['results']['empty'][] = $topic->id;
-      $message = "Skipping topic {$topic->id} as empty";
+        $context['results']['empty'][] = $topic->id;
+        $message = "Skipping topic {$topic->id} as empty";
     }
     else {
-      $context['results']['failure'][] = $topic->id;
-      $message = "Failed to import topic {$topic->id}!";
-      watchdog('boincimport',
+        $context['results']['failure'][] = $topic->id;
+        $message = "Failed to import topic {$topic->id}!";
+        watchdog('boincimport',
         'Failed to import topic @id! (@error)',
         array(
-          '@id' => $topic->id,
-          '@error' => $error_detail,
+            '@id' => $topic->id,
+            '@error' => $error_detail,
         ),
         WATCHDOG_WARNING
-      ); 
+        ); 
     }
     
     // Update our progress information.
@@ -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/boincteam/boincteam.module

Indentation +571 added lines, -571 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;
+    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 (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,313 +426,313 @@ 
     $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 {
-      drupal_set_message(t('There was a problem joining @team, please try again
+        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;
+    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)) {
+    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;
 }
 
 /** 
@@ -754,18 +754,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);
-  }
+    }
 }
 
 
@@ -777,125 +777,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">';
@@ -914,254 +914,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 
@@ -1170,131 +1170,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;
 }
 
 /**
@@ -1322,50 +1322,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.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;
 }