BOINC / boinc

drupal/sites/all/libraries/phpmailer/class.pop3.php

Doc Comments +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
      * Connect to a POP3 server.
      * @access public
      * @param string $host
-     * @param integer|boolean $port
+     * @param integer $port
      * @param integer $tval
      * @return boolean
      */

drupal/sites/all/libraries/phpmailer/extras/htmlfilter.php

Doc Comments +11 added lines, -2 removed lines

@@ -663,6 +663,12 @@ 
     }
 }
 
+/**
+ * @param string $body
+ * @param integer $pos
+ * @param string $trans_image_path
+ * @param boolean $block_external_images
+ */
 function tln_fixstyle($body, $pos, $trans_image_path, $block_external_images)
 {
     // workaround for </style> in between comments
@@ -788,6 +794,9 @@ 
     return array($content, $newpos);
 }
 
+/**
+ * @param string $trans_image_path
+ */
 function tln_body2div($attary, $trans_image_path)
 {
     $divattary = array('class' => "'bodyclass'");
@@ -828,8 +837,8 @@ 
  *
  * @param string $body                    The HTML you wish to filter
  * @param array $tag_list                see description above
- * @param array $rm_tags_with_content see description above
- * @param array $self_closing_tags    see description above
+ * @param string[] $rm_tags_with_content see description above
+ * @param string[] $self_closing_tags    see description above
  * @param boolean $force_tag_closing    see description above
  * @param array $rm_attnames            see description above
  * @param array $bad_attvals            see description above

Indentation +16 added lines, -17 removed lines

@@ -583,7 +583,7 @@ 
                 }
             }
         }
-     }
+        }
     /**
      * See if we need to append any attributes to this tag.
      */
@@ -680,10 +680,10 @@ 
                  if ($sToken == '<') {
                     $sToken .= $char;
                     $bEndTag = true;
-                 } else {
+                    } else {
                     $content .= $char;
-                 }
-                 break;
+                    }
+                    break;
             case '>':
                  if ($bEndTag) {
                     $sToken .= $char;
@@ -695,10 +695,10 @@ 
                         $content .= $sToken;
                     }
                     $bEndTag = false;
