BOINC / boinc

html/ops/bbcode_convert_signature.php

Spacing +4 added lines, -4 removed lines

@@ -42,15 +42,15 @@
     $start_id = 0; //Set this to something else if you like
     $forum_preferencess = _mysql_query("select * from forum_preferences where userid>$start_id order by userid");
     echo _mysql_error();
-    $i=0;
-    while ($forum_preferences = _mysql_fetch_object($forum_preferencess)){
+    $i = 0;
+    while ($forum_preferences = _mysql_fetch_object($forum_preferencess)) {
         $i++;
         if ($i%100 == 0) {                      //For every 100 forum_preferencess
-            echo $forum_preferences->userid.". "; flush();   // print out where we are
+            echo $forum_preferences->userid.". "; flush(); // print out where we are
             //usleep(200000);
         }
 
-        if ($forum_preferences->userid > $start_id){
+        if ($forum_preferences->userid > $start_id) {
             fix_forum_preferences($forum_preferences);
         }
     }

Braces +4 added lines, -3 removed lines

@@ -43,14 +43,15 @@
     $forum_preferencess = _mysql_query("select * from forum_preferences where userid>$start_id order by userid");
     echo _mysql_error();
     $i=0;
-    while ($forum_preferences = _mysql_fetch_object($forum_preferencess)){
+    while ($forum_preferences = _mysql_fetch_object($forum_preferencess)) {
         $i++;
-        if ($i%100 == 0) {                      //For every 100 forum_preferencess
+        if ($i%100 == 0) {
+//For every 100 forum_preferencess
             echo $forum_preferences->userid.". "; flush();   // print out where we are
             //usleep(200000);
         }
 
-        if ($forum_preferences->userid > $start_id){
+        if ($forum_preferences->userid > $start_id) {
             fix_forum_preferences($forum_preferences);
         }
     }

html/ops/user_graph.php

Spacing +5 added lines, -5 removed lines

@@ -26,13 +26,13 @@ 
 
 
     // Create the graph. These two calls are always required
-    $graph = new Graph(350,250,"auto");
+    $graph = new Graph(350, 250, "auto");
     //$graph->SetScale("lin");
     //$graph->SetScale("textlin");
     $graph->SetScale("loglin");
 
     // Create the linear plot
-    $lineplot=new BarPlot($arr, $xarr);
+    $lineplot = new BarPlot($arr, $xarr);
     $lineplot->SetColor("blue");
 
     // Add the plot to the graph
@@ -44,7 +44,7 @@ 
 
 function show_text($xarr, $yarr) {
     $n = sizeof($xarr);
-    for ($i=0; $i<$n; $i++) {
+    for ($i = 0; $i < $n; $i++) {
         echo "<br>$xarr[$i] $yarr[$i]\n";
     }
 }
@@ -90,9 +90,9 @@ 
         if ($ind > $maxind) $maxind = $ind;
     }
     $xarr = array();
-    for ($i=0; $i<=$maxind; $i++) {
+    for ($i = 0; $i <= $maxind; $i++) {
         $xarr[$i] = $i;
-        if (is_null($yarr[$i])) $yarr[$i]=0;
+        if (is_null($yarr[$i])) $yarr[$i] = 0;
     }
     if ($show_text) {
         show_text($xarr, $yarr);

html/ops/bbcode_convert.php

Spacing +4 added lines, -4 removed lines

@@ -44,15 +44,15 @@
     $start_id = 0; //Set this to something else if you like
     $posts = _mysql_query("select * from post where id>$start_id order by id");
     echo _mysql_error();
-    $i=0;
-    while ($post = _mysql_fetch_object($posts)){
+    $i = 0;
+    while ($post = _mysql_fetch_object($posts)) {
         $i++;
         if ($i%100 == 0) {                      //For every 100 posts
-            echo $post->id.". "; flush();   // print out where we are
+            echo $post->id.". "; flush(); // print out where we are
             //usleep(200000);
         }
 
-        if ($post->id > $start_id){
+        if ($post->id > $start_id) {
             fix_post($post);
         }
     }

Braces +4 added lines, -3 removed lines

@@ -45,14 +45,15 @@
     $posts = _mysql_query("select * from post where id>$start_id order by id");
     echo _mysql_error();
     $i=0;
-    while ($post = _mysql_fetch_object($posts)){
+    while ($post = _mysql_fetch_object($posts)) {
         $i++;
-        if ($i%100 == 0) {                      //For every 100 posts
+        if ($i%100 == 0) {
+//For every 100 posts
             echo $post->id.". "; flush();   // print out where we are
             //usleep(200000);
         }
 
-        if ($post->id > $start_id){
+        if ($post->id > $start_id) {
             fix_post($post);
         }
     }

html/ops/list_new_users.php

Braces +3 added lines, -4 removed lines

@@ -67,7 +67,7 @@ 
     $email_validated = $row->email_validated;
 
     $team_name="";
-    if($row->teamid > 0){
+    if($row->teamid > 0) {
         $team = BoincTeam::lookup_id($row->teamid);
         $team_name = $team->name;
     }
@@ -80,7 +80,7 @@ 
     if ($special_bits != "0") {
         for ($i = 0; $i < 7; $i++) {
             $bit = substr($special_bits, $i, 1);
-            if ($bit == '1'){
+            if ($bit == '1') {
                 if (!empty($roles)) {
                     $roles .= ", ";
                 }
@@ -97,8 +97,7 @@ 
         $dt = $user->banished_until - time();
         if( $dt > 0 ) {
             $x = "<span style=\"color: #ff0000\">Currently banished</span>";
-        }
-        else {
+        } else {
             $x = "<span style=\"color: #ff9900\">Previously banished</span>";
         }
         $roles .= $x;

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
 \***********************************************************************/
 
 $limit = get_int('limit', true);
-if (! $limit > 0 ) $limit = 30;
+if (!$limit > 0) $limit = 30;
 
 
 
@@ -48,7 +48,7 @@ 
 echo "<input class=\"btn btn-default\" type=\"submit\" value=\"Display\">\n";
 echo "</form>\n";
 
-$query="SELECT * FROM user ORDER BY create_time DESC LIMIT $limit";
+$query = "SELECT * FROM user ORDER BY create_time DESC LIMIT $limit";
 $result = _mysql_query($query);
 if (_mysql_num_rows($result) < 1) {
     echo "There are no new users.";
@@ -66,8 +66,8 @@ 
     $joined = time_str($row->create_time);
     $email_validated = $row->email_validated;
 
-    $team_name="";
-    if($row->teamid > 0){
+    $team_name = "";
+    if ($row->teamid > 0) {
         $team = BoincTeam::lookup_id($row->teamid);
         $team_name = $team->name;
     }
@@ -80,7 +80,7 @@ 
     if ($special_bits != "0") {
         for ($i = 0; $i < 7; $i++) {
             $bit = substr($special_bits, $i, 1);
-            if ($bit == '1'){
+            if ($bit == '1') {
                 if (!empty($roles)) {
                     $roles .= ", ";
                 }
@@ -95,7 +95,7 @@ 
     // Banished?
     if (!empty($user->banished_until)) {
         $dt = $user->banished_until - time();
-        if( $dt > 0 ) {
+        if ($dt > 0) {
             $x = "<span style=\"color: #ff0000\">Currently banished</span>";
         }
         else {

html/ops/db_form.php

Indentation +6 added lines, -6 removed lines

@@ -35,10 +35,10 @@ 
 start_table();
 
 switch($table){
-	case "platform":
-		break;
-	case "app":
-		break;
+    case "platform":
+        break;
+    case "app":
+        break;
     case "app_version":
         print_detail_field();
         print_query_field();
@@ -89,8 +89,8 @@ 
     case "user":
         print_query_field();
         break;
-	default:
-		echo "Unknown table name\n";
+    default:
+        echo "Unknown table name\n";
         exit();
 }
 

Switch Indentation +50 added lines, -50 removed lines

@@ -35,63 +35,63 @@
 start_table();
 
 switch($table){
-	case "platform":
-		break;
-	case "app":
-		break;
-    case "app_version":
-        print_detail_field();
-        print_query_field();
-        break;
-    case "host":
-        echo "
+case "platform":
+	break;
+case "app":
+	break;
+case "app_version":
+    print_detail_field();
+    print_query_field();
+    break;
+case "host":
+    echo "
             <tr>
             <td align=\"right\">Show Aggregate Information</td>
             <td>
         ";
-        print_checkbox("", "show_aggregate", $show_aggregate);
-        echo "
+    print_checkbox("", "show_aggregate", $show_aggregate);
+    echo "
             </td>
             </tr>
         ";
-        print_detail_field();
-        print_query_field();
-        break;
-    case "workunit":
-        print_detail_field();
-        print_query_field();
-        echo "<input type=\"hidden\" name=\"sort_by\" value=\"id\">\n";
-        break;
-    case "result":
-        echo "<tr><td align=\"right\">Server state</td><td> ";
-        server_state_select();
-        echo "</td></tr>\n";
-        //print_text_field( "Batch number:", "batch", $batch );
-        echo "<tr><td align=\"right\">Outcome</td><td>";
-        outcome_select();
-        echo "</td></tr>\n";
-        echo "<tr><td align=\"right\">Client state</td><td>";
-        client_state_select();
-        echo "</td></tr>\n";
-        echo "<tr><td align=\"right\">Validate state</td><td>";
-        validate_state_select();
-        echo "</td></tr>\n";
-        echo "<tr><td align=\"right\">Sort by</td><td>";
-        result_sort_select();
-        sort_order_select();
-        echo "</td></tr>\n";
-        print_detail_field();
-        print_query_field();
-        break;
-    case "team":
-        print_query_field();
-        break;
-    case "user":
-        print_query_field();
-        break;
-	default:
-		echo "Unknown table name\n";
-        exit();
+    print_detail_field();
+    print_query_field();
+    break;
+case "workunit":
+    print_detail_field();
+    print_query_field();
+    echo "<input type=\"hidden\" name=\"sort_by\" value=\"id\">\n";
+    break;
+case "result":
+    echo "<tr><td align=\"right\">Server state</td><td> ";
+    server_state_select();
+    echo "</td></tr>\n";
+    //print_text_field( "Batch number:", "batch", $batch );
+    echo "<tr><td align=\"right\">Outcome</td><td>";
+    outcome_select();
+    echo "</td></tr>\n";
+    echo "<tr><td align=\"right\">Client state</td><td>";
+    client_state_select();
+    echo "</td></tr>\n";
+    echo "<tr><td align=\"right\">Validate state</td><td>";
+    validate_state_select();
+    echo "</td></tr>\n";
+    echo "<tr><td align=\"right\">Sort by</td><td>";
+    result_sort_select();
+    sort_order_select();
+    echo "</td></tr>\n";
+    print_detail_field();
+    print_query_field();
+    break;
+case "team":
+    print_query_field();
+    break;
+case "user":
+    print_query_field();
+    break;
+default:
+	echo "Unknown table name\n";
+       exit();
 }
 
 row2("Number of entries to show", "<input name=\"nresults\" value=\"20\">");

Braces +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
 start_table();
 
-switch($table){
+switch($table) {
 	case "platform":
 		break;
 	case "app":

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
 start_table();
 
-switch($table){
+switch ($table) {
 	case "platform":
 		break;
 	case "app":

html/ops/db_update.php

Spacing +5 added lines, -5 removed lines

@@ -276,7 +276,7 @@ 
     do_query("alter table host add max_results_day integer not null");
 }
 
-function update_4_20_2005(){
+function update_4_20_2005() {
     do_query("ALTER TABLE `thread` ADD `sticky` TINYINT UNSIGNED DEFAULT '0' NOT NULL");
     do_query("ALTER TABLE `forum` ADD `post_min_total_credit` INT NOT NULL AFTER `posts`");
     do_query("ALTER TABLE `forum` ADD `post_min_expavg_credit` INT NOT NULL AFTER `posts`");
@@ -286,7 +286,7 @@ 
     do_query("ALTER TABLE `forum_preferences` ADD `last_post` INT( 14 ) UNSIGNED NOT NULL AFTER `posts`");
 }
 
-function update_4_30_2005(){
+function update_4_30_2005() {
     do_query("ALTER TABLE `forum_preferences` ADD `ignore_sticky_posts` TINYINT( 1 ) UNSIGNED NOT NULL");
 }
 
@@ -313,7 +313,7 @@ 
     do_query("update user set country='Macedonia' where country='Macedonia, The Former Yugoslav Republic of'");
 }
 
-function update_11_24_2005(){
+function update_11_24_2005() {
     do_query("ALTER TABLE `forum_preferences` ADD `minimum_wrap_postcount` INT DEFAULT '100' NOT NULL AFTER `high_rating_threshold` ,
 ADD `display_wrap_postcount` INT DEFAULT '75' NOT NULL AFTER `minimum_wrap_postcount`");
 }
@@ -618,7 +618,7 @@ 
     ");
 }
 
-function update_10_05_2008(){
+function update_10_05_2008() {
     do_query("alter table forum_preferences add highlight_special tinyint default '1' not null");
 }
 
@@ -1244,7 +1244,7 @@ 
 // This used to be the Subversion version#,
 // but with Git we just use sequential integers
 //
-$db_updates = array (
+$db_updates = array(
     array(18490, "update_6_16_2009"),
     array(19001, "update_9_3_2009"),
     array(20807, "update_3_5_2010"),

Braces +4 added lines, -4 removed lines

@@ -276,7 +276,7 @@ 
     do_query("alter table host add max_results_day integer not null");
 }
 
-function update_4_20_2005(){
+function update_4_20_2005() {
     do_query("ALTER TABLE `thread` ADD `sticky` TINYINT UNSIGNED DEFAULT '0' NOT NULL");
     do_query("ALTER TABLE `forum` ADD `post_min_total_credit` INT NOT NULL AFTER `posts`");
     do_query("ALTER TABLE `forum` ADD `post_min_expavg_credit` INT NOT NULL AFTER `posts`");
@@ -286,7 +286,7 @@ 
     do_query("ALTER TABLE `forum_preferences` ADD `last_post` INT( 14 ) UNSIGNED NOT NULL AFTER `posts`");
 }
 
-function update_4_30_2005(){
+function update_4_30_2005() {
     do_query("ALTER TABLE `forum_preferences` ADD `ignore_sticky_posts` TINYINT( 1 ) UNSIGNED NOT NULL");
 }
 
@@ -313,7 +313,7 @@ 
     do_query("update user set country='Macedonia' where country='Macedonia, The Former Yugoslav Republic of'");
 }
 
-function update_11_24_2005(){
+function update_11_24_2005() {
     do_query("ALTER TABLE `forum_preferences` ADD `minimum_wrap_postcount` INT DEFAULT '100' NOT NULL AFTER `high_rating_threshold` ,
 ADD `display_wrap_postcount` INT DEFAULT '75' NOT NULL AFTER `minimum_wrap_postcount`");
 }
@@ -618,7 +618,7 @@ 
     ");
 }
 
-function update_10_05_2008(){
+function update_10_05_2008() {
     do_query("alter table forum_preferences add highlight_special tinyint default '1' not null");
 }
 

html/ops/bbcode_convert_response2.php

Spacing +4 added lines, -4 removed lines

@@ -42,15 +42,15 @@
     $start_id = 0; //Set this to something else if you like
     $profiles = _mysql_query("select * from profile where userid>$start_id order by userid");
     echo _mysql_error();
-    $i=0;
-    while ($profile = _mysql_fetch_object($profiles)){
+    $i = 0;
+    while ($profile = _mysql_fetch_object($profiles)) {
         $i++;
         if ($i%100 == 0) {                      //For every 100 profiles
-            echo $profile->userid.". "; flush();   // print out where we are
+            echo $profile->userid.". "; flush(); // print out where we are
             //usleep(200000);
         }
 
-        if ($profile->userid > $start_id){
+        if ($profile->userid > $start_id) {
             fix_profile($profile);
         }
     }

Braces +4 added lines, -3 removed lines

@@ -43,14 +43,15 @@
     $profiles = _mysql_query("select * from profile where userid>$start_id order by userid");
     echo _mysql_error();
     $i=0;
-    while ($profile = _mysql_fetch_object($profiles)){
+    while ($profile = _mysql_fetch_object($profiles)) {
         $i++;
-        if ($i%100 == 0) {                      //For every 100 profiles
+        if ($i%100 == 0) {
+//For every 100 profiles
             echo $profile->userid.". "; flush();   // print out where we are
             //usleep(200000);
         }
 
-        if ($profile->userid > $start_id){
+        if ($profile->userid > $start_id) {
             fix_profile($profile);
         }
     }

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

Indentation +245 added lines, -245 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));
-
-  // Set user roles based on current penalty status...
-  if ($account->boincuser_penalty_expiration > time()) {
+    }
+    $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()) {
     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,33 +339,33 @@ 
  *
  */
 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. The @project administrators have been notified.",
         array(
-          '@id' => $boinc_user->id,
-          '@project' => variable_get('site_name', 'Drupal-BOINC'), NULL, 'boinc:add-new-user'
+            '@id' => $boinc_user->id,
+            '@project' => variable_get('site_name', 'Drupal-BOINC'), NULL, 'boinc:add-new-user'
         ),
         'NULL', 'boinc:consent-termsofuse'),
-      'error');
-      rules_invoke_event('boincuser_general_consent_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
+        'error');
+        rules_invoke_event('boincuser_general_consent_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
     }
     return $rc1;
-  }
-  else {
+    }
+    else {
     drupal_set_message(
-      bts('ERROR: Consent type for enrollment not found. The @project administrators have been nofitifed.',
+        bts('ERROR: Consent type for enrollment not found. The @project administrators have been nofitifed.',
         array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:consent-termsofuse'),
     'error');
     rules_invoke_event('boincuser_general_consent_type_error', CONSENT_TYPE_ENROLL, variable_get('boinc_admin_mailing_list_subject_tag', ''));
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
@@ -374,16 +374,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;
 }
 
 /**
@@ -391,20 +391,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);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -415,17 +415,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);
-  }
+    }
 }
 
 /**
@@ -433,7 +433,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);
@@ -441,84 +441,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();
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -530,41 +530,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);
 }
 
 /**
@@ -574,10 +574,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);
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -588,8 +588,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!';
 }
 
 
@@ -598,14 +598,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>';
 }
 
@@ -614,13 +614,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);
 }

Spacing +13 added lines, -13 removed lines

@@ -165,8 +165,8 @@ 
       WHERE n.type = 'profile'
       AND n.status = 1
       AND n.moderate = 0
-      " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '') . "
-      " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '') . "
+      " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '')."
+      " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '')."
       ORDER BY RAND()
       LIMIT 1"
     ));
@@ -212,7 +212,7 @@ 
  * this function is called, it may be called with optional parameters
  * new and prev email.
  */
-function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) {
+function _boincuser_send_emailchange($account, $new_email = NULL, $prev_email = NULL, $adminuser = FALSE) {
   require_boinc('token');
   module_load_include('inc', 'rules', 'modules/system.rules');
 
@@ -303,7 +303,7 @@ 
     // 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);
+    $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length - 56) + 3);
   }
 
   // Determine if there are duplicate names, if so append a number to end.
@@ -379,7 +379,7 @@ 
     // 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)) {
+    if (preg_match('{'.$pi.'}', $path)) {
       return TRUE;
     }
   }
@@ -505,15 +505,15 @@ 
   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>' .
-            t('and') . '</strong> ' . t('save the configuration'),
+          array('!verify' => l(t('verify the default values').' <strong>'.
+            t('and').'</strong> '.t('save the configuration'),
             'admin/boinc/scheduler', array('html' => TRUE))
           ), WATCHDOG_WARNING);
     if (user_access('administer site configuration')) {
       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'),
+            array('!verify' => l(t('verify the default values').' <strong>'.
+              t('and').'</strong> '.t('save the configuration'),
               'admin/boinc/scheduler', array('html' => TRUE))
             )), 'warning', FALSE);
     }
@@ -575,7 +575,7 @@ 
  */
 function _boincuser_node_profile_delete_submit($form, &$form_state) {
   $node = $form['#node'];
-  $deleteurl = 'node/'. $node->nid .'/delete';
+  $deleteurl = 'node/'.$node->nid.'/delete';
   $afterq = 'destination=account';
   drupal_goto($deleteurl, $afterq);
 }
@@ -605,8 +605,8 @@ 
   $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>';
+  return '<h2 class="pane-title">'.bts('Friends (@count)',
+    array('@count' => $friend_count)).'</h2>';
 }
 
 /**
@@ -619,7 +619,7 @@ 
   $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 . ')';
+      $matches[$user->name.'_'.$user->id] = htmlentities($user->name)." (".$user->id.')';
   }
 
   drupal_json((object)$matches);

Braces +11 added lines, -22 removed lines

@@ -71,8 +71,7 @@ 
       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.
@@ -88,8 +87,7 @@ 
         $account->roles[$unrestricted_role] = 'verified contributor';
         user_save($account, array('roles' => $account->roles));
       }
-    }
-    else {
+    } else {
       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)
@@ -175,12 +173,10 @@ 
       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;
       }
@@ -235,8 +231,7 @@ 
     $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 {
+  } 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 "
@@ -357,8 +352,7 @@ 
       rules_invoke_event('boincuser_general_consent_error', variable_get('boinc_admin_mailing_list_subject_tag', ''));
     }
     return $rc1;
-  }
-  else {
+  } else {
     drupal_set_message(
       bts('ERROR: Consent type for enrollment not found. The @project administrators have been nofitifed.',
         array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:consent-termsofuse'),
@@ -399,8 +393,7 @@ 
   // 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']}";
   }
@@ -451,8 +444,7 @@ 
   $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'
@@ -465,8 +457,7 @@ 
         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);
       }
@@ -481,8 +472,7 @@ 
       if (!in_array($_GET['q'], $redirect_blacklist)) {
         drupal_goto('');
       }
-    }
-    else {
+    } else {
       // Clear the messages on the environment config page
       drupal_get_messages();
     }
@@ -501,8 +491,7 @@ 
   );
   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>' .

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

@@ -27,7 +27,7 @@ 
 /**
  * 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) {
+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) {
@@ -49,7 +49,7 @@ 
 function boincuser_check_credit_requirements() {
   global $user;
   if (!$user->uid) {
-    return FALSE;
+    return false;
   }
   $account = user_load($user->uid);
   $min_credit_to_post = variable_get('boinc_comment_min_credit', 0);
@@ -61,7 +61,7 @@ 
     drupal_set_message(bts(
       'You are banned from community participation until @date',
       array('@date' => format_date($account->boincuser_penalty_expiration))
-    ), 'warning', FALSE);
+    ), 'warning', false);
     if (isset($account->roles[$community_role])) {
       // Remove from the community role, if not already
       unset($account->roles[$community_role]);
@@ -93,7 +93,7 @@ 
       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);
+      ), '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
@@ -108,7 +108,7 @@ 
 /**
  * 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) {
+function boincuser_get_first_unread_comment_id($nid, $uid = null) {
   if (!$uid) {
     global $user;
     $uid = $user->uid;
@@ -174,15 +174,15 @@ 
       // 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;
+        $never_been_picked = false;
       }
       elseif ($active_users) {
         // Allow users who are not even active (getting desperate)
-        $active_users = FALSE;
+        $active_users = false;
       }
       else {
         // Process failed...
-        return FALSE;
+        return false;
       }
     }
   }
@@ -212,7 +212,7 @@ 
  * this function is called, it may be called with optional parameters
  * new and prev email.
  */
-function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) {
+function _boincuser_send_emailchange($account, $new_email=null, $prev_email=null, $adminuser=false) {
   require_boinc('token');
   module_load_include('inc', 'rules', 'modules/system.rules');
 
@@ -327,7 +327,7 @@ 
  */
 function boincuser_check_termsofuse($user) {
   require_boinc('consent');
-  $boinc_user = boincuser_load($user->uid, TRUE);
+  $boinc_user = boincuser_load($user->uid, true);
   return check_user_consent($boinc_user, CONSENT_TYPE_ENROLL);
 }
 
@@ -340,7 +340,7 @@ 
  */
 function boincuser_consentto_termsofuse($user) {
   require_boinc('consent');
-  $boinc_user = boincuser_load($user->uid, TRUE);
+  $boinc_user = boincuser_load($user->uid, true);
 
   list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
   if ($checkct) {
@@ -350,7 +350,7 @@ 
         bts("ERROR: Database error when attempting to INSERT into table consent with ID=@id. The @project administrators have been notified.",
         array(
           '@id' => $boinc_user->id,
-          '@project' => variable_get('site_name', 'Drupal-BOINC'), NULL, 'boinc:add-new-user'
+          '@project' => variable_get('site_name', 'Drupal-BOINC'), null, 'boinc:add-new-user'
         ),
         'NULL', 'boinc:consent-termsofuse'),
       'error');
@@ -361,11 +361,11 @@ 
   else {
     drupal_set_message(
       bts('ERROR: Consent type for enrollment not found. The @project administrators have been nofitifed.',
-        array('@project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:consent-termsofuse'),
+        array('@project' => variable_get('site_name', 'Drupal-BOINC')), null, 'boinc:consent-termsofuse'),
     'error');
     rules_invoke_event('boincuser_general_consent_type_error', CONSENT_TYPE_ENROLL, variable_get('boinc_admin_mailing_list_subject_tag', ''));
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -380,10 +380,10 @@ 
     // 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;
 }
 
 /**
@@ -464,11 +464,11 @@ 
       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);
+            'admin/boinc/environment'))), 'warning', false);
       }
       else {
         drupal_set_message(t('There is a problem with the site. Please contact
-          the system administrator.'), 'error', FALSE);
+          the system administrator.'), 'error', false);
       }
       // Redirect home to display the error message and avoid fatal errors
       // (unless on a blacklisted page)
@@ -487,7 +487,7 @@ 
       drupal_get_messages();
     }
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -507,15 +507,15 @@ 
         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))
+            'admin/boinc/scheduler', array('html' => true))
           ), WATCHDOG_WARNING);
     if (user_access('administer site configuration')) {
       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))
-            )), 'warning', FALSE);
+              'admin/boinc/scheduler', array('html' => true))
+            )), 'warning', false);
     }
   }
   return array();
@@ -532,7 +532,7 @@ 
 function is_current_boinc_user($boinc_id) {
   global $user;
   if (!$user->uid) {
-    return FALSE;
+    return false;
   }
   // boincuser_id is not stored in the global user, so load a new instance
   $drupuser = user_load($user->uid);
@@ -553,11 +553,11 @@ 
 /**
  * Get a BOINC user object
  */
-function boincuser_load($user_id = NULL, $is_drupal_id = FALSE) {
+function boincuser_load($user_id = null, $is_drupal_id = false) {
   if (!$user_id) {
     global $user;
     $user_id = $user->uid;
-    $is_drupal_id = TRUE;
+    $is_drupal_id = true;
   }
   if ($is_drupal_id) {
     $account = user_load($user_id);

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

Indentation +1727 added lines, -1727 removed lines

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

Switch Indentation +109 added lines, -109 removed lines

@@ -301,125 +301,125 @@
   }
 
   switch ($form_state['values']['import']) {
-    case 'users':
-      boincimport_users();
-      break;
-
-    case 'teams':
-      boincimport_teams();
-      if (!variable_get('boincimport_import_team_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'teams';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      break;
+  case 'users':
+    boincimport_users();
+    break;
 
-    case 'friends':
-      boincimport_friends();
-      if (!variable_get('boincimport_import_friend_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      break;
+  case 'teams':
+    boincimport_teams();
+    if (!variable_get('boincimport_import_team_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'teams';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'friends';
+    }
+    break;
 
-    case 'preferences':
-      boincimport_preferences();
-      if (!variable_get('boincimport_import_preferences_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      break;
+  case 'friends':
+    boincimport_friends();
+    if (!variable_get('boincimport_import_friend_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'friends';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'preferences';
+    }
+    break;
 
-    case 'private messages':
-      boincimport_private_msgs();
-      if (!variable_get('boincimport_import_private_msg_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      break;
+  case 'preferences':
+    boincimport_preferences();
+    if (!variable_get('boincimport_import_preferences_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'preferences';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'private messages';
+    }
+    break;
 
-    case 'categories':
-      boincimport_forum_categories();
-      if (!variable_get('boincimport_import_category_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      break;
+  case 'private messages':
+    boincimport_private_msgs();
+    if (!variable_get('boincimport_import_private_msg_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'private messages';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'categories';
+    }
+    break;
 
-    case 'topics':
-      boincimport_forum_topics();
-      if (!variable_get('boincimport_import_topic_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      break;
+  case 'categories':
+    boincimport_forum_categories();
+    if (!variable_get('boincimport_import_category_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'categories';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'topics';
+    }
+    break;
 
-    case 'posts':
-      boincimport_forum_posts();
-      if (!variable_get('boincimport_import_post_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      break;
+  case 'topics':
+    boincimport_forum_topics();
+    if (!variable_get('boincimport_import_topic_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'topics';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'posts';
+    }
+    break;
 
-    case 'team forums':
-      boincimport_team_forums();
-      if (!variable_get('boincimport_team_forum_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'team forums';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      break;
+  case 'posts':
+    boincimport_forum_posts();
+    if (!variable_get('boincimport_import_post_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'posts';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'url';
+    }
+    break;
 
-    case 'team topics':
-      boincimport_team_forum_topics();
-      if (!variable_get('boincimport_team_topic_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      break;
+  case 'team forums':
+    boincimport_team_forums();
+    if (!variable_get('boincimport_team_forum_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'team forums';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'team topics';
+    }
+    break;
 
-    case 'team posts':
-      boincimport_team_forum_posts();
-      if (!variable_get('boincimport_team_post_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      else {
-        $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      break;
+  case 'team topics':
+    boincimport_team_forum_topics();
+    if (!variable_get('boincimport_team_topic_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'team topics';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'team posts';
+    }
+    break;
 
-    case 'url':
-      boincimport_replace_urls();
-      if (!variable_get('boincimport_replace_url_successful', 0)) {
-        $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      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;
-    default:
-      $_SESSION['boincimport_stage_selected'] = 'users';
-      break;
+  case 'team posts':
+    boincimport_team_forum_posts();
+    if (!variable_get('boincimport_team_post_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'team posts';
+    }
+    else {
+      $_SESSION['boincimport_stage_selected'] = 'url';
+    }
+    break;
+
+  case 'url':
+    boincimport_replace_urls();
+    if (!variable_get('boincimport_replace_url_successful', 0)) {
+      $_SESSION['boincimport_stage_selected'] = 'url';
+    }
+    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;
+  default:
+    $_SESSION['boincimport_stage_selected'] = 'users';
+    break;
   }
 }
 

Spacing +77 added lines, -77 removed lines

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

Braces +91 added lines, -180 removed lines

@@ -172,8 +172,7 @@ 
   $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>';
@@ -201,16 +200,14 @@ 
     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));
-    }
-    else {
+    } else {
       // 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>';
-    }
-    else {
+    } else {
       $out['html'] .= '<li><span class="marker">'. t('Table <strong>%table</strong> does not exist!', array('%table' => $table)) .'</span></li>';
       $out['result']= 0;
     }
@@ -258,8 +255,7 @@ 
       array('!unlock_it' => l(t('release the lock'),
         'admin/boinc/import/unlock')
       ), WATCHDOG_WARNING);
-  }
-  else {
+  } else {
     $boincimport_functions = array(
       'users' => t('Import users'),
       'teams' => t('Import teams'),
@@ -294,8 +290,7 @@ 
   // 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);
   }
@@ -309,8 +304,7 @@ 
       boincimport_teams();
       if (!variable_get('boincimport_import_team_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'teams';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'friends';
       }
       break;
@@ -319,8 +313,7 @@ 
       boincimport_friends();
       if (!variable_get('boincimport_import_friend_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'preferences';
       }
       break;
@@ -329,8 +322,7 @@ 
       boincimport_preferences();
       if (!variable_get('boincimport_import_preferences_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'private messages';
       }
       break;
@@ -339,8 +331,7 @@ 
       boincimport_private_msgs();
       if (!variable_get('boincimport_import_private_msg_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'categories';
       }
       break;
@@ -349,8 +340,7 @@ 
       boincimport_forum_categories();
       if (!variable_get('boincimport_import_category_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'topics';
       }
       break;
@@ -359,8 +349,7 @@ 
       boincimport_forum_topics();
       if (!variable_get('boincimport_import_topic_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'posts';
       }
       break;
@@ -369,8 +358,7 @@ 
       boincimport_forum_posts();
       if (!variable_get('boincimport_import_post_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'url';
       }
       break;
@@ -379,8 +367,7 @@ 
       boincimport_team_forums();
       if (!variable_get('boincimport_team_forum_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team forums';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'team topics';
       }
       break;
@@ -389,8 +376,7 @@ 
       boincimport_team_forum_topics();
       if (!variable_get('boincimport_team_topic_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'team posts';
       }
       break;
@@ -399,8 +385,7 @@ 
       boincimport_team_forum_posts();
       if (!variable_get('boincimport_team_post_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'url';
       }
       break;
@@ -409,8 +394,7 @@ 
       boincimport_replace_urls();
       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);
@@ -479,8 +463,7 @@ 
       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);
@@ -556,8 +539,7 @@ 
      if (isset($existing_users[$boinc_account->id])) {
       // This user has already been imported
       $duplicates[] = $boinc_account->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_users_op', array(
           $boinc_account->id
@@ -613,8 +595,7 @@ 
     // 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',
@@ -631,8 +612,7 @@ 
   // 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'];
   }
 }
@@ -657,8 +637,7 @@ 
     // 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);
@@ -720,8 +699,7 @@ 
         $team_type = array(
           'tid' => $team_type_id
         );
-      }
-      else {
+      } else {
         if (!$name) continue;
         $team_type = array(
           'name' => strip_tags($name),
@@ -784,8 +762,7 @@ 
      if (isset($existing_teams[$boinc_team->id])) {
       // This team has already been imported
       $duplicates[] = $boinc_team->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_teams_op', array(
           $boinc_team
@@ -826,8 +803,7 @@ 
     // 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',
@@ -844,8 +820,7 @@ 
   // 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'];
   }
 }
@@ -868,8 +843,7 @@ 
     // 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);
@@ -990,8 +964,7 @@ 
       SET uid = '%d', friend_uid = '%d', created = '%d'",
       $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}!";
   }
@@ -1000,8 +973,7 @@ 
     // 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!";
@@ -1017,8 +989,7 @@ 
   // 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'];
   }
 }
@@ -1042,8 +1013,7 @@ 
     // 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);
@@ -1167,8 +1137,7 @@ 
     );
     if ($user_ignored) {
       $success = TRUE;
-    }
-    else {
+    } else {
       $context['results']['warning'][] = "{$uid}:{$ignored_user_uid}";
       watchdog('boincimport',
         'Could not add user @ignored_uid to the ignore list of user @uid',
@@ -1183,8 +1152,7 @@ 
     // 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',
@@ -1201,8 +1169,7 @@ 
   // 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'];
   }
 }
@@ -1227,8 +1194,7 @@ 
     // 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);
@@ -1362,8 +1328,7 @@ 
     // 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',
@@ -1380,8 +1345,7 @@ 
   // 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'];
   }
 }
@@ -1404,8 +1368,7 @@ 
     // 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);
@@ -1558,8 +1521,7 @@ 
     if (in_array($boinc_forum_category->name, $existing_categories)) {
       // This category has already been imported
       $duplicate_categories[] = $boinc_forum_category->name;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_forum_categories_op', array(
           $boinc_forum_category, $forum_vid, $pre, FALSE
@@ -1573,8 +1535,7 @@ 
      if (isset($existing_forums[$boinc_forum->id])) {
       // This forum has already been imported
       $duplicates[] = $boinc_forum->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_forums_op', array(
           $boinc_forum, $forum_vid, $pre
@@ -1641,8 +1602,7 @@ 
     $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('
@@ -1685,13 +1645,11 @@ 
     // Store some result for post-processing in the finished callback.
     if (!$category AND $create_hidden) {
       $message = "Created special hidden container";
-    }
-    else {
+    } else {
       $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',
@@ -1708,8 +1666,7 @@ 
   // 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'];
   }
 }
@@ -1745,8 +1702,7 @@ 
     // 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,
@@ -1772,8 +1728,7 @@ 
     // 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}!";
   }
@@ -1786,8 +1741,7 @@ 
   // 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'];
   }
 }
@@ -1888,8 +1842,7 @@ 
     // 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);
@@ -2043,9 +1996,7 @@ 
 
     if ($duplicate OR !$post) {
       $success = FALSE;
-    }
-
-    else {
+    } 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('
@@ -2109,12 +2060,10 @@ 
           if (!$success) {
             $error_detail = 'topic imported, but failed to set last comment timestamp';
           }
-        }
-        else {
+        } else {
           $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';
       }
     }
@@ -2125,16 +2074,13 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['success'][] = $topic->id;
       $message = "Successfully imported topic {$topic->id}";
-    }
-    elseif ($duplicate) {
+    } elseif ($duplicate) {
       $context['results']['duplicate'][] = $topic->id;
       $message = "Topic {$topic->id} was already imported";
-    }
-    elseif (!$post) {
+    } elseif (!$post) {
       $context['results']['empty'][] = $topic->id;
       $message = "Skipping topic {$topic->id} as empty";
-    }
-    else {
+    } else {
       $context['results']['failure'][] = $topic->id;
       $message = "Failed to import topic {$topic->id}!";
       watchdog('boincimport',
@@ -2155,8 +2101,7 @@ 
     // 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'];
     }
   }
@@ -2190,8 +2135,7 @@ 
     // 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);
@@ -2439,18 +2383,15 @@ 
           if ($success) {
             $posts_imported++;
             $context['results']['posts']['success'][] = $post->id;
-          }
-          else {
+          } else {
             $context['results']['posts']['failure'][] = $post->id;
             $error_posts++;
           }
-        }
-        else {
+        } else {
           $context['results']['posts']['failure'][] = $post->id;
           $error_posts++;
         }
-      }
-      else {
+      } else {
         $context['results']['posts']['empty'][] = $post->id;
         $empty_posts++;
       }
@@ -2461,8 +2402,7 @@ 
       // 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 {
+    } 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)',
@@ -2483,8 +2423,7 @@ 
     // 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'];
     }
   }
@@ -2524,8 +2463,7 @@ 
     // 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);
@@ -2612,8 +2550,7 @@ 
      if (isset($existing_team_forums[$boincteam_forum->id])) {
       // This team has already been imported
       $duplicates[] = $boincteam_forum->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_team_forums_op', array(
           $boincteam_forum
@@ -2679,8 +2616,7 @@ 
     // 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',
@@ -2697,8 +2633,7 @@ 
   // 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'];
   }
 }
@@ -2721,8 +2656,7 @@ 
     // 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);
@@ -2817,8 +2751,7 @@ 
      if (isset($existing_team_topics[$boincteam_topic->id])) {
       // This team topic has already been imported
       $duplicates[] = $boincteam_topic->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_team_topics_op', array(
           $boincteam_topic
@@ -2865,8 +2798,7 @@ 
   ));
   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('
@@ -2883,8 +2815,7 @@ 
       // Empty topics should have already been filtered out of the import, so
       // consider this an error condition
       $empty_topics[] = $topic->id;
-    }
-    else {
+    } else {
       // Get the user ID along with other data to define the topic
       $uid = boincuser_lookup_uid($topic->owner);
        if (!$topic->owner) {
@@ -2948,8 +2879,7 @@ 
     // 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',
@@ -2966,8 +2896,7 @@ 
   // 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'];
   }
 }
@@ -2990,8 +2919,7 @@ 
     // 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);
@@ -3113,8 +3041,7 @@ 
       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(
             $boincteam_post
@@ -3230,8 +3157,7 @@ 
     // 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',
@@ -3248,8 +3174,7 @@ 
   // 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'];
   }
 }
@@ -3272,8 +3197,7 @@ 
     // 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);
@@ -3379,8 +3303,7 @@ 
     $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',
@@ -3397,8 +3320,7 @@ 
   // 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'];
   }
 }
@@ -3423,8 +3345,7 @@ 
     // 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);
@@ -3602,8 +3523,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['nodes']['updated'][] = $node->nid;
       $message = "Successfully updated node {$node->nid}";
-    }
-    else {
+    } else {
       $message = "No changes made to node {$node->nid}!";
     }
 
@@ -3615,8 +3535,7 @@ 
     // 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'];
     }
   }
@@ -3666,8 +3585,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['comments']['updated'][] = $comment->cid;
       $message = "Successfully updated comment {$comment->cid}";
-    }
-    else {
+    } else {
       $message = "No changes made to comment {$comment->cid}!";
     }
 
@@ -3679,8 +3597,7 @@ 
     // 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'];
     }
   }
@@ -3729,8 +3646,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['pm']['updated'][] = $pm->mid;
       $message = "Successfully updated private message {$pm->mid}";
-    }
-    else {
+    } else {
       $message = "No changes made to private message {$pm->mid}!";
     }
 
@@ -3742,8 +3658,7 @@ 
     // 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'];
     }
   }
@@ -3808,8 +3723,7 @@ 
     // 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);
@@ -3911,7 +3825,8 @@ 
   $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;
   }
 
@@ -4034,13 +3949,11 @@ 
       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 {
+    } else {
       // This is a relative URL
       return $this->basePath;
     }
@@ -4062,8 +3975,7 @@ 
       ));
       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);
       }
@@ -4087,8 +3999,7 @@ 
       ));
       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);
       }

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

@@ -662,7 +662,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
 
@@ -873,7 +873,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
 
@@ -978,13 +978,13 @@ 
 function boincimport_friends_op($friendship, &$context) {
 
   $input_format = variable_get('boincimport_input_format', 0);
-  $success = FALSE;
+  $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) {
+  if ($uid and $friend_uid) {
     $success = db_query("
       INSERT IGNORE INTO {flag_friend}
       SET uid = '%d', friend_uid = '%d', created = '%d'",
@@ -1047,7 +1047,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
 
@@ -1146,7 +1146,7 @@ 
  */
 function boincimport_quarrels_op($boinc_user, &$context) {
 
-  $success = FALSE;
+  $success = false;
   $uid = boincuser_lookup_uid($boinc_user->userid);
   $ignored_users = explode('|', trim($boinc_user->ignorelist, '|'));
   foreach ($ignored_users as $ignored_user) {
@@ -1166,7 +1166,7 @@ 
       $uid, $ignored_user_uid
     );
     if ($user_ignored) {
-      $success = TRUE;
+      $success = true;
     }
     else {
       $context['results']['warning'][] = "{$uid}:{$ignored_user_uid}";
@@ -1232,7 +1232,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
 
@@ -1358,7 +1358,7 @@ 
   );
 
   $message = '';
-  if ($message_added AND $recipient_added AND $sender_added) {
+  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}";
@@ -1409,7 +1409,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
 
@@ -1548,7 +1548,7 @@ 
   if (!$hidden_forum_tid) {
     $operations[] = array(
       'boincimport_forum_categories_op', array(
-        NULL, $forum_vid, $pre, TRUE
+        null, $forum_vid, $pre, true
       )
     );
   }
@@ -1562,7 +1562,7 @@ 
     else {
       $operations[] = array(
         'boincimport_forum_categories_op', array(
-          $boinc_forum_category, $forum_vid, $pre, FALSE
+          $boinc_forum_category, $forum_vid, $pre, false
         )
       );
     }
@@ -1631,16 +1631,16 @@ 
   $parent_id = 0;
   $description = '';
   $weight = 0;
-  $hidden = FALSE;
+  $hidden = false;
 
   $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;
+    $hidden = true;
   }
   else {
     // If this container is empty, put it into the hidden container
@@ -1653,7 +1653,7 @@ 
     db_set_active('default');
     if (!$forums_contained) {
       $parent_id = $category_map[0];
-      $hidden = TRUE;
+      $hidden = true;
     }
   }
 
@@ -1683,7 +1683,7 @@ 
   $message = '';
   if ($success) {
     // Store some result for post-processing in the finished callback.
-    if (!$category AND $create_hidden) {
+    if (!$category and $create_hidden) {
       $message = "Created special hidden container";
     }
     else {
@@ -1720,8 +1720,8 @@ 
  */
 function boincimport_forums_op($boincforum, $forum_vid, $pre = '', &$context) {
 
-  $hidden_forum = FALSE;
-  $open_forum = FALSE;
+  $hidden_forum = false;
+  $open_forum = false;
   $category_map = variable_get('boincimport_forum_category_map', array());
 
   // Set term parameters for forums
@@ -1732,11 +1732,11 @@ 
   $weight = $boincforum->orderID;
   if ($parent_id == $category_map[0]) {
     // If this forum is hidden, flag for appropriate access controls
-    $hidden_forum = TRUE;
+    $hidden_forum = true;
   }
   if ($name == 'Getting Started') {
     // Must allow users to post in this forum even if they have no credit!
-    $open_forum = TRUE;
+    $open_forum = true;
   }
 
   // Try to detect a BOINC news forum and flag it so that news can be
@@ -1744,7 +1744,7 @@ 
   if ($name == 'News') {
     // Save the ID of the News forum for later import
     variable_set('boincimport_news_forum_id', $forum_id);
-    $success = TRUE;
+    $success = true;
   }
   else {
     // Save all other forums as taxonomy terms
@@ -1795,7 +1795,7 @@ 
 /**
  * Helper function to set permissions on forums upon import
  */
-function boincimport_forum_set_permissions($forum, $hidden = FALSE, $open = FALSE) {
+function boincimport_forum_set_permissions($forum, $hidden = false, $open = false) {
 
   // Set access controls
   $forum_perms = array();
@@ -1893,7 +1893,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
 
@@ -2041,8 +2041,8 @@ 
       $topic->id
     ));
 
-    if ($duplicate OR !$post) {
-      $success = FALSE;
+    if ($duplicate or !$post) {
+      $success = false;
     }
 
     else {
@@ -2070,7 +2070,7 @@ 
       }
 
       // If dealing with a News topic, be sure it is imported as such
-      if ($news_forum_id AND $topic->forum == $news_forum_id) {
+      if ($news_forum_id and $topic->forum == $news_forum_id) {
         $node_type = 'news';
         $promote = 1;
       }
@@ -2097,7 +2097,7 @@ 
       $node = (object) $node; // node_save requires an object form
       node_save($node);
       taxonomy_node_save($node, array($tid));
-      $success = ($node->nid) ? TRUE : FALSE;
+      $success = ($node->nid) ? true : false;
       if ($success) {
         $success = db_query('
           INSERT INTO {boincimport_temp_topic} (topic_id, post_id, nid)
@@ -2128,7 +2128,7 @@ 
     }
     elseif ($duplicate) {
       $context['results']['duplicate'][] = $topic->id;
-      $message = "Topic {$topic->id} was already imported";
+      $message = "topic {$topic->id} was already imported";
     }
     elseif (!$post) {
       $context['results']['empty'][] = $topic->id;
@@ -2195,7 +2195,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
 
@@ -2336,8 +2336,8 @@ 
     db_set_active('default');
 
     $first_post = true;
-    $topic_has_responses = FALSE;
-    $success = FALSE;
+    $topic_has_responses = false;
+    $success = false;
     $posts_imported = 0;
     $empty_posts = 0;
     $error_posts = 0;
@@ -2352,7 +2352,7 @@ 
       }
 
       // Making it this far confirms that there are posts to import
-      $topic_has_responses = TRUE;
+      $topic_has_responses = true;
 
       $is_duplicate = db_result(db_query('
         SELECT COUNT(*) FROM {boincimport_temp_post}
@@ -2398,14 +2398,14 @@ 
         ));
         $post_reply = $pid;
 
-        if ($post_reply OR $topic_reply) {
+        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);
+          $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
@@ -2457,10 +2457,10 @@ 
     }
 
     $message = '';
-    if ($success OR !$topic_has_responses) {
+    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}";
+      $message = "imported {$posts_imported} post(s) for topic {$boinc_topic->id}";
     }
     else {
       $context['results']['failure'][] = $boinc_topic->id;
@@ -2529,7 +2529,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
 
@@ -2726,7 +2726,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
 
@@ -2853,7 +2853,7 @@ 
 function boincimport_team_topics_op($topic, &$context) {
 
   $input_format = variable_get('boincimport_input_format', 0);
-  $success = FALSE;
+  $success = false;
   $missing_parent = array();
   $empty_topics = array();
 
@@ -2938,7 +2938,7 @@ 
           WHERE nid = %d',
           $node->created, $node->nid
         );
-        $success = TRUE;
+        $success = true;
       }
     }
   }
@@ -2995,7 +2995,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
 
@@ -3150,7 +3150,7 @@ 
 function boincimport_team_posts_op($post, &$context) {
 
   $input_format = variable_get('boincimport_input_format', 0);
-  $success = FALSE;
+  $success = false;
 
   // Make sure the post is valid
   if ($post->content) {
@@ -3184,14 +3184,14 @@ 
     ));
     $post_reply = $pid;
 
-    if ($post_reply OR $topic_reply) {
+    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);
+      $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
@@ -3277,7 +3277,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
 
@@ -3428,7 +3428,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
 
@@ -3478,7 +3478,7 @@ 
     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'
     );
@@ -3580,14 +3580,14 @@ 
   );
 
   while ($node = db_fetch_object($nodes)) {
-    $updated = FALSE;
+    $updated = false;
 
     // Update URLs in node contents
     $original_body = $node->body;
     $original_teaser = $node->teaser;
     $node->body = _boincimport_replace_links($node->body);
     $node->teaser = _boincimport_replace_links($node->teaser);
-    if ($node->body != $original_body OR $node->teaser != $original_teaser) {
+    if ($node->body != $original_body or $node->teaser != $original_teaser) {
       $updated = db_query("
         UPDATE {node_revisions}
         SET body= '%s', teaser = '%s'
@@ -3646,7 +3646,7 @@ 
   );
 
   while ($comment = db_fetch_object($comments)) {
-    $updated = FALSE;
+    $updated = false;
 
     // Update URLs in comment contents
     $original_comment = $comment->comment;
@@ -3709,7 +3709,7 @@ 
   );
 
   while ($pm = db_fetch_object($messages)) {
-    $updated = FALSE;
+    $updated = false;
 
     // Update URLs in private message body
     $original_pm_body = $pm->body;
@@ -3813,7 +3813,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
   }
   drupal_set_message($message);
 
@@ -4010,7 +4010,7 @@ 
     foreach ($boinc_base_urls as $url) {
       $domain = parse_url($url, PHP_URL_HOST);
       if ($domain) {
-        $this->boincDomains[$domain] = TRUE;
+        $this->boincDomains[$domain] = true;
       }
     }
     if (!$this->boincDomains) {
@@ -4037,7 +4037,7 @@ 
       }
       else {
         // This URL should not be transformed
-        return NULL;
+        return null;
       }
     }
     else {
@@ -4053,7 +4053,7 @@ 
   function transformPostLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $id = db_result(db_query('
         SELECT p.cid
         FROM {boincimport_temp_post} p
@@ -4078,7 +4078,7 @@ 
   function transformOldPostLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $id = db_result(db_query('
         SELECT p.cid
         FROM {boincimport_temp_post} p
@@ -4099,7 +4099,7 @@ 
   function transformTopicLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $id = db_result(db_query('
         SELECT nid
         FROM {boincimport_temp_topic}
@@ -4114,7 +4114,7 @@ 
   function transformForumLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $forum = db_fetch_object(db_query('
         SELECT tid
         FROM {boincimport_temp_forum}
@@ -4129,7 +4129,7 @@ 
   function transformUserLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       // 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
@@ -4145,7 +4145,7 @@ 
   function transformWorkUnitLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $id = $matches[3];
       $link = "{$newBaseUrl}workunit/{$id}";
     }
@@ -4155,7 +4155,7 @@ 
   function transformResultLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $id = $matches[3];
       $link = "{$newBaseUrl}task/{$id}";
     }
@@ -4165,7 +4165,7 @@ 
   function transformHostResultsLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $id = $matches[3];
       $link = "{$newBaseUrl}host/{$id}/tasks";
     }
@@ -4175,7 +4175,7 @@ 
   function transformUserResultsLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $link = "{$newBaseUrl}account/tasks";
     }
     return $link;
@@ -4184,7 +4184,7 @@ 
   function transformHostLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $id = $matches[3];
       $link = "{$newBaseUrl}host/{$id}";
     }
@@ -4194,7 +4194,7 @@ 
   function transformUserHostsLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $uid = boincuser_lookup_uid($matches[3]);
       if ($uid) {
         $link = "{$newBaseUrl}account/{$uid}/computers";
@@ -4206,7 +4206,7 @@ 
   function transformForumIndexLinks($matches) {
     $link = $matches[0];
     $newBaseUrl = $this->getNewBaseUrl($matches);
-    if ($newBaseUrl !== NULL) {
+    if ($newBaseUrl !== null) {
       $link = "{$newBaseUrl}community/forum";
     }
     return $link;