-                 } else {
+                    } else {
                     $content .= $char;
-                 }
-                 break;
+                    }
+                    break;
             case '!':
                 if ($sToken == '<') {
                     // possible comment
@@ -737,8 +737,8 @@ 
     $content = preg_replace("|body(\s*\{.*?\})|si", ".bodyclass\\1", $content);
 
     /**
-    * Fix url('blah') declarations.
-    */
+     * Fix url('blah') declarations.
+     */
     //   $content = preg_replace("|url\s*\(\s*([\'\"])\s*\S+script\s*:.*?([\'\"])\s*\)|si",
     //                           "url(\\1$trans_image_path\\2)", $content);
 
@@ -836,7 +836,6 @@ 
  * @param array $add_attr_to_tag        see description above
  * @param string $trans_image_path
  * @param boolean $block_external_images
-
  * @return string                       Sanitized html safe to show on your pages.
  */
 function tln_sanitize(
@@ -884,13 +883,13 @@ 
             if ($free_content != FALSE){
                 if ( !empty($attary) ) {
                     $attary = tln_fixatts($tagname,
-                                         $attary,
-                                         $rm_attnames,
-                                         $bad_attvals,
-                                         $add_attr_to_tag,
-                                         $trans_image_path,
-                                         $block_external_images
-                                         );
+                                            $attary,
+                                            $rm_attnames,
+                                            $bad_attvals,
+                                            $add_attr_to_tag,
+                                            $trans_image_path,
+                                            $block_external_images
+                                            );
                 }
                 $trusted .= tln_tagprint($tagname, $attary, $tagtype);
                 $trusted .= $free_content;

drupal/sites/all/libraries/phpmailer/extras/ntlm_sasl_client.php

Doc Comments +9 added lines

@@ -18,6 +18,9 @@ 
     public $credentials = array();
     public $state = SASL_NTLM_STATE_START;
 
+    /**
+     * @param stdClass $client
+     */
     public function initialize(&$client)
     {
         if (!function_exists($function = "mcrypt_encrypt")
@@ -63,6 +66,9 @@ 
         );
     }
 
+    /**
+     * @param string $challenge
+     */
     public function NTLMResponse($challenge, $password)
     {
         $unicode = $this->ASCIIToUnicode($password);
@@ -85,6 +91,9 @@ 
         return $response;
     }
 
+    /**
+     * @param string $ntlm_response
+     */
     public function typeMsg3($ntlm_response, $user, $domain, $workstation)
     {
         $domain_unicode = $this->ASCIIToUnicode($domain);

drupal/sites/all/themes/zen/template.php

Doc Comments +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
  * @param $breadcrumb
  *   An array containing the breadcrumb links.
  * @return
- *   A string containing the breadcrumb output.
+ string   A string containing the breadcrumb output.
  */
 function zen_breadcrumb($breadcrumb) {
   // Determine if we are to display the breadcrumb.
@@ -87,7 +87,7 @@ 
  *   See http://juicystudio.com/article/screen-readers-display-none.php
  *   and http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
  * @return
- *   A string containing an unordered list of links.
+ string   A string containing an unordered list of links.
  */
 function zen_links($links, $attributes = array('class' => 'links'), $heading = '') {
   global $language;
@@ -600,10 +600,10 @@ 
    * Do not pass one string containing multiple classes as they will be
    * incorrectly concatenated with dashes, i.e. "one two" will become "one-two".
    *
-   * @param $class
+   * @param string $class
    *   The class name to clean.
    * @return
-   *   The cleaned class name.
+   string   The cleaned class name.
    */
   function drupal_html_class($class) {
     // By default, we filter using Drupal's coding standards.
@@ -633,7 +633,7 @@ 
    * @param $id
    *   The ID to clean.
    * @return
-   *   The cleaned ID.
+   string   The cleaned ID.
    */
   function drupal_html_id($id) {
     $id = strtr(drupal_strtolower($id), array(' ' => '-', '_' => '-', '[' => '-', ']' => ''));

Indentation +242 added lines, -242 removed lines

@@ -13,7 +13,7 @@ 
 
 // Auto-rebuild the theme registry during theme development.
 if (theme_get_setting('zen_rebuild_registry')) {
-  drupal_rebuild_theme_registry();
+    drupal_rebuild_theme_registry();
 }
 
 
@@ -21,9 +21,9 @@ 
  * Implements HOOK_theme().
  */
 function zen_theme(&$existing, $type, $theme, $path) {
-  // When #341140 is fixed, replace _zen_path() with drupal_get_path().
-  include_once './' . _zen_path() . '/zen-internals/template.theme-registry.inc';
-  return _zen_theme($existing, $type, $theme, $path);
+    // When #341140 is fixed, replace _zen_path() with drupal_get_path().
+    include_once './' . _zen_path() . '/zen-internals/template.theme-registry.inc';
+    return _zen_theme($existing, $type, $theme, $path);
 }
 
 /**
@@ -35,33 +35,33 @@ 
  *   A string containing the breadcrumb output.
  */
 function zen_breadcrumb($breadcrumb) {
-  // Determine if we are to display the breadcrumb.
-  $show_breadcrumb = theme_get_setting('zen_breadcrumb');
-  if ($show_breadcrumb == 'yes' || $show_breadcrumb == 'admin' && arg(0) == 'admin') {
+    // Determine if we are to display the breadcrumb.
+    $show_breadcrumb = theme_get_setting('zen_breadcrumb');
+    if ($show_breadcrumb == 'yes' || $show_breadcrumb == 'admin' && arg(0) == 'admin') {
 
     // Optionally get rid of the homepage link.
     $show_breadcrumb_home = theme_get_setting('zen_breadcrumb_home');
     if (!$show_breadcrumb_home) {
-      array_shift($breadcrumb);
+        array_shift($breadcrumb);
     }
 
     // Return the breadcrumb with separators.
     if (!empty($breadcrumb)) {
-      $breadcrumb_separator = theme_get_setting('zen_breadcrumb_separator');
-      $trailing_separator = $title = '';
-      if (theme_get_setting('zen_breadcrumb_title')) {
+        $breadcrumb_separator = theme_get_setting('zen_breadcrumb_separator');
+        $trailing_separator = $title = '';
+        if (theme_get_setting('zen_breadcrumb_title')) {
         if ($title = drupal_get_title()) {
-          $trailing_separator = $breadcrumb_separator;
+            $trailing_separator = $breadcrumb_separator;
         }
-      }
-      elseif (theme_get_setting('zen_breadcrumb_trailing')) {
+        }
+        elseif (theme_get_setting('zen_breadcrumb_trailing')) {
         $trailing_separator = $breadcrumb_separator;
-      }
-      return '<div class="breadcrumb">' . implode($breadcrumb_separator, $breadcrumb) . "$trailing_separator$title</div>";
+        }
+        return '<div class="breadcrumb">' . implode($breadcrumb_separator, $breadcrumb) . "$trailing_separator$title</div>";
     }
-  }
-  // Otherwise, return an empty string.
-  return '';
+    }
+    // Otherwise, return an empty string.
+    return '';
 }
 
 /**
@@ -90,27 +90,27 @@ 
  *   A string containing an unordered list of links.
  */
 function zen_links($links, $attributes = array('class' => 'links'), $heading = '') {
-  global $language;
-  $output = '';
+    global $language;
+    $output = '';
 
-  if (count($links) > 0) {
+    if (count($links) > 0) {
     // Treat the heading first if it is present to prepend it to the
     // list of links.
     if (!empty($heading)) {
-      if (is_string($heading)) {
+        if (is_string($heading)) {
         // Prepare the array that will be used when the passed heading
         // is a string.
         $heading = array(
-          'text' => $heading,
-          // Set the default level of the heading.
-          'level' => 'h2',
+            'text' => $heading,
+            // Set the default level of the heading.
+            'level' => 'h2',
         );
-      }
-      $output .= '<' . $heading['level'];
-      if (!empty($heading['class'])) {
+        }
+        $output .= '<' . $heading['level'];
+        if (!empty($heading['class'])) {
         $output .= drupal_attributes(array('class' => $heading['class']));
-      }
-      $output .= '>' . check_plain($heading['text']) . '</' . $heading['level'] . '>';
+        }
+        $output .= '>' . check_plain($heading['text']) . '</' . $heading['level'] . '>';
     }
 
     $output .= '<ul'. drupal_attributes($attributes) .'>';
@@ -119,89 +119,89 @@ 
     $i = 1;
 
     foreach ($links as $key => $link) {
-      $class = $key;
+        $class = $key;
 
-      // Add first, last and active classes to the list of links to help out themers.
-      if ($i == 1) {
+        // Add first, last and active classes to the list of links to help out themers.
+        if ($i == 1) {
         $class .= ' first';
-      }
-      if ($i == $num_links) {
+        }
+        if ($i == $num_links) {
         $class .= ' last';
-      }
-      if (isset($link['href']) && ($link['href'] == $_GET['q'] || ($link['href'] == '<front>' && drupal_is_front_page()))
+        }
+        if (isset($link['href']) && ($link['href'] == $_GET['q'] || ($link['href'] == '<front>' && drupal_is_front_page()))
           && (empty($link['language']) || $link['language']->language == $language->language)) {
         $class .= ' active';
-      }
-      $output .= '<li'. drupal_attributes(array('class' => $class)) .'>';
+        }
+        $output .= '<li'. drupal_attributes(array('class' => $class)) .'>';
 
-      if (isset($link['href'])) {
+        if (isset($link['href'])) {
         // Pass in $link as $options, they share the same keys.
         $output .= l($link['title'], $link['href'], $link);
-      }
-      else if (!empty($link['title'])) {
+        }
+        else if (!empty($link['title'])) {
         // Some links are actually not links, but we wrap these in <span> for adding title and class attributes
         if (empty($link['html'])) {
-          $link['title'] = check_plain($link['title']);
+            $link['title'] = check_plain($link['title']);
         }
         $span_attributes = '';
         if (isset($link['attributes'])) {
-          $span_attributes = drupal_attributes($link['attributes']);
+            $span_attributes = drupal_attributes($link['attributes']);
         }
         $output .= '<span'. $span_attributes .'>'. $link['title'] .'</span>';
-      }
+        }
 
-      $i++;
-      $output .= "</li>\n";
+        $i++;
+        $output .= "</li>\n";
     }
 
     $output .= '</ul>';
-  }
+    }
 
-  return $output;
+    return $output;
 }
 
 /**
  * Implements theme_menu_item_link()
  */
 function zen_menu_item_link($link) {
-  if (empty($link['localized_options'])) {
+    if (empty($link['localized_options'])) {
     $link['localized_options'] = array();
-  }
+    }
 
-  // If an item is a LOCAL TASK, render it as a tab
-  if ($link['type'] & MENU_IS_LOCAL_TASK) {
+    // If an item is a LOCAL TASK, render it as a tab
+    if ($link['type'] & MENU_IS_LOCAL_TASK) {
     $link['title'] = '<span class="tab">' . check_plain($link['title']) . '</span>';
     $link['localized_options']['html'] = TRUE;
-  }
+    }
 
-  return l($link['title'], $link['href'], $link['localized_options']);
+    return l($link['title'], $link['href'], $link['localized_options']);
 }
 
 /**
  * Duplicate of theme_menu_local_tasks() but adds clearfix to tabs.
  */
 function zen_menu_local_tasks() {
-  $output = '';
+    $output = '';
 
-  // CTools requires a different set of local task functions.
-  if (module_exists('ctools')) {
+    // CTools requires a different set of local task functions.
+    if (module_exists('ctools')) {
     ctools_include('menu');
     $primary = ctools_menu_primary_local_tasks();
     $secondary = ctools_menu_secondary_local_tasks();
-  }
-  else {
+    }
+    else {
     $primary = menu_primary_local_tasks();
     $secondary = menu_secondary_local_tasks();
-  }
+    }
 
-  if ($primary) {
+    if ($primary) {
     $output .= '<ul class="tabs primary clearfix">' . $primary . '</ul>';
-  }
-  if ($secondary) {
+    }
+    if ($secondary) {
     $output .= '<ul class="tabs secondary clearfix">' . $secondary . '</ul>';
-  }
+    }
 
-  return $output;
+    return $output;
 }
 
 /**
@@ -218,32 +218,32 @@ 
  * @see zen_show_blocks_discovery()
  */
 function zen_blocks($region, $show_blocks = NULL) {
-  // Since Drupal 6 doesn't pass $show_blocks to theme_blocks, we manually call
-  // theme('blocks', NULL, $show_blocks) so that this function can remember the
-  // value on later calls.
-  static $render_sidebars = TRUE;
-  if (!is_null($show_blocks)) {
+    // Since Drupal 6 doesn't pass $show_blocks to theme_blocks, we manually call
+    // theme('blocks', NULL, $show_blocks) so that this function can remember the
+    // value on later calls.
+    static $render_sidebars = TRUE;
+    if (!is_null($show_blocks)) {
     $render_sidebars = $show_blocks;
-  }
+    }
 
-  // If zen_blocks was called with a NULL region, its likely we were just
-  // setting the $render_sidebars static variable.
-  if ($region) {
+    // If zen_blocks was called with a NULL region, its likely we were just
+    // setting the $render_sidebars static variable.
+    if ($region) {
     $output = '';
 
     // If $renders_sidebars is FALSE, don't render any region whose name begins
     // with "sidebar_".
     if ($render_sidebars || (strpos($region, 'sidebar_') !== 0)) {
-      // Allow context module to set blocks.
-      if (function_exists('context_blocks')) {
+        // Allow context module to set blocks.
+        if (function_exists('context_blocks')) {
         $output = context_blocks($region);
-      }
-      else {
+        }
+        else {
         foreach (block_list($region) as $key => $block) {
-          // $key == module_delta
-          $output .= theme('block', $block);
+            // $key == module_delta
+            $output .= theme('block', $block);
+        }
         }
-      }
     }
 
     // Add any content assigned to this region through drupal_set_content() calls.
@@ -255,11 +255,11 @@ 
     // Set the theme hook suggestions.
     $hook = array('region_' . $region);
     if (strpos($region, 'sidebar_') === 0) {
-      $hook[] = 'region_sidebar';
+        $hook[] = 'region_sidebar';
     }
     $hook[] = 'region';
     return $output ? theme($hook, $elements) : '';
-  }
+    }
 }
 
 /**
@@ -271,11 +271,11 @@ 
  * @see zen_blocks()
  */
 function zen_show_blocks_discovery(&$vars) {
-  if ($vars['show_blocks'] == FALSE) {
+    if ($vars['show_blocks'] == FALSE) {
     // Allow zen_blocks() to statically cache the $show_blocks variable. A TRUE
     // value is assumed, so we only need to override when $show_blocks is FALSE.
     theme('blocks', NULL, FALSE);
-  }
+    }
 }
 
 /**
@@ -287,25 +287,25 @@ 
  *   The name of the template being rendered.
  */
 function zen_preprocess(&$vars, $hook) {
-  // In D6, the page.tpl uses a different variable name to hold the classes.
-  $key = ($hook == 'page' || $hook == 'maintenance_page') ? 'body_classes' : 'classes';
+    // In D6, the page.tpl uses a different variable name to hold the classes.
+    $key = ($hook == 'page' || $hook == 'maintenance_page') ? 'body_classes' : 'classes';
 
-  // Create a D7-standard classes_array variable.
-  if (array_key_exists($key, $vars)) {
+    // Create a D7-standard classes_array variable.
+    if (array_key_exists($key, $vars)) {
     // Views (and possibly other modules) have templates with a $classes
     // variable that isn't a string, so we leave those variables alone.
     if (is_string($vars[$key])) {
-      $vars['classes_array'] = explode(' ', $hook . ' ' . $vars[$key]);
-      unset($vars[$key]);
+        $vars['classes_array'] = explode(' ', $hook . ' ' . $vars[$key]);
+        unset($vars[$key]);
+    }
     }
-  }
-  else {
+    else {
     $vars['classes_array'] = array($hook);
-  }
-  // Add support for Skinr
-  if (!empty($vars['skinr']) && array_key_exists('classes_array', $vars)) {
+    }
+    // Add support for Skinr
+    if (!empty($vars['skinr']) && array_key_exists('classes_array', $vars)) {
     $vars['classes_array'][] = $vars['skinr'];
-  }
+    }
 }
 
 /**
@@ -317,82 +317,82 @@ 
  *   The name of the template being rendered ("page" in this case.)
  */
 function zen_preprocess_page(&$vars, $hook) {
-  // If the user is silly and enables Zen as the theme, add some styles.
-  if ($GLOBALS['theme'] == 'zen') {
+    // If the user is silly and enables Zen as the theme, add some styles.
+    if ($GLOBALS['theme'] == 'zen') {
     include_once './' . _zen_path() . '/zen-internals/template.zen.inc';
     _zen_preprocess_page($vars, $hook);
-  }
-  // Add conditional stylesheets.
-  elseif (!module_exists('conditional_styles')) {
+    }
+    // Add conditional stylesheets.
+    elseif (!module_exists('conditional_styles')) {
     $language = $GLOBALS['language']->direction == LANGUAGE_RTL ? '_rtl' : '';
     $vars['conditional_styles'] = variable_get('conditional_styles_' . $GLOBALS['theme'] . $language, '');
     $vars['styles'] .= $vars['conditional_styles'];
-  }
+    }
 
-  // Classes for body element. Allows advanced theming based on context
-  // (home page, node of certain type, etc.)
-  // Remove the mostly useless page-ARG0 class.
-  if ($index = array_search(preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', 'page-'. drupal_strtolower(arg(0))), $vars['classes_array'])) {
+    // Classes for body element. Allows advanced theming based on context
+    // (home page, node of certain type, etc.)
+    // Remove the mostly useless page-ARG0 class.
+    if ($index = array_search(preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', 'page-'. drupal_strtolower(arg(0))), $vars['classes_array'])) {
     unset($vars['classes_array'][$index]);
-  }
-  if (!$vars['is_front']) {
+    }
+    if (!$vars['is_front']) {
     // Add unique class for each page.
     $path = drupal_get_path_alias($_GET['q']);
     $vars['classes_array'][] = drupal_html_class('page-' . $path);
     // Add unique class for each website section.
     list($section, ) = explode('/', $path, 2);
     if (arg(0) == 'node') {
-      if (arg(1) == 'add') {
+        if (arg(1) == 'add') {
         $section = 'node-add';
-      }
-      elseif (is_numeric(arg(1)) && (arg(2) == 'edit' || arg(2) == 'delete')) {
+        }
+        elseif (is_numeric(arg(1)) && (arg(2) == 'edit' || arg(2) == 'delete')) {
         $section = 'node-' . arg(2);
-      }
+        }
     }
     $vars['classes_array'][] = drupal_html_class('section-' . $section);
-  }
-  if (theme_get_setting('zen_wireframes')) {
+    }
+    if (theme_get_setting('zen_wireframes')) {
     $vars['classes_array'][] = 'with-wireframes'; // Optionally add the wireframes style.
-  }
-  // We need to re-do the $layout and body classes because
-  // template_preprocess_page() assumes sidebars are named 'left' and 'right'.
-  $vars['layout'] = 'none';
-  if (!empty($vars['sidebar_first'])) {
+    }
+    // We need to re-do the $layout and body classes because
+    // template_preprocess_page() assumes sidebars are named 'left' and 'right'.
+    $vars['layout'] = 'none';
+    if (!empty($vars['sidebar_first'])) {
     $vars['layout'] = 'first';
-  }
-  if (!empty($vars['sidebar_second'])) {
+    }
+    if (!empty($vars['sidebar_second'])) {
     $vars['layout'] = ($vars['layout'] == 'first') ? 'both' : 'second';
-  }
-  // If the layout is 'none', then template_preprocess_page() will already have
-  // set a 'no-sidebars' class since it won't find a 'left' or 'right' sidebar.
-  if ($vars['layout'] != 'none') {
+    }
+    // If the layout is 'none', then template_preprocess_page() will already have
+    // set a 'no-sidebars' class since it won't find a 'left' or 'right' sidebar.
+    if ($vars['layout'] != 'none') {
     // Remove the incorrect 'no-sidebars' class.
     if ($index = array_search('no-sidebars', $vars['classes_array'])) {
-      unset($vars['classes_array'][$index]);
+        unset($vars['classes_array'][$index]);
     }
     // Set the proper layout body classes.
     if ($vars['layout'] == 'both') {
-      $vars['classes_array'][] = 'two-sidebars';
+        $vars['classes_array'][] = 'two-sidebars';
     }
     else {
-      $vars['classes_array'][] = 'one-sidebar';
-      $vars['classes_array'][] = 'sidebar-' . $vars['layout'];
+        $vars['classes_array'][] = 'one-sidebar';
+        $vars['classes_array'][] = 'sidebar-' . $vars['layout'];
+    }
     }
-  }
-  // Store the menu item since it has some useful information.
-  $vars['menu_item'] = menu_get_item();
-  switch ($vars['menu_item']['page_callback']) {
+    // Store the menu item since it has some useful information.
+    $vars['menu_item'] = menu_get_item();
+    switch ($vars['menu_item']['page_callback']) {
     case 'views_page':
       // Is this a Views page?
       $vars['classes_array'][] = 'page-views';
-      break;
+        break;
     case 'page_manager_page_execute':
     case 'page_manager_node_view':
     case 'page_manager_contact_site':
       // Is this a Panels page?
       $vars['classes_array'][] = 'page-panels';
-      break;
-  }
+        break;
+    }
 }
 
 /**
@@ -404,17 +404,17 @@ 
  *   The name of the template being rendered ("maintenance_page" in this case.)
  */
 function zen_preprocess_maintenance_page(&$vars, $hook) {
-  // If Zen is the maintenance theme, add some styles.
-  if ($GLOBALS['theme'] == 'zen') {
+    // If Zen is the maintenance theme, add some styles.
+    if ($GLOBALS['theme'] == 'zen') {
     include_once './' . _zen_path() . '/zen-internals/template.zen.inc';
     _zen_preprocess_page($vars, $hook);
-  }
-  // Add conditional stylesheets.
-  elseif (!module_exists('conditional_styles')) {
+    }
+    // Add conditional stylesheets.
+    elseif (!module_exists('conditional_styles')) {
     $language = $GLOBALS['language']->direction == LANGUAGE_RTL ? '_rtl' : '';
     $vars['conditional_styles'] = variable_get('conditional_styles_' . $GLOBALS['theme'] . $language, '');
     $vars['styles'] .= $vars['conditional_styles'];
-  }
+    }
 }
 
 /**
@@ -426,67 +426,67 @@ 
  *   The name of the template being rendered ("node" in this case.)
  */
 function zen_preprocess_node(&$vars, $hook) {
-  // Create the build_mode variable.
-  switch ($vars['node']->build_mode) {
+    // Create the build_mode variable.
+    switch ($vars['node']->build_mode) {
     case NODE_BUILD_NORMAL:
       if ($vars['node']->build_mode === NODE_BUILD_NORMAL) {
         $vars['build_mode'] = $vars['teaser'] ? 'teaser' : 'full';
-      }
-      else {
+        }
+        else {
         $vars['build_mode'] = $vars['node']->build_mode;
-      }
-      break;
+        }
+        break;
     case NODE_BUILD_PREVIEW:
       $vars['build_mode'] = 'preview';
-      break;
+        break;
     case NODE_BUILD_SEARCH_INDEX:
       $vars['build_mode'] = 'search_index';
-      break;
+        break;
     case NODE_BUILD_SEARCH_RESULT:
       $vars['build_mode'] = 'search_result';
-      break;
+        break;
     case NODE_BUILD_RSS:
       $vars['build_mode'] = 'rss';
-      break;
+        break;
     case NODE_BUILD_PRINT:
       $vars['build_mode'] = 'print';
-      break;
+        break;
     default:
       $vars['build_mode'] = $vars['node']->build_mode;
-  }
+    }
 
-  // Create the user_picture variable.
-  $vars['user_picture'] = $vars['picture'];
+    // Create the user_picture variable.
+    $vars['user_picture'] = $vars['picture'];
 
-  // Create the Drupal 7 $display_submitted variable.
-  $vars['display_submitted'] = theme_get_setting('toggle_node_info_' . $vars['node']->type);
+    // Create the Drupal 7 $display_submitted variable.
+    $vars['display_submitted'] = theme_get_setting('toggle_node_info_' . $vars['node']->type);
 
-  // Special classes for nodes.
-  // Class for node type: "node-type-page", "node-type-story", "node-type-my-custom-type", etc.
-  $vars['classes_array'][] = drupal_html_class('node-type-' . $vars['type']);
-  if ($vars['promote']) {
+    // Special classes for nodes.
+    // Class for node type: "node-type-page", "node-type-story", "node-type-my-custom-type", etc.
+    $vars['classes_array'][] = drupal_html_class('node-type-' . $vars['type']);
+    if ($vars['promote']) {
     $vars['classes_array'][] = 'node-promoted';
-  }
-  if ($vars['sticky']) {
+    }
+    if ($vars['sticky']) {
     $vars['classes_array'][] = 'node-sticky';
-  }
-  if (!$vars['status']) {
+    }
+    if (!$vars['status']) {
     $vars['classes_array'][] = 'node-unpublished';
     $vars['unpublished'] = TRUE;
-  }
-  else {
+    }
+    else {
     $vars['unpublished'] = FALSE;
-  }
-  if ($vars['uid'] && $vars['uid'] == $GLOBALS['user']->uid) {
+    }
+    if ($vars['uid'] && $vars['uid'] == $GLOBALS['user']->uid) {
     $vars['classes_array'][] = 'node-by-viewer'; // Node is authored by current user.
-  }
-  if ($vars['teaser']) {
+    }
+    if ($vars['teaser']) {
     $vars['classes_array'][] = 'node-teaser'; // Node is displayed as teaser.
-  }
-  if (isset($vars['preview'])) {
+    }
+    if (isset($vars['preview'])) {
     $vars['classes_array'][] = 'node-preview';
-  }
-  $vars['classes_array'][] = 'build-mode-' . $vars['build_mode'] ;
+    }
+    $vars['classes_array'][] = 'build-mode-' . $vars['build_mode'] ;
 }
 
 /**
@@ -498,8 +498,8 @@ 
  *   The name of the template being rendered ("comment" in this case.)
  */
 function zen_preprocess_comment(&$vars, $hook) {
-  include_once './' . _zen_path() . '/zen-internals/template.comment.inc';
-  _zen_preprocess_comment($vars, $hook);
+    include_once './' . _zen_path() . '/zen-internals/template.comment.inc';
+    _zen_preprocess_comment($vars, $hook);
 }
 
 /**
@@ -511,18 +511,18 @@ 
  * @see region.tpl.php
  */
 function zen_preprocess_region(&$vars, $hook) {
-  // Create the $content variable that templates expect.
-  $vars['content'] = $vars['elements']['#children'];
-  $vars['region'] = $vars['elements']['#region'];
+    // Create the $content variable that templates expect.
+    $vars['content'] = $vars['elements']['#children'];
+    $vars['region'] = $vars['elements']['#region'];
 
-  // Setup the default classes.
-  $vars['classes_array'] = array('region', 'region-' . str_replace('_', '-', $vars['region']));
+    // Setup the default classes.
+    $vars['classes_array'] = array('region', 'region-' . str_replace('_', '-', $vars['region']));
 
-  // Sidebar regions get a couple extra classes.
-  if (strpos($vars['region'], 'sidebar_') === 0) {
+    // Sidebar regions get a couple extra classes.
+    if (strpos($vars['region'], 'sidebar_') === 0) {
     $vars['classes_array'][] = 'column';
     $vars['classes_array'][] = 'sidebar';
-  }
+    }
 }
 
 /**
@@ -534,36 +534,36 @@ 
  *   The name of the template being rendered ("block" in this case.)
  */
 function zen_preprocess_block(&$vars, $hook) {
-  $block = $vars['block'];
+    $block = $vars['block'];
 
-  // Drupal 7 uses a $content variable instead of $block->content.
-  $vars['content'] = $block->content;
-  // Drupal 7 should use a $title variable instead of $block->subject.
-  $vars['title'] = $block->subject;
+    // Drupal 7 uses a $content variable instead of $block->content.
+    $vars['content'] = $block->content;
+    // Drupal 7 should use a $title variable instead of $block->subject.
+    $vars['title'] = $block->subject;
 
-  // Special classes for blocks.
-  $vars['classes_array'][] = 'block-' . $block->module;
-  // Classes describing the position of the block within the region.
-  if ($vars['block_id'] == 1) {
+    // Special classes for blocks.
+    $vars['classes_array'][] = 'block-' . $block->module;
+    // Classes describing the position of the block within the region.
+    if ($vars['block_id'] == 1) {
     $vars['classes_array'][] = 'first';
-  }
-  if (!function_exists('context_blocks') && count(block_list($vars['block']->region)) == $vars['block_id']) {
+    }
+    if (!function_exists('context_blocks') && count(block_list($vars['block']->region)) == $vars['block_id']) {
     $vars['classes_array'][] = 'last';
-  }
-  $vars['classes_array'][] = 'region-' . $vars['block_zebra'];
-  $vars['classes_array'][] = $vars['zebra'];
-  $vars['classes_array'][] = 'region-count-' . $vars['block_id'];
-  $vars['classes_array'][] = 'count-' . $vars['id'];
+    }
+    $vars['classes_array'][] = 'region-' . $vars['block_zebra'];
+    $vars['classes_array'][] = $vars['zebra'];
+    $vars['classes_array'][] = 'region-count-' . $vars['block_id'];
+    $vars['classes_array'][] = 'count-' . $vars['id'];
 
-  // Create the block ID.
-  $vars['block_html_id'] = 'block-' . $block->module . '-' . $block->delta;
+    // Create the block ID.
+    $vars['block_html_id'] = 'block-' . $block->module . '-' . $block->delta;
 
-  $vars['edit_links_array'] = array();
-  if (theme_get_setting('zen_block_editing') && user_access('administer blocks')) {
+    $vars['edit_links_array'] = array();
+    if (theme_get_setting('zen_block_editing') && user_access('administer blocks')) {
     include_once './' . _zen_path() . '/zen-internals/template.block-editing.inc';
     zen_preprocess_block_editing($vars, $hook);
     $vars['classes_array'][] = 'with-block-editing';
-  }
+    }
 }
 
 /**
@@ -575,10 +575,10 @@ 
  *   The name of the template being rendered.
  */
 function zen_process(&$vars, $hook) {
-  // Don't clobber Views 3 classes.
-  if (array_key_exists('classes_array', $vars) && !array_key_exists('classes', $vars)) {
+    // Don't clobber Views 3 classes.
+    if (array_key_exists('classes_array', $vars) && !array_key_exists('classes', $vars)) {
     $vars['classes'] = implode(' ', $vars['classes_array']);
-  }
+    }
 }
 
 /**
@@ -590,22 +590,22 @@ 
  *   The name of the template being rendered ("block" in this case.)
  */
 function zen_process_block(&$vars, $hook) {
-  $vars['edit_links'] = !empty($vars['edit_links_array']) ? '<div class="edit">' . implode(' ', $vars['edit_links_array']) . '</div>' : '';
+    $vars['edit_links'] = !empty($vars['edit_links_array']) ? '<div class="edit">' . implode(' ', $vars['edit_links_array']) . '</div>' : '';
 }
 
 if (!function_exists('drupal_html_class')) {
-  /**
-   * Prepare a string for use as a valid class name.
-   *
-   * Do not pass one string containing multiple classes as they will be
-   * incorrectly concatenated with dashes, i.e. "one two" will become "one-two".
-   *
-   * @param $class
-   *   The class name to clean.
-   * @return
-   *   The cleaned class name.
-   */
-  function drupal_html_class($class) {
+    /**
+     * Prepare a string for use as a valid class name.
+     *
+     * Do not pass one string containing multiple classes as they will be
+     * incorrectly concatenated with dashes, i.e. "one two" will become "one-two".
+     *
+     * @param $class
+     *   The class name to clean.
+     * @return
+     *   The cleaned class name.
+     */
+    function drupal_html_class($class) {
     // By default, we filter using Drupal's coding standards.
     $class = strtr(drupal_strtolower($class), array(' ' => '-', '_' => '-', '/' => '-', '[' => '-', ']' => ''));
 
@@ -623,19 +623,19 @@ 
     $class = preg_replace('/[^\x{002D}\x{0030}-\x{0039}\x{0041}-\x{005A}\x{005F}\x{0061}-\x{007A}\x{00A1}-\x{FFFF}]/u', '', $class);
 
     return $class;
-  }
+    }
 } /* End of drupal_html_class conditional definition. */
 
 if (!function_exists('drupal_html_id')) {
-  /**
-   * Prepare a string for use as a valid HTML ID and guarantee uniqueness.
-   *
-   * @param $id
-   *   The ID to clean.
-   * @return
-   *   The cleaned ID.
-   */
-  function drupal_html_id($id) {
+    /**
+     * Prepare a string for use as a valid HTML ID and guarantee uniqueness.
+     *
+     * @param $id
+     *   The ID to clean.
+     * @return
+     *   The cleaned ID.
+     */
+    function drupal_html_id($id) {
     $id = strtr(drupal_strtolower($id), array(' ' => '-', '_' => '-', '[' => '-', ']' => ''));
 
     // As defined in http://www.w3.org/TR/html4/types.html#type-name, HTML IDs can
@@ -647,7 +647,7 @@ 
     $id = preg_replace('/[^A-Za-z0-9\-_]/', '', $id);
 
     return $id;
-  }
+    }
 } /* End of drupal_html_id conditional definition. */
 
 /**
@@ -657,12 +657,12 @@ 
  * replace _zen_path() with drupal_get_path('theme', 'zen').
  */
 function _zen_path() {
-  static $path = FALSE;
-  if (!$path) {
+    static $path = FALSE;
+    if (!$path) {
     $matches = drupal_system_listing('zen\.info$', 'themes', 'name', 0);
     if (!empty($matches['zen']->filename)) {
-      $path = dirname($matches['zen']->filename);
+        $path = dirname($matches['zen']->filename);
+    }
     }
-  }
-  return $path;
+    return $path;
 }

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

Doc Comments +2 added lines, -1 removed lines

@@ -132,7 +132,7 @@ 
  * Set database connection for boincimport
  *
  * @return
- *   1 if can connect to BOINC database.
+ integer   1 if can connect to BOINC database.
  *
  * BEWARE: if you test using db_connect and the connection
  * fails, the process will die() which is a bit too much since we only
@@ -162,6 +162,7 @@ 
 /**
  * Check if the module is enabled.
  * 
+ * @param string $module
  * @return array
  *    $out['html'] = formatted html.
  *    $out['result'] = boolean.

Indentation +1723 added lines, -1723 removed lines

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

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

Doc Comments +3 added lines

@@ -422,6 +422,9 @@
 /*
  *
  */
+/**
+ * @param integer $credit
+ */
 function boincstats_credit_to_ghours($credit) {
   return $credit / (100 * 365);
 }

Indentation +194 added lines, -194 removed lines

@@ -2,9 +2,9 @@ 
 // $Id$
 
 /**
-  * @file
-  * Enable BOINC charting features for statistics
-  */
+ * @file
+ * Enable BOINC charting features for statistics
+ */
 
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -18,10 +18,10 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 /**
-  * Implementation of hook_menu().
-  */
+ * Implementation of hook_menu().
+ */
 function boincstats_menu() {
-  $items['admin/boinc/stats'] = array(
+    $items['admin/boinc/stats'] = array(
     'title' => 'Environment: Statistics setup',
     'description' => 'Configure the stats system for generating charts and 
       providing cross project data.',
@@ -30,18 +30,18 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boincstats.admin.inc'
-  );
-  $items['charts/user'] = array(
+    );
+    $items['charts/user'] = array(
     'page callback' => 'boincstats_get_user_stats_chart',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  $items['charts/project'] = array(
+    );
+    $items['charts/project'] = array(
     'page callback' => 'boincstats_get_project_stats_chart',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  return $items;
+    );
+    return $items;
 }
 
 
@@ -50,44 +50,44 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
  
 /**
-  * User stats chart menu callback
-  * Called to generate the daily credit status chart for a user (dashboard)
-  */
+ * User stats chart menu callback
+ * Called to generate the daily credit status chart for a user (dashboard)
+ */
 function boincstats_get_user_stats_chart($cpid = null, $chart_size = 'medium') {
   
-  // pChart library inclusions
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pData.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pDraw.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pImage.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pCache.class');
+    // pChart library inclusions
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pData.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pDraw.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pImage.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pCache.class');
   
-  init_theme();
-  global $theme_key;
-  $cache_name = "{$theme_key}_";
+    init_theme();
+    global $theme_key;
+    $cache_name = "{$theme_key}_";
   
-  // Determine the stats environment
-  boincstats_check_configuration();
-  $stats_server = variable_get('boinc_stats_server', '');
-  $stats_rpc = variable_get('boinc_stats_user_credit_history_rpc', '');
-  $project_id = variable_get('boinc_stats_remote_project_id', '');
+    // Determine the stats environment
+    boincstats_check_configuration();
+    $stats_server = variable_get('boinc_stats_server', '');
+    $stats_rpc = variable_get('boinc_stats_user_credit_history_rpc', '');
+    $project_id = variable_get('boinc_stats_remote_project_id', '');
   
-  $dataset_size = 0;
-  $chart_height = 0;
-  $chart_width = 0;
-  $draw_x_lines = FALSE;
-  $label_x_axis = FALSE;
+    $dataset_size = 0;
+    $chart_height = 0;
+    $chart_width = 0;
+    $draw_x_lines = FALSE;
+    $label_x_axis = FALSE;
   
-  $stats_xml = NULL;
-  $color_keys = array('R', 'G', 'B');
+    $stats_xml = NULL;
+    $color_keys = array('R', 'G', 'B');
   
-  // Get color configuration
-  $palette_color_hex = theme_get_setting('boinc_stats_chart_color');
-  $palette_color = array_combine($color_keys, sscanf($palette_color_hex, "#%02x%02x%02x"));
-  $backdrop_color_hex = theme_get_setting('boinc_stats_chart_bcolor');
-  $backdrop_color = array_combine($color_keys, sscanf($backdrop_color_hex, "#%02x%02x%02x"));
+    // Get color configuration
+    $palette_color_hex = theme_get_setting('boinc_stats_chart_color');
+    $palette_color = array_combine($color_keys, sscanf($palette_color_hex, "#%02x%02x%02x"));
+    $backdrop_color_hex = theme_get_setting('boinc_stats_chart_bcolor');
+    $backdrop_color = array_combine($color_keys, sscanf($backdrop_color_hex, "#%02x%02x%02x"));
   
-  switch($chart_size) {
-  case 'small':
+    switch($chart_size) {
+    case 'small':
     $cache_name .= "{$cpid}_small";
     $dataset_size = 30;
     $chart_height = 80;
@@ -96,7 +96,7 @@ 
     $draw_x_lines = FALSE;
     $label_x_axis = FALSE;
     break;
-  case 'medium':
+    case 'medium':
   default:
     $cache_name .= $cpid;
     $dataset_size = 60;
@@ -104,25 +104,25 @@ 
     $chart_width = 589;
     $draw_x_lines = TRUE;
     $label_x_axis = TRUE;
-  }
+    }
   
-  // Sanity check for cache directory
-  if (!boincstats_check_cache_dir()) {
+    // Sanity check for cache directory
+    if (!boincstats_check_cache_dir()) {
     return;
-  }
+    }
   
-  // Initialize the cache object and flush stale images
-  $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path() . '/files/cache'));
-  $myCache->removeOlderThan(60*60*24);
+    // Initialize the cache object and flush stale images
+    $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path() . '/files/cache'));
+    $myCache->removeOlderThan(60*60*24);
   
-  if ($myCache->isInCache($cache_name)) {
+    if ($myCache->isInCache($cache_name)) {
     $myCache->strokeFromCache($cache_name);
-  }
-  else {
+    }
+    else {
     // Construct query string
     $get = array(
-      'cpid' => $cpid,
-      'projectid' => $project_id
+        'cpid' => $cpid,
+        'projectid' => $project_id
     );
     $args = array();
     foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
@@ -132,7 +132,7 @@ 
     $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
     $result = drupal_http_request($target_url);
     if (in_array($result->code, array(200, 304))) {
-      $stats_xml = simplexml_load_string($result->data);
+        $stats_xml = simplexml_load_string($result->data);
     }
     
     // Create and populate the pData object
@@ -141,15 +141,15 @@ 
     // Initialize dataset
     $dataset = array();
     if ($stats_xml) {
-      $credit = null;
-      for ($i = 0, $j = 31; $j <= 91; $i++, $j++) {
+        $credit = null;
+        for ($i = 0, $j = 31; $j <= 91; $i++, $j++) {
         $day = "day_{$j}";
         $credit[$i] = isset($stats_xml->total_credit_history_last_91_days->$day) ? (int) $stats_xml->total_credit_history_last_91_days->$day : 0;
         $dataset[$i] = ($i) ? ($credit[$i] - $credit[$i-1]) : 0;
-      }
+        }
     }
     else {
-      for ($i = 0; $i <= $dataset_size; $i++) $dataset[] = 0;
+        for ($i = 0; $i <= $dataset_size; $i++) $dataset[] = 0;
     }
     
     $MyData->addPoints($dataset, 'series1');
@@ -168,39 +168,39 @@ 
     // Define the chart area
     $myPicture->setGraphArea(0, 3, $chart_width, $chart_height);
     if ($backdrop_color) {
-      $myPicture->drawFilledRectangle(0, 0, $chart_width, $chart_height, $backdrop_color);
+        $myPicture->drawFilledRectangle(0, 0, $chart_width, $chart_height, $backdrop_color);
     }
     
     // Draw the scale
     $scaleSettings = array(
-      'Mode' => SCALE_MODE_START0,
-      'DrawYLines' => false,
-      'DrawXLines' => $draw_x_lines,
-      'GridTicks' => 2,
-      'LabelSkip' => 9,
-      'SkippedAxisAlpha' => 0,
-      'SkippedInnerTickWidth' => 0,
-      'SkippedOuterTickWidth' => 0,
-      'AxisAlpha' => 0,
-      'InnerTickWidth' => 0,
-      'OuterTickWidth' => 0,
-      'XMargin' => 1,
-      'YMargin' => 0,
-      'Floating' => TRUE,
-      'GridR' => 200,
-      'GridG' => 200,
-      'GridB' => 200,
-      'DrawSubTicks' => false,
-      'CycleBackground' => false
+        'Mode' => SCALE_MODE_START0,
+        'DrawYLines' => false,
+        'DrawXLines' => $draw_x_lines,
+        'GridTicks' => 2,
+        'LabelSkip' => 9,
+        'SkippedAxisAlpha' => 0,
+        'SkippedInnerTickWidth' => 0,
+        'SkippedOuterTickWidth' => 0,
+        'AxisAlpha' => 0,
+        'InnerTickWidth' => 0,
+        'OuterTickWidth' => 0,
+        'XMargin' => 1,
+        'YMargin' => 0,
+        'Floating' => TRUE,
+        'GridR' => 200,
+        'GridG' => 200,
+        'GridB' => 200,
+        'DrawSubTicks' => false,
+        'CycleBackground' => false
     );
     $myPicture->setFontProperties(array('FontSize' => 10));
     $myPicture->drawScale($scaleSettings);
     
     if ($label_x_axis) {
-      for ($i = 5; $i >= 0; $i--) {
+        for ($i = 5; $i >= 0; $i--) {
         $label = ($i) ? -10*$i : 'Today';
         $myPicture->drawText(589-587*($i/6)-5, 2, $label, array('Align' => TEXT_ALIGN_TOPRIGHT));
-      }
+        }
     }
 
     // Draw the area chart
@@ -212,7 +212,7 @@ 
     // Render the picture (choose the best way)
     //$myPicture->autoOutput('pictures/example.drawAreaChart.simple.png');
     $myPicture->stroke();
-  }
+    }
 }
 
 /**
@@ -220,53 +220,53 @@ 
  * Called to generate the daily credit status chart for the whole project
  */
 function boincstats_get_project_stats_chart() {
-  // pChart library inclusions
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pData.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pDraw.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pImage.class');
-  module_load_include('php', 'boincstats', 'includes/pchart/class/pCache.class');
+    // pChart library inclusions
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pData.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pDraw.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pImage.class');
+    module_load_include('php', 'boincstats', 'includes/pchart/class/pCache.class');
   
-  init_theme();
-  global $theme_key;
-  $cache_name = "{$theme_key}_project_chart";
+    init_theme();
+    global $theme_key;
+    $cache_name = "{$theme_key}_project_chart";
   
-  $stats_xml = boincstats_get_project_stats();
-  $color_keys = array('R', 'G', 'B');
+    $stats_xml = boincstats_get_project_stats();
+    $color_keys = array('R', 'G', 'B');
   
-  // Get color configuration
-  $palette_color_hex = theme_get_setting('boinc_stats_chart_color');
-  $palette_color = array_combine($color_keys, sscanf($palette_color_hex, "#%02x%02x%02x"));
-  $backdrop_color_hex = theme_get_setting('boinc_stats_chart_bcolor');
-  $backdrop_color = array_combine($color_keys, sscanf($backdrop_color_hex, "#%02x%02x%02x"));
+    // Get color configuration
+    $palette_color_hex = theme_get_setting('boinc_stats_chart_color');
+    $palette_color = array_combine($color_keys, sscanf($palette_color_hex, "#%02x%02x%02x"));
+    $backdrop_color_hex = theme_get_setting('boinc_stats_chart_bcolor');
+    $backdrop_color = array_combine($color_keys, sscanf($backdrop_color_hex, "#%02x%02x%02x"));
    
-  // Create and populate the pData object
-  $MyData = new pData();
+    // Create and populate the pData object
+    $MyData = new pData();
   
-  // Sanity check for cache directory
-  if (!boincstats_check_cache_dir()) {
+    // Sanity check for cache directory
+    if (!boincstats_check_cache_dir()) {
     return;
-  }
+    }
   
-  // Initialize the cache object and flush stale images
-  $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path(). '/files/cache'));
-  $myCache->removeOlderThan(60*60*24);
+    // Initialize the cache object and flush stale images
+    $myCache = new pCache(array('CacheFolder' => realpath('.') . '/' . conf_path(). '/files/cache'));
+    $myCache->removeOlderThan(60*60*24);
   
-  if ($myCache->isInCache($cache_name)) {
+    if ($myCache->isInCache($cache_name)) {
     $myCache->strokeFromCache($cache_name);
-  }
-  else {
+    }
+    else {
     // Initialize dataset
     $dataset = array();
     if ($stats_xml) {
-      $credit = null;
-      for ($i = 0, $j = 31; $j <= 91; $i++, $j++) {
+        $credit = null;
+        for ($i = 0, $j = 31; $j <= 91; $i++, $j++) {
         $day = "day_{$j}";
         $credit[$i] = isset($stats_xml->$day) ? (int) $stats_xml->$day : 0;
         $dataset[$i] = ($i) ? ($credit[$i] - $credit[$i-1]) : 0;
-      }
+        }
     }
     else {
-      for ($i = 0; $i <= 30; $i++) $dataset[] = 0;
+        for ($i = 0; $i <= 30; $i++) $dataset[] = 0;
     }
     
     $MyData->addPoints($dataset, 'series1');
@@ -288,25 +288,25 @@ 
 
     // Draw the scale
     $scaleSettings = array(
-      'Mode' => SCALE_MODE_START0,
-      'DrawYLines' => false,
-      'DrawXLines' => false,
-      'GridTicks' => 2,
-      'LabelSkip' => 9,
-      'SkippedAxisAlpha' => 0,
-      'SkippedInnerTickWidth' => 0,
-      'SkippedOuterTickWidth' => 0,
-      'AxisAlpha' => 0,
-      'InnerTickWidth' => 0,
-      'OuterTickWidth' => 0,
-      'XMargin' => 1,
-      'YMargin' => 0,
-      'Floating' => TRUE,
-      'GridR' => 200,
-      'GridG' => 200,
-      'GridB' => 200,
-      'DrawSubTicks' => false,
-      'CycleBackground' => false
+        'Mode' => SCALE_MODE_START0,
+        'DrawYLines' => false,
+        'DrawXLines' => false,
+        'GridTicks' => 2,
+        'LabelSkip' => 9,
+        'SkippedAxisAlpha' => 0,
+        'SkippedInnerTickWidth' => 0,
+        'SkippedOuterTickWidth' => 0,
+        'AxisAlpha' => 0,
+        'InnerTickWidth' => 0,
+        'OuterTickWidth' => 0,
+        'XMargin' => 1,
+        'YMargin' => 0,
+        'Floating' => TRUE,
+        'GridR' => 200,
+        'GridG' => 200,
+        'GridB' => 200,
+        'DrawSubTicks' => false,
+        'CycleBackground' => false
     );
     $myPicture->setFontProperties(array('FontSize' => 10));
     $myPicture->drawScale($scaleSettings);
@@ -325,41 +325,41 @@ 
     // Render the picture (choose the best way)
     //$myPicture->autoOutput('pictures/example.drawAreaChart.simple.png');
     $myPicture->stroke();
-  }
+    }
 }
 
 /*
  *
  */
 function boincstats_check_cache_dir($cache_path = 'files/cache') {
-  $cache_dir = realpath('.') . '/' . conf_path() . '/' . $cache_path;
-  if (!is_writeable($cache_dir)) {
+    $cache_dir = realpath('.') . '/' . conf_path() . '/' . $cache_path;
+    if (!is_writeable($cache_dir)) {
     if (!is_dir($cache_dir)) {
-      if (!is_writeable(dirname($cache_dir))) {
+        if (!is_writeable(dirname($cache_dir))) {
         // If the parent "files" dir isn't even writeable...
         watchdog('boincstats', '@parent_dir directory is not writeable. This
           directory must be writeable by the web server.',
-          array('@parent_dir' => dirname($cache_dir)), WATCHDOG_ERROR);
+            array('@parent_dir' => dirname($cache_dir)), WATCHDOG_ERROR);
         return FALSE;
-      }
-      else {
+        }
+        else {
         // Create the cache dir
         if (!mkdir($cache_dir, 0775)) {
-          watchdog('boincstats', 'Failed to create @cache_dir directory. Check
+            watchdog('boincstats', 'Failed to create @cache_dir directory. Check
             filesystem permissions...?',
             array('@cache_dir' => $cache_dir), WATCHDOG_ERROR);
-          return FALSE;
+            return FALSE;
+        }
         }
-      }
     }
     else {
-      watchdog('boincstats', 'Cache directory at @cache_dir is not writeable.
+        watchdog('boincstats', 'Cache directory at @cache_dir is not writeable.
         Please allow webserver write access.',
         array('@cache_dir' => $cache_dir), WATCHDOG_ERROR);
-      return FALSE;
+        return FALSE;
     }
-  }
-  return TRUE;
+    }
+    return TRUE;
 }
 
 /*
@@ -367,76 +367,76 @@ 
  */
 function boincstats_get_project_stats() {
   
-  // Determine the stats environment
-  boincstats_check_configuration();
-  $stats_server = variable_get('boinc_stats_server', '');
-  $stats_rpc = variable_get('boinc_stats_project_credit_history_rpc', '');
-  $project_id = variable_get('boinc_stats_remote_project_id', '');
+    // Determine the stats environment
+    boincstats_check_configuration();
+    $stats_server = variable_get('boinc_stats_server', '');
+    $stats_rpc = variable_get('boinc_stats_project_credit_history_rpc', '');
+    $project_id = variable_get('boinc_stats_remote_project_id', '');
   
-  // Construct query string
-  $get = array(
+    // Construct query string
+    $get = array(
     'projectid' => $project_id
-  );
-  $args = array();
-  foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
-  $query = '?' . implode('&', $args);
+    );
+    $args = array();
+    foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
+    $query = '?' . implode('&', $args);
   
-  // Load XML from RPC
-  $stats_xml = NULL;
-  $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
-  $result = drupal_http_request($target_url);
-  if (in_array($result->code, array(200, 304))) {
+    // Load XML from RPC
+    $stats_xml = NULL;
+    $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
+    $result = drupal_http_request($target_url);
+    if (in_array($result->code, array(200, 304))) {
     $stats_xml = simplexml_load_string($result->data);
-  }
-  watchdog('boincstats', $target_url);
-  return $stats_xml;
+    }
+    watchdog('boincstats', $target_url);
+    return $stats_xml;
 }
 
 /*
  *
  */
 function boincstats_get_project_total_credit() {
-  $stats_xml = boincstats_get_project_stats();
-  return isset($stats_xml->day_91) ? (int) $stats_xml->day_91 : 0;
+    $stats_xml = boincstats_get_project_stats();
+    return isset($stats_xml->day_91) ? (int) $stats_xml->day_91 : 0;
 }
 
 /*
  *
  */
 function boincstats_get_project_avg_credit() {
-  $stats_xml = boincstats_get_project_stats();
-  $dataset = array();
-  if ($stats_xml) {
+    $stats_xml = boincstats_get_project_stats();
+    $dataset = array();
+    if ($stats_xml) {
     $daily_values = null;
     $dail_totals = null;
     for ($i = 61; $i <= 91; $i++) {
-      $day = "day_{$i}";
-      $daily_totals[$i] = isset($stats_xml->$day) ? (int) $stats_xml->$day : 0;
-      if ($i == 61) continue;
-      $daily_values[$i] = ($i) ? ($daily_totals[$i] - $daily_totals[$i-1]) : 0;
+        $day = "day_{$i}";
+        $daily_totals[$i] = isset($stats_xml->$day) ? (int) $stats_xml->$day : 0;
+        if ($i == 61) continue;
+        $daily_values[$i] = ($i) ? ($daily_totals[$i] - $daily_totals[$i-1]) : 0;
     }
-  }
-  return (count($daily_values)) ? array_sum($daily_values) / count($daily_values) : 0;
+    }
+    return (count($daily_values)) ? array_sum($daily_values) / count($daily_values) : 0;
 }
 
 /*
  *
  */
 function boincstats_credit_to_ghours($credit) {
-  return $credit / (100 * 365);
+    return $credit / (100 * 365);
 }
 
 /*
  *
  */
 function boincstats_credit_to_flops($credit, $prefix = 0) {
-  $factor = array(
+    $factor = array(
     '0' => 0,
     'g' => 3,
     't' => 6,
     'p' => 9
-  );
-  return $credit / (pow(10, (int) $factor[$prefix]) / 10);
+    );
+    return $credit / (pow(10, (int) $factor[$prefix]) / 10);
 }
 
 
@@ -445,22 +445,22 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 
 function boincstats_get_project_stats_overview($type = 'basic') {
-  global $base_path;
-  $output = '';
-  switch ($type) {
-  case 'basic':
+    global $base_path;
+    $output = '';
+    switch ($type) {
+    case 'basic':
     $output .= '<div class="overlay"><span>(' . bts('Credits per day') . ')</span></div>' . "\n";
     $output .= '<div class="chart"><img src="' . $base_path . 'charts/project" /></div>' . "\n";
     break;
-  case 'detailed':
+    case 'detailed':
     $output .= '<div class="stats"><label>' . bts('Total G-hours') . ': </label><span>' . number_format(boincstats_credit_to_ghours(boincstats_get_project_total_credit())) . '</span></div>' . "\n";
     $output .= '<div class="stats"><label>' . bts('Avg TFlops') . ': </label><span>' . number_format(boincstats_credit_to_flops(boincstats_get_project_avg_credit(), 't')) . '</span></div>' . "\n";
     //$output .= '<div class="stats"><a href="#">' . bts('Pending credits') . '</a></div>' . "\n";
     $output .= '<div class="chart"><img src="' . $base_path . 'charts/project" /></div>' . "\n";
     break;
-  default:
+    default:
   }
-  return $output;
+    return $output;
 }
 
 
@@ -472,19 +472,19 @@ 
  * Check that the stats system is configured, report if it isn't
  */
 function boincstats_check_configuration() {
-  $project_id = variable_get('boinc_stats_remote_project_id', '');
-  if (!$project_id) {
+    $project_id = variable_get('boinc_stats_remote_project_id', '');
+    if (!$project_id) {
     watchdog('boincstats', 'The BOINC stats system is not configured. Please
         !configure_it', array('!configure_it' => l(t('configure it now'),
-          'admin/boinc/stats')), WATCHDOG_ERROR);
+            'admin/boinc/stats')), WATCHDOG_ERROR);
     if (user_access('administer site configuration')) {
-      drupal_set_message(t('The BOINC stats system is not configured. Please
+        drupal_set_message(t('The BOINC stats system is not configured. Please
         !configure_it', array('!configure_it' => l(t('configure it now'),
-          'admin/boinc/stats'))), 'error', FALSE);
+            'admin/boinc/stats'))), 'error', FALSE);
     }
     else {
-      drupal_set_message(t('There is a problem with the site. Please contact
+        drupal_set_message(t('There is a problem with the site. Please contact
         the system administrator.'), 'error', FALSE);
     }
-  }
+    }
 }

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pBarcode128.class.php

Doc Comments +4 added lines

@@ -179,6 +179,10 @@
 
    function left($value,$NbChar) { return substr($value,0,$NbChar); }  
    function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
+
+   /**
+    * @param integer $NbChar
+    */
    function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
   }
 ?>
\ No newline at end of file

Indentation +133 added lines, -133 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pBarcode128 - class to create barcodes (128B)
 
      Version     : 2.1.3
@@ -13,172 +13,172 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- /* pData class definition */
- class pBarcode128
-  {
-   var $Codes;
-   var $Reverse;
-   var $Result;
-   var $pChartObject;
-   var $CRC;
-
-   /* Class creator */
-   function pBarcode128($BasePath="")
+    /* pData class definition */
+    class pBarcode128
     {
-     $this->Codes   = "";
-     $this->Reverse = "";
-
-     $FileHandle = @fopen($BasePath."data/128B.db", "r");
-
-     if (!$FileHandle) { die("Cannot find barcode database (".$BasePath."128B.db)."); }
-
-     while (!feof($FileHandle))
-      {
-       $Buffer = fgets($FileHandle,4096);
-       $Buffer = str_replace(chr(10),"",$Buffer);
-       $Buffer = str_replace(chr(13),"",$Buffer);
-       $Values = preg_split("/;/",$Buffer);
-
-       $this->Codes[$Values[1]]["ID"]     = $Values[0];
-       $this->Codes[$Values[1]]["Code"]   = $Values[2];
-       $this->Reverse[$Values[0]]["Code"] = $Values[2];
-       $this->Reverse[$Values[0]]["Asc"]  = $Values[1];
-      }
-     fclose($FileHandle);
+    var $Codes;
+    var $Reverse;
+    var $Result;
+    var $pChartObject;
+    var $CRC;
+
+    /* Class creator */
+    function pBarcode128($BasePath="")
+    {
+        $this->Codes   = "";
+        $this->Reverse = "";
+
+        $FileHandle = @fopen($BasePath."data/128B.db", "r");
+
+        if (!$FileHandle) { die("Cannot find barcode database (".$BasePath."128B.db)."); }
+
+        while (!feof($FileHandle))
+        {
+        $Buffer = fgets($FileHandle,4096);
+        $Buffer = str_replace(chr(10),"",$Buffer);
+        $Buffer = str_replace(chr(13),"",$Buffer);
+        $Values = preg_split("/;/",$Buffer);
+
+        $this->Codes[$Values[1]]["ID"]     = $Values[0];
+        $this->Codes[$Values[1]]["Code"]   = $Values[2];
+        $this->Reverse[$Values[0]]["Code"] = $Values[2];
+        $this->Reverse[$Values[0]]["Asc"]  = $Values[1];
+        }
+        fclose($FileHandle);
     }
 
-   /* Return the projected size of a barcode */
-   function getSize($TextString,$Format="")
+    /* Return the projected size of a barcode */
+    function getSize($TextString,$Format="")
     {
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
-     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
-     $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : 12;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+        $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+        $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+        $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+        $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+        $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : 12;
+        $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
 
-     $TextString    = $this->encode128($TextString);
-     $BarcodeLength = strlen($this->Result);
+        $TextString    = $this->encode128($TextString);
+        $BarcodeLength = strlen($this->Result);
 
-     if ( $DrawArea )   { $WOffset = 20; } else { $WOffset = 0; }
-     if ( $ShowLegend ) { $HOffset = $FontSize+$LegendOffset+$WOffset; } else { $HOffset = 0; }
+        if ( $DrawArea )   { $WOffset = 20; } else { $WOffset = 0; }
+        if ( $ShowLegend ) { $HOffset = $FontSize+$LegendOffset+$WOffset; } else { $HOffset = 0; }
 
-     $X1 = cos($Angle * PI / 180) * ($WOffset+$BarcodeLength);
-     $Y1 = sin($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+        $X1 = cos($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+        $Y1 = sin($Angle * PI / 180) * ($WOffset+$BarcodeLength);
 
-     $X2 = $X1 + cos(($Angle+90) * PI / 180) * ($HOffset+$Height);
-     $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * ($HOffset+$Height);
+        $X2 = $X1 + cos(($Angle+90) * PI / 180) * ($HOffset+$Height);
+        $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * ($HOffset+$Height);
 
 
-     $AreaWidth  = max(abs($X1),abs($X2));
-     $AreaHeight = max(abs($Y1),abs($Y2));
+        $AreaWidth  = max(abs($X1),abs($X2));
+        $AreaHeight = max(abs($Y1),abs($Y2));
 
-     return(array("Width"=>$AreaWidth,"Height"=>$AreaHeight));
+        return(array("Width"=>$AreaWidth,"Height"=>$AreaHeight));
     }
 
-   function encode128($Value,$Format="")
+    function encode128($Value,$Format="")
     {
-     $this->Result  = "11010010000";
-     $this->CRC     = 104;
-     $TextString    = "";
-
-     for($i=1;$i<=strlen($Value);$i++)
-      {
-       $CharCode = ord($this->mid($Value,$i,1));
-       if ( isset($this->Codes[$CharCode]) )
+        $this->Result  = "11010010000";
+        $this->CRC     = 104;
+        $TextString    = "";
+
+        for($i=1;$i<=strlen($Value);$i++)
         {
-         $this->Result = $this->Result.$this->Codes[$CharCode]["Code"];
-         $this->CRC = $this->CRC + $i*$this->Codes[$CharCode]["ID"];
-         $TextString = $TextString.chr($CharCode);
+        $CharCode = ord($this->mid($Value,$i,1));
+        if ( isset($this->Codes[$CharCode]) )
+        {
+            $this->Result = $this->Result.$this->Codes[$CharCode]["Code"];
+            $this->CRC = $this->CRC + $i*$this->Codes[$CharCode]["ID"];
+            $TextString = $TextString.chr($CharCode);
+        }
         }
-      }
-     $this->CRC = $this->CRC - floor($this->CRC/103)*103;
+        $this->CRC = $this->CRC - floor($this->CRC/103)*103;
 
-     $this->Result = $this->Result.$this->Reverse[$this->CRC]["Code"];
-     $this->Result = $this->Result."1100011101011";
+        $this->Result = $this->Result.$this->Reverse[$this->CRC]["Code"];
+        $this->Result = $this->Result."1100011101011";
 
-     return($TextString);
+        return($TextString);
     }
 
-   /* Create the encoded string */
-   function draw($Object,$Value,$X,$Y,$Format="")
+    /* Create the encoded string */
+    function draw($Object,$Value,$X,$Y,$Format="")
     {
-     $this->pChartObject = $Object;
-
-     $R			= isset($Format["R"]) ? $Format["R"] : 0;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
-     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
-     $AreaR		= isset($Format["AreaR"]) ? $Format["AreaR"] : 255;
-     $AreaG		= isset($Format["AreaG"]) ? $Format["AreaG"] : 255;
-     $AreaB		= isset($Format["AreaB"]) ? $Format["AreaB"] : 255;
-     $AreaBorderR	= isset($Format["AreaBorderR"]) ? $Format["AreaBorderR"] : $AreaR;
-     $AreaBorderG	= isset($Format["AreaBorderG"]) ? $Format["AreaBorderG"] : $AreaG;
-     $AreaBorderB	= isset($Format["AreaBorderB"]) ? $Format["AreaBorderB"] : $AreaB;
-
-     $TextString = $this->encode128($Value);
-
-     if ( $DrawArea )
-      {
-       $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
-       $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
-
-       $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
-       $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
-
-       if ( $ShowLegend )
+        $this->pChartObject = $Object;
+
+        $R			= isset($Format["R"]) ? $Format["R"] : 0;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+        $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+        $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+        $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+        $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+        $AreaR		= isset($Format["AreaR"]) ? $Format["AreaR"] : 255;
+        $AreaG		= isset($Format["AreaG"]) ? $Format["AreaG"] : 255;
+        $AreaB		= isset($Format["AreaB"]) ? $Format["AreaB"] : 255;
+        $AreaBorderR	= isset($Format["AreaBorderR"]) ? $Format["AreaBorderR"] : $AreaR;
+        $AreaBorderG	= isset($Format["AreaBorderG"]) ? $Format["AreaBorderG"] : $AreaG;
+        $AreaBorderB	= isset($Format["AreaBorderB"]) ? $Format["AreaBorderB"] : $AreaB;
+
+        $TextString = $this->encode128($Value);
+
+        if ( $DrawArea )
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+        $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
+        $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
+
+        $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
+        $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
+
+        if ( $ShowLegend )
+        {
+            $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+            $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
         }
-       else
+        else
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
+            $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
+            $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
         }
 
-       $X4 = $X3 + cos(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
-       $Y4 = $Y3 + sin(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+        $X4 = $X3 + cos(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+        $Y4 = $Y3 + sin(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
 
-       $Polygon  = array($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4);
-       $Settings = array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"BorderR"=>$AreaBorderR,"BorderG"=>$AreaBorderG,"BorderB"=>$AreaBorderB);
-       $this->pChartObject->drawPolygon($Polygon,$Settings);
-      }
+        $Polygon  = array($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4);
+        $Settings = array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"BorderR"=>$AreaBorderR,"BorderG"=>$AreaBorderG,"BorderB"=>$AreaBorderB);
+        $this->pChartObject->drawPolygon($Polygon,$Settings);
+        }
 
-     for($i=1;$i<=strlen($this->Result);$i++)
-      {
-       if ( $this->mid($this->Result,$i,1) == 1 )
+        for($i=1;$i<=strlen($this->Result);$i++)
+        {
+        if ( $this->mid($this->Result,$i,1) == 1 )
         {
-         $X1 = $X + cos($Angle * PI / 180) * $i;
-         $Y1 = $Y + sin($Angle * PI / 180) * $i;
-         $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
-         $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * $Height;
+            $X1 = $X + cos($Angle * PI / 180) * $i;
+            $Y1 = $Y + sin($Angle * PI / 180) * $i;
+            $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
+            $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * $Height;
 
-         $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-         $this->pChartObject->drawLine($X1,$Y1,$X2,$Y2,$Settings);
+            $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+            $this->pChartObject->drawLine($X1,$Y1,$X2,$Y2,$Settings);
+        }
         }
-      }
 
-     if ( $ShowLegend )
-      {
-       $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
-       $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
+        if ( $ShowLegend )
+        {
+        $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
+        $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
 
-       $LegendX = $X1 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
-       $LegendY = $Y1 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+        $LegendX = $X1 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+        $LegendY = $Y1 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
 
-       $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Angle"=>-$Angle,"Align"=>TEXT_ALIGN_TOPMIDDLE);
-       $this->pChartObject->drawText($LegendX,$LegendY,$TextString,$Settings);
-      }
+        $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Angle"=>-$Angle,"Align"=>TEXT_ALIGN_TOPMIDDLE);
+        $this->pChartObject->drawText($LegendX,$LegendY,$TextString,$Settings);
+        }
     }
 
-   function left($value,$NbChar) { return substr($value,0,$NbChar); }  
-   function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
-   function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
-  }
+    function left($value,$NbChar) { return substr($value,0,$NbChar); }  
+    function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
+    function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
+    }
 ?>
\ No newline at end of file

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pBarcode39.class.php

Doc Comments +8 added lines

@@ -181,6 +181,9 @@ 
       }
     }
 
+   /**
+    * @param string $string
+    */
    function checksum( $string )
     {
      $checksum = 0;
@@ -195,6 +198,11 @@ 
 
    function left($value,$NbChar) { return substr($value,0,$NbChar); }  
    function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
+
+   /**
+    * @param integer $Depart
+    * @param integer $NbChar
+    */
    function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
   }
 ?>
\ No newline at end of file

Indentation +139 added lines, -139 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pBarcode39 - class to create barcodes (39B)
 
      Version     : 2.1.3
@@ -13,188 +13,188 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- /* pData class definition */
- class pBarcode39
-  {
-   var $Codes;
-   var $Reverse;
-   var $Result;
-   var $pChartObject;
-   var $CRC;
-   var $MOD43;
-
-   /* Class creator */
-   function pBarcode39($BasePath="",$EnableMOD43=FALSE)
+    /* pData class definition */
+    class pBarcode39
     {
-     $this->MOD43  = $EnableMOD43;
-     $this->Codes   = "";
-     $this->Reverse = "";
+    var $Codes;
+    var $Reverse;
+    var $Result;
+    var $pChartObject;
+    var $CRC;
+    var $MOD43;
+
+    /* Class creator */
+    function pBarcode39($BasePath="",$EnableMOD43=FALSE)
+    {
+        $this->MOD43  = $EnableMOD43;
+        $this->Codes   = "";
+        $this->Reverse = "";
 
-     $FileHandle = @fopen($BasePath."data/39.db", "r");
+        $FileHandle = @fopen($BasePath."data/39.db", "r");
 
-     if (!$FileHandle) { die("Cannot find barcode database (".$BasePath."data/39.db)."); }
+        if (!$FileHandle) { die("Cannot find barcode database (".$BasePath."data/39.db)."); }
 
-     while (!feof($FileHandle))
-      {
-       $Buffer = fgets($FileHandle,4096);
-       $Buffer = str_replace(chr(10),"",$Buffer);
-       $Buffer = str_replace(chr(13),"",$Buffer);
-       $Values = preg_split("/;/",$Buffer);
+        while (!feof($FileHandle))
+        {
+        $Buffer = fgets($FileHandle,4096);
+        $Buffer = str_replace(chr(10),"",$Buffer);
+        $Buffer = str_replace(chr(13),"",$Buffer);
+        $Values = preg_split("/;/",$Buffer);
 
-       $this->Codes[$Values[0]] = $Values[1];
-      }
-     fclose($FileHandle);
+        $this->Codes[$Values[0]] = $Values[1];
+        }
+        fclose($FileHandle);
     }
 
-   /* Return the projected size of a barcode */
-   function getSize($TextString,$Format="")
+    /* Return the projected size of a barcode */
+    function getSize($TextString,$Format="")
     {
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
-     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
-     $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : 12;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+        $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+        $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+        $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+        $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+        $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : 12;
+        $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
 
-     $TextString    = $this->encode39($TextString);
-     $BarcodeLength = strlen($this->Result);
+        $TextString    = $this->encode39($TextString);
+        $BarcodeLength = strlen($this->Result);
 
-     if ( $DrawArea )   { $WOffset = 20; } else { $WOffset = 0; }
-     if ( $ShowLegend ) { $HOffset = $FontSize+$LegendOffset+$WOffset; } else { $HOffset = 0; }
+        if ( $DrawArea )   { $WOffset = 20; } else { $WOffset = 0; }
+        if ( $ShowLegend ) { $HOffset = $FontSize+$LegendOffset+$WOffset; } else { $HOffset = 0; }
 
-     $X1 = cos($Angle * PI / 180) * ($WOffset+$BarcodeLength);
-     $Y1 = sin($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+        $X1 = cos($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+        $Y1 = sin($Angle * PI / 180) * ($WOffset+$BarcodeLength);
 
-     $X2 = $X1 + cos(($Angle+90) * PI / 180) * ($HOffset+$Height);
-     $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * ($HOffset+$Height);
+        $X2 = $X1 + cos(($Angle+90) * PI / 180) * ($HOffset+$Height);
+        $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * ($HOffset+$Height);
 
 
-     $AreaWidth  = max(abs($X1),abs($X2));
-     $AreaHeight = max(abs($Y1),abs($Y2));
+        $AreaWidth  = max(abs($X1),abs($X2));
+        $AreaHeight = max(abs($Y1),abs($Y2));
 
-     return(array("Width"=>$AreaWidth,"Height"=>$AreaHeight));
+        return(array("Width"=>$AreaWidth,"Height"=>$AreaHeight));
     }
 
-   /* Create the encoded string */
-   function encode39($Value)
+    /* Create the encoded string */
+    function encode39($Value)
     {
-     $this->Result = "100101101101"."0";
-     $TextString   = "";
-     for($i=1;$i<=strlen($Value);$i++)
-      {
-       $CharCode = ord($this->mid($Value,$i,1));
-       if ( $CharCode >= 97 && $CharCode <= 122 ) { $CharCode = $CharCode - 32; }
-
-       if ( isset($this->Codes[chr($CharCode)]) )
+        $this->Result = "100101101101"."0";
+        $TextString   = "";
+        for($i=1;$i<=strlen($Value);$i++)
+        {
+        $CharCode = ord($this->mid($Value,$i,1));
+        if ( $CharCode >= 97 && $CharCode <= 122 ) { $CharCode = $CharCode - 32; }
+
+        if ( isset($this->Codes[chr($CharCode)]) )
         {
-         $this->Result = $this->Result.$this->Codes[chr($CharCode)]."0";
-         $TextString = $TextString.chr($CharCode);
+            $this->Result = $this->Result.$this->Codes[chr($CharCode)]."0";
+            $TextString = $TextString.chr($CharCode);
+        }
         }
-      }
 
-     if ( $this->MOD43 )
-      {
-       $Checksum = $this->checksum($TextString);
-       $this->Result = $this->Result.$this->Codes[$Checksum]."0";
-      }
+        if ( $this->MOD43 )
+        {
+        $Checksum = $this->checksum($TextString);
+        $this->Result = $this->Result.$this->Codes[$Checksum]."0";
+        }
 
-     $this->Result = $this->Result."100101101101";
-     $TextString   = "*".$TextString."*";
+        $this->Result = $this->Result."100101101101";
+        $TextString   = "*".$TextString."*";
 
-     return($TextString);
+        return($TextString);
     }
 
-   /* Create the encoded string */
-   function draw($Object,$Value,$X,$Y,$Format="")
+    /* Create the encoded string */
+    function draw($Object,$Value,$X,$Y,$Format="")
     {
-     $this->pChartObject = $Object;
-
-     $R			= isset($Format["R"]) ? $Format["R"] : 0;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
-     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
-     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
-     $AreaR		= isset($Format["AreaR"]) ? $Format["AreaR"] : 255;
-     $AreaG		= isset($Format["AreaG"]) ? $Format["AreaG"] : 255;
-     $AreaB		= isset($Format["AreaB"]) ? $Format["AreaB"] : 255;
-     $AreaBorderR	= isset($Format["AreaBorderR"]) ? $Format["AreaBorderR"] : $AreaR;
-     $AreaBorderG	= isset($Format["AreaBorderG"]) ? $Format["AreaBorderG"] : $AreaG;
-     $AreaBorderB	= isset($Format["AreaBorderB"]) ? $Format["AreaBorderB"] : $AreaB;
-
-     $TextString   = $this->encode39($Value);
-
-     if ( $DrawArea )
-      {
-       $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
-       $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
-
-       $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
-       $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
-
-       if ( $ShowLegend )
+        $this->pChartObject = $Object;
+
+        $R			= isset($Format["R"]) ? $Format["R"] : 0;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+        $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+        $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+        $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+        $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+        $AreaR		= isset($Format["AreaR"]) ? $Format["AreaR"] : 255;
+        $AreaG		= isset($Format["AreaG"]) ? $Format["AreaG"] : 255;
+        $AreaB		= isset($Format["AreaB"]) ? $Format["AreaB"] : 255;
+        $AreaBorderR	= isset($Format["AreaBorderR"]) ? $Format["AreaBorderR"] : $AreaR;
+        $AreaBorderG	= isset($Format["AreaBorderG"]) ? $Format["AreaBorderG"] : $AreaG;
+        $AreaBorderB	= isset($Format["AreaBorderB"]) ? $Format["AreaBorderB"] : $AreaB;
+
+        $TextString   = $this->encode39($Value);
+
+        if ( $DrawArea )
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+        $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
+        $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
+
+        $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
+        $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
+
+        if ( $ShowLegend )
+        {
+            $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+            $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
         }
-       else
+        else
         {
-         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
-         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
+            $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
+            $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
         }
 
-       $X4 = $X3 + cos(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
-       $Y4 = $Y3 + sin(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+        $X4 = $X3 + cos(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+        $Y4 = $Y3 + sin(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
 
-       $Polygon  = array($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4);
-       $Settings = array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"BorderR"=>$AreaBorderR,"BorderG"=>$AreaBorderG,"BorderB"=>$AreaBorderB);
-       $this->pChartObject->drawPolygon($Polygon,$Settings);
-      }
+        $Polygon  = array($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4);
+        $Settings = array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"BorderR"=>$AreaBorderR,"BorderG"=>$AreaBorderG,"BorderB"=>$AreaBorderB);
+        $this->pChartObject->drawPolygon($Polygon,$Settings);
+        }
 
-     for($i=1;$i<=strlen($this->Result);$i++)
-      {
-       if ( $this->mid($this->Result,$i,1) == 1 )
+        for($i=1;$i<=strlen($this->Result);$i++)
+        {
+        if ( $this->mid($this->Result,$i,1) == 1 )
         {
-         $X1 = $X + cos($Angle * PI / 180) * $i;
-         $Y1 = $Y + sin($Angle * PI / 180) * $i;
-         $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
-         $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * $Height;
+            $X1 = $X + cos($Angle * PI / 180) * $i;
+            $Y1 = $Y + sin($Angle * PI / 180) * $i;
+            $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
+            $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * $Height;
 
-         $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-         $this->pChartObject->drawLine($X1,$Y1,$X2,$Y2,$Settings);
+            $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+            $this->pChartObject->drawLine($X1,$Y1,$X2,$Y2,$Settings);
+        }
         }
-      }
 
-     if ( $ShowLegend )
-      {
-       $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
-       $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
+        if ( $ShowLegend )
+        {
+        $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
+        $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
 
-       $LegendX = $X1 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
-       $LegendY = $Y1 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+        $LegendX = $X1 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+        $LegendY = $Y1 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
 
-       $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Angle"=>-$Angle,"Align"=>TEXT_ALIGN_TOPMIDDLE);
-       $this->pChartObject->drawText($LegendX,$LegendY,$TextString,$Settings);
-      }
+        $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Angle"=>-$Angle,"Align"=>TEXT_ALIGN_TOPMIDDLE);
+        $this->pChartObject->drawText($LegendX,$LegendY,$TextString,$Settings);
+        }
     }
 
-   function checksum( $string )
+    function checksum( $string )
     {
-     $checksum = 0;
-     $length   = strlen( $string );
-     $charset  = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%';
+        $checksum = 0;
+        $length   = strlen( $string );
+        $charset  = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%';
 
-     for( $i=0; $i < $length; ++$i )
-      $checksum += strpos( $charset, $string[$i] );
+        for( $i=0; $i < $length; ++$i )
+        $checksum += strpos( $charset, $string[$i] );
  
-     return substr( $charset, ($checksum % 43), 1 );
+        return substr( $charset, ($checksum % 43), 1 );
     }
 
-   function left($value,$NbChar) { return substr($value,0,$NbChar); }  
-   function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
-   function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
-  }
+    function left($value,$NbChar) { return substr($value,0,$NbChar); }  
+    function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
+    function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
+    }
 ?>
\ No newline at end of file

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pCache.class.php

Doc Comments +11 added lines

@@ -47,6 +47,10 @@ 
     { return(md5($Marker.serialize($Data->Data))); }
 
    /* Write the generated picture to the cache */
+
+   /**
+    * @param pImage $pChartObject
+    */
    function writeToCache($ID,$pChartObject)
     {
      /* Compute the paths */
@@ -81,6 +85,10 @@ 
     }
 
    /* Remove object older than the specified TS */
+
+   /**
+    * @param integer $Expiry
+    */
    function removeOlderThan($Expiry)
     { $this->dbRemoval(array("Expiry"=>$Expiry)); }
 
@@ -235,6 +243,9 @@ 
      return(TRUE);
     }
 
+   /**
+    * @param string $Destination
+    */
    function saveFromCache($ID,$Destination)
     {
      /* Get the raw picture from the cache */

Indentation +205 added lines, -205 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pCache - speed up the rendering by caching up the pictures
 
      Version     : 2.1.3
@@ -13,268 +13,268 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- /* pData class definition */
- class pCache
-  {
-   var $CacheFolder;
-   var $CacheIndex;
-   var $CacheDB;
+    /* pData class definition */
+    class pCache
+    {
+    var $CacheFolder;
+    var $CacheIndex;
+    var $CacheDB;
 
-   /* Class creator */
-   function pCache($Settings="")
+    /* Class creator */
+    function pCache($Settings="")
     {
-     $CacheFolder	= isset($Settings["CacheFolder"]) ? $Settings["CacheFolder"] : "cache";
-     $CacheIndex	= isset($Settings["CacheIndex"]) ? $Settings["CacheIndex"] : "index.db";
-     $CacheDB		= isset($Settings["CacheDB"]) ? $Settings["CacheDB"] : "cache.db";
+        $CacheFolder	= isset($Settings["CacheFolder"]) ? $Settings["CacheFolder"] : "cache";
+        $CacheIndex	= isset($Settings["CacheIndex"]) ? $Settings["CacheIndex"] : "index.db";
+        $CacheDB		= isset($Settings["CacheDB"]) ? $Settings["CacheDB"] : "cache.db";
 
-     $this->CacheFolder	= $CacheFolder;
-     $this->CacheIndex	= $CacheIndex;
-     $this->CacheDB	= $CacheDB;
+        $this->CacheFolder	= $CacheFolder;
+        $this->CacheIndex	= $CacheIndex;
+        $this->CacheDB	= $CacheDB;
 
-     if (!file_exists($this->CacheFolder."/".$this->CacheIndex)) { touch($this->CacheFolder."/".$this->CacheIndex); }
-     if (!file_exists($this->CacheFolder."/".$this->CacheDB))    { touch($this->CacheFolder."/".$this->CacheDB); }
+        if (!file_exists($this->CacheFolder."/".$this->CacheIndex)) { touch($this->CacheFolder."/".$this->CacheIndex); }
+        if (!file_exists($this->CacheFolder."/".$this->CacheDB))    { touch($this->CacheFolder."/".$this->CacheDB); }
     }
 
-   /* Flush the cache contents */
-   function flush()
+    /* Flush the cache contents */
+    function flush()
     {
-     if (file_exists($this->CacheFolder."/".$this->CacheIndex)) { unlink($this->CacheFolder."/".$this->CacheIndex); touch($this->CacheFolder."/".$this->CacheIndex); }
-     if (file_exists($this->CacheFolder."/".$this->CacheDB))    { unlink($this->CacheFolder."/".$this->CacheDB); touch($this->CacheFolder."/".$this->CacheDB); }
+        if (file_exists($this->CacheFolder."/".$this->CacheIndex)) { unlink($this->CacheFolder."/".$this->CacheIndex); touch($this->CacheFolder."/".$this->CacheIndex); }
+        if (file_exists($this->CacheFolder."/".$this->CacheDB))    { unlink($this->CacheFolder."/".$this->CacheDB); touch($this->CacheFolder."/".$this->CacheDB); }
     }
 
-   /* Return the MD5 of the data array to clearly identify the chart */
-   function getHash($Data,$Marker="")
+    /* Return the MD5 of the data array to clearly identify the chart */
+    function getHash($Data,$Marker="")
     { return(md5($Marker.serialize($Data->Data))); }
 
-   /* Write the generated picture to the cache */
-   function writeToCache($ID,$pChartObject)
+    /* Write the generated picture to the cache */
+    function writeToCache($ID,$pChartObject)
     {
-     /* Compute the paths */
-     $TemporaryFile = $this->CacheFolder."/tmp_".rand(0,1000).".png";
-     $Database      = $this->CacheFolder."/".$this->CacheDB;
-     $Index         = $this->CacheFolder."/".$this->CacheIndex;
-
-     /* Flush the picture to a temporary file */
-     imagepng($pChartObject->Picture ,$TemporaryFile);
-
-     /* Retrieve the files size */
-     $PictureSize = filesize($TemporaryFile);
-     $DBSize      = filesize($Database);
-
-     /* Save the index */
-     $Handle = fopen($Index,"a");
-     fwrite($Handle, $ID.",".$DBSize.",".$PictureSize.",".time().",0      \r\n");
-     fclose($Handle);
-
-     /* Get the picture raw contents */
-     $Handle = fopen($TemporaryFile,"r");
-     $Raw    = fread($Handle,$PictureSize);
-     fclose($Handle);
-
-     /* Save the picture in the solid database file */
-     $Handle = fopen($Database,"a");
-     fwrite($Handle, $Raw);
-     fclose($Handle);
-
-     /* Remove temporary file */
-     unlink($TemporaryFile);
+        /* Compute the paths */
+        $TemporaryFile = $this->CacheFolder."/tmp_".rand(0,1000).".png";
+        $Database      = $this->CacheFolder."/".$this->CacheDB;
+        $Index         = $this->CacheFolder."/".$this->CacheIndex;
+
+        /* Flush the picture to a temporary file */
+        imagepng($pChartObject->Picture ,$TemporaryFile);
+
+        /* Retrieve the files size */
+        $PictureSize = filesize($TemporaryFile);
+        $DBSize      = filesize($Database);
+
+        /* Save the index */
+        $Handle = fopen($Index,"a");
+        fwrite($Handle, $ID.",".$DBSize.",".$PictureSize.",".time().",0      \r\n");
+        fclose($Handle);
+
+        /* Get the picture raw contents */
+        $Handle = fopen($TemporaryFile,"r");
+        $Raw    = fread($Handle,$PictureSize);
+        fclose($Handle);
+
+        /* Save the picture in the solid database file */
+        $Handle = fopen($Database,"a");
+        fwrite($Handle, $Raw);
+        fclose($Handle);
+
+        /* Remove temporary file */
+        unlink($TemporaryFile);
     }
 
-   /* Remove object older than the specified TS */
-   function removeOlderThan($Expiry)
+    /* Remove object older than the specified TS */
+    function removeOlderThan($Expiry)
     { $this->dbRemoval(array("Expiry"=>$Expiry)); }
 
-   /* Remove an object from the cache */
-   function remove($ID)
+    /* Remove an object from the cache */
+    function remove($ID)
     { $this->dbRemoval(array("Name"=>$ID)); }
 
-   /* Remove with specified criterias */
-   function dbRemoval($Settings)
+    /* Remove with specified criterias */
+    function dbRemoval($Settings)
     {
-     $ID     = isset($Settings["Name"]) ? $Settings["Name"] : NULL;
-     $Expiry = isset($Settings["Expiry"]) ? $Settings["Expiry"] : -(24*60*60);
-     $TS     = time()-$Expiry;
-
-     /* Compute the paths */
-     $Database     = $this->CacheFolder."/".$this->CacheDB;
-     $Index        = $this->CacheFolder."/".$this->CacheIndex;
-     $DatabaseTemp = $this->CacheFolder."/".$this->CacheDB.".tmp";
-     $IndexTemp    = $this->CacheFolder."/".$this->CacheIndex.".tmp";
-
-     /* Single file removal */
-     if ( $ID != NULL )
-      {
-       /* Retrieve object informations */
-       $Object = $this->isInCache($ID,TRUE);
-
-       /* If it's not in the cache DB, go away */
-       if ( !$Object ) { return(0); }
-      }
-
-     /* Create the temporary files */
-     if (!file_exists($DatabaseTemp)) { touch($DatabaseTemp); }
-     if (!file_exists($IndexTemp))    { touch($IndexTemp); }
-
-     /* Open the file handles */
-     $IndexHandle     = @fopen($Index, "r");
-     $IndexTempHandle = @fopen($IndexTemp, "w");
-     $DBHandle        = @fopen($Database, "r");
-     $DBTempHandle    = @fopen($DatabaseTemp, "w");
-
-     /* Remove the selected ID from the database */
-     while (!feof($IndexHandle))
-      {
-       $Entry    = fgets($IndexHandle, 4096);
-       $Entry    = str_replace("\r","",$Entry);
-       $Entry    = str_replace("\n","",$Entry);
-       $Settings = preg_split("/,/",$Entry);
-
-       if ( $Entry != "" )
+        $ID     = isset($Settings["Name"]) ? $Settings["Name"] : NULL;
+        $Expiry = isset($Settings["Expiry"]) ? $Settings["Expiry"] : -(24*60*60);
+        $TS     = time()-$Expiry;
+
+        /* Compute the paths */
+        $Database     = $this->CacheFolder."/".$this->CacheDB;
+        $Index        = $this->CacheFolder."/".$this->CacheIndex;
+        $DatabaseTemp = $this->CacheFolder."/".$this->CacheDB.".tmp";
+        $IndexTemp    = $this->CacheFolder."/".$this->CacheIndex.".tmp";
+
+        /* Single file removal */
+        if ( $ID != NULL )
         {
-         $PicID       = $Settings[0];
-         $DBPos       = $Settings[1];
-         $PicSize     = $Settings[2];
-         $GeneratedTS = $Settings[3];
-         $Hits        = $Settings[4];
-
-         if ( $Settings[0] != $ID && $GeneratedTS > $TS)
-          {
-           $CurrentPos  = ftell($DBTempHandle);
-           fwrite($IndexTempHandle, $PicID.",".$CurrentPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
-
-           fseek($DBHandle,$DBPos);
-           $Picture = fread($DBHandle,$PicSize);
-           fwrite($DBTempHandle,$Picture);
-          }
+        /* Retrieve object informations */
+        $Object = $this->isInCache($ID,TRUE);
+
+        /* If it's not in the cache DB, go away */
+        if ( !$Object ) { return(0); }
+        }
+
+        /* Create the temporary files */
+        if (!file_exists($DatabaseTemp)) { touch($DatabaseTemp); }
+        if (!file_exists($IndexTemp))    { touch($IndexTemp); }
+
+        /* Open the file handles */
+        $IndexHandle     = @fopen($Index, "r");
+        $IndexTempHandle = @fopen($IndexTemp, "w");
+        $DBHandle        = @fopen($Database, "r");
+        $DBTempHandle    = @fopen($DatabaseTemp, "w");
+
+        /* Remove the selected ID from the database */
+        while (!feof($IndexHandle))
+        {
+        $Entry    = fgets($IndexHandle, 4096);
+        $Entry    = str_replace("\r","",$Entry);
+        $Entry    = str_replace("\n","",$Entry);
+        $Settings = preg_split("/,/",$Entry);
+
+        if ( $Entry != "" )
+        {
+            $PicID       = $Settings[0];
+            $DBPos       = $Settings[1];
+            $PicSize     = $Settings[2];
+            $GeneratedTS = $Settings[3];
+            $Hits        = $Settings[4];
+
+            if ( $Settings[0] != $ID && $GeneratedTS > $TS)
+            {
+            $CurrentPos  = ftell($DBTempHandle);
+            fwrite($IndexTempHandle, $PicID.",".$CurrentPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
+
+            fseek($DBHandle,$DBPos);
+            $Picture = fread($DBHandle,$PicSize);
+            fwrite($DBTempHandle,$Picture);
+            }
+        }
         }
-      }
 
-     /* Close the handles */
-     fclose($IndexHandle);
-     fclose($IndexTempHandle);
-     fclose($DBHandle);
-     fclose($DBTempHandle);
+        /* Close the handles */
+        fclose($IndexHandle);
+        fclose($IndexTempHandle);
+        fclose($DBHandle);
+        fclose($DBTempHandle);
 
-     /* Remove the prod files */
-     unlink($Database);
-     unlink($Index);
+        /* Remove the prod files */
+        unlink($Database);
+        unlink($Index);
 
-     /* Swap the temp & prod DB */
-     rename($DatabaseTemp,$Database);
-     rename($IndexTemp,$Index);
+        /* Swap the temp & prod DB */
+        rename($DatabaseTemp,$Database);
+        rename($IndexTemp,$Index);
     }
 
-   function isInCache($ID,$Verbose=FALSE,$UpdateHitsCount=FALSE)
+    function isInCache($ID,$Verbose=FALSE,$UpdateHitsCount=FALSE)
     {
-     /* Compute the paths */
-     $Index = $this->CacheFolder."/".$this->CacheIndex;
-
-     /* Search the picture in the index file */
-     $Handle = @fopen($Index, "r");
-     while (!feof($Handle))
-      {
-       $IndexPos = ftell($Handle);
-       $Entry = fgets($Handle, 4096);
-       if ( $Entry != "" )
+        /* Compute the paths */
+        $Index = $this->CacheFolder."/".$this->CacheIndex;
+
+        /* Search the picture in the index file */
+        $Handle = @fopen($Index, "r");
+        while (!feof($Handle))
+        {
+        $IndexPos = ftell($Handle);
+        $Entry = fgets($Handle, 4096);
+        if ( $Entry != "" )
         {
-         $Settings = preg_split("/,/",$Entry);
-         $PicID    = $Settings[0];
-         if ( $PicID == $ID )
-          {
-           fclose($Handle);
-
-           $DBPos       = $Settings[1];
-           $PicSize     = $Settings[2];
-           $GeneratedTS = $Settings[3];
-           $Hits        = intval($Settings[4]);
-
-           if ( $UpdateHitsCount )
+            $Settings = preg_split("/,/",$Entry);
+            $PicID    = $Settings[0];
+            if ( $PicID == $ID )
             {
-             $Hits++;
-             if ( strlen($Hits) < 7 ) { $Hits = $Hits.str_repeat(" ",7-strlen($Hits)); }
+            fclose($Handle);
+
+            $DBPos       = $Settings[1];
+            $PicSize     = $Settings[2];
+            $GeneratedTS = $Settings[3];
+            $Hits        = intval($Settings[4]);
 
-             $Handle = @fopen($Index, "r+");
-             fseek($Handle,$IndexPos);
-             fwrite($Handle, $PicID.",".$DBPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
-             fclose($Handle);
+            if ( $UpdateHitsCount )
+            {
+                $Hits++;
+                if ( strlen($Hits) < 7 ) { $Hits = $Hits.str_repeat(" ",7-strlen($Hits)); }
+
+                $Handle = @fopen($Index, "r+");
+                fseek($Handle,$IndexPos);
+                fwrite($Handle, $PicID.",".$DBPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
+                fclose($Handle);
             }
 
-           if ($Verbose)
+            if ($Verbose)
             { return(array("DBPos"=>$DBPos,"PicSize"=>$PicSize,"GeneratedTS"=>$GeneratedTS,"Hits"=>$Hits)); }
-           else
+            else
             { return(TRUE); }
-          }
+            }
         }
-      }
-     fclose($Handle);
+        }
+        fclose($Handle);
 
-     /* Picture isn't in the cache */
-     return(FALSE);
+        /* Picture isn't in the cache */
+        return(FALSE);
     }
 
-   /* Automatic output method based on the calling interface */
-   function autoOutput($ID,$Destination="output.png")
+    /* Automatic output method based on the calling interface */
+    function autoOutput($ID,$Destination="output.png")
     {
-     if (php_sapi_name() == "cli")
-      $this->saveFromCache($ID,$Destination);
-     else
-      $this->strokeFromCache($ID);
+        if (php_sapi_name() == "cli")
+        $this->saveFromCache($ID,$Destination);
+        else
+        $this->strokeFromCache($ID);
     }
 
-   function strokeFromCache($ID)
+    function strokeFromCache($ID)
     {
-     /* Get the raw picture from the cache */
-     $Picture = $this->getFromCache($ID);
+        /* Get the raw picture from the cache */
+        $Picture = $this->getFromCache($ID);
 
-     /* Do we have a hit? */
-     if ( $Picture == NULL ) { return(FALSE); }
+        /* Do we have a hit? */
+        if ( $Picture == NULL ) { return(FALSE); }
 
-     header('Content-type: image/png');
-     echo $Picture;
+        header('Content-type: image/png');
+        echo $Picture;
 
-     return(TRUE);
+        return(TRUE);
     }
 
-   function saveFromCache($ID,$Destination)
+    function saveFromCache($ID,$Destination)
     {
-     /* Get the raw picture from the cache */
-     $Picture = $this->getFromCache($ID);
+        /* Get the raw picture from the cache */
+        $Picture = $this->getFromCache($ID);
 
-     /* Do we have a hit? */
-     if ( $Picture == NULL ) { return(FALSE); }
+        /* Do we have a hit? */
+        if ( $Picture == NULL ) { return(FALSE); }
 
-     /* Flush the picture to a file */
-     $Handle = fopen($Destination,"w");
-     fwrite($Handle,$Picture);
-     fclose($Handle);
+        /* Flush the picture to a file */
+        $Handle = fopen($Destination,"w");
+        fwrite($Handle,$Picture);
+        fclose($Handle);
 
-     /* All went fine */
-     return(TRUE);
+        /* All went fine */
+        return(TRUE);
     }
 
-   function getFromCache($ID)
+    function getFromCache($ID)
     {
-     /* Compute the path */
-     $Database = $this->CacheFolder."/".$this->CacheDB;
+        /* Compute the path */
+        $Database = $this->CacheFolder."/".$this->CacheDB;
 
-     /* Lookup for the picture in the cache */
-     $CacheInfo = $this->isInCache($ID,TRUE,TRUE);
+        /* Lookup for the picture in the cache */
+        $CacheInfo = $this->isInCache($ID,TRUE,TRUE);
 
-     /* Not in the cache */
-     if (!$CacheInfo) { return(NULL); }
+        /* Not in the cache */
+        if (!$CacheInfo) { return(NULL); }
 
-     /* Get the database extended information */     
-     $DBPos   = $CacheInfo["DBPos"];
-     $PicSize = $CacheInfo["PicSize"];
+        /* Get the database extended information */     
+        $DBPos   = $CacheInfo["DBPos"];
+        $PicSize = $CacheInfo["PicSize"];
 
-     /* Extract the picture from the solid cache file */
-     $Handle = @fopen($Database, "r");
-     fseek($Handle,$DBPos);
-     $Picture = fread($Handle,$PicSize);
-     fclose($Handle);
+        /* Extract the picture from the solid cache file */
+        $Handle = @fopen($Database, "r");
+        fseek($Handle,$DBPos);
+        $Picture = fread($Handle,$PicSize);
+        fclose($Handle);
 
-     /* Return back the raw picture data */
-     return($Picture);
+        /* Return back the raw picture data */
+        return($Picture);
+    }
     }
-  }
 ?>
\ No newline at end of file