BOINC / boinc

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 +179 added lines, -179 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,31 +50,31 @@ 
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
  
 /**
-  * 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}_";
   
-  $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;
+    $stats_xml = NULL;
   
-  switch($chart_size) {
-  case 'small':
+    switch($chart_size) {
+    case 'small':
     $cache_name .= "{$cpid}_small";
     $dataset_size = 30;
     $chart_height = 80;
@@ -83,7 +83,7 @@ 
     $draw_x_lines = FALSE;
     $label_x_axis = FALSE;
     break;
-  case 'medium':
+    case 'medium':
   default:
     $cache_name .= $cpid;
     $dataset_size = 60;
@@ -91,32 +91,32 @@ 
     $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 {
     // Initialize dataset
     $dataset = array();
     $stats_xml = boincstats_get_project_stats('daily', $cpid);
     if ($stats_xml) {
-      // Get the last 60 days of stats for the chart
-      for ($j = 30; $j < 90; $j++) {
+        // Get the last 60 days of stats for the chart
+        for ($j = 30; $j < 90; $j++) {
         $dataset[] = (int) $stats_xml->records->record[$j];
-      }
+        }
     }
     else {
-      for ($i = 0; $i <= $dataset_size; $i++) $dataset[] = 0;
+        for ($i = 0; $i <= $dataset_size; $i++) $dataset[] = 0;
     }
     
     // Get color configuration
@@ -145,39 +145,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
@@ -189,7 +189,7 @@ 
     // Render the picture (choose the best way)
     //$myPicture->autoOutput('pictures/example.drawAreaChart.simple.png');
     $myPicture->stroke();
-  }
+    }
 }
 
 /**
@@ -197,48 +197,48 @@ 
  * 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";
   
-  $color_keys = array('R', 'G', 'B');
+    $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"));
    
-  // 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();
     $stats_xml = boincstats_get_project_stats('daily');
     if ($stats_xml) {
-      // Get the last 60 days of stats for the chart
-      for ($j = 30; $j < 90; $j++) {
+        // Get the last 60 days of stats for the chart
+        for ($j = 30; $j < 90; $j++) {
         $dataset[] = (int) $stats_xml->records->record[$j];
-      }
+        }
     }
     else {
-      for ($i = 0; $i <= 30; $i++) $dataset[] = 0;
+        for ($i = 0; $i <= 30; $i++) $dataset[] = 0;
     }
     
     // Create and populate the pData object
@@ -263,25 +263,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);
@@ -300,41 +300,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;
 }
 
 /*
@@ -342,87 +342,87 @@ 
  */
 function boincstats_get_project_stats($type = 'total', $cpid = NULL) {
   
-  // 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', '');
   
-  $get = array(
+    $get = array(
     'id' => $project_id
-  );
-  switch ($type) {
-  case 'daily':
+    );
+    switch ($type) {
+    case 'daily':
     $get['daily'] = NULL;
     break;
-  case 'total':
+    case 'total':
   default:
   }
   
-  if ($cpid) {
+    if ($cpid) {
     // If a user CPID has been provided, limit scope to that user
     $stats_rpc = variable_get('boinc_stats_user_credit_history_rpc', '');
     $get['cpid'] = $cpid;
-  }
+    }
   
-  // Construct query string
-  $args = array();
-  foreach ($get as $arg => $value) {
+    // Construct query string
+    $args = array();
+    foreach ($get as $arg => $value) {
     if ($value !== NULL) {
-      $args[] = "{$arg}=" . rawurlencode($value);
+        $args[] = "{$arg}=" . rawurlencode($value);
     }
     else {
-      $args[] = $arg;
+        $args[] = $arg;
     }
-  }
-  $query = '?' . implode('&', $args);
+    }
+    $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();
-  $last_record = end($stats_xml->records->record);
-  return ($last_record) ? (int) $last_record : 0;
+    $stats_xml = boincstats_get_project_stats();
+    $last_record = end($stats_xml->records->record);
+    return ($last_record) ? (int) $last_record : 0;
 }
 
 /*
  *
  */
 function boincstats_get_project_avg_credit() {
-  $stats_xml = boincstats_get_project_stats();
-  return (isset($stats_xml->recent_avg)) ? $stats_xml->recent_avg : 0;
+    $stats_xml = boincstats_get_project_stats();
+    return (isset($stats_xml->recent_avg)) ? $stats_xml->recent_avg : 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);
 }
 
 
@@ -431,22 +431,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', array(), NULL, 'boinc:front-page') . ')</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', array(), NULL, 'boinc:front-page') . ': </label><span>' . number_format(boincstats_credit_to_ghours(boincstats_get_project_total_credit())) . '</span></div>' . "\n";
     $output .= '<div class="stats"><label>' . bts('Avg TFlops', array(), NULL, 'boinc:front-page') . ': </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', array(), NULL, 'boinc:front-page') . '</a></div>' . "\n";
     $output .= '<div class="chart"><img src="' . $base_path . 'charts/project" /></div>' . "\n";
     break;
-  default:
+    default:
   }
-  return $output;
+    return $output;
 }
 
 
@@ -458,19 +458,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

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

Doc Comments +25 added lines

@@ -105,6 +105,10 @@ 
     }
 
    /* Strip VOID values */
+
+   /**
+    * @param string $Values
+    */
    function stripVOID($Values)
     { if (!is_array($Values)) { return(array()); } $Result = array(); foreach($Values as $Key => $Value) { if ( $Value != VOID ) { $Result[] = $Value; } } return($Result); }
 
@@ -414,6 +418,11 @@ 
     }
 
    /* Set the position of an Axis */
+
+   /**
+    * @param integer $AxisID
+    * @param integer $Position
+    */
    function setAxisPosition($AxisID,$Position=AXIS_POSITION_LEFT)
     { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Position"] = $Position; } }
 
@@ -497,6 +506,10 @@ 
     }
 
    /* Set the color of one serie */
+
+   /**
+    * @param string $Series
+    */
    function setPalette($Series,$Format=NULL)
     {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
@@ -559,6 +572,10 @@ 
     }
 
    /* Initialise a given scatter serie */
+
+   /**
+    * @param integer $ID
+    */
    function initScatterSerie($ID)
     {
      if ( isset($this->Data["ScatterSeries"][$ID]) ) { return(0); }
@@ -581,6 +598,10 @@ 
     }
 
    /* Initialise a given serie */
+
+   /**
+    * @param string $Serie
+    */
    function initialise($Serie)
     {
      if ( isset($this->Data["Series"]) ) { $ID = count($this->Data["Series"]); } else { $ID = 0; }
@@ -781,6 +802,10 @@ 
     { return("pData object."); }
 
    function left($value,$NbChar)	{ return substr($value,0,$NbChar); }  
+
+   /**
+    * @param integer $NbChar
+    */
    function right($value,$NbChar)	{ return substr($value,strlen($value)-$NbChar,$NbChar); }  
    function mid($value,$Depart,$NbChar)	{ return substr($value,$Depart-1,$NbChar); }  
   }

Indentation +524 added lines, -524 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pDraw - class to manipulate data arrays
 
      Version     : 2.1.3
@@ -13,50 +13,50 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- /* Axis configuration */
- define("AXIS_FORMAT_DEFAULT"		, 680001);
- define("AXIS_FORMAT_TIME"		, 680002);
- define("AXIS_FORMAT_DATE"		, 680003);
- define("AXIS_FORMAT_METRIC"		, 680004);
- define("AXIS_FORMAT_CURRENCY"		, 680005);
- define("AXIS_FORMAT_CUSTOM"		, 680006);
-
- /* Axis position */
- define("AXIS_POSITION_LEFT"		, 681001);
- define("AXIS_POSITION_RIGHT"		, 681002);
- define("AXIS_POSITION_TOP"		, 681001);
- define("AXIS_POSITION_BOTTOM"		, 681002);
-
- /* Families of data points */
- define("SERIE_SHAPE_FILLEDCIRCLE"	, 681011);
- define("SERIE_SHAPE_FILLEDTRIANGLE"	, 681012);
- define("SERIE_SHAPE_FILLEDSQUARE"	, 681013);
- define("SERIE_SHAPE_FILLEDDIAMOND"	, 681017);
- define("SERIE_SHAPE_CIRCLE"		, 681014);
- define("SERIE_SHAPE_TRIANGLE"		, 681015);
- define("SERIE_SHAPE_SQUARE"		, 681016);
- define("SERIE_SHAPE_DIAMOND"		, 681018);
-
- /* Axis position */
- define("AXIS_X"			, 682001);
- define("AXIS_Y"			, 682002);
-
- /* Define value limits */
- define("ABSOLUTE_MIN"          	, -10000000000000);
- define("ABSOLUTE_MAX"          	, 10000000000000);
-
- /* Replacement to the PHP NULL keyword */
- define("VOID"                  	, 0.123456789);
-
- /* Euro symbol for GD fonts */
- define("EURO_SYMBOL"			, utf8_encode("&#8364;"));
-
- /* pData class definition */
- class pData
-  {
-   var $Data;
-
-   var $Palette = array("0"=>array("R"=>188,"G"=>224,"B"=>46,"Alpha"=>100),
+    /* Axis configuration */
+    define("AXIS_FORMAT_DEFAULT"		, 680001);
+    define("AXIS_FORMAT_TIME"		, 680002);
+    define("AXIS_FORMAT_DATE"		, 680003);
+    define("AXIS_FORMAT_METRIC"		, 680004);
+    define("AXIS_FORMAT_CURRENCY"		, 680005);
+    define("AXIS_FORMAT_CUSTOM"		, 680006);
+
+    /* Axis position */
+    define("AXIS_POSITION_LEFT"		, 681001);
+    define("AXIS_POSITION_RIGHT"		, 681002);
+    define("AXIS_POSITION_TOP"		, 681001);
+    define("AXIS_POSITION_BOTTOM"		, 681002);
+
+    /* Families of data points */
+    define("SERIE_SHAPE_FILLEDCIRCLE"	, 681011);
+    define("SERIE_SHAPE_FILLEDTRIANGLE"	, 681012);
+    define("SERIE_SHAPE_FILLEDSQUARE"	, 681013);
+    define("SERIE_SHAPE_FILLEDDIAMOND"	, 681017);
+    define("SERIE_SHAPE_CIRCLE"		, 681014);
+    define("SERIE_SHAPE_TRIANGLE"		, 681015);
+    define("SERIE_SHAPE_SQUARE"		, 681016);
+    define("SERIE_SHAPE_DIAMOND"		, 681018);
+
+    /* Axis position */
+    define("AXIS_X"			, 682001);
+    define("AXIS_Y"			, 682002);
+
+    /* Define value limits */
+    define("ABSOLUTE_MIN"          	, -10000000000000);
+    define("ABSOLUTE_MAX"          	, 10000000000000);
+
+    /* Replacement to the PHP NULL keyword */
+    define("VOID"                  	, 0.123456789);
+
+    /* Euro symbol for GD fonts */
+    define("EURO_SYMBOL"			, utf8_encode("&#8364;"));
+
+    /* pData class definition */
+    class pData
+    {
+    var $Data;
+
+    var $Palette = array("0"=>array("R"=>188,"G"=>224,"B"=>46,"Alpha"=>100),
                         "1"=>array("R"=>224,"G"=>100,"B"=>46,"Alpha"=>100),
                         "2"=>array("R"=>224,"G"=>214,"B"=>46,"Alpha"=>100),
                         "3"=>array("R"=>46,"G"=>151,"B"=>224,"Alpha"=>100),
@@ -65,723 +65,723 @@ 
                         "6"=>array("R"=>92,"G"=>224,"B"=>46,"Alpha"=>100),
                         "7"=>array("R"=>224,"G"=>176,"B"=>46,"Alpha"=>100));
 
-   /* Class creator */
-   function pData()
+    /* Class creator */
+    function pData()
     {
-     $this->Data = "";
-     $this->Data["XAxisDisplay"]	= AXIS_FORMAT_DEFAULT;
-     $this->Data["XAxisFormat"]		= NULL;
-     $this->Data["XAxisName"]		= NULL;
-     $this->Data["XAxisUnit"]		= NULL;
-     $this->Data["Abscissa"]		= NULL;
-     $this->Data["AbsicssaPosition"]	= AXIS_POSITION_BOTTOM;
+        $this->Data = "";
+        $this->Data["XAxisDisplay"]	= AXIS_FORMAT_DEFAULT;
+        $this->Data["XAxisFormat"]		= NULL;
+        $this->Data["XAxisName"]		= NULL;
+        $this->Data["XAxisUnit"]		= NULL;
+        $this->Data["Abscissa"]		= NULL;
+        $this->Data["AbsicssaPosition"]	= AXIS_POSITION_BOTTOM;
 
-     $this->Data["Axis"][0]["Display"]  = AXIS_FORMAT_DEFAULT;
-     $this->Data["Axis"][0]["Position"] = AXIS_POSITION_LEFT;
-     $this->Data["Axis"][0]["Identity"] = AXIS_Y;
+        $this->Data["Axis"][0]["Display"]  = AXIS_FORMAT_DEFAULT;
+        $this->Data["Axis"][0]["Position"] = AXIS_POSITION_LEFT;
+        $this->Data["Axis"][0]["Identity"] = AXIS_Y;
     }
 
-   /* Add a single point or an array to the given serie */
-   function addPoints($Values,$SerieName="Serie1")
+    /* Add a single point or an array to the given serie */
+    function addPoints($Values,$SerieName="Serie1")
     {
-     if (!isset($this->Data["Series"][$SerieName]))
-      $this->initialise($SerieName);
+        if (!isset($this->Data["Series"][$SerieName]))
+        $this->initialise($SerieName);
 
-     if ( is_array($Values) )
-      {
-       foreach($Values as $Key => $Value)
+        if ( is_array($Values) )
+        {
+        foreach($Values as $Key => $Value)
         { $this->Data["Series"][$SerieName]["Data"][] = $Value; }
-      }
-     else
-      $this->Data["Series"][$SerieName]["Data"][] = $Values;
+        }
+        else
+        $this->Data["Series"][$SerieName]["Data"][] = $Values;
 
-     if ( $Values != VOID )
-      {
-       $StrippedData = $this->stripVOID($this->Data["Series"][$SerieName]["Data"]);
-       if ( empty($StrippedData) ) { $this->Data["Series"][$SerieName]["Max"] = 0; $this->Data["Series"][$SerieName]["Min"] =0; return(0); }
-       $this->Data["Series"][$SerieName]["Max"] = max($StrippedData);
-       $this->Data["Series"][$SerieName]["Min"] = min($StrippedData);
-      }
+        if ( $Values != VOID )
+        {
+        $StrippedData = $this->stripVOID($this->Data["Series"][$SerieName]["Data"]);
+        if ( empty($StrippedData) ) { $this->Data["Series"][$SerieName]["Max"] = 0; $this->Data["Series"][$SerieName]["Min"] =0; return(0); }
+        $this->Data["Series"][$SerieName]["Max"] = max($StrippedData);
+        $this->Data["Series"][$SerieName]["Min"] = min($StrippedData);
+        }
     }
 
-   /* Strip VOID values */
-   function stripVOID($Values)
+    /* Strip VOID values */
+    function stripVOID($Values)
     { if (!is_array($Values)) { return(array()); } $Result = array(); foreach($Values as $Key => $Value) { if ( $Value != VOID ) { $Result[] = $Value; } } return($Result); }
 
-   /* Return the number of values contained in a given serie */
-   function getSerieCount($Serie)
+    /* Return the number of values contained in a given serie */
+    function getSerieCount($Serie)
     { if (isset($this->Data["Series"][$Serie]["Data"])) { return(sizeof($this->Data["Series"][$Serie]["Data"])); } else { return(0); } }
 
-   /* Remove a serie from the pData object */
-   function removeSerie($Series)
+    /* Remove a serie from the pData object */
+    function removeSerie($Series)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie])) { unset($this->Data["Series"][$Serie]); } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie])) { unset($this->Data["Series"][$Serie]); } }
     }
 
-   /* Return a value from given serie & index */
-   function getValueAt($Serie,$Index=0)
+    /* Return a value from given serie & index */
+    function getValueAt($Serie,$Index=0)
     { if (isset($this->Data["Series"][$Serie]["Data"][$Index])) { return($this->Data["Series"][$Serie]["Data"][$Index]); } else { return(NULL); } }
 
-   /* Return the values array */
-   function getValues($Serie)
+    /* Return the values array */
+    function getValues($Serie)
     { if (isset($this->Data["Series"][$Serie]["Data"])) { return($this->Data["Series"][$Serie]["Data"]); } else { return(NULL); } }
 
-   /* Reverse the values in the given serie */
-   function reverseSerie($Series)
+    /* Reverse the values in the given serie */
+    function reverseSerie($Series)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]["Data"])) { $this->Data["Series"][$Serie]["Data"] = array_reverse($this->Data["Series"][$Serie]["Data"]); } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]["Data"])) { $this->Data["Series"][$Serie]["Data"] = array_reverse($this->Data["Series"][$Serie]["Data"]); } }
     }
 
-   /* Return the sum of the serie values */
-   function getSum($Serie)
+    /* Return the sum of the serie values */
+    function getSum($Serie)
     { if (isset($this->Data["Series"][$Serie])) { return(array_sum($this->Data["Series"][$Serie]["Data"])); } else { return(NULL); } }
 
-   /* Return the max value of a given serie */
-   function getMax($Serie)
+    /* Return the max value of a given serie */
+    function getMax($Serie)
     { if (isset($this->Data["Series"][$Serie]["Max"])) { return($this->Data["Series"][$Serie]["Max"]); } else { return(NULL); } }
 
-   /* Return the min value of a given serie */
-   function getMin($Serie)
+    /* Return the min value of a given serie */
+    function getMin($Serie)
     { if (isset($this->Data["Series"][$Serie]["Min"])) { return($this->Data["Series"][$Serie]["Min"]); } else { return(NULL); } }
 
-   /* Set the description of a given serie */
-   function setSerieShape($Series,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
+    /* Set the description of a given serie */
+    function setSerieShape($Series,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Shape"] = $Shape; } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Shape"] = $Shape; } }
     }
 
-   /* Set the description of a given serie */
-   function setSerieDescription($Series,$Description="My serie")
+    /* Set the description of a given serie */
+    function setSerieDescription($Series,$Description="My serie")
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Description"] = $Description; } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Description"] = $Description; } }
     }
 
-   /* Set a serie as "drawable" while calling a rendering function */
-   function setSerieDrawable($Series,$Drawable=TRUE)
+    /* Set a serie as "drawable" while calling a rendering function */
+    function setSerieDrawable($Series,$Drawable=TRUE)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["isDrawable"] = $Drawable; } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["isDrawable"] = $Drawable; } }
     }
 
-   /* Set the icon associated to a given serie */
-   function setSeriePicture($Series,$Picture=NULL)
+    /* Set the icon associated to a given serie */
+    function setSeriePicture($Series,$Picture=NULL)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Picture"] = $Picture; } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Picture"] = $Picture; } }
     }
 
-   /* Set the name of the X Axis */
-   function setXAxisName($Name)
+    /* Set the name of the X Axis */
+    function setXAxisName($Name)
     { $this->Data["XAxisName"] = $Name; }
 
-   /* Set the display mode of the  X Axis */
-   function setXAxisDisplay($Mode,$Format=NULL)
+    /* Set the display mode of the  X Axis */
+    function setXAxisDisplay($Mode,$Format=NULL)
     { $this->Data["XAxisDisplay"] = $Mode; $this->Data["XAxisFormat"]  = $Format; }
 
-   /* Set the unit that will be displayed on the X axis */
-   function setXAxisUnit($Unit)
+    /* Set the unit that will be displayed on the X axis */
+    function setXAxisUnit($Unit)
     { $this->Data["XAxisUnit"] = $Unit; }
 
-   /* Set the serie that will be used as abscissa */
-   function setAbscissa($Serie)
+    /* Set the serie that will be used as abscissa */
+    function setAbscissa($Serie)
     { if (isset($this->Data["Series"][$Serie])) { $this->Data["Abscissa"] = $Serie; } }
 
-   function setAbsicssaPosition($Position = AXIS_POSITION_BOTTOM)
+    function setAbsicssaPosition($Position = AXIS_POSITION_BOTTOM)
     { $this->Data["AbsicssaPosition"] = $Position; }
 
-   /* Set the name of the abscissa axis */
-   function setAbscissaName($Name)
+    /* Set the name of the abscissa axis */
+    function setAbscissaName($Name)
     { $this->Data["AbscissaName"] = $Name; }
 
-   /* Create a scatter group specifyin X and Y data series */
-   function setScatterSerie($SerieX,$SerieY,$ID=0)
+    /* Create a scatter group specifyin X and Y data series */
+    function setScatterSerie($SerieX,$SerieY,$ID=0)
     { if (isset($this->Data["Series"][$SerieX]) && isset($this->Data["Series"][$SerieY]) ) { $this->initScatterSerie($ID); $this->Data["ScatterSeries"][$ID]["X"] = $SerieX; $this->Data["ScatterSeries"][$ID]["Y"] = $SerieY; } }
 
-   /* Set the shape of a given sctatter serie */
-   function setScatterSerieShape($ID,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
+    /* Set the shape of a given sctatter serie */
+    function setScatterSerieShape($ID,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
     { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Shape"] = $Shape; } }
 
-   /* Set the description of a given scatter serie */
-   function setScatterSerieDescription($ID,$Description="My serie")
+    /* Set the description of a given scatter serie */
+    function setScatterSerieDescription($ID,$Description="My serie")
     { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Description"] = $Description; } }
 
-   /* Set the icon associated to a given scatter serie */
-   function setScatterSeriePicture($ID,$Picture=NULL)
+    /* Set the icon associated to a given scatter serie */
+    function setScatterSeriePicture($ID,$Picture=NULL)
     { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Picture"] = $Picture; } }
 
-   /* Set a scatter serie as "drawable" while calling a rendering function */
-   function setScatterSerieDrawable($ID ,$Drawable=TRUE)
+    /* Set a scatter serie as "drawable" while calling a rendering function */
+    function setScatterSerieDrawable($ID ,$Drawable=TRUE)
     { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["isDrawable"] = $Drawable; } }
 
-   /* Define if a scatter serie should be draw with ticks */
-   function setScatterSerieTicks($ID,$Width=0)
+    /* Define if a scatter serie should be draw with ticks */
+    function setScatterSerieTicks($ID,$Width=0)
     { if ( isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Ticks"] = $Width; } }
 
-   /* Define if a scatter serie should be draw with a special weight */
-   function setScatterSerieWeight($ID,$Weight=0)
+    /* Define if a scatter serie should be draw with a special weight */
+    function setScatterSerieWeight($ID,$Weight=0)
     { if ( isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Weight"] = $Weight; } }
 
-   /* Associate a color to a scatter serie */
-   function setScatterSerieColor($ID,$Format)
+    /* Associate a color to a scatter serie */
+    function setScatterSerieColor($ID,$Format)
     {
-     $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;
+        $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;
 
-     if ( isset($this->Data["ScatterSeries"][$ID]) )
-      {
-       $this->Data["ScatterSeries"][$ID]["Color"]["R"] = $R;
-       $this->Data["ScatterSeries"][$ID]["Color"]["G"] = $G;
-       $this->Data["ScatterSeries"][$ID]["Color"]["B"] = $B;
-       $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = $Alpha;
-      }
+        if ( isset($this->Data["ScatterSeries"][$ID]) )
+        {
+        $this->Data["ScatterSeries"][$ID]["Color"]["R"] = $R;
+        $this->Data["ScatterSeries"][$ID]["Color"]["G"] = $G;
+        $this->Data["ScatterSeries"][$ID]["Color"]["B"] = $B;
+        $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = $Alpha;
+        }
     }
 
-   /* Compute the series limits for an individual and global point of view */
-   function limits()
+    /* Compute the series limits for an individual and global point of view */
+    function limits()
     {
-     $GlobalMin = ABSOLUTE_MAX;
-     $GlobalMax = ABSOLUTE_MIN;
+        $GlobalMin = ABSOLUTE_MAX;
+        $GlobalMax = ABSOLUTE_MIN;
 
-     foreach($this->Data["Series"] as $Key => $Value)
-      {
-       if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"] == TRUE)
+        foreach($this->Data["Series"] as $Key => $Value)
+        {
+        if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"] == TRUE)
         {
-         if ( $GlobalMin > $this->Data["Series"][$Key]["Min"] ) { $GlobalMin = $this->Data["Series"][$Key]["Min"]; }
-         if ( $GlobalMax < $this->Data["Series"][$Key]["Max"] ) { $GlobalMax = $this->Data["Series"][$Key]["Max"]; }
+            if ( $GlobalMin > $this->Data["Series"][$Key]["Min"] ) { $GlobalMin = $this->Data["Series"][$Key]["Min"]; }
+            if ( $GlobalMax < $this->Data["Series"][$Key]["Max"] ) { $GlobalMax = $this->Data["Series"][$Key]["Max"]; }
         }
-      }
-     $this->Data["Min"] = $GlobalMin;
-     $this->Data["Max"] = $GlobalMax;
+        }
+        $this->Data["Min"] = $GlobalMin;
+        $this->Data["Max"] = $GlobalMax;
 
-     return(array($GlobalMin,$GlobalMax));
+        return(array($GlobalMin,$GlobalMax));
     }
 
-   /* Mark all series as drawable */
-   function drawAll()
+    /* Mark all series as drawable */
+    function drawAll()
     { foreach($this->Data["Series"] as $Key => $Value) { if ( $this->Data["Abscissa"] != $Key ) { $this->Data["Series"][$Key]["isDrawable"]=TRUE; } } }    
 
-   /* Return the average value of the given serie */
-   function getSerieAverage($Serie)
+    /* Return the average value of the given serie */
+    function getSerieAverage($Serie)
     {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
-       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
-       return(array_sum($SerieData)/sizeof($SerieData));
-      }
-     else
-      return(NULL);
+        if ( isset($this->Data["Series"][$Serie]) )
+        {
+        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+        return(array_sum($SerieData)/sizeof($SerieData));
+        }
+        else
+        return(NULL);
     }
 
-   /* Return the geometric mean of the given serie */
-   function getGeometricMean($Serie)
+    /* Return the geometric mean of the given serie */
+    function getGeometricMean($Serie)
     {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
-       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
-       $Seriesum  = 1; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum * $Value; }
-       return(pow($Seriesum,1/sizeof($SerieData)));
-      }
-     else
-      return(NULL);
+        if ( isset($this->Data["Series"][$Serie]) )
+        {
+        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+        $Seriesum  = 1; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum * $Value; }
+        return(pow($Seriesum,1/sizeof($SerieData)));
+        }
+        else
+        return(NULL);
     }
 
-   /* Return the harmonic mean of the given serie */
-   function getHarmonicMean($Serie)
+    /* Return the harmonic mean of the given serie */
+    function getHarmonicMean($Serie)
     {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
-       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
-       $Seriesum  = 0; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum + 1/$Value; }
-       return(sizeof($SerieData)/$Seriesum);
-      }
-     else
-      return(NULL);
+        if ( isset($this->Data["Series"][$Serie]) )
+        {
+        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+        $Seriesum  = 0; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum + 1/$Value; }
+        return(sizeof($SerieData)/$Seriesum);
+        }
+        else
+        return(NULL);
     }
 
-   /* Return the standard deviation of the given serie */
-   function getStandardDeviation($Serie)
+    /* Return the standard deviation of the given serie */
+    function getStandardDeviation($Serie)
     {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
-       $Average   = $this->getSerieAverage($Serie);
-       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+        if ( isset($this->Data["Series"][$Serie]) )
+        {
+        $Average   = $this->getSerieAverage($Serie);
+        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
 
-       $DeviationSum = 0;
-       foreach($SerieData as $Key => $Value)
+        $DeviationSum = 0;
+        foreach($SerieData as $Key => $Value)
         $DeviationSum = $DeviationSum + ($Value-$Average)*($Value-$Average);
 
-       $Deviation = sqrt($DeviationSum/count($SerieData));
+        $Deviation = sqrt($DeviationSum/count($SerieData));
 
-       return($Deviation);
-      }
-     else
-      return(NULL);
+        return($Deviation);
+        }
+        else
+        return(NULL);
     }
 
-   /* Return the Coefficient of variation of the given serie */
-   function getCoefficientOfVariation($Serie)
+    /* Return the Coefficient of variation of the given serie */
+    function getCoefficientOfVariation($Serie)
     {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
-       $Average           = $this->getSerieAverage($Serie);
-       $StandardDeviation = $this->getStandardDeviation($Serie);
+        if ( isset($this->Data["Series"][$Serie]) )
+        {
+        $Average           = $this->getSerieAverage($Serie);
+        $StandardDeviation = $this->getStandardDeviation($Serie);
 
-       if ( $StandardDeviation != 0 )
+        if ( $StandardDeviation != 0 )
         return($StandardDeviation/$Average);
-       else
+        else
+        return(NULL);
+        }
+        else
         return(NULL);
-      }
-     else
-      return(NULL);
     }
 
-   /* Return the median value of the given serie */
-   function getSerieMedian($Serie)
+    /* Return the median value of the given serie */
+    function getSerieMedian($Serie)
     {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
-       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
-       sort($SerieData);
-       $SerieCenter = floor(sizeof($SerieData)/2);
+        if ( isset($this->Data["Series"][$Serie]) )
+        {
+        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+        sort($SerieData);
+        $SerieCenter = floor(sizeof($SerieData)/2);
 
-       if ( isset($SerieData[$SerieCenter]) )
+        if ( isset($SerieData[$SerieCenter]) )
         return($SerieData[$SerieCenter]);
-       else
+        else
+        return(NULL);
+        }
+        else
         return(NULL);
-      }
-     else
-      return(NULL);
     }
 
-   /* Return the x th percentil of the given serie */
-   function getSeriePercentile($Serie="Serie1",$Percentil=95)
+    /* Return the x th percentil of the given serie */
+    function getSeriePercentile($Serie="Serie1",$Percentil=95)
     {
-     if (!isset($this->Data["Series"][$Serie]["Data"])) { return(NULL); }
+        if (!isset($this->Data["Series"][$Serie]["Data"])) { return(NULL); }
 
-     $Values = count($this->Data["Series"][$Serie]["Data"])-1;
-     if ( $Values < 0 ) { $Values = 0; }
+        $Values = count($this->Data["Series"][$Serie]["Data"])-1;
+        if ( $Values < 0 ) { $Values = 0; }
 
-     $PercentilID  = floor(($Values/100)*$Percentil+.5);
-     $SortedValues = $this->Data["Series"][$Serie]["Data"];
-     sort($SortedValues);
+        $PercentilID  = floor(($Values/100)*$Percentil+.5);
+        $SortedValues = $this->Data["Series"][$Serie]["Data"];
+        sort($SortedValues);
 
-     if ( is_numeric($SortedValues[$PercentilID]) )
-      return($SortedValues[$PercentilID]);
-     else
-      return(NULL);
+        if ( is_numeric($SortedValues[$PercentilID]) )
+        return($SortedValues[$PercentilID]);
+        else
+        return(NULL);
     }
 
-   /* Add random values to a given serie */
-   function addRandomValues($SerieName="Serie1",$Options="")
+    /* Add random values to a given serie */
+    function addRandomValues($SerieName="Serie1",$Options="")
     {
-     $Values    = isset($Options["Values"]) ? $Options["Values"] : 20;
-     $Min       = isset($Options["Min"]) ? $Options["Min"] : 0;
-     $Max       = isset($Options["Max"]) ? $Options["Max"] : 100;
-     $withFloat = isset($Options["withFloat"]) ? $Options["withFloat"] : FALSE;
+        $Values    = isset($Options["Values"]) ? $Options["Values"] : 20;
+        $Min       = isset($Options["Min"]) ? $Options["Min"] : 0;
+        $Max       = isset($Options["Max"]) ? $Options["Max"] : 100;
+        $withFloat = isset($Options["withFloat"]) ? $Options["withFloat"] : FALSE;
 
-     for ($i=0;$i<=$Values;$i++)
-      {
-       if ( $withFloat ) { $Value = rand($Min*100,$Max*100)/100; } else { $Value = rand($Min,$Max); }
-       $this->addPoints($Value,$SerieName);
-      }
+        for ($i=0;$i<=$Values;$i++)
+        {
+        if ( $withFloat ) { $Value = rand($Min*100,$Max*100)/100; } else { $Value = rand($Min,$Max); }
+        $this->addPoints($Value,$SerieName);
+        }
     }
 
-   /* Test if we have valid data */
-   function containsData()
+    /* Test if we have valid data */
+    function containsData()
     {
-     if (!isset($this->Data["Series"])) { return(FALSE); }
+        if (!isset($this->Data["Series"])) { return(FALSE); }
 
-     $Result = FALSE;
-     foreach($this->Data["Series"] as $Key => $Value)
-      { if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"]==TRUE) { $Result=TRUE; } }
-     return($Result);
+        $Result = FALSE;
+        foreach($this->Data["Series"] as $Key => $Value)
+        { if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"]==TRUE) { $Result=TRUE; } }
+        return($Result);
     }
 
-   /* Set the display mode of an Axis */
-   function setAxisDisplay($AxisID,$Mode=AXIS_FORMAT_DEFAULT,$Format=NULL)
+    /* Set the display mode of an Axis */
+    function setAxisDisplay($AxisID,$Mode=AXIS_FORMAT_DEFAULT,$Format=NULL)
     {
-     if ( isset($this->Data["Axis"][$AxisID] ) )
-      {
-       $this->Data["Axis"][$AxisID]["Display"] = $Mode;
-       if ( $Format != NULL ) { $this->Data["Axis"][$AxisID]["Format"] = $Format; }
-      }
+        if ( isset($this->Data["Axis"][$AxisID] ) )
+        {
+        $this->Data["Axis"][$AxisID]["Display"] = $Mode;
+        if ( $Format != NULL ) { $this->Data["Axis"][$AxisID]["Format"] = $Format; }
+        }
     }
 
-   /* Set the position of an Axis */
-   function setAxisPosition($AxisID,$Position=AXIS_POSITION_LEFT)
+    /* Set the position of an Axis */
+    function setAxisPosition($AxisID,$Position=AXIS_POSITION_LEFT)
     { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Position"] = $Position; } }
 
-   /* Associate an unit to an axis */
-   function setAxisUnit($AxisID,$Unit)
+    /* Associate an unit to an axis */
+    function setAxisUnit($AxisID,$Unit)
     { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Unit"] = $Unit; } }
 
-   /* Associate a name to an axis */
-   function setAxisName($AxisID,$Name)
+    /* Associate a name to an axis */
+    function setAxisName($AxisID,$Name)
     { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Name"] = $Name; } }
 
-   /* Associate a color to an axis */
-   function setAxisColor($AxisID,$Format)
+    /* Associate a color to an axis */
+    function setAxisColor($AxisID,$Format)
     {
-     $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;
+        $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;
 
-     if ( isset($this->Data["Axis"][$AxisID] ) )
-      {
-       $this->Data["Axis"][$AxisID]["Color"]["R"] = $R;
-       $this->Data["Axis"][$AxisID]["Color"]["G"] = $G;
-       $this->Data["Axis"][$AxisID]["Color"]["B"] = $B;
-       $this->Data["Axis"][$AxisID]["Color"]["Alpha"] = $Alpha;
-      }
+        if ( isset($this->Data["Axis"][$AxisID] ) )
+        {
+        $this->Data["Axis"][$AxisID]["Color"]["R"] = $R;
+        $this->Data["Axis"][$AxisID]["Color"]["G"] = $G;
+        $this->Data["Axis"][$AxisID]["Color"]["B"] = $B;
+        $this->Data["Axis"][$AxisID]["Color"]["Alpha"] = $Alpha;
+        }
     }
 
 
-   /* Design an axis as X or Y member */
-   function setAxisXY($AxisID,$Identity=AXIS_Y)
+    /* Design an axis as X or Y member */
+    function setAxisXY($AxisID,$Identity=AXIS_Y)
     { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Identity"] = $Identity; } }
 
-   /* Associate one data serie with one axis */
-   function setSerieOnAxis($Series,$AxisID)
+    /* Associate one data serie with one axis */
+    function setSerieOnAxis($Series,$AxisID)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie)
-      {
-       $PreviousAxis = $this->Data["Series"][$Serie]["Axis"];
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie)
+        {
+        $PreviousAxis = $this->Data["Series"][$Serie]["Axis"];
 
-       /* Create missing axis */
-       if ( !isset($this->Data["Axis"][$AxisID] ) )
+        /* Create missing axis */
+        if ( !isset($this->Data["Axis"][$AxisID] ) )
         { $this->Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_LEFT; $this->Data["Axis"][$AxisID]["Identity"] = AXIS_Y;}
 
-       $this->Data["Series"][$Serie]["Axis"] = $AxisID;
+        $this->Data["Series"][$Serie]["Axis"] = $AxisID;
 
-       /* Cleanup unused axis */
-       $Found = FALSE;
-       foreach($this->Data["Series"] as $SerieName => $Values) { if ( $Values["Axis"] == $PreviousAxis ) { $Found = TRUE; } }
-       if (!$Found) { unset($this->Data["Axis"][$PreviousAxis]); }
-      }
+        /* Cleanup unused axis */
+        $Found = FALSE;
+        foreach($this->Data["Series"] as $SerieName => $Values) { if ( $Values["Axis"] == $PreviousAxis ) { $Found = TRUE; } }
+        if (!$Found) { unset($this->Data["Axis"][$PreviousAxis]); }
+        }
     }
 
-   /* Define if a serie should be draw with ticks */
-   function setSerieTicks($Series,$Width=0)
+    /* Define if a serie should be draw with ticks */
+    function setSerieTicks($Series,$Width=0)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Ticks"] = $Width; } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Ticks"] = $Width; } }
     }
 
-   /* Define if a serie should be draw with a special weight */
-   function setSerieWeight($Series,$Weight=0)
+    /* Define if a serie should be draw with a special weight */
+    function setSerieWeight($Series,$Weight=0)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Weight"] = $Weight; } }
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Weight"] = $Weight; } }
     }
 
-   /* Returns the palette of the given serie */
-   function getSeriePalette($Serie)
+    /* Returns the palette of the given serie */
+    function getSeriePalette($Serie)
     {
-     if ( !isset($this->Data["Series"][$Serie]) ) { return(NULL); }
+        if ( !isset($this->Data["Series"][$Serie]) ) { return(NULL); }
 
-     $Result = "";
-     $Result["R"] = $this->Data["Series"][$Serie]["Color"]["R"];
-     $Result["G"] = $this->Data["Series"][$Serie]["Color"]["G"];
-     $Result["B"] = $this->Data["Series"][$Serie]["Color"]["B"];
-     $Result["Alpha"] = $this->Data["Series"][$Serie]["Color"]["Alpha"];
+        $Result = "";
+        $Result["R"] = $this->Data["Series"][$Serie]["Color"]["R"];
+        $Result["G"] = $this->Data["Series"][$Serie]["Color"]["G"];
+        $Result["B"] = $this->Data["Series"][$Serie]["Color"]["B"];
+        $Result["Alpha"] = $this->Data["Series"][$Serie]["Color"]["Alpha"];
 
-     return($Result);
+        return($Result);
     }
 
-   /* Set the color of one serie */
-   function setPalette($Series,$Format=NULL)
+    /* Set the color of one serie */
+    function setPalette($Series,$Format=NULL)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-
-     foreach($Series as $Key => $Serie)
-      {
-       $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;
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
 
-       if ( isset($this->Data["Series"][$Serie]) )
+        foreach($Series as $Key => $Serie)
         {
-         $OldR = $this->Data["Series"][$Serie]["Color"]["R"]; $OldG = $this->Data["Series"][$Serie]["Color"]["G"]; $OldB = $this->Data["Series"][$Serie]["Color"]["B"];
-         $this->Data["Series"][$Serie]["Color"]["R"] = $R;
-         $this->Data["Series"][$Serie]["Color"]["G"] = $G;
-         $this->Data["Series"][$Serie]["Color"]["B"] = $B;
-         $this->Data["Series"][$Serie]["Color"]["Alpha"] = $Alpha;
+        $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;
 
-         /* Do reverse processing on the internal palette array */
-         foreach ($this->Palette as $Key => $Value)
-          { if ($Value["R"] == $OldR && $Value["G"] == $OldG && $Value["B"] == $OldB) { $this->Palette[$Key]["R"] = $R; $this->Palette[$Key]["G"] = $G; $this->Palette[$Key]["B"] = $B; $this->Palette[$Key]["Alpha"] = $Alpha;} }
+        if ( isset($this->Data["Series"][$Serie]) )
+        {
+            $OldR = $this->Data["Series"][$Serie]["Color"]["R"]; $OldG = $this->Data["Series"][$Serie]["Color"]["G"]; $OldB = $this->Data["Series"][$Serie]["Color"]["B"];
+            $this->Data["Series"][$Serie]["Color"]["R"] = $R;
+            $this->Data["Series"][$Serie]["Color"]["G"] = $G;
+            $this->Data["Series"][$Serie]["Color"]["B"] = $B;
+            $this->Data["Series"][$Serie]["Color"]["Alpha"] = $Alpha;
+
+            /* Do reverse processing on the internal palette array */
+            foreach ($this->Palette as $Key => $Value)
+            { if ($Value["R"] == $OldR && $Value["G"] == $OldG && $Value["B"] == $OldB) { $this->Palette[$Key]["R"] = $R; $this->Palette[$Key]["G"] = $G; $this->Palette[$Key]["B"] = $B; $this->Palette[$Key]["Alpha"] = $Alpha;} }
+        }
         }
-      }
     }
 
-   /* Load a palette file */
-   function loadPalette($FileName,$Overwrite=FALSE)
+    /* Load a palette file */
+    function loadPalette($FileName,$Overwrite=FALSE)
     {
-     if ( !file_exists($FileName) ) { return(-1); }
-     if ( $Overwrite ) { $this->Palette = ""; }
+        if ( !file_exists($FileName) ) { return(-1); }
+        if ( $Overwrite ) { $this->Palette = ""; }
 
-     $fileHandle = @fopen($FileName, "r");
-     if (!$fileHandle) { return(-1); }
-     while (!feof($fileHandle))
-      {
-       $buffer = fgets($fileHandle, 4096);
-       if ( preg_match("/,/",$buffer) )
+        $fileHandle = @fopen($FileName, "r");
+        if (!$fileHandle) { return(-1); }
+        while (!feof($fileHandle))
         {
-         list($R,$G,$B,$Alpha) = preg_split("/,/",$buffer);
-         if ( $this->Palette == "" ) { $ID = 0; } else { $ID = count($this->Palette); }
-         $this->Palette[$ID] = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+        $buffer = fgets($fileHandle, 4096);
+        if ( preg_match("/,/",$buffer) )
+        {
+            list($R,$G,$B,$Alpha) = preg_split("/,/",$buffer);
+            if ( $this->Palette == "" ) { $ID = 0; } else { $ID = count($this->Palette); }
+            $this->Palette[$ID] = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+        }
         }
-      }
-     fclose($fileHandle);
+        fclose($fileHandle);
 
-     /* Apply changes to current series */
-     $ID = 0;
-     if ( isset($this->Data["Series"]))
-      {
-       foreach($this->Data["Series"] as $Key => $Value)
+        /* Apply changes to current series */
+        $ID = 0;
+        if ( isset($this->Data["Series"]))
         {
-         if ( !isset($this->Palette[$ID]) )
-          $this->Data["Series"][$Key]["Color"] = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>0);
-         else
-          $this->Data["Series"][$Key]["Color"] = $this->Palette[$ID];
-         $ID++;
+        foreach($this->Data["Series"] as $Key => $Value)
+        {
+            if ( !isset($this->Palette[$ID]) )
+            $this->Data["Series"][$Key]["Color"] = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>0);
+            else
+            $this->Data["Series"][$Key]["Color"] = $this->Palette[$ID];
+            $ID++;
+        }
         }
-      }
     }
 
-   /* Initialise a given scatter serie */
-   function initScatterSerie($ID)
+    /* Initialise a given scatter serie */
+    function initScatterSerie($ID)
     {
-     if ( isset($this->Data["ScatterSeries"][$ID]) ) { return(0); }
+        if ( isset($this->Data["ScatterSeries"][$ID]) ) { return(0); }
 
-     $this->Data["ScatterSeries"][$ID]["Description"]	= "Scatter ".$ID;
-     $this->Data["ScatterSeries"][$ID]["isDrawable"]	= TRUE;
-     $this->Data["ScatterSeries"][$ID]["Picture"]	= NULL;
-     $this->Data["ScatterSeries"][$ID]["Ticks"]		= 0;
-     $this->Data["ScatterSeries"][$ID]["Weight"]	= 0;
+        $this->Data["ScatterSeries"][$ID]["Description"]	= "Scatter ".$ID;
+        $this->Data["ScatterSeries"][$ID]["isDrawable"]	= TRUE;
+        $this->Data["ScatterSeries"][$ID]["Picture"]	= NULL;
+        $this->Data["ScatterSeries"][$ID]["Ticks"]		= 0;
+        $this->Data["ScatterSeries"][$ID]["Weight"]	= 0;
 
-     if ( isset($this->Palette[$ID]) )
-      $this->Data["ScatterSeries"][$ID]["Color"] = $this->Palette[$ID];
-     else
-      {
-       $this->Data["ScatterSeries"][$ID]["Color"]["R"] = rand(0,255);
-       $this->Data["ScatterSeries"][$ID]["Color"]["G"] = rand(0,255);
-       $this->Data["ScatterSeries"][$ID]["Color"]["B"] = rand(0,255);
-       $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = 100;
-      }
+        if ( isset($this->Palette[$ID]) )
+        $this->Data["ScatterSeries"][$ID]["Color"] = $this->Palette[$ID];
+        else
+        {
+        $this->Data["ScatterSeries"][$ID]["Color"]["R"] = rand(0,255);
+        $this->Data["ScatterSeries"][$ID]["Color"]["G"] = rand(0,255);
+        $this->Data["ScatterSeries"][$ID]["Color"]["B"] = rand(0,255);
+        $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = 100;
+        }
     }
 
-   /* Initialise a given serie */
-   function initialise($Serie)
+    /* Initialise a given serie */
+    function initialise($Serie)
     {
-     if ( isset($this->Data["Series"]) ) { $ID = count($this->Data["Series"]); } else { $ID = 0; }
+        if ( isset($this->Data["Series"]) ) { $ID = count($this->Data["Series"]); } else { $ID = 0; }
 
-     $this->Data["Series"][$Serie]["Description"]	= $Serie;
-     $this->Data["Series"][$Serie]["isDrawable"]	= TRUE;
-     $this->Data["Series"][$Serie]["Picture"]		= NULL;
-     $this->Data["Series"][$Serie]["Max"]		= NULL;
-     $this->Data["Series"][$Serie]["Min"]		= NULL;
-     $this->Data["Series"][$Serie]["Axis"]		= 0;
-     $this->Data["Series"][$Serie]["Ticks"]		= 0;
-     $this->Data["Series"][$Serie]["Weight"]		= 0;
-     $this->Data["Series"][$Serie]["Shape"]		= SERIE_SHAPE_FILLEDCIRCLE;
+        $this->Data["Series"][$Serie]["Description"]	= $Serie;
+        $this->Data["Series"][$Serie]["isDrawable"]	= TRUE;
+        $this->Data["Series"][$Serie]["Picture"]		= NULL;
+        $this->Data["Series"][$Serie]["Max"]		= NULL;
+        $this->Data["Series"][$Serie]["Min"]		= NULL;
+        $this->Data["Series"][$Serie]["Axis"]		= 0;
+        $this->Data["Series"][$Serie]["Ticks"]		= 0;
+        $this->Data["Series"][$Serie]["Weight"]		= 0;
+        $this->Data["Series"][$Serie]["Shape"]		= SERIE_SHAPE_FILLEDCIRCLE;
 
-     if ( isset($this->Palette[$ID]) )
-      $this->Data["Series"][$Serie]["Color"] = $this->Palette[$ID];
-     else
-      {
-       $this->Data["Series"][$Serie]["Color"]["R"] = rand(0,255);
-       $this->Data["Series"][$Serie]["Color"]["G"] = rand(0,255);
-       $this->Data["Series"][$Serie]["Color"]["B"] = rand(0,255);
-       $this->Data["Series"][$Serie]["Color"]["Alpha"] = 100;
-      }
+        if ( isset($this->Palette[$ID]) )
+        $this->Data["Series"][$Serie]["Color"] = $this->Palette[$ID];
+        else
+        {
+        $this->Data["Series"][$Serie]["Color"]["R"] = rand(0,255);
+        $this->Data["Series"][$Serie]["Color"]["G"] = rand(0,255);
+        $this->Data["Series"][$Serie]["Color"]["B"] = rand(0,255);
+        $this->Data["Series"][$Serie]["Color"]["Alpha"] = 100;
+        }
     }
      
-   function normalize($NormalizationFactor=100,$UnitChange=NULL,$Round=1)
+    function normalize($NormalizationFactor=100,$UnitChange=NULL,$Round=1)
     {
-     $Abscissa = $this->Data["Abscissa"];
+        $Abscissa = $this->Data["Abscissa"];
 
-     $SelectedSeries = "";
-     $MaxVal         = 0;
-     foreach($this->Data["Axis"] as $AxisID => $Axis)
-      {
-       if ( $UnitChange != NULL ) { $this->Data["Axis"][$AxisID]["Unit"] = $UnitChange; }
+        $SelectedSeries = "";
+        $MaxVal         = 0;
+        foreach($this->Data["Axis"] as $AxisID => $Axis)
+        {
+        if ( $UnitChange != NULL ) { $this->Data["Axis"][$AxisID]["Unit"] = $UnitChange; }
 
-       foreach($this->Data["Series"] as $SerieName => $Serie)
+        foreach($this->Data["Series"] as $SerieName => $Serie)
         {
-         if ($Serie["Axis"] == $AxisID && $Serie["isDrawable"] == TRUE && $SerieName != $Abscissa)
-          {
-           $SelectedSeries[$SerieName] = $SerieName;
+            if ($Serie["Axis"] == $AxisID && $Serie["isDrawable"] == TRUE && $SerieName != $Abscissa)
+            {
+            $SelectedSeries[$SerieName] = $SerieName;
 
-           if ( count($Serie["Data"] ) > $MaxVal ) { $MaxVal = count($Serie["Data"]); }
-          }
+            if ( count($Serie["Data"] ) > $MaxVal ) { $MaxVal = count($Serie["Data"]); }
+            }
+        }
         }
-      }
 
-     for($i=0;$i<=$MaxVal-1;$i++)
-      {
-       $Factor = 0;
-       foreach ($SelectedSeries as $Key => $SerieName )
+        for($i=0;$i<=$MaxVal-1;$i++)
         {
-         $Value = $this->Data["Series"][$SerieName]["Data"][$i];
-         if ( $Value != VOID )
-          $Factor = $Factor + abs($Value);
+        $Factor = 0;
+        foreach ($SelectedSeries as $Key => $SerieName )
+        {
+            $Value = $this->Data["Series"][$SerieName]["Data"][$i];
+            if ( $Value != VOID )
+            $Factor = $Factor + abs($Value);
         }
 
-       if ( $Factor != 0 )
+        if ( $Factor != 0 )
         {
-         $Factor = $NormalizationFactor / $Factor;
+            $Factor = $NormalizationFactor / $Factor;
 
-         foreach ($SelectedSeries as $Key => $SerieName )
-          {
-           $Value = $this->Data["Series"][$SerieName]["Data"][$i];
+            foreach ($SelectedSeries as $Key => $SerieName )
+            {
+            $Value = $this->Data["Series"][$SerieName]["Data"][$i];
 
-           if ( $Value != VOID && $Factor != $NormalizationFactor )
+            if ( $Value != VOID && $Factor != $NormalizationFactor )
             $this->Data["Series"][$SerieName]["Data"][$i] = round(abs($Value)*$Factor,$Round);
-           elseif ( $Value == VOID || $Value == 0 )
+            elseif ( $Value == VOID || $Value == 0 )
             $this->Data["Series"][$SerieName]["Data"][$i] = VOID;
-           elseif ( $Factor == $NormalizationFactor )
+            elseif ( $Factor == $NormalizationFactor )
             $this->Data["Series"][$SerieName]["Data"][$i] = $NormalizationFactor;
-          }
+            }
+        }
         }
-      }
 
-     foreach ($SelectedSeries as $Key => $SerieName )
-      {
-       $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
-       $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
-      }
+        foreach ($SelectedSeries as $Key => $SerieName )
+        {
+        $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+        $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+        }
     }
 
-   /* Load data from a CSV (or similar) data source */
-   function importFromCSV($FileName,$Options="")
+    /* Load data from a CSV (or similar) data source */
+    function importFromCSV($FileName,$Options="")
     {
-     $Delimiter		= isset($Options["Delimiter"]) ? $Options["Delimiter"] : ",";
-     $GotHeader		= isset($Options["GotHeader"]) ? $Options["GotHeader"] : FALSE;
-     $SkipColumns	= isset($Options["SkipColumns"]) ? $Options["SkipColumns"] : array(-1);
-     $DefaultSerieName	= isset($Options["DefaultSerieName"]) ? $Options["DefaultSerieName"] : "Serie";
+        $Delimiter		= isset($Options["Delimiter"]) ? $Options["Delimiter"] : ",";
+        $GotHeader		= isset($Options["GotHeader"]) ? $Options["GotHeader"] : FALSE;
+        $SkipColumns	= isset($Options["SkipColumns"]) ? $Options["SkipColumns"] : array(-1);
+        $DefaultSerieName	= isset($Options["DefaultSerieName"]) ? $Options["DefaultSerieName"] : "Serie";
 
-     $Handle = @fopen($FileName,"r");
-     if ($Handle)
-      {
-       $HeaderParsed = FALSE; $SerieNames = "";
-       while (!feof($Handle))
+        $Handle = @fopen($FileName,"r");
+        if ($Handle)
         {
-         $Buffer = fgets($Handle, 4096);
-         $Buffer = str_replace(chr(10),"",$Buffer);
-         $Buffer = str_replace(chr(13),"",$Buffer);
-         $Values = preg_split("/".$Delimiter."/",$Buffer);
+        $HeaderParsed = FALSE; $SerieNames = "";
+        while (!feof($Handle))
+        {
+            $Buffer = fgets($Handle, 4096);
+            $Buffer = str_replace(chr(10),"",$Buffer);
+            $Buffer = str_replace(chr(13),"",$Buffer);
+            $Values = preg_split("/".$Delimiter."/",$Buffer);
 
-         if ( $Buffer != "" )
-          {
-           if ( $GotHeader && !$HeaderParsed )
+            if ( $Buffer != "" )
+            {
+            if ( $GotHeader && !$HeaderParsed )
             {
-             foreach($Values as $Key => $Name) { if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $Name; } }
-             $HeaderParsed = TRUE;
+                foreach($Values as $Key => $Name) { if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $Name; } }
+                $HeaderParsed = TRUE;
             }
-           else
+            else
             {
-             if ($SerieNames == "" ) { foreach($Values as $Key => $Name) {  if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $DefaultSerieName.$Key; } } }
-             foreach($Values as $Key => $Value) {  if ( !in_array($Key,$SkipColumns) ) { $this->addPoints($Value,$SerieNames[$Key]); } }
+                if ($SerieNames == "" ) { foreach($Values as $Key => $Name) {  if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $DefaultSerieName.$Key; } } }
+                foreach($Values as $Key => $Value) {  if ( !in_array($Key,$SkipColumns) ) { $this->addPoints($Value,$SerieNames[$Key]); } }
             }
-          }
+            }
+        }
+        fclose($Handle);
         }
-       fclose($Handle);
-      }
     }
 
-   /* Create a dataset based on a formula */
-   function createFunctionSerie($SerieName,$Formula="",$Options="")
+    /* Create a dataset based on a formula */
+    function createFunctionSerie($SerieName,$Formula="",$Options="")
     {
-     $MinX		= isset($Options["MinX"]) ? $Options["MinX"] : -10;
-     $MaxX		= isset($Options["MaxX"]) ? $Options["MaxX"] : 10;
-     $XStep		= isset($Options["XStep"]) ? $Options["XStep"] : 1;
-     $AutoDescription	= isset($Options["AutoDescription"]) ? $Options["AutoDescription"] : FALSE;
-     $RecordAbscissa	= isset($Options["RecordAbscissa"]) ? $Options["RecordAbscissa"] : FALSE;
-     $AbscissaSerie	= isset($Options["AbscissaSerie"]) ? $Options["AbscissaSerie"] : "Abscissa";
+        $MinX		= isset($Options["MinX"]) ? $Options["MinX"] : -10;
+        $MaxX		= isset($Options["MaxX"]) ? $Options["MaxX"] : 10;
+        $XStep		= isset($Options["XStep"]) ? $Options["XStep"] : 1;
+        $AutoDescription	= isset($Options["AutoDescription"]) ? $Options["AutoDescription"] : FALSE;
+        $RecordAbscissa	= isset($Options["RecordAbscissa"]) ? $Options["RecordAbscissa"] : FALSE;
+        $AbscissaSerie	= isset($Options["AbscissaSerie"]) ? $Options["AbscissaSerie"] : "Abscissa";
 
-     if ( $Formula == "" ) { return(0); }
+        if ( $Formula == "" ) { return(0); }
 
-     $Result = ""; $Abscissa = "";
-     for($i=$MinX; $i<=$MaxX; $i=$i+$XStep)
-      {
-       $Expression = "\$return = '!'.(".str_replace("z",$i,$Formula).");";
-       if ( @eval($Expression) === FALSE ) { $return = VOID; }
-       if ( $return == "!" ) { $return = VOID; } else { $return = $this->right($return,strlen($return)-1); }
-       if ( $return == "NAN" ) { $return = VOID; }
-       if ( $return == "INF" ) { $return = VOID; }
-       if ( $return == "-INF" ) { $return = VOID; }
-
-       $Abscissa[] = $i;
-       $Result[]   = $return;
-      }
+        $Result = ""; $Abscissa = "";
+        for($i=$MinX; $i<=$MaxX; $i=$i+$XStep)
+        {
+        $Expression = "\$return = '!'.(".str_replace("z",$i,$Formula).");";
+        if ( @eval($Expression) === FALSE ) { $return = VOID; }
+        if ( $return == "!" ) { $return = VOID; } else { $return = $this->right($return,strlen($return)-1); }
+        if ( $return == "NAN" ) { $return = VOID; }
+        if ( $return == "INF" ) { $return = VOID; }
+        if ( $return == "-INF" ) { $return = VOID; }
+
+        $Abscissa[] = $i;
+        $Result[]   = $return;
+        }
 
-     $this->addPoints($Result,$SerieName);
-     if ( $AutoDescription ) { $this->setSerieDescription($SerieName,$Formula); }
-     if ( $RecordAbscissa ) { $this->addPoints($Abscissa,$AbscissaSerie); }
+        $this->addPoints($Result,$SerieName);
+        if ( $AutoDescription ) { $this->setSerieDescription($SerieName,$Formula); }
+        if ( $RecordAbscissa ) { $this->addPoints($Abscissa,$AbscissaSerie); }
     }
 
-   function negateValues($Series)
+    function negateValues($Series)
     {
-     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $SerieName)
-      {
-       if (isset($this->Data["Series"][$SerieName]))
+        if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+        foreach($Series as $Key => $SerieName)
+        {
+        if (isset($this->Data["Series"][$SerieName]))
         {
-         $Data = "";
-         foreach($this->Data["Series"][$SerieName]["Data"] as $Key => $Value)
-          { if ( $Value == VOID ) { $Data[] = VOID; } else { $Data[] = -$Value; } }
-         $this->Data["Series"][$SerieName]["Data"] = $Data;
+            $Data = "";
+            foreach($this->Data["Series"][$SerieName]["Data"] as $Key => $Value)
+            { if ( $Value == VOID ) { $Data[] = VOID; } else { $Data[] = -$Value; } }
+            $this->Data["Series"][$SerieName]["Data"] = $Data;
 
-         $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
-         $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+            $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+            $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+        }
         }
-      }
     }
 
-   /* Return the data & configuration of the series */
-   function getData()
+    /* Return the data & configuration of the series */
+    function getData()
     { return($this->Data); }
 
-   /* Save a palette element */
-   function savePalette($ID,$Color)
+    /* Save a palette element */
+    function savePalette($ID,$Color)
     { $this->Palette[$ID] = $Color; }
 
-   /* Return the palette of the series */
-   function getPalette()
+    /* Return the palette of the series */
+    function getPalette()
     { return($this->Palette); }
 
-   /* Called by the scaling algorithm to save the config */
-   function saveAxisConfig($Axis) { $this->Data["Axis"]=$Axis; }
+    /* Called by the scaling algorithm to save the config */
+    function saveAxisConfig($Axis) { $this->Data["Axis"]=$Axis; }
 
-   /* Save the Y Margin if set */
-   function saveYMargin($Value) { $this->Data["YMargin"]=$Value; }
+    /* Save the Y Margin if set */
+    function saveYMargin($Value) { $this->Data["YMargin"]=$Value; }
 
-   /* Save extended configuration to the pData object */
-   function saveExtendedData($Tag,$Values) { $this->Data["Extended"][$Tag]=$Values; }
+    /* Save extended configuration to the pData object */
+    function saveExtendedData($Tag,$Values) { $this->Data["Extended"][$Tag]=$Values; }
 
-   /* Called by the scaling algorithm to save the orientation of the scale */
-   function saveOrientation($Orientation) { $this->Data["Orientation"]=$Orientation; }
+    /* Called by the scaling algorithm to save the orientation of the scale */
+    function saveOrientation($Orientation) { $this->Data["Orientation"]=$Orientation; }
 
-   /* Convert a string to a single elements array */
-   function convertToArray($Value)
+    /* Convert a string to a single elements array */
+    function convertToArray($Value)
     { $Values = ""; $Values[] = $Value; return($Values); }
 
-   /* Class string wrapper */
-   function __toString()
+    /* Class string wrapper */
+    function __toString()
     { return("pData object."); }
 
-   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/pDraw.class.php

Doc Comments +44 added lines

@@ -124,6 +124,10 @@ 
     }
 
    /* Draw a polygon */
+
+   /**
+    * @param string $Points
+    */
    function drawPolygon($Points,$Format="")
     {
      $R			= isset($Format["R"]) ? $Format["R"] : 0;
@@ -573,6 +577,10 @@ 
     }
 
    /* Drawn a spline based on the bezier function */
+
+   /**
+    * @param string $Coordinates
+    */
    function drawSpline($Coordinates,$Format="")
     {
      $R		= isset($Format["R"]) ? $Format["R"] : 0;
@@ -1028,6 +1036,10 @@ 
     }
 
    /* Draw a gradient within a defined area */
+
+   /**
+    * @param integer $Direction
+    */
    function drawGradientArea($X1,$Y1,$X2,$Y2,$Direction,$Format="")
     {
      $StartR	= isset($Format["StartR"]) ? $Format["StartR"] : 90;
@@ -1109,6 +1121,11 @@ 
     }
 
    /* Draw an aliased pixel */
+
+   /**
+    * @param double $X
+    * @param double $Y
+    */
    function drawAntialiasPixel($X,$Y,$Format="")
     {
      $R     = isset($Format["R"]) ? $Format["R"] : 0;
@@ -1188,6 +1205,10 @@ 
     }
 
    /* Convert apha to base 10 */
+
+   /**
+    * @param integer $AlphaValue
+    */
    function convertAlpha($AlphaValue)
     { return((127/100)*(100-$AlphaValue)); }
 
@@ -1205,6 +1226,11 @@ 
     }
 
    /* Load a PNG file and draw it over the chart */
+
+   /**
+    * @param double $X
+    * @param double $Y
+    */
    function drawFromPNG($X,$Y,$FileName)
     { $this->drawFromPicture(1,$FileName,$X,$Y); }
 
@@ -2483,6 +2509,9 @@ 
       }
     }
 
+   /**
+    * @param integer $ID
+    */
    function isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip)
     {
      if ( $LabelingMethod == LABELING_DIFFERENT && $Value != $LastValue ) { return(TRUE); }
@@ -2494,6 +2523,10 @@ 
     }
 
    /* Compute the scale, check for the best visual factors */
+
+   /**
+    * @param double $MaxDivs
+    */
    function computeScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID=0)
     {
      /* Compute each factors */
@@ -2522,6 +2555,10 @@ 
     }
 
    /* Compute the best matching scale based on size & factors */
+
+   /**
+    * @param integer $AxisID
+    */
    function processScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID)
     {
      $ScaleHeight = abs(ceil($XMax)-floor($XMin));
@@ -2602,6 +2639,9 @@ 
      return($Scale);
     }
 
+   /**
+    * @param double $Value2
+    */
    function modulo($Value1,$Value2)
     {
      if (floor($Value2) == 0) { return(0); }
@@ -5772,6 +5812,10 @@ 
     }
 
    /* Draw a label box */
+
+   /**
+    * @param string $Captions
+    */
    function drawLabelBox($X,$Y,$Title,$Captions,$Format="")
     {
      $NoTitle		= isset($Format["NoTitle"]) ? $Format["NoTitle"] : NULL;

Indentation +5013 added lines, -5013 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pDraw - class extension with drawing methods
 
      Version     : 2.1.3
@@ -13,6181 +13,6181 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("DIRECTION_VERTICAL"		, 690001);
- define("DIRECTION_HORIZONTAL"		, 690002);
-
- define("SCALE_POS_LEFTRIGHT"		, 690101);
- define("SCALE_POS_TOPBOTTOM"		, 690102);
-
- define("SCALE_MODE_FLOATING"		, 690201);
- define("SCALE_MODE_START0"		, 690202);
- define("SCALE_MODE_ADDALL"		, 690203);
- define("SCALE_MODE_ADDALL_START0"	, 690204);
- define("SCALE_MODE_MANUAL"		, 690205);
-
- define("SCALE_SKIP_NONE"		, 690301);
- define("SCALE_SKIP_SAME"		, 690302);
- define("SCALE_SKIP_NUMBERS"		, 690303);
-
- define("TEXT_ALIGN_TOPLEFT"		, 690401);
- define("TEXT_ALIGN_TOPMIDDLE"		, 690402);
- define("TEXT_ALIGN_TOPRIGHT"		, 690403);
- define("TEXT_ALIGN_MIDDLELEFT"		, 690404);
- define("TEXT_ALIGN_MIDDLEMIDDLE"	, 690405);
- define("TEXT_ALIGN_MIDDLERIGHT"	, 690406);
- define("TEXT_ALIGN_BOTTOMLEFT"		, 690407);
- define("TEXT_ALIGN_BOTTOMMIDDLE"	, 690408);
- define("TEXT_ALIGN_BOTTOMRIGHT"	, 690409);
-
- define("POSITION_TOP"                  , 690501);
- define("POSITION_BOTTOM"               , 690502);
-
- define("LABEL_POS_LEFT"		, 690601);
- define("LABEL_POS_CENTER"		, 690602);
- define("LABEL_POS_RIGHT"		, 690603);
- define("LABEL_POS_TOP"			, 690604);
- define("LABEL_POS_BOTTOM"		, 690605);
- define("LABEL_POS_INSIDE"		, 690606);
- define("LABEL_POS_OUTSIDE"		, 690607);
-
- define("ORIENTATION_HORIZONTAL"	, 690701);
- define("ORIENTATION_VERTICAL"		, 690702);
- define("ORIENTATION_AUTO"		, 690703);
-
- define("LEGEND_NOBORDER"		, 690800);
- define("LEGEND_BOX"			, 690801);
- define("LEGEND_ROUND"			, 690802);
-
- define("LEGEND_VERTICAL"		, 690901);
- define("LEGEND_HORIZONTAL"		, 690902);
-
- define("LEGEND_FAMILY_BOX"		, 691051);
- define("LEGEND_FAMILY_CIRCLE"		, 691052);
- define("LEGEND_FAMILY_LINE"		, 691053);
-
- define("DISPLAY_AUTO"			, 691001);
- define("DISPLAY_MANUAL"		, 691002);
-
- define("LABELING_ALL"			, 691011);
- define("LABELING_DIFFERENT"		, 691012);
-
- define("BOUND_MIN"			, 691021);
- define("BOUND_MAX"			, 691022);
- define("BOUND_BOTH"			, 691023);
-
- define("BOUND_LABEL_POS_TOP"		, 691031);
- define("BOUND_LABEL_POS_BOTTOM"	, 691032);
- define("BOUND_LABEL_POS_AUTO"		, 691033);
-
- define("CAPTION_LEFT_TOP"		, 691041);
- define("CAPTION_RIGHT_BOTTOM"		, 691042);
-
- define("GRADIENT_SIMPLE"		, 691051);
- define("GRADIENT_EFFECT_CAN"		, 691052);
-
- define("LABEL_TITLE_NOBACKGROUND"	, 691061);
- define("LABEL_TITLE_BACKGROUND"	, 691062);
-
- define("LABEL_POINT_NONE"		, 691071);
- define("LABEL_POINT_CIRCLE"		, 691072);
- define("LABEL_POINT_BOX"		, 691073);
-
- define("ZONE_NAME_ANGLE_AUTO"		, 691081);
-
- define("PI"		, 3.14159265);
- define("ALL"		, 69);
- define("NONE"		, 31);
- define("AUTO"		, 690000);
- define("OUT_OF_SIGHT"	, -10000000000000);
-
- class pDraw
-  {
-   /* Returns the number of drawable series */
-   function countDrawableSeries()
+    define("DIRECTION_VERTICAL"		, 690001);
+    define("DIRECTION_HORIZONTAL"		, 690002);
+
+    define("SCALE_POS_LEFTRIGHT"		, 690101);
+    define("SCALE_POS_TOPBOTTOM"		, 690102);
+
+    define("SCALE_MODE_FLOATING"		, 690201);
+    define("SCALE_MODE_START0"		, 690202);
+    define("SCALE_MODE_ADDALL"		, 690203);
+    define("SCALE_MODE_ADDALL_START0"	, 690204);
+    define("SCALE_MODE_MANUAL"		, 690205);
+
+    define("SCALE_SKIP_NONE"		, 690301);
+    define("SCALE_SKIP_SAME"		, 690302);
+    define("SCALE_SKIP_NUMBERS"		, 690303);
+
+    define("TEXT_ALIGN_TOPLEFT"		, 690401);
+    define("TEXT_ALIGN_TOPMIDDLE"		, 690402);
+    define("TEXT_ALIGN_TOPRIGHT"		, 690403);
+    define("TEXT_ALIGN_MIDDLELEFT"		, 690404);
+    define("TEXT_ALIGN_MIDDLEMIDDLE"	, 690405);
+    define("TEXT_ALIGN_MIDDLERIGHT"	, 690406);
+    define("TEXT_ALIGN_BOTTOMLEFT"		, 690407);
+    define("TEXT_ALIGN_BOTTOMMIDDLE"	, 690408);
+    define("TEXT_ALIGN_BOTTOMRIGHT"	, 690409);
+
+    define("POSITION_TOP"                  , 690501);
+    define("POSITION_BOTTOM"               , 690502);
+
+    define("LABEL_POS_LEFT"		, 690601);
+    define("LABEL_POS_CENTER"		, 690602);
+    define("LABEL_POS_RIGHT"		, 690603);
+    define("LABEL_POS_TOP"			, 690604);
+    define("LABEL_POS_BOTTOM"		, 690605);
+    define("LABEL_POS_INSIDE"		, 690606);
+    define("LABEL_POS_OUTSIDE"		, 690607);
+
+    define("ORIENTATION_HORIZONTAL"	, 690701);
+    define("ORIENTATION_VERTICAL"		, 690702);
+    define("ORIENTATION_AUTO"		, 690703);
+
+    define("LEGEND_NOBORDER"		, 690800);
+    define("LEGEND_BOX"			, 690801);
+    define("LEGEND_ROUND"			, 690802);
+
+    define("LEGEND_VERTICAL"		, 690901);
+    define("LEGEND_HORIZONTAL"		, 690902);
+
+    define("LEGEND_FAMILY_BOX"		, 691051);
+    define("LEGEND_FAMILY_CIRCLE"		, 691052);
+    define("LEGEND_FAMILY_LINE"		, 691053);
+
+    define("DISPLAY_AUTO"			, 691001);
+    define("DISPLAY_MANUAL"		, 691002);
+
+    define("LABELING_ALL"			, 691011);
+    define("LABELING_DIFFERENT"		, 691012);
+
+    define("BOUND_MIN"			, 691021);
+    define("BOUND_MAX"			, 691022);
+    define("BOUND_BOTH"			, 691023);
+
+    define("BOUND_LABEL_POS_TOP"		, 691031);
+    define("BOUND_LABEL_POS_BOTTOM"	, 691032);
+    define("BOUND_LABEL_POS_AUTO"		, 691033);
+
+    define("CAPTION_LEFT_TOP"		, 691041);
+    define("CAPTION_RIGHT_BOTTOM"		, 691042);
+
+    define("GRADIENT_SIMPLE"		, 691051);
+    define("GRADIENT_EFFECT_CAN"		, 691052);
+
+    define("LABEL_TITLE_NOBACKGROUND"	, 691061);
+    define("LABEL_TITLE_BACKGROUND"	, 691062);
+
+    define("LABEL_POINT_NONE"		, 691071);
+    define("LABEL_POINT_CIRCLE"		, 691072);
+    define("LABEL_POINT_BOX"		, 691073);
+
+    define("ZONE_NAME_ANGLE_AUTO"		, 691081);
+
+    define("PI"		, 3.14159265);
+    define("ALL"		, 69);
+    define("NONE"		, 31);
+    define("AUTO"		, 690000);
+    define("OUT_OF_SIGHT"	, -10000000000000);
+
+    class pDraw
+    {
+    /* Returns the number of drawable series */
+    function countDrawableSeries()
     {
-     $Results = 0;
-     $Data = $this->DataSet->getData();
+        $Results = 0;
+        $Data = $this->DataSet->getData();
 
-     foreach($Data["Series"] as $SerieName => $Serie)
-      { if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) { $Results++; } }
+        foreach($Data["Series"] as $SerieName => $Serie)
+        { if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) { $Results++; } }
 
-     return($Results);
+        return($Results);
     }
 
-   /* Fix box coordinates */
-   function fixBoxCoordinates($Xa,$Ya,$Xb,$Yb)
+    /* Fix box coordinates */
+    function fixBoxCoordinates($Xa,$Ya,$Xb,$Yb)
     {
-     $X1 = min($Xa,$Xb); $Y1 = min($Ya,$Yb);
-     $X2 = max($Xa,$Xb); $Y2 = max($Ya,$Yb);
+        $X1 = min($Xa,$Xb); $Y1 = min($Ya,$Yb);
+        $X2 = max($Xa,$Xb); $Y2 = max($Ya,$Yb);
 
-     return(array($X1,$Y1,$X2,$Y2));
+        return(array($X1,$Y1,$X2,$Y2));
     }
 
-   /* Draw a polygon */
-   function drawPolygon($Points,$Format="")
+    /* Draw a polygon */
+    function drawPolygon($Points,$Format="")
     {
-     $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;
-     $NoFill		= isset($Format["NoFill"]) ? $Format["NoFill"] : FALSE;
-     $NoBorder		= isset($Format["NoBorder"]) ? $Format["NoBorder"] : FALSE;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
-     $BorderAlpha 	= isset($Format["Alpha"]) ? $Format["Alpha"] : $Alpha / 2;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $SkipX		= isset($Format["SkipX"]) ? $Format["SkipX"] : OUT_OF_SIGHT;
-     $SkipY		= isset($Format["SkipY"]) ? $Format["SkipY"] : OUT_OF_SIGHT;
-
-     /* Calling the ImageFilledPolygon() function over the $Points array will round it */ 	
-     $Backup = $Points;
-
-     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-
-     if ( $SkipX != OUT_OF_SIGHT ) { $SkipX = floor($SkipX); }
-     if ( $SkipY != OUT_OF_SIGHT ) { $SkipY = floor($SkipY); }
-
-     $RestoreShadow = $this->Shadow;
-     if ( !$NoFill )
-      {
-       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-        {
-         $this->Shadow = FALSE;
-         for($i=0;$i<=count($Points)-1;$i=$i+2)
-          { $Shadow[] = $Points[$i] + $this->ShadowX; $Shadow[] = $Points[$i+1] + $this->ShadowY; }
-         $this->drawPolygon($Shadow,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"NoBorder"=>TRUE));
-        }
-
-       $FillColor = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-
-       if ( count($Points) >= 6 )
+        $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;
+        $NoFill		= isset($Format["NoFill"]) ? $Format["NoFill"] : FALSE;
+        $NoBorder		= isset($Format["NoBorder"]) ? $Format["NoBorder"] : FALSE;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
+        $BorderAlpha 	= isset($Format["Alpha"]) ? $Format["Alpha"] : $Alpha / 2;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $SkipX		= isset($Format["SkipX"]) ? $Format["SkipX"] : OUT_OF_SIGHT;
+        $SkipY		= isset($Format["SkipY"]) ? $Format["SkipY"] : OUT_OF_SIGHT;
+
+        /* Calling the ImageFilledPolygon() function over the $Points array will round it */ 	
+        $Backup = $Points;
+
+        if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+
+        if ( $SkipX != OUT_OF_SIGHT ) { $SkipX = floor($SkipX); }
+        if ( $SkipY != OUT_OF_SIGHT ) { $SkipY = floor($SkipY); }
+
+        $RestoreShadow = $this->Shadow;
+        if ( !$NoFill )
+        {
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+            $this->Shadow = FALSE;
+            for($i=0;$i<=count($Points)-1;$i=$i+2)
+            { $Shadow[] = $Points[$i] + $this->ShadowX; $Shadow[] = $Points[$i+1] + $this->ShadowY; }
+            $this->drawPolygon($Shadow,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"NoBorder"=>TRUE));
+        }
+
+        $FillColor = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+
+        if ( count($Points) >= 6 )
         { ImageFilledPolygon($this->Picture,$Points,count($Points)/2,$FillColor); }
-      }
+        }
 
-     if ( !$NoBorder )
-      {
-       $Points = $Backup;
+        if ( !$NoBorder )
+        {
+        $Points = $Backup;
 
-       if ( $NoFill )
+        if ( $NoFill )
         $BorderSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-       else
+        else
         $BorderSettings = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
 
-       for($i=0;$i<=count($Points)-1;$i=$i+2)
+        for($i=0;$i<=count($Points)-1;$i=$i+2)
         {
-         if ( isset($Points[$i+2]) )
-          {
-           if ( !($Points[$i] == $Points[$i+2] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[$i+3] && $Points[$i+1] == $SkipY ) )
+            if ( isset($Points[$i+2]) )
+            {
+            if ( !($Points[$i] == $Points[$i+2] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[$i+3] && $Points[$i+1] == $SkipY ) )
             $this->drawLine($Points[$i],$Points[$i+1],$Points[$i+2],$Points[$i+3],$BorderSettings);
-          }
-         else
-          {
-           if ( !($Points[$i] == $Points[0] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[1] && $Points[$i+1] == $SkipY ) )
+            }
+            else
+            {
+            if ( !($Points[$i] == $Points[0] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[1] && $Points[$i+1] == $SkipY ) )
             $this->drawLine($Points[$i],$Points[$i+1],$Points[0],$Points[1],$BorderSettings);
-          }
+            }
+        }
         }
-      }
 
-     $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Apply AALias correction to the rounded box boundaries */
-   function offsetCorrection($Value,$Mode)
+    /* Apply AALias correction to the rounded box boundaries */
+    function offsetCorrection($Value,$Mode)
     {
-     $Value = round($Value,1);
+        $Value = round($Value,1);
 
-     if ( $Value == 0 && $Mode == 1 ) { return(.9); }
-     if ( $Value == 0 ) { return(0); }
+        if ( $Value == 0 && $Mode == 1 ) { return(.9); }
+        if ( $Value == 0 ) { return(0); }
 
-     if ( $Mode == 1) 
-      { if ( $Value == 1 ) { return(.9); }; if ( $Value == .1 ) { return(.9); }; if ( $Value == .2 ) { return(.8); }; if ( $Value == .3 ) { return(.8); }; if ( $Value == .4 ) { return(.7); }; if ( $Value == .5 ) { return(.5); }; if ( $Value == .6 ) { return(.8); }; if ( $Value == .7 ) { return(.7); }; if ( $Value == .8 ) { return(.6); }; if ( $Value == .9 ) { return(.9); }; }
+        if ( $Mode == 1) 
+        { if ( $Value == 1 ) { return(.9); }; if ( $Value == .1 ) { return(.9); }; if ( $Value == .2 ) { return(.8); }; if ( $Value == .3 ) { return(.8); }; if ( $Value == .4 ) { return(.7); }; if ( $Value == .5 ) { return(.5); }; if ( $Value == .6 ) { return(.8); }; if ( $Value == .7 ) { return(.7); }; if ( $Value == .8 ) { return(.6); }; if ( $Value == .9 ) { return(.9); }; }
 
-     if ( $Mode == 2) 
-      { if ( $Value == 1 ) { return(.9); }; if ( $Value == .1 ) { return(.1); }; if ( $Value == .2 ) { return(.2); }; if ( $Value == .3 ) { return(.3); }; if ( $Value == .4 ) { return(.4); }; if ( $Value == .5 ) { return(.5); }; if ( $Value == .6 ) { return(.8); }; if ( $Value == .7 ) { return(.7); }; if ( $Value == .8 ) { return(.8); }; if ( $Value == .9 ) { return(.9); }; }
+        if ( $Mode == 2) 
+        { if ( $Value == 1 ) { return(.9); }; if ( $Value == .1 ) { return(.1); }; if ( $Value == .2 ) { return(.2); }; if ( $Value == .3 ) { return(.3); }; if ( $Value == .4 ) { return(.4); }; if ( $Value == .5 ) { return(.5); }; if ( $Value == .6 ) { return(.8); }; if ( $Value == .7 ) { return(.7); }; if ( $Value == .8 ) { return(.8); }; if ( $Value == .9 ) { return(.9); }; }
 
-     if ( $Mode == 3) 
-      { if ( $Value == 1 ) { return(.1); }; if ( $Value == .1 ) { return(.1); }; if ( $Value == .2 ) { return(.2); }; if ( $Value == .3 ) { return(.3); }; if ( $Value == .4 ) { return(.4); }; if ( $Value == .5 ) { return(.9); }; if ( $Value == .6 ) { return(.6); }; if ( $Value == .7 ) { return(.7); }; if ( $Value == .8 ) { return(.4); }; if ( $Value == .9 ) { return(.5); }; }
+        if ( $Mode == 3) 
+        { if ( $Value == 1 ) { return(.1); }; if ( $Value == .1 ) { return(.1); }; if ( $Value == .2 ) { return(.2); }; if ( $Value == .3 ) { return(.3); }; if ( $Value == .4 ) { return(.4); }; if ( $Value == .5 ) { return(.9); }; if ( $Value == .6 ) { return(.6); }; if ( $Value == .7 ) { return(.7); }; if ( $Value == .8 ) { return(.4); }; if ( $Value == .9 ) { return(.5); }; }
 
-     if ( $Mode == 4) 
-      { if ( $Value == 1 ) { return(-1); }; if ( $Value == .1 ) { return(.1); }; if ( $Value == .2 ) { return(.2); }; if ( $Value == .3 ) { return(.3); }; if ( $Value == .4 ) { return(.1); }; if ( $Value == .5 ) { return(-.1); }; if ( $Value == .6 ) { return(.8); }; if ( $Value == .7 ) { return(.1); }; if ( $Value == .8 ) { return(.1); }; if ( $Value == .9 ) { return(.1); }; }
+        if ( $Mode == 4) 
+        { if ( $Value == 1 ) { return(-1); }; if ( $Value == .1 ) { return(.1); }; if ( $Value == .2 ) { return(.2); }; if ( $Value == .3 ) { return(.3); }; if ( $Value == .4 ) { return(.1); }; if ( $Value == .5 ) { return(-.1); }; if ( $Value == .6 ) { return(.8); }; if ( $Value == .7 ) { return(.1); }; if ( $Value == .8 ) { return(.1); }; if ( $Value == .9 ) { return(.1); }; }
     }
 
-   /* Draw a rectangle with rounded corners */
-   function drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$Format="")
+    /* Draw a rectangle with rounded corners */
+    function drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$Format="")
     {
-     $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;
-
-     list($X1,$Y1,$X2,$Y2) = $this->fixBoxCoordinates($X1,$Y1,$X2,$Y2);
-
-     if ( $X2 - $X1 < $Radius ) { $Radius = floor((($X2-$X1))/2); }
-     if ( $Y2 - $Y1 < $Radius ) { $Radius = floor((($Y2-$Y1))/2); }
-
-     $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"NoBorder"=>TRUE);
-
-     if ( $Radius <= 0 ) { $this->drawRectangle($X1,$Y1,$X2,$Y2,$Color); return(0); }
-
-     if ( $this->Antialias )
-      {
-       $this->drawLine($X1+$Radius,$Y1,$X2-$Radius,$Y1,$Color);
-       $this->drawLine($X2,$Y1+$Radius,$X2,$Y2-$Radius,$Color);
-       $this->drawLine($X2-$Radius,$Y2,$X1+$Radius,$Y2,$Color);
-       $this->drawLine($X1,$Y1+$Radius,$X1,$Y2-$Radius,$Color);
-      }
-     else
-      {
-       $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-       imageline($this->Picture,$X1+$Radius,$Y1,$X2-$Radius,$Y1,$Color);
-       imageline($this->Picture,$X2,$Y1+$Radius,$X2,$Y2-$Radius,$Color);
-       imageline($this->Picture,$X2-$Radius,$Y2,$X1+$Radius,$Y2,$Color);
-       imageline($this->Picture,$X1,$Y1+$Radius,$X1,$Y2-$Radius,$Color);
-      }
-
-     $Step = 360 / (2 * PI * $Radius);
-     for($i=0;$i<=90;$i=$i+$Step)
-      {
-       $X = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
-       $Y = sin(($i+180)*PI/180) * $Radius + $Y1 + $Radius;
-       $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-
-       $X = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
-       $Y = sin(($i+90)*PI/180) * $Radius + $Y2 - $Radius;
-       $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-
-       $X = cos($i*PI/180) * $Radius + $X2 - $Radius;
-       $Y = sin($i*PI/180) * $Radius + $Y2 - $Radius;
-       $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-
-       $X = cos(($i+270)*PI/180) * $Radius + $X2 - $Radius;
-       $Y = sin(($i+270)*PI/180) * $Radius + $Y1 + $Radius;
-       $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
+        $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;
+
+        list($X1,$Y1,$X2,$Y2) = $this->fixBoxCoordinates($X1,$Y1,$X2,$Y2);
+
+        if ( $X2 - $X1 < $Radius ) { $Radius = floor((($X2-$X1))/2); }
+        if ( $Y2 - $Y1 < $Radius ) { $Radius = floor((($Y2-$Y1))/2); }
+
+        $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"NoBorder"=>TRUE);
+
+        if ( $Radius <= 0 ) { $this->drawRectangle($X1,$Y1,$X2,$Y2,$Color); return(0); }
+
+        if ( $this->Antialias )
+        {
+        $this->drawLine($X1+$Radius,$Y1,$X2-$Radius,$Y1,$Color);
+        $this->drawLine($X2,$Y1+$Radius,$X2,$Y2-$Radius,$Color);
+        $this->drawLine($X2-$Radius,$Y2,$X1+$Radius,$Y2,$Color);
+        $this->drawLine($X1,$Y1+$Radius,$X1,$Y2-$Radius,$Color);
+        }
+        else
+        {
+        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        imageline($this->Picture,$X1+$Radius,$Y1,$X2-$Radius,$Y1,$Color);
+        imageline($this->Picture,$X2,$Y1+$Radius,$X2,$Y2-$Radius,$Color);
+        imageline($this->Picture,$X2-$Radius,$Y2,$X1+$Radius,$Y2,$Color);
+        imageline($this->Picture,$X1,$Y1+$Radius,$X1,$Y2-$Radius,$Color);
+        }
+
+        $Step = 360 / (2 * PI * $Radius);
+        for($i=0;$i<=90;$i=$i+$Step)
+        {
+        $X = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
+        $Y = sin(($i+180)*PI/180) * $Radius + $Y1 + $Radius;
+        $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+        $X = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
+        $Y = sin(($i+90)*PI/180) * $Radius + $Y2 - $Radius;
+        $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+        $X = cos($i*PI/180) * $Radius + $X2 - $Radius;
+        $Y = sin($i*PI/180) * $Radius + $Y2 - $Radius;
+        $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+        $X = cos(($i+270)*PI/180) * $Radius + $X2 - $Radius;
+        $Y = sin(($i+270)*PI/180) * $Radius + $Y1 + $Radius;
+        $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        }
     }
 
-   /* Draw a rectangle with rounded corners */
-   function drawRoundedFilledRectangle($X1,$Y1,$X2,$Y2,$Radius,$Format="")
+    /* Draw a rectangle with rounded corners */
+    function drawRoundedFilledRectangle($X1,$Y1,$X2,$Y2,$Radius,$Format="")
     {
-     $R			= isset($Format["R"]) ? $Format["R"] : 0;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-
-     /* Temporary fix for AA issue */
-     $Y1 = floor($Y1); $Y2 = floor($Y2); $X1 = floor($X1); $X2 = floor($X2);
-
-     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-     if ( $BorderR == -1 ) { $BorderR = $R; $BorderG = $G; $BorderB = $B; }
-
-     list($X1,$Y1,$X2,$Y2) = $this->fixBoxCoordinates($X1,$Y1,$X2,$Y2);
-
-     if ( $X2 - $X1 < $Radius*2 ) { $Radius = floor((($X2-$X1))/4); }
-     if ( $Y2 - $Y1 < $Radius*2 ) { $Radius = floor((($Y2-$Y1))/4); }
-
-     $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $this->Shadow = FALSE;
-       $this->drawRoundedFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
-      }
-
-     $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"NoBorder"=>TRUE);
-
-     if ( $Radius <= 0 ) { $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Color); return(0); }
-
-     $YTop    = $Y1+$Radius;
-     $YBottom = $Y2-$Radius;
-
-     $Step = 360 / (2 * PI * $Radius);
-     $Positions = ""; $Radius--; $MinY = ""; $MaxY = "";
-     for($i=0;$i<=90;$i=$i+$Step)
-      {
-       $Xp1 = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
-       $Xp2 = cos(((90-$i)+270)*PI/180) * $Radius + $X2 - $Radius;
-       $Yp  = floor(sin(($i+180)*PI/180) * $Radius + $YTop);
-       if ( $MinY == "" || $Yp > $MinY ) { $MinY = $Yp; }
-
-       if ( $Xp1 <= floor($X1) )  { $Xp1++; }
-       if ( $Xp2 >= floor($X2) )  { $Xp2--; }
-       $Xp1++;
-
-       if ( !isset($Positions[$Yp]) )
+        $R			= isset($Format["R"]) ? $Format["R"] : 0;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+
+        /* Temporary fix for AA issue */
+        $Y1 = floor($Y1); $Y2 = floor($Y2); $X1 = floor($X1); $X2 = floor($X2);
+
+        if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+        if ( $BorderR == -1 ) { $BorderR = $R; $BorderG = $G; $BorderB = $B; }
+
+        list($X1,$Y1,$X2,$Y2) = $this->fixBoxCoordinates($X1,$Y1,$X2,$Y2);
+
+        if ( $X2 - $X1 < $Radius*2 ) { $Radius = floor((($X2-$X1))/4); }
+        if ( $Y2 - $Y1 < $Radius*2 ) { $Radius = floor((($Y2-$Y1))/4); }
+
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $this->Shadow = FALSE;
+        $this->drawRoundedFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+        }
+
+        $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"NoBorder"=>TRUE);
+
+        if ( $Radius <= 0 ) { $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Color); return(0); }
+
+        $YTop    = $Y1+$Radius;
+        $YBottom = $Y2-$Radius;
+
+        $Step = 360 / (2 * PI * $Radius);
+        $Positions = ""; $Radius--; $MinY = ""; $MaxY = "";
+        for($i=0;$i<=90;$i=$i+$Step)
+        {
+        $Xp1 = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
+        $Xp2 = cos(((90-$i)+270)*PI/180) * $Radius + $X2 - $Radius;
+        $Yp  = floor(sin(($i+180)*PI/180) * $Radius + $YTop);
+        if ( $MinY == "" || $Yp > $MinY ) { $MinY = $Yp; }
+
+        if ( $Xp1 <= floor($X1) )  { $Xp1++; }
+        if ( $Xp2 >= floor($X2) )  { $Xp2--; }
+        $Xp1++;
+
+        if ( !isset($Positions[$Yp]) )
         { $Positions[$Yp]["X1"] = $Xp1; $Positions[$Yp]["X2"] = $Xp2; }
-       else
+        else
         { $Positions[$Yp]["X1"] = ($Positions[$Yp]["X1"]+$Xp1)/2; $Positions[$Yp]["X2"] = ($Positions[$Yp]["X2"]+$Xp2)/2; }
 
-       $Xp1 = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
-       $Xp2 = cos((90-$i)*PI/180) * $Radius + $X2 - $Radius;
-       $Yp  = floor(sin(($i+90)*PI/180) * $Radius + $YBottom);
-       if ( $MaxY == "" || $Yp < $MaxY ) { $MaxY = $Yp; }
+        $Xp1 = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
+        $Xp2 = cos((90-$i)*PI/180) * $Radius + $X2 - $Radius;
+        $Yp  = floor(sin(($i+90)*PI/180) * $Radius + $YBottom);
+        if ( $MaxY == "" || $Yp < $MaxY ) { $MaxY = $Yp; }
 
-       if ( $Xp1 <= floor($X1) ) { $Xp1++; }
-       if ( $Xp2 >= floor($X2) ) { $Xp2--; }
-       $Xp1++;
+        if ( $Xp1 <= floor($X1) ) { $Xp1++; }
+        if ( $Xp2 >= floor($X2) ) { $Xp2--; }
+        $Xp1++;
 
-       if ( !isset($Positions[$Yp]) )
+        if ( !isset($Positions[$Yp]) )
         { $Positions[$Yp]["X1"] = $Xp1; $Positions[$Yp]["X2"] = $Xp2; }
-       else
+        else
         { $Positions[$Yp]["X1"] = ($Positions[$Yp]["X1"]+$Xp1)/2; $Positions[$Yp]["X2"] = ($Positions[$Yp]["X2"]+$Xp2)/2; }
-      }
+        }
 
-     $ManualColor  = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-     foreach($Positions as $Yp => $Bounds)
-      {
-       $X1 = $Bounds["X1"]; $X1Dec = $this->getFirstDecimal($X1); if ( $X1Dec != 0 ) { $X1 = floor($X1)+1; }
-       $X2 = $Bounds["X2"]; $X2Dec = $this->getFirstDecimal($X2); if ( $X2Dec != 0 ) { $X2 = floor($X2)-1; }
-       imageline($this->Picture,$X1,$Yp,$X2,$Yp,$ManualColor);
-      }
-     $this->drawFilledRectangle($X1,$MinY+1,floor($X2),$MaxY-1,$Color);
+        $ManualColor  = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        foreach($Positions as $Yp => $Bounds)
+        {
+        $X1 = $Bounds["X1"]; $X1Dec = $this->getFirstDecimal($X1); if ( $X1Dec != 0 ) { $X1 = floor($X1)+1; }
+        $X2 = $Bounds["X2"]; $X2Dec = $this->getFirstDecimal($X2); if ( $X2Dec != 0 ) { $X2 = floor($X2)-1; }
+        imageline($this->Picture,$X1,$Yp,$X2,$Yp,$ManualColor);
+        }
+        $this->drawFilledRectangle($X1,$MinY+1,floor($X2),$MaxY-1,$Color);
 
-     $Radius++;
-     $this->drawRoundedRectangle($X1,$Y1,$X2+1,$Y2-1,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+        $Radius++;
+        $this->drawRoundedRectangle($X1,$Y1,$X2+1,$Y2-1,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
 
-     $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Draw a rectangle with rounded corners */
-   function drawRoundedFilledRectangle_deprecated($X1,$Y1,$X2,$Y2,$Radius,$Format="")
+    /* Draw a rectangle with rounded corners */
+    function drawRoundedFilledRectangle_deprecated($X1,$Y1,$X2,$Y2,$Radius,$Format="")
     {
-     $R			= isset($Format["R"]) ? $Format["R"] : 0;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $R			= isset($Format["R"]) ? $Format["R"] : 0;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
 
-     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-     if ( $BorderR == -1 ) { $BorderR = $R; $BorderG = $G; $BorderB = $B; }
+        if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+        if ( $BorderR == -1 ) { $BorderR = $R; $BorderG = $G; $BorderB = $B; }
 
-     list($X1,$Y1,$X2,$Y2) = $this->fixBoxCoordinates($X1,$Y1,$X2,$Y2);
+        list($X1,$Y1,$X2,$Y2) = $this->fixBoxCoordinates($X1,$Y1,$X2,$Y2);
 
-     if ( $X2 - $X1 < $Radius ) { $Radius = floor((($X2-$X1)+2)/2); }
-     if ( $Y2 - $Y1 < $Radius ) { $Radius = floor((($Y2-$Y1)+2)/2); }
+        if ( $X2 - $X1 < $Radius ) { $Radius = floor((($X2-$X1)+2)/2); }
+        if ( $Y2 - $Y1 < $Radius ) { $Radius = floor((($Y2-$Y1)+2)/2); }
 
-     $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $this->Shadow = FALSE;
-       $this->drawRoundedFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
-      }
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $this->Shadow = FALSE;
+        $this->drawRoundedFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+        }
 
-     if ( $this->getFirstDecimal($X2) >= 5 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
-     if ( $this->getFirstDecimal($X1) <= 5 )  { $XOffset1 = 1; } else { $XOffset1 = 0; }
+        if ( $this->getFirstDecimal($X2) >= 5 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
+        if ( $this->getFirstDecimal($X1) <= 5 )  { $XOffset1 = 1; } else { $XOffset1 = 0; }
 
-     if ( !$this->Antialias ) { $XOffset1 = 1; $XOffset2 = 1; }
+        if ( !$this->Antialias ) { $XOffset1 = 1; $XOffset2 = 1; }
 
-     $YTop    = floor($Y1+$Radius);
-     $YBottom = floor($Y2-$Radius);
+        $YTop    = floor($Y1+$Radius);
+        $YBottom = floor($Y2-$Radius);
 
-     $this->drawFilledRectangle($X1-$XOffset1,$YTop,$X2+$XOffset2,$YBottom,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"NoBorder"=>TRUE));
+        $this->drawFilledRectangle($X1-$XOffset1,$YTop,$X2+$XOffset2,$YBottom,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"NoBorder"=>TRUE));
 
-     $Step = 360 / (2 * PI * $Radius);
-     $Color  = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-     $Color2 = $this->allocateColor($this->Picture,255,0,0,$Alpha);
-     $Drawn = "";
+        $Step = 360 / (2 * PI * $Radius);
+        $Color  = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        $Color2 = $this->allocateColor($this->Picture,255,0,0,$Alpha);
+        $Drawn = "";
 
-     if ( $Alpha < 100 )  { $Drawn[$YTop] = FALSE; }
-     if ( $Alpha < 100 )  { $Drawn[$YBottom] = TRUE; }
+        if ( $Alpha < 100 )  { $Drawn[$YTop] = FALSE; }
+        if ( $Alpha < 100 )  { $Drawn[$YBottom] = TRUE; }
      
-     for($i=0;$i<=90;$i=$i+$Step)
-      {
-       $Xp1 = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
-       $Xp2 = cos(((90-$i)+270)*PI/180) * $Radius + $X2 - $Radius;
-       $Yp  = sin(($i+180)*PI/180) * $Radius + $YTop;
+        for($i=0;$i<=90;$i=$i+$Step)
+        {
+        $Xp1 = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
+        $Xp2 = cos(((90-$i)+270)*PI/180) * $Radius + $X2 - $Radius;
+        $Yp  = sin(($i+180)*PI/180) * $Radius + $YTop;
 
-       if ( $this->getFirstDecimal($Xp1) > 5 )  { $XOffset1 = 1; } else { $XOffset1 = 0; }
-       if ( $this->getFirstDecimal($Xp2) > 5 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
-       if ( $this->getFirstDecimal($Yp) > 5 )  { $YOffset = 1; } else { $YOffset = 0; }
+        if ( $this->getFirstDecimal($Xp1) > 5 )  { $XOffset1 = 1; } else { $XOffset1 = 0; }
+        if ( $this->getFirstDecimal($Xp2) > 5 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
+        if ( $this->getFirstDecimal($Yp) > 5 )  { $YOffset = 1; } else { $YOffset = 0; }
 
-       if ( !isset($Drawn[$Yp+$YOffset]) || $Alpha == 100 )
+        if ( !isset($Drawn[$Yp+$YOffset]) || $Alpha == 100 )
         imageline($this->Picture,$Xp1+$XOffset1,$Yp+$YOffset,$Xp2+$XOffset2,$Yp+$YOffset,$Color);
 
-       $Drawn[$Yp+$YOffset] = $Xp2;
+        $Drawn[$Yp+$YOffset] = $Xp2;
 
-       $Xp1 = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
-       $Xp2 = cos((90-$i)*PI/180) * $Radius + $X2 - $Radius;
-       $Yp  = sin(($i+90)*PI/180) * $Radius + $YBottom;
+        $Xp1 = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
+        $Xp2 = cos((90-$i)*PI/180) * $Radius + $X2 - $Radius;
+        $Yp  = sin(($i+90)*PI/180) * $Radius + $YBottom;
 
-       if ( $this->getFirstDecimal($Xp1) > 7 )  { $XOffset1 = 1; } else { $XOffset1 = 0; }
-       if ( $this->getFirstDecimal($Xp2) > 7 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
-       if ( $this->getFirstDecimal($Yp) > 5 )  { $YOffset = 1; } else { $YOffset = 0; }
+        if ( $this->getFirstDecimal($Xp1) > 7 )  { $XOffset1 = 1; } else { $XOffset1 = 0; }
+        if ( $this->getFirstDecimal($Xp2) > 7 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
+        if ( $this->getFirstDecimal($Yp) > 5 )  { $YOffset = 1; } else { $YOffset = 0; }
 
-       if ( !isset($Drawn[$Yp+$YOffset]) || $Alpha == 100 )
+        if ( !isset($Drawn[$Yp+$YOffset]) || $Alpha == 100 )
         imageline($this->Picture,$Xp1+$XOffset1,$Yp+$YOffset,$Xp2+$XOffset2,$Yp+$YOffset,$Color);
 
-       $Drawn[$Yp+$YOffset] = $Xp2;
-      }
+        $Drawn[$Yp+$YOffset] = $Xp2;
+        }
 
-     $this->drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+        $this->drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
 
-     $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Draw a rectangle */
-   function drawRectangle($X1,$Y1,$X2,$Y2,$Format="")
+    /* Draw a rectangle */
+    function drawRectangle($X1,$Y1,$X2,$Y2,$Format="")
     {
-     $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;
-     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-     $NoAngle	= isset($Format["NoAngle"]) ? $Format["NoAngle"] : FALSE;
-
-     if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
-     if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
-
-     if ( $this->Antialias )
-      {
-       if ( $NoAngle )
-        {
-         $this->drawLine($X1+1,$Y1,$X2-1,$Y1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-         $this->drawLine($X2,$Y1+1,$X2,$Y2-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-         $this->drawLine($X2-1,$Y2,$X1+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-         $this->drawLine($X1,$Y1+1,$X1,$Y2-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-        }
-       else
-        {
-         $this->drawLine($X1+1,$Y1,$X2-1,$Y1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-         $this->drawLine($X2,$Y1,$X2,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-         $this->drawLine($X2-1,$Y2,$X1+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-         $this->drawLine($X1,$Y1,$X1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-        }
-      }
-     else
-      {
-       $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-       imagerectangle($this->Picture,$X1,$Y1,$X2,$Y2,$Color);
-      }
+        $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;
+        $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $NoAngle	= isset($Format["NoAngle"]) ? $Format["NoAngle"] : FALSE;
+
+        if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
+        if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
+
+        if ( $this->Antialias )
+        {
+        if ( $NoAngle )
+        {
+            $this->drawLine($X1+1,$Y1,$X2-1,$Y1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            $this->drawLine($X2,$Y1+1,$X2,$Y2-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            $this->drawLine($X2-1,$Y2,$X1+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            $this->drawLine($X1,$Y1+1,$X1,$Y2-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+        }
+        else
+        {
+            $this->drawLine($X1+1,$Y1,$X2-1,$Y1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            $this->drawLine($X2,$Y1,$X2,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            $this->drawLine($X2-1,$Y2,$X1+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            $this->drawLine($X1,$Y1,$X1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+        }
+        }
+        else
+        {
+        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        imagerectangle($this->Picture,$X1,$Y1,$X2,$Y2,$Color);
+        }
     }
 
-   /* Draw a filled rectangle */
-   function drawFilledRectangle($X1,$Y1,$X2,$Y2,$Format="")
+    /* Draw a filled rectangle */
+    function drawFilledRectangle($X1,$Y1,$X2,$Y2,$Format="")
     {
-     $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;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
-     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-     $NoAngle		= isset($Format["NoAngle"]) ? $Format["NoAngle"] : NULL;
-     $Dash		= isset($Format["Dash"]) ? $Format["Dash"] : FALSE;
-     $DashStep		= isset($Format["DashStep"]) ? $Format["DashStep"] : 4;
-     $DashR		= isset($Format["DashR"]) ? $Format["DashR"] : 0;
-     $DashG		= isset($Format["DashG"]) ? $Format["DashG"] : 0;
-     $DashB		= isset($Format["DashB"]) ? $Format["DashB"] : 0;
-     $NoBorder		= isset($Format["NoBorder"]) ? $Format["NoBorder"] : FALSE;
-
-     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-
-     if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
-     if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
-
-     $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $this->Shadow = FALSE;
-       $this->drawFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks,"NoAngle"=>$NoAngle));
-      }
-
-     $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-     if ( $NoAngle )
-      {
-       imagefilledrectangle($this->Picture,ceil($X1)+1,ceil($Y1),floor($X2)-1,floor($Y2),$Color);
-       imageline($this->Picture,ceil($X1),ceil($Y1)+1,ceil($X1),floor($Y2)-1,$Color);
-       imageline($this->Picture,floor($X2),ceil($Y1)+1,floor($X2),floor($Y2)-1,$Color);
-      }
-     else
-      imagefilledrectangle($this->Picture,ceil($X1),ceil($Y1),floor($X2),floor($Y2),$Color);
-
-     if ( $Dash )
-      {
-       if ( $BorderR != -1 ) { $iX1=$X1+1; $iY1=$Y1+1; $iX2=$X2-1; $iY2=$Y2-1; } else { $iX1=$X1; $iY1=$Y1; $iX2=$X2; $iY2=$Y2; }
-
-       $Color = $this->allocateColor($this->Picture,$DashR,$DashG,$DashB,$Alpha);
-       $Y=$iY1-$DashStep;
-       for($X=$iX1; $X<=$iX2+($iY2-$iY1); $X=$X+$DashStep)
-        {
-         $Y=$Y+$DashStep;
-         if ( $X > $iX2 ) { $Xa = $X-($X-$iX2); $Ya = $iY1+($X-$iX2); } else { $Xa = $X; $Ya = $iY1; }
-         if ( $Y > $iY2 ) { $Xb = $iX1+($Y-$iY2); $Yb = $Y-($Y-$iY2); } else { $Xb = $iX1; $Yb = $Y; }
-         imageline($this->Picture,$Xa,$Ya,$Xb,$Yb,$Color);
-        }
-      }
-
-     if ( $this->Antialias && !$NoBorder )
-      {
-       if ( $X1 < ceil($X1) )
-        {
-         $AlphaA = $Alpha * (ceil($X1) - $X1);
-         $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
-         imageline($this->Picture,ceil($X1)-1,ceil($Y1),ceil($X1)-1,floor($Y2),$Color);
-        }
-
-       if ( $Y1 < ceil($Y1) )
-        {
-         $AlphaA = $Alpha * (ceil($Y1) - $Y1);
-         $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
-         imageline($this->Picture,ceil($X1),ceil($Y1)-1,floor($X2),ceil($Y1)-1,$Color);
-        }
-
-       if ( $X2 > floor($X2) )
-        {
-         $AlphaA = $Alpha * (.5-($X2 - floor($X2)));
-         $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
-         imageline($this->Picture,floor($X2)+1,ceil($Y1),floor($X2)+1,floor($Y2),$Color);
+        $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;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+        $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $NoAngle		= isset($Format["NoAngle"]) ? $Format["NoAngle"] : NULL;
+        $Dash		= isset($Format["Dash"]) ? $Format["Dash"] : FALSE;
+        $DashStep		= isset($Format["DashStep"]) ? $Format["DashStep"] : 4;
+        $DashR		= isset($Format["DashR"]) ? $Format["DashR"] : 0;
+        $DashG		= isset($Format["DashG"]) ? $Format["DashG"] : 0;
+        $DashB		= isset($Format["DashB"]) ? $Format["DashB"] : 0;
+        $NoBorder		= isset($Format["NoBorder"]) ? $Format["NoBorder"] : FALSE;
+
+        if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+
+        if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
+        if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
+
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $this->Shadow = FALSE;
+        $this->drawFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks,"NoAngle"=>$NoAngle));
+        }
+
+        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        if ( $NoAngle )
+        {
+        imagefilledrectangle($this->Picture,ceil($X1)+1,ceil($Y1),floor($X2)-1,floor($Y2),$Color);
+        imageline($this->Picture,ceil($X1),ceil($Y1)+1,ceil($X1),floor($Y2)-1,$Color);
+        imageline($this->Picture,floor($X2),ceil($Y1)+1,floor($X2),floor($Y2)-1,$Color);
+        }
+        else
+        imagefilledrectangle($this->Picture,ceil($X1),ceil($Y1),floor($X2),floor($Y2),$Color);
+
+        if ( $Dash )
+        {
+        if ( $BorderR != -1 ) { $iX1=$X1+1; $iY1=$Y1+1; $iX2=$X2-1; $iY2=$Y2-1; } else { $iX1=$X1; $iY1=$Y1; $iX2=$X2; $iY2=$Y2; }
+
+        $Color = $this->allocateColor($this->Picture,$DashR,$DashG,$DashB,$Alpha);
+        $Y=$iY1-$DashStep;
+        for($X=$iX1; $X<=$iX2+($iY2-$iY1); $X=$X+$DashStep)
+        {
+            $Y=$Y+$DashStep;
+            if ( $X > $iX2 ) { $Xa = $X-($X-$iX2); $Ya = $iY1+($X-$iX2); } else { $Xa = $X; $Ya = $iY1; }
+            if ( $Y > $iY2 ) { $Xb = $iX1+($Y-$iY2); $Yb = $Y-($Y-$iY2); } else { $Xb = $iX1; $Yb = $Y; }
+            imageline($this->Picture,$Xa,$Ya,$Xb,$Yb,$Color);
+        }
+        }
+
+        if ( $this->Antialias && !$NoBorder )
+        {
+        if ( $X1 < ceil($X1) )
+        {
+            $AlphaA = $Alpha * (ceil($X1) - $X1);
+            $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
+            imageline($this->Picture,ceil($X1)-1,ceil($Y1),ceil($X1)-1,floor($Y2),$Color);
+        }
+
+        if ( $Y1 < ceil($Y1) )
+        {
+            $AlphaA = $Alpha * (ceil($Y1) - $Y1);
+            $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
+            imageline($this->Picture,ceil($X1),ceil($Y1)-1,floor($X2),ceil($Y1)-1,$Color);
+        }
+
+        if ( $X2 > floor($X2) )
+        {
+            $AlphaA = $Alpha * (.5-($X2 - floor($X2)));
+            $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
+            imageline($this->Picture,floor($X2)+1,ceil($Y1),floor($X2)+1,floor($Y2),$Color);
         } 
 
-       if ( $Y2 > floor($Y2) )
+        if ( $Y2 > floor($Y2) )
         {
-         $AlphaA = $Alpha * (.5-($Y2 - floor($Y2)));
-         $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
-         imageline($this->Picture,ceil($X1),floor($Y2)+1,floor($X2),floor($Y2)+1,$Color);
+            $AlphaA = $Alpha * (.5-($Y2 - floor($Y2)));
+            $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
+            imageline($this->Picture,ceil($X1),floor($Y2)+1,floor($X2),floor($Y2)+1,$Color);
+        }
         }
-      }
 
-     if ( $BorderR != -1 )
-      $this->drawRectangle($X1,$Y1,$X2,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$Ticks,"NoAngle"=>$NoAngle));
+        if ( $BorderR != -1 )
+        $this->drawRectangle($X1,$Y1,$X2,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$Ticks,"NoAngle"=>$NoAngle));
 
-     $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Draw a rectangular marker of the specified size */
-   function drawRectangleMarker($X,$Y,$Format="")
+    /* Draw a rectangular marker of the specified size */
+    function drawRectangleMarker($X,$Y,$Format="")
     {
-     $Size = isset($Format["Size"]) ? $Format["Size"] : 4;
+        $Size = isset($Format["Size"]) ? $Format["Size"] : 4;
 
-     $HalfSize = floor($Size/2);
-     $this->drawFilledRectangle($X-$HalfSize,$Y-$HalfSize,$X+$HalfSize,$Y+$HalfSize,$Format);
+        $HalfSize = floor($Size/2);
+        $this->drawFilledRectangle($X-$HalfSize,$Y-$HalfSize,$X+$HalfSize,$Y+$HalfSize,$Format);
     }
 
-   /* Drawn a spline based on the bezier function */
-   function drawSpline($Coordinates,$Format="")
+    /* Drawn a spline based on the bezier function */
+    function drawSpline($Coordinates,$Format="")
     {
-     $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;
-     $Force	= isset($Format["Force"]) ? $Format["Force"] : 30;
-     $Forces	= isset($Format["Forces"]) ? $Format["Forces"] : NULL;
-     $ShowC	= isset($Format["ShowControl"]) ? $Format["ShowControl"] : FALSE;
-     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-     $PathOnly	= isset($Format["PathOnly"]) ? $Format["PathOnly"] : FALSE;
-     $Weight	= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
-
-     $Cpt = NULL; $Mode = NULL; $Result = "";
-     for($i=1;$i<=count($Coordinates)-1;$i++)
-      {
-       $X1 = $Coordinates[$i-1][0]; $Y1 = $Coordinates[$i-1][1];
-       $X2 = $Coordinates[$i][0];   $Y2 = $Coordinates[$i][1];
-
-       if ( $Forces != NULL ) { $Force = $Forces[$i]; }
-
-       /* First segment */
-       if ( $i == 1 )
+        $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;
+        $Force	= isset($Format["Force"]) ? $Format["Force"] : 30;
+        $Forces	= isset($Format["Forces"]) ? $Format["Forces"] : NULL;
+        $ShowC	= isset($Format["ShowControl"]) ? $Format["ShowControl"] : FALSE;
+        $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $PathOnly	= isset($Format["PathOnly"]) ? $Format["PathOnly"] : FALSE;
+        $Weight	= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+
+        $Cpt = NULL; $Mode = NULL; $Result = "";
+        for($i=1;$i<=count($Coordinates)-1;$i++)
+        {
+        $X1 = $Coordinates[$i-1][0]; $Y1 = $Coordinates[$i-1][1];
+        $X2 = $Coordinates[$i][0];   $Y2 = $Coordinates[$i][1];
+
+        if ( $Forces != NULL ) { $Force = $Forces[$i]; }
+
+        /* First segment */
+        if ( $i == 1 )
         { $Xv1 = $X1; $Yv1 = $Y1; }
-       else
+        else
         {
-         $Angle1 = $this->getAngle($XLast,$YLast,$X1,$Y1);
-         $Angle2 = $this->getAngle($X1,$Y1,$X2,$Y2);
-         $XOff = cos($Angle2 * PI / 180) * $Force + $X1;
-         $YOff = sin($Angle2 * PI / 180) * $Force + $Y1;
+            $Angle1 = $this->getAngle($XLast,$YLast,$X1,$Y1);
+            $Angle2 = $this->getAngle($X1,$Y1,$X2,$Y2);
+            $XOff = cos($Angle2 * PI / 180) * $Force + $X1;
+            $YOff = sin($Angle2 * PI / 180) * $Force + $Y1;
 
-         $Xv1 = cos($Angle1 * PI / 180) * $Force + $XOff;
-         $Yv1 = sin($Angle1 * PI / 180) * $Force + $YOff;
+            $Xv1 = cos($Angle1 * PI / 180) * $Force + $XOff;
+            $Yv1 = sin($Angle1 * PI / 180) * $Force + $YOff;
         }
 
-       /* Last segment */
-       if ( $i == count($Coordinates)-1 )
+        /* Last segment */
+        if ( $i == count($Coordinates)-1 )
         { $Xv2 = $X2; $Yv2 = $Y2; }
-       else
+        else
         {
-         $Angle1 = $this->getAngle($X2,$Y2,$Coordinates[$i+1][0],$Coordinates[$i+1][1]);
-         $Angle2 = $this->getAngle($X1,$Y1,$X2,$Y2);
-         $XOff = cos(($Angle2+180) * PI / 180) * $Force + $X2;
-         $YOff = sin(($Angle2+180) * PI / 180) * $Force + $Y2;
+            $Angle1 = $this->getAngle($X2,$Y2,$Coordinates[$i+1][0],$Coordinates[$i+1][1]);
+            $Angle2 = $this->getAngle($X1,$Y1,$X2,$Y2);
+            $XOff = cos(($Angle2+180) * PI / 180) * $Force + $X2;
+            $YOff = sin(($Angle2+180) * PI / 180) * $Force + $Y2;
 
-         $Xv2 = cos(($Angle1+180) * PI / 180) * $Force + $XOff;
-         $Yv2 = sin(($Angle1+180) * PI / 180) * $Force + $YOff;
+            $Xv2 = cos(($Angle1+180) * PI / 180) * $Force + $XOff;
+            $Yv2 = sin(($Angle1+180) * PI / 180) * $Force + $YOff;
         }
 
-       $Path = $this->drawBezier($X1,$Y1,$X2,$Y2,$Xv1,$Yv1,$Xv2,$Yv2,$Format);
-       if ($PathOnly) { $Result[] = $Path; }
+        $Path = $this->drawBezier($X1,$Y1,$X2,$Y2,$Xv1,$Yv1,$Xv2,$Yv2,$Format);
+        if ($PathOnly) { $Result[] = $Path; }
 
-       $XLast = $X1; $YLast = $Y1;
-      }
+        $XLast = $X1; $YLast = $Y1;
+        }
 
-     return($Result);
+        return($Result);
     }
 
-   /* Draw a bezier curve with two controls points */
-   function drawBezier($X1,$Y1,$X2,$Y2,$Xv1,$Yv1,$Xv2,$Yv2,$Format="")
+    /* Draw a bezier curve with two controls points */
+    function drawBezier($X1,$Y1,$X2,$Y2,$Xv1,$Yv1,$Xv2,$Yv2,$Format="")
     {
-     $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;
-     $ShowC	= isset($Format["ShowControl"]) ? $Format["ShowControl"] : FALSE;
-     $Segments	= isset($Format["Segments"]) ? $Format["Segments"] : NULL;
-     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-     $NoDraw    = isset($Format["NoDraw"]) ? $Format["NoDraw"] : FALSE;
-     $PathOnly  = isset($Format["PathOnly"]) ? $Format["PathOnly"] : FALSE;
-     $Weight    = isset($Format["Weight"]) ? $Format["Weight"] : NULL;
-     $DrawArrow		= isset($Format["DrawArrow"]) ? $Format["DrawArrow"] : FALSE;
-     $ArrowSize		= isset($Format["ArrowSize"]) ? $Format["ArrowSize"] : 10;
-     $ArrowRatio	= isset($Format["ArrowRatio"]) ? $Format["ArrowRatio"] : .5;
-     $ArrowTwoHeads	= isset($Format["ArrowTwoHeads"]) ? $Format["ArrowTwoHeads"] : FALSE;
-
-     if ( $Segments == NULL )
-      {
-       $Length    = $this->getLength($X1,$Y1,$X2,$Y2);
-       $Precision = ($Length*125)/1000;
-      }
-     else
-      $Precision = $Segments;
+        $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;
+        $ShowC	= isset($Format["ShowControl"]) ? $Format["ShowControl"] : FALSE;
+        $Segments	= isset($Format["Segments"]) ? $Format["Segments"] : NULL;
+        $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $NoDraw    = isset($Format["NoDraw"]) ? $Format["NoDraw"] : FALSE;
+        $PathOnly  = isset($Format["PathOnly"]) ? $Format["PathOnly"] : FALSE;
+        $Weight    = isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+        $DrawArrow		= isset($Format["DrawArrow"]) ? $Format["DrawArrow"] : FALSE;
+        $ArrowSize		= isset($Format["ArrowSize"]) ? $Format["ArrowSize"] : 10;
+        $ArrowRatio	= isset($Format["ArrowRatio"]) ? $Format["ArrowRatio"] : .5;
+        $ArrowTwoHeads	= isset($Format["ArrowTwoHeads"]) ? $Format["ArrowTwoHeads"] : FALSE;
+
+        if ( $Segments == NULL )
+        {
+        $Length    = $this->getLength($X1,$Y1,$X2,$Y2);
+        $Precision = ($Length*125)/1000;
+        }
+        else
+        $Precision = $Segments;
 
-     $P[0]["X"] = $X1;  $P[0]["Y"] = $Y1;
-     $P[1]["X"] = $Xv1; $P[1]["Y"] = $Yv1;
-     $P[2]["X"] = $Xv2; $P[2]["Y"] = $Yv2;
-     $P[3]["X"] = $X2;  $P[3]["Y"] = $Y2;
+        $P[0]["X"] = $X1;  $P[0]["Y"] = $Y1;
+        $P[1]["X"] = $Xv1; $P[1]["Y"] = $Yv1;
+        $P[2]["X"] = $Xv2; $P[2]["Y"] = $Yv2;
+        $P[3]["X"] = $X2;  $P[3]["Y"] = $Y2;
 
-     /* Compute the bezier points */
-     $Q = ""; $ID = 0; $Path = "";
-     for($i=0;$i<=$Precision;$i=$i+1)
-      {
-       $u = $i / $Precision;
+        /* Compute the bezier points */
+        $Q = ""; $ID = 0; $Path = "";
+        for($i=0;$i<=$Precision;$i=$i+1)
+        {
+        $u = $i / $Precision;
 
-       $C    = "";
-       $C[0] = (1 - $u) * (1 - $u) * (1 - $u);
-       $C[1] = ($u * 3) * (1 - $u) * (1 - $u);
-       $C[2] = 3 * $u * $u * (1 - $u);
-       $C[3] = $u * $u * $u;
+        $C    = "";
+        $C[0] = (1 - $u) * (1 - $u) * (1 - $u);
+        $C[1] = ($u * 3) * (1 - $u) * (1 - $u);
+        $C[2] = 3 * $u * $u * (1 - $u);
+        $C[3] = $u * $u * $u;
 
-       for($j=0;$j<=3;$j++)
+        for($j=0;$j<=3;$j++)
         {
-         if ( !isset($Q[$ID]) ) { $Q[$ID] = ""; }
-         if ( !isset($Q[$ID]["X"]) ) { $Q[$ID]["X"] = 0; }
-         if ( !isset($Q[$ID]["Y"]) ) { $Q[$ID]["Y"] = 0; }
+            if ( !isset($Q[$ID]) ) { $Q[$ID] = ""; }
+            if ( !isset($Q[$ID]["X"]) ) { $Q[$ID]["X"] = 0; }
+            if ( !isset($Q[$ID]["Y"]) ) { $Q[$ID]["Y"] = 0; }
 
-         $Q[$ID]["X"] = $Q[$ID]["X"] + $P[$j]["X"] * $C[$j];
-         $Q[$ID]["Y"] = $Q[$ID]["Y"] + $P[$j]["Y"] * $C[$j];
+            $Q[$ID]["X"] = $Q[$ID]["X"] + $P[$j]["X"] * $C[$j];
+            $Q[$ID]["Y"] = $Q[$ID]["Y"] + $P[$j]["Y"] * $C[$j];
         }
-       $ID++;
-      }        
-     $Q[$ID]["X"] = $X2; $Q[$ID]["Y"] = $Y2;
+        $ID++;
+        }        
+        $Q[$ID]["X"] = $X2; $Q[$ID]["Y"] = $Y2;
 
-     if ( !$NoDraw )
-      {
-       /* Display the control points */
-       if ( $ShowC && !$PathOnly )
+        if ( !$NoDraw )
+        {
+        /* Display the control points */
+        if ( $ShowC && !$PathOnly )
         {
-         $Xv1 = floor($Xv1); $Yv1 = floor($Yv1); $Xv2 = floor($Xv2); $Yv2 = floor($Yv2);
+            $Xv1 = floor($Xv1); $Yv1 = floor($Yv1); $Xv2 = floor($Xv2); $Yv2 = floor($Yv2);
 
-         $this->drawLine($X1,$Y1,$X2,$Y2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>30));
+            $this->drawLine($X1,$Y1,$X2,$Y2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>30));
 
-         $MyMarkerSettings = array("R"=>255,"G"=>0,"B"=>0,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
-         $this->drawRectangleMarker($Xv1,$Yv1,$MyMarkerSettings);
-         $this->drawText($Xv1+4,$Yv1,"v1");
-         $MyMarkerSettings = array("R"=>0,"G"=>0,"B"=>255,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
-         $this->drawRectangleMarker($Xv2,$Yv2,$MyMarkerSettings);
-         $this->drawText($Xv2+4,$Yv2,"v2");
+            $MyMarkerSettings = array("R"=>255,"G"=>0,"B"=>0,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
+            $this->drawRectangleMarker($Xv1,$Yv1,$MyMarkerSettings);
+            $this->drawText($Xv1+4,$Yv1,"v1");
+            $MyMarkerSettings = array("R"=>0,"G"=>0,"B"=>255,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
+            $this->drawRectangleMarker($Xv2,$Yv2,$MyMarkerSettings);
+            $this->drawText($Xv2+4,$Yv2,"v2");
         }
 
-       /* Draw the bezier */
-       $LastX = NULL; $LastY = NULL; $Cpt = NULL; $Mode = NULL; $ArrowS = NULL;
-       foreach ($Q as $Key => $Point)
+        /* Draw the bezier */
+        $LastX = NULL; $LastY = NULL; $Cpt = NULL; $Mode = NULL; $ArrowS = NULL;
+        foreach ($Q as $Key => $Point)
         {
-         $X = $Point["X"]; $Y = $Point["Y"];
+            $X = $Point["X"]; $Y = $Point["Y"];
 
-         /* Get the first segment */
-         if ( $ArrowS == NULL && $LastX != NULL && $LastY != NULL )
-          { $ArrowS["X2"] = $LastX; $ArrowS["Y2"] = $LastY; $ArrowS["X1"] = $X; $ArrowS["Y1"] = $Y; }
+            /* Get the first segment */
+            if ( $ArrowS == NULL && $LastX != NULL && $LastY != NULL )
+            { $ArrowS["X2"] = $LastX; $ArrowS["Y2"] = $LastY; $ArrowS["X1"] = $X; $ArrowS["Y1"] = $Y; }
 
-         if ( $LastX != NULL && $LastY != NULL && !$PathOnly)
-          list($Cpt,$Mode) = $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Cpt"=>$Cpt,"Mode"=>$Mode,"Weight"=>$Weight));
+            if ( $LastX != NULL && $LastY != NULL && !$PathOnly)
+            list($Cpt,$Mode) = $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Cpt"=>$Cpt,"Mode"=>$Mode,"Weight"=>$Weight));
 
-         /* Get the last segment */
-         $ArrowE["X1"] = $LastX; $ArrowE["Y1"] = $LastY; $ArrowE["X2"] = $X; $ArrowE["Y2"] = $Y;
+            /* Get the last segment */
+            $ArrowE["X1"] = $LastX; $ArrowE["Y1"] = $LastY; $ArrowE["X2"] = $X; $ArrowE["Y2"] = $Y;
 
-         $LastX = $X; $LastY = $Y;
+            $LastX = $X; $LastY = $Y;
         }
 
-       if ( $DrawArrow && !$PathOnly )
+        if ( $DrawArrow && !$PathOnly )
         {
-         $ArrowSettings = array("FillR"=>$R,"FillG"=>$G,"FillB"=>$B,"Alpha"=>$Alpha,"Size"=>$ArrowSize,"Ratio"=>$ArrowRatio);
-         if ( $ArrowTwoHeads )
-          $this->drawArrow($ArrowS["X1"],$ArrowS["Y1"],$ArrowS["X2"],$ArrowS["Y2"],$ArrowSettings);
+            $ArrowSettings = array("FillR"=>$R,"FillG"=>$G,"FillB"=>$B,"Alpha"=>$Alpha,"Size"=>$ArrowSize,"Ratio"=>$ArrowRatio);
+            if ( $ArrowTwoHeads )
+            $this->drawArrow($ArrowS["X1"],$ArrowS["Y1"],$ArrowS["X2"],$ArrowS["Y2"],$ArrowSettings);
 
-         $this->drawArrow($ArrowE["X1"],$ArrowE["Y1"],$ArrowE["X2"],$ArrowE["Y2"],$ArrowSettings);
+            $this->drawArrow($ArrowE["X1"],$ArrowE["Y1"],$ArrowE["X2"],$ArrowE["Y2"],$ArrowSettings);
         }
-      }
-     return($Q);
+        }
+        return($Q);
     }
 
-   /* Draw a line between two points */
-   function drawLine($X1,$Y1,$X2,$Y2,$Format="")
+    /* Draw a line between two points */
+    function drawLine($X1,$Y1,$X2,$Y2,$Format="")
     {
-     $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;
-     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-     $Cpt	= isset($Format["Cpt"]) ? $Format["Cpt"] : 1;
-     $Mode	= isset($Format["Mode"]) ? $Format["Mode"] : 1;
-     $Weight	= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
-     $Threshold	= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
-
-     if ( $this->Antialias == FALSE && $Ticks == NULL )
-      {
-       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        $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;
+        $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $Cpt	= isset($Format["Cpt"]) ? $Format["Cpt"] : 1;
+        $Mode	= isset($Format["Mode"]) ? $Format["Mode"] : 1;
+        $Weight	= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+        $Threshold	= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
+
+        if ( $this->Antialias == FALSE && $Ticks == NULL )
         {
-         $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
-         imageline($this->Picture,$X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$ShadowColor);
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+            $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
+            imageline($this->Picture,$X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$ShadowColor);
         }
 
-       $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-       imageline($this->Picture,$X1,$Y1,$X2,$Y2,$Color);
-       return(0);
-      }
+        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        imageline($this->Picture,$X1,$Y1,$X2,$Y2,$Color);
+        return(0);
+        }
 
-     $Distance = sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1));  
-     if ( $Distance == 0 ) { return(-1); }
+        $Distance = sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1));  
+        if ( $Distance == 0 ) { return(-1); }
 
-     /* Derivative algorithm for overweighted lines, re-route to polygons primitives */
-     if ( $Weight != NULL )
-      {
-       $Angle        = $this->getAngle($X1,$Y1,$X2,$Y2);
-       $PolySettings = array ("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderAlpha"=>$Alpha);
+        /* Derivative algorithm for overweighted lines, re-route to polygons primitives */
+        if ( $Weight != NULL )
+        {
+        $Angle        = $this->getAngle($X1,$Y1,$X2,$Y2);
+        $PolySettings = array ("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderAlpha"=>$Alpha);
 
-       if ( $Ticks == NULL )
+        if ( $Ticks == NULL )
         {
-         $Points   = ""; 
-         $Points[] = cos(deg2rad($Angle-90)) * $Weight + $X1; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Y1;
-         $Points[] = cos(deg2rad($Angle+90)) * $Weight + $X1; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Y1;
-         $Points[] = cos(deg2rad($Angle+90)) * $Weight + $X2; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Y2;
-         $Points[] = cos(deg2rad($Angle-90)) * $Weight + $X2; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Y2;
+            $Points   = ""; 
+            $Points[] = cos(deg2rad($Angle-90)) * $Weight + $X1; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Y1;
+            $Points[] = cos(deg2rad($Angle+90)) * $Weight + $X1; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Y1;
+            $Points[] = cos(deg2rad($Angle+90)) * $Weight + $X2; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Y2;
+            $Points[] = cos(deg2rad($Angle-90)) * $Weight + $X2; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Y2;
 
-         $this->drawPolygon($Points,$PolySettings);
+            $this->drawPolygon($Points,$PolySettings);
         }
-       else
+        else
         {
-         for($i=0;$i<=$Distance;$i=$i+$Ticks*2)
-          {
-           $Xa = (($X2-$X1)/$Distance) * $i + $X1; $Ya = (($Y2-$Y1)/$Distance) * $i + $Y1;
-           $Xb = (($X2-$X1)/$Distance) * ($i+$Ticks) + $X1; $Yb = (($Y2-$Y1)/$Distance) * ($i+$Ticks) + $Y1;
+            for($i=0;$i<=$Distance;$i=$i+$Ticks*2)
+            {
+            $Xa = (($X2-$X1)/$Distance) * $i + $X1; $Ya = (($Y2-$Y1)/$Distance) * $i + $Y1;
+            $Xb = (($X2-$X1)/$Distance) * ($i+$Ticks) + $X1; $Yb = (($Y2-$Y1)/$Distance) * ($i+$Ticks) + $Y1;
 
-           $Points   = ""; 
-           $Points[] = cos(deg2rad($Angle-90)) * $Weight + $Xa; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Ya;
-           $Points[] = cos(deg2rad($Angle+90)) * $Weight + $Xa; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Ya;
-           $Points[] = cos(deg2rad($Angle+90)) * $Weight + $Xb; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Yb;
-           $Points[] = cos(deg2rad($Angle-90)) * $Weight + $Xb; $Points[] = sin(deg2rad($Angle-90)) * $Weight 	+ $Yb;
+            $Points   = ""; 
+            $Points[] = cos(deg2rad($Angle-90)) * $Weight + $Xa; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Ya;
+            $Points[] = cos(deg2rad($Angle+90)) * $Weight + $Xa; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Ya;
+            $Points[] = cos(deg2rad($Angle+90)) * $Weight + $Xb; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Yb;
+            $Points[] = cos(deg2rad($Angle-90)) * $Weight + $Xb; $Points[] = sin(deg2rad($Angle-90)) * $Weight 	+ $Yb;
 
-           $this->drawPolygon($Points,$PolySettings);
-          }
+            $this->drawPolygon($Points,$PolySettings);
+            }
         }
 
-       return(1);
-      }
+        return(1);
+        }
 
-     $XStep = ($X2-$X1) / $Distance;
-     $YStep = ($Y2-$Y1) / $Distance;
+        $XStep = ($X2-$X1) / $Distance;
+        $YStep = ($Y2-$Y1) / $Distance;
 
-     for($i=0;$i<=$Distance;$i++)
-      {
-       $X = $i * $XStep + $X1;
-       $Y = $i * $YStep + $Y1;
+        for($i=0;$i<=$Distance;$i++)
+        {
+        $X = $i * $XStep + $X1;
+        $Y = $i * $YStep + $Y1;
 
-       $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+        $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
 
-       if ( $Threshold != NULL )
+        if ( $Threshold != NULL )
         {
-         foreach($Threshold as $Key => $Parameters)
-          {
-           if ( $Y <= $Parameters["MinX"] && $Y >= $Parameters["MaxX"])
+            foreach($Threshold as $Key => $Parameters)
+            {
+            if ( $Y <= $Parameters["MinX"] && $Y >= $Parameters["MaxX"])
             {
-             if ( isset($Parameters["R"]) ) { $RT = $Parameters["R"]; } else { $RT = 0; }
-             if ( isset($Parameters["G"]) ) { $GT = $Parameters["G"]; } else { $GT = 0; }
-             if ( isset($Parameters["B"]) ) { $BT = $Parameters["B"]; } else { $BT = 0; }
-             if ( isset($Parameters["Alpha"]) ) { $AlphaT = $Parameters["Alpha"]; } else { $AlphaT = 0; }
-             $Color = array("R"=>$RT,"G"=>$GT,"B"=>$BT,"Alpha"=>$AlphaT);
+                if ( isset($Parameters["R"]) ) { $RT = $Parameters["R"]; } else { $RT = 0; }
+                if ( isset($Parameters["G"]) ) { $GT = $Parameters["G"]; } else { $GT = 0; }
+                if ( isset($Parameters["B"]) ) { $BT = $Parameters["B"]; } else { $BT = 0; }
+                if ( isset($Parameters["Alpha"]) ) { $AlphaT = $Parameters["Alpha"]; } else { $AlphaT = 0; }
+                $Color = array("R"=>$RT,"G"=>$GT,"B"=>$BT,"Alpha"=>$AlphaT);
+            }
             }
-          }
         }
 
-       if ( $Ticks != NULL )
+        if ( $Ticks != NULL )
         {
-         if ( $Cpt % $Ticks == 0 )
-          { $Cpt = 0; if ( $Mode == 1 ) { $Mode = 0; } else { $Mode = 1; } }
+            if ( $Cpt % $Ticks == 0 )
+            { $Cpt = 0; if ( $Mode == 1 ) { $Mode = 0; } else { $Mode = 1; } }
 
-         if ( $Mode == 1 )
-          $this->drawAntialiasPixel($X,$Y,$Color);
+            if ( $Mode == 1 )
+            $this->drawAntialiasPixel($X,$Y,$Color);
 
-         $Cpt++;
+            $Cpt++;
         }
-       else
+        else
         $this->drawAntialiasPixel($X,$Y,$Color);
-      }
+        }
 
-     return(array($Cpt,$Mode));
+        return(array($Cpt,$Mode));
     }
 
-   /* Draw a circle */
-   function drawCircle($Xc,$Yc,$Height,$Width,$Format="")
+    /* Draw a circle */
+    function drawCircle($Xc,$Yc,$Height,$Width,$Format="")
     {
-     $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;
-     $Ticks = isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $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;
+        $Ticks = isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
 
-     $Height	= abs($Height);
-     $Width	= abs($Width);
+        $Height	= abs($Height);
+        $Width	= abs($Width);
 
-     if ( $Height == 0 ) { $Height = 1; }
-     if ( $Width == 0 )  { $Width = 1; }
-     $Xc = floor($Xc); $Yc = floor($Yc);
+        if ( $Height == 0 ) { $Height = 1; }
+        if ( $Width == 0 )  { $Width = 1; }
+        $Xc = floor($Xc); $Yc = floor($Yc);
 
-     $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $this->Shadow = FALSE;
-       $this->drawCircle($Xc+$this->ShadowX,$Yc+$this->ShadowY,$Height,$Width,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks));
-      }
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $this->Shadow = FALSE;
+        $this->drawCircle($Xc+$this->ShadowX,$Yc+$this->ShadowY,$Height,$Width,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks));
+        }
 
-     if ( $Width == 0 ) { $Width = $Height; }
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+        if ( $Width == 0 ) { $Width = $Height; }
+        if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+        if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+        if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
 
-     $Step = 360 / (2 * PI * max($Width,$Height));
-     $Mode = 1; $Cpt = 1;
-     for($i=0;$i<=360;$i=$i+$Step)
-      {
-       $X = cos($i*PI/180) * $Height + $Xc;
-       $Y = sin($i*PI/180) * $Width + $Yc;
+        $Step = 360 / (2 * PI * max($Width,$Height));
+        $Mode = 1; $Cpt = 1;
+        for($i=0;$i<=360;$i=$i+$Step)
+        {
+        $X = cos($i*PI/180) * $Height + $Xc;
+        $Y = sin($i*PI/180) * $Width + $Yc;
 
-       if ( $Ticks != NULL )
+        if ( $Ticks != NULL )
         {
-         if ( $Cpt % $Ticks == 0 )
-          { $Cpt = 0; if ( $Mode == 1 ) { $Mode = 0; } else { $Mode = 1; } }
+            if ( $Cpt % $Ticks == 0 )
+            { $Cpt = 0; if ( $Mode == 1 ) { $Mode = 0; } else { $Mode = 1; } }
 
-         if ( $Mode == 1 )
-          $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+            if ( $Mode == 1 )
+            $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
 
-         $Cpt++;
+            $Cpt++;
         }
-       else
+        else
         $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
 
-      }
-     $this->Shadow = $RestoreShadow;
+        }
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Draw a filled circle */
-   function drawFilledCircle($X,$Y,$Radius,$Format="")
+    /* Draw a filled circle */
+    function drawFilledCircle($X,$Y,$Radius,$Format="")
     {
-     $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;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
-     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha;
-     $Ticks     	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-     $Surrounding 	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-
-     if ( $Radius == 0 ) { $Radius = 1; }
-     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-     $X = floor($X); $Y = floor($Y);
-
-     $Radius = abs($Radius);
-
-     $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $this->Shadow = FALSE;
-       $this->drawFilledCircle($X+$this->ShadowX,$Y+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks));
-      }
-
-     $this->Mask  = "";
-     $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-     for ($i=0; $i<=$Radius*2; $i++)
-      {
-       $Slice  = sqrt($Radius * $Radius - ($Radius - $i) * ($Radius - $i));
-       $XPos   = floor($Slice);
-       $YPos   = $Y + $i - $Radius;
-       $AAlias = $Slice - floor($Slice);
-
-       $this->Mask[$X-$XPos][$YPos] = TRUE;
-       $this->Mask[$X+$XPos][$YPos] = TRUE;
-       imageline($this->Picture,$X-$XPos,$YPos,$X+$XPos,$YPos,$Color);
-      }
-     if ( $this->Antialias )
-      $this->drawCircle($X,$Y,$Radius,$Radius,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-
-     $this->Mask = "";
-
-     if ( $BorderR != -1 )
-      $this->drawCircle($X,$Y,$Radius,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$Ticks));
-
-     $this->Shadow	= $RestoreShadow;
+        $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;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+        $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha;
+        $Ticks     	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $Surrounding 	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+
+        if ( $Radius == 0 ) { $Radius = 1; }
+        if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+        $X = floor($X); $Y = floor($Y);
+
+        $Radius = abs($Radius);
+
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $this->Shadow = FALSE;
+        $this->drawFilledCircle($X+$this->ShadowX,$Y+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks));
+        }
+
+        $this->Mask  = "";
+        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        for ($i=0; $i<=$Radius*2; $i++)
+        {
+        $Slice  = sqrt($Radius * $Radius - ($Radius - $i) * ($Radius - $i));
+        $XPos   = floor($Slice);
+        $YPos   = $Y + $i - $Radius;
+        $AAlias = $Slice - floor($Slice);
+
+        $this->Mask[$X-$XPos][$YPos] = TRUE;
+        $this->Mask[$X+$XPos][$YPos] = TRUE;
+        imageline($this->Picture,$X-$XPos,$YPos,$X+$XPos,$YPos,$Color);
+        }
+        if ( $this->Antialias )
+        $this->drawCircle($X,$Y,$Radius,$Radius,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+
+        $this->Mask = "";
+
+        if ( $BorderR != -1 )
+        $this->drawCircle($X,$Y,$Radius,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$Ticks));
+
+        $this->Shadow	= $RestoreShadow;
     }
 
-   /* Write text */
-   function drawText($X,$Y,$Text,$Format="")
+    /* Write text */
+    function drawText($X,$Y,$Text,$Format="")
     {
-     $R			= isset($Format["R"]) ? $Format["R"] : $this->FontColorR;
-     $G			= isset($Format["G"]) ? $Format["G"] : $this->FontColorG;
-     $B			= isset($Format["B"]) ? $Format["B"] : $this->FontColorB;
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $Align		= isset($Format["Align"]) ? $Format["Align"] : TEXT_ALIGN_BOTTOMLEFT;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->FontColorA;
-     $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
-     $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
-     $ShowOrigine	= isset($Format["ShowOrigine"]) ? $Format["ShowOrigine"] : FALSE;
-     $TOffset		= isset($Format["TOffset"]) ? $Format["TOffset"] : 2;
-     $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : FALSE;
-     $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : TRUE;
-     $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 6;
-     $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : FALSE;
-     $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 6;
-     $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 255;
-     $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 255;
-     $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 255;
-     $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 50;
-     $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
-     $BoxBorderR	= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
-     $BoxBorderG	= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
-     $BoxBorderB	= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
-     $BoxBorderAlpha	= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 50;
-     $NoShadow		= isset($Format["NoShadow"]) ? $Format["NoShadow"] : FALSE;
-
-     $Shadow = $this->Shadow;
-     if ( $NoShadow ) { $this->Shadow = FALSE; }
-
-     if ( $BoxSurrounding != "" ) { $BoxBorderR = $BoxR - $BoxSurrounding; $BoxBorderG = $BoxG - $BoxSurrounding; $BoxBorderB = $BoxB - $BoxSurrounding; $BoxBorderAlpha = $BoxAlpha; }
-
-     if ( $ShowOrigine )
-      {
-       $MyMarkerSettings = array("R"=>255,"G"=>0,"B"=>0,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
-       $this->drawRectangleMarker($X,$Y,$MyMarkerSettings);
-      }
-
-     $TxtPos = $this->getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text);
-
-     if ( $DrawBox && ($Angle == 0 || $Angle == 90 || $Angle == 180 || $Angle == 270))
-      {
-       $T[0]["X"]=0;$T[0]["Y"]=0;$T[1]["X"]=0;$T[1]["Y"]=0;$T[2]["X"]=0;$T[2]["Y"]=0;$T[3]["X"]=0;$T[3]["Y"]=0;
-       if ( $Angle == 0 ) { $T[0]["X"]=-$TOffset;$T[0]["Y"]=$TOffset;$T[1]["X"]=$TOffset;$T[1]["Y"]=$TOffset;$T[2]["X"]=$TOffset;$T[2]["Y"]=-$TOffset;$T[3]["X"]=-$TOffset;$T[3]["Y"]=-$TOffset; }
-
-       $X1 = min($TxtPos[0]["X"],$TxtPos[1]["X"],$TxtPos[2]["X"],$TxtPos[3]["X"]) - $BorderOffset + 3;
-       $Y1 = min($TxtPos[0]["Y"],$TxtPos[1]["Y"],$TxtPos[2]["Y"],$TxtPos[3]["Y"]) - $BorderOffset;
-       $X2 = max($TxtPos[0]["X"],$TxtPos[1]["X"],$TxtPos[2]["X"],$TxtPos[3]["X"]) + $BorderOffset + 3;
-       $Y2 = max($TxtPos[0]["Y"],$TxtPos[1]["Y"],$TxtPos[2]["Y"],$TxtPos[3]["Y"]) + $BorderOffset - 3;
-
-       $X1 = $X1 - $TxtPos[$Align]["X"] + $X + $T[0]["X"];
-       $Y1 = $Y1 - $TxtPos[$Align]["Y"] + $Y + $T[0]["Y"];
-       $X2 = $X2 - $TxtPos[$Align]["X"] + $X + $T[0]["X"];
-       $Y2 = $Y2 - $TxtPos[$Align]["Y"] + $Y + $T[0]["Y"];
-
-       $Settings = array("R"=>$BoxR,"G"=>$BoxG,"B"=>$BoxB,"Alpha"=>$BoxAlpha,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"BorderAlpha"=>$BoxBorderAlpha);
-
-       if ( $BoxRounded )
+        $R			= isset($Format["R"]) ? $Format["R"] : $this->FontColorR;
+        $G			= isset($Format["G"]) ? $Format["G"] : $this->FontColorG;
+        $B			= isset($Format["B"]) ? $Format["B"] : $this->FontColorB;
+        $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+        $Align		= isset($Format["Align"]) ? $Format["Align"] : TEXT_ALIGN_BOTTOMLEFT;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->FontColorA;
+        $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
+        $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
+        $ShowOrigine	= isset($Format["ShowOrigine"]) ? $Format["ShowOrigine"] : FALSE;
+        $TOffset		= isset($Format["TOffset"]) ? $Format["TOffset"] : 2;
+        $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : FALSE;
+        $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : TRUE;
+        $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 6;
+        $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : FALSE;
+        $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 6;
+        $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 255;
+        $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 255;
+        $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 255;
+        $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 50;
+        $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
+        $BoxBorderR	= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
+        $BoxBorderG	= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
+        $BoxBorderB	= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
+        $BoxBorderAlpha	= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 50;
+        $NoShadow		= isset($Format["NoShadow"]) ? $Format["NoShadow"] : FALSE;
+
+        $Shadow = $this->Shadow;
+        if ( $NoShadow ) { $this->Shadow = FALSE; }
+
+        if ( $BoxSurrounding != "" ) { $BoxBorderR = $BoxR - $BoxSurrounding; $BoxBorderG = $BoxG - $BoxSurrounding; $BoxBorderB = $BoxB - $BoxSurrounding; $BoxBorderAlpha = $BoxAlpha; }
+
+        if ( $ShowOrigine )
+        {
+        $MyMarkerSettings = array("R"=>255,"G"=>0,"B"=>0,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
+        $this->drawRectangleMarker($X,$Y,$MyMarkerSettings);
+        }
+
+        $TxtPos = $this->getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text);
+
+        if ( $DrawBox && ($Angle == 0 || $Angle == 90 || $Angle == 180 || $Angle == 270))
+        {
+        $T[0]["X"]=0;$T[0]["Y"]=0;$T[1]["X"]=0;$T[1]["Y"]=0;$T[2]["X"]=0;$T[2]["Y"]=0;$T[3]["X"]=0;$T[3]["Y"]=0;
+        if ( $Angle == 0 ) { $T[0]["X"]=-$TOffset;$T[0]["Y"]=$TOffset;$T[1]["X"]=$TOffset;$T[1]["Y"]=$TOffset;$T[2]["X"]=$TOffset;$T[2]["Y"]=-$TOffset;$T[3]["X"]=-$TOffset;$T[3]["Y"]=-$TOffset; }
+
+        $X1 = min($TxtPos[0]["X"],$TxtPos[1]["X"],$TxtPos[2]["X"],$TxtPos[3]["X"]) - $BorderOffset + 3;
+        $Y1 = min($TxtPos[0]["Y"],$TxtPos[1]["Y"],$TxtPos[2]["Y"],$TxtPos[3]["Y"]) - $BorderOffset;
+        $X2 = max($TxtPos[0]["X"],$TxtPos[1]["X"],$TxtPos[2]["X"],$TxtPos[3]["X"]) + $BorderOffset + 3;
+        $Y2 = max($TxtPos[0]["Y"],$TxtPos[1]["Y"],$TxtPos[2]["Y"],$TxtPos[3]["Y"]) + $BorderOffset - 3;
+
+        $X1 = $X1 - $TxtPos[$Align]["X"] + $X + $T[0]["X"];
+        $Y1 = $Y1 - $TxtPos[$Align]["Y"] + $Y + $T[0]["Y"];
+        $X2 = $X2 - $TxtPos[$Align]["X"] + $X + $T[0]["X"];
+        $Y2 = $Y2 - $TxtPos[$Align]["Y"] + $Y + $T[0]["Y"];
+
+        $Settings = array("R"=>$BoxR,"G"=>$BoxG,"B"=>$BoxB,"Alpha"=>$BoxAlpha,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"BorderAlpha"=>$BoxBorderAlpha);
+
+        if ( $BoxRounded )
         { $this->drawRoundedFilledRectangle($X1,$Y1,$X2,$Y2,$RoundedRadius,$Settings); }
-       else
+        else
         { $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Settings); }
-      }
+        }
 
-     $X = $X - $TxtPos[$Align]["X"] + $X;
-     $Y = $Y - $TxtPos[$Align]["Y"] + $Y;
+        $X = $X - $TxtPos[$Align]["X"] + $X;
+        $Y = $Y - $TxtPos[$Align]["Y"] + $Y;
 
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $C_ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
-       imagettftext($this->Picture,$FontSize,$Angle,$X+$this->ShadowX,$Y+$this->ShadowY,$C_ShadowColor,$FontName,$Text);
-      }
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $C_ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
+        imagettftext($this->Picture,$FontSize,$Angle,$X+$this->ShadowX,$Y+$this->ShadowY,$C_ShadowColor,$FontName,$Text);
+        }
 
-     $C_TextColor = $this->AllocateColor($this->Picture,$R,$G,$B,$Alpha);
-     imagettftext($this->Picture,$FontSize,$Angle,$X,$Y,$C_TextColor,$FontName,$Text);
+        $C_TextColor = $this->AllocateColor($this->Picture,$R,$G,$B,$Alpha);
+        imagettftext($this->Picture,$FontSize,$Angle,$X,$Y,$C_TextColor,$FontName,$Text);
 
-     $this->Shadow = $Shadow;
+        $this->Shadow = $Shadow;
 
-     return($TxtPos);
+        return($TxtPos);
     }
 
-   /* Draw a gradient within a defined area */
-   function drawGradientArea($X1,$Y1,$X2,$Y2,$Direction,$Format="")
+    /* Draw a gradient within a defined area */
+    function drawGradientArea($X1,$Y1,$X2,$Y2,$Direction,$Format="")
     {
-     $StartR	= isset($Format["StartR"]) ? $Format["StartR"] : 90;
-     $StartG	= isset($Format["StartG"]) ? $Format["StartG"] : 90;
-     $StartB	= isset($Format["StartB"]) ? $Format["StartB"] : 90;
-     $EndR	= isset($Format["EndR"]) ? $Format["EndR"] : 0;
-     $EndG	= isset($Format["EndG"]) ? $Format["EndG"] : 0;
-     $EndB	= isset($Format["EndB"]) ? $Format["EndB"] : 0;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Levels	= isset($Format["Levels"]) ? $Format["Levels"] : NULL;
-
-     $Shadow = $this->Shadow;
-     $this->Shadow = FALSE;
-
-     if ( $StartR == $EndR && $StartG == $EndG && $StartB == $EndB )
-      {
-       $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,array("R"=>$StartR,"G"=>$StartG,"B"=>$StartB,"Alpha"=>$Alpha));
-       return(0);
-      }
-
-     if ( $Levels != NULL )
-      { $EndR=$StartR+$Levels; $EndG=$StartG+$Levels; $EndB=$StartB+$Levels; }
-
-     if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
-     if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
-
-     if ( $Direction == DIRECTION_VERTICAL )   { $Width = abs($Y2-$Y1); }
-     if ( $Direction == DIRECTION_HORIZONTAL ) { $Width = abs($X2-$X1); }
-
-     $Step     = max(abs($EndR-$StartR),abs($EndG-$StartG),abs($EndB-$StartB));
-     $StepSize = $Width/$Step;
-     $RStep    = ($EndR-$StartR)/$Step;
-     $GStep    = ($EndG-$StartG)/$Step;
-     $BStep    = ($EndB-$StartB)/$Step;
-
-     $R=$StartR;$G=$StartG;$B=$StartB;
-     switch($Direction)
-      {
-       case DIRECTION_VERTICAL:
+        $StartR	= isset($Format["StartR"]) ? $Format["StartR"] : 90;
+        $StartG	= isset($Format["StartG"]) ? $Format["StartG"] : 90;
+        $StartB	= isset($Format["StartB"]) ? $Format["StartB"] : 90;
+        $EndR	= isset($Format["EndR"]) ? $Format["EndR"] : 0;
+        $EndG	= isset($Format["EndG"]) ? $Format["EndG"] : 0;
+        $EndB	= isset($Format["EndB"]) ? $Format["EndB"] : 0;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Levels	= isset($Format["Levels"]) ? $Format["Levels"] : NULL;
+
+        $Shadow = $this->Shadow;
+        $this->Shadow = FALSE;
+
+        if ( $StartR == $EndR && $StartG == $EndG && $StartB == $EndB )
+        {
+        $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,array("R"=>$StartR,"G"=>$StartG,"B"=>$StartB,"Alpha"=>$Alpha));
+        return(0);
+        }
+
+        if ( $Levels != NULL )
+        { $EndR=$StartR+$Levels; $EndG=$StartG+$Levels; $EndB=$StartB+$Levels; }
+
+        if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
+        if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
+
+        if ( $Direction == DIRECTION_VERTICAL )   { $Width = abs($Y2-$Y1); }
+        if ( $Direction == DIRECTION_HORIZONTAL ) { $Width = abs($X2-$X1); }
+
+        $Step     = max(abs($EndR-$StartR),abs($EndG-$StartG),abs($EndB-$StartB));
+        $StepSize = $Width/$Step;
+        $RStep    = ($EndR-$StartR)/$Step;
+        $GStep    = ($EndG-$StartG)/$Step;
+        $BStep    = ($EndB-$StartB)/$Step;
+
+        $R=$StartR;$G=$StartG;$B=$StartB;
+        switch($Direction)
+        {
+        case DIRECTION_VERTICAL:
         $StartY = $Y1; $EndY = floor($Y2)+1; $LastY2 = $StartY;
         for($i=0;$i<=$Step;$i++)
-         {
-          $Y2 = floor($StartY + ($i * $StepSize));
+            {
+            $Y2 = floor($StartY + ($i * $StepSize));
 
-          if ($Y2 > $EndY) { $Y2 = $EndY; }
-          if (($Y1 != $Y2 && $Y1 < $Y2) || $Y2 == $EndY)
-           {
+            if ($Y2 > $EndY) { $Y2 = $EndY; }
+            if (($Y1 != $Y2 && $Y1 < $Y2) || $Y2 == $EndY)
+            {
             $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
             $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Color);
             $LastY2 = max($LastY2,$Y2);
             $Y1 = $Y2+1;
-           }
-          $R = $R + $RStep; $G = $G + $GStep; $B = $B + $BStep;
-         }
+            }
+            $R = $R + $RStep; $G = $G + $GStep; $B = $B + $BStep;
+            }
         if ( $LastY2 < $EndY && isset($Color)) { for ($i=$LastY2+1;$i<=$EndY;$i++) { $this->drawLine($X1,$i,$X2,$i,$Color); } }
         break;
 
-       case DIRECTION_HORIZONTAL:
+        case DIRECTION_HORIZONTAL:
         $StartX = $X1; $EndX = $X2;
         for($i=0;$i<=$Step;$i++)
-         {
-          $X2 = floor($StartX + ($i * $StepSize));
+            {
+            $X2 = floor($StartX + ($i * $StepSize));
 
-          if ($X2 > $EndX) { $X2 = $EndX; }
-          if (($X1 != $X2 && $X1 < $X2) || $X2 == $EndX)
-           {
+            if ($X2 > $EndX) { $X2 = $EndX; }
+            if (($X1 != $X2 && $X1 < $X2) || $X2 == $EndX)
+            {
             $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
             $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Color);
             $X1 = $X2+1;
-           }
-          $R = $R + $RStep; $G = $G + $GStep; $B = $B + $BStep; 
-         }
+            }
+            $R = $R + $RStep; $G = $G + $GStep; $B = $B + $BStep; 
+            }
         if ( $X2 < $EndX && isset($Color)) { $this->drawFilledRectangle($X2,$Y1,$EndX,$Y2,$Color); }
         break;
-      }
+        }
 
-     $this->Shadow = $Shadow;
+        $this->Shadow = $Shadow;
 
     }
 
-   /* Draw an aliased pixel */
-   function drawAntialiasPixel($X,$Y,$Format="")
+    /* Draw an aliased pixel */
+    function drawAntialiasPixel($X,$Y,$Format="")
     {
-     $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;
+        $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;
 
-     if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
-      return(-1);
+        if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
+        return(-1);
 
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+        if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+        if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+        if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
 
-     if ( !$this->Antialias )
-      {
-       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        if ( !$this->Antialias )
+        {
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
         {
-         $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
-         imagesetpixel($this->Picture,$X+$this->ShadowX,$Y+$this->ShadowY,$ShadowColor);
+            $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
+            imagesetpixel($this->Picture,$X+$this->ShadowX,$Y+$this->ShadowY,$ShadowColor);
         }
 
-       $PlotColor = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-       imagesetpixel($this->Picture,$X,$Y,$PlotColor);
+        $PlotColor = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        imagesetpixel($this->Picture,$X,$Y,$PlotColor);
 
-       return(0);
-      }
+        return(0);
+        }
 
-     $Plot = "";
-     $Xi   = floor($X);
-     $Yi   = floor($Y);
+        $Plot = "";
+        $Xi   = floor($X);
+        $Yi   = floor($Y);
 
-     if ( $Xi == $X && $Yi == $Y)
-      {
-       if ( $Alpha == 100 )
+        if ( $Xi == $X && $Yi == $Y)
+        {
+        if ( $Alpha == 100 )
         $this->drawAlphaPixel($X,$Y,100,$R,$G,$B);
-       else
+        else
         $this->drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B);
-      }
-     else
-      {
-       $Alpha1 = (((1 - ($X - floor($X))) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
-       if ( $Alpha1 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi,$Alpha1,$R,$G,$B); }
+        }
+        else
+        {
+        $Alpha1 = (((1 - ($X - floor($X))) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
+        if ( $Alpha1 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi,$Alpha1,$R,$G,$B); }
 
-       $Alpha2 = ((($X - floor($X)) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
-       if ( $Alpha2 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi,$Alpha2,$R,$G,$B); }
+        $Alpha2 = ((($X - floor($X)) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
+        if ( $Alpha2 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi,$Alpha2,$R,$G,$B); }
 
-       $Alpha3 = (((1 - ($X - floor($X))) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
-       if ( $Alpha3 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi+1,$Alpha3,$R,$G,$B); }
+        $Alpha3 = (((1 - ($X - floor($X))) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
+        if ( $Alpha3 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi+1,$Alpha3,$R,$G,$B); }
 
-       $Alpha4 = ((($X - floor($X)) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
-       if ( $Alpha4 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi+1,$Alpha4,$R,$G,$B); }
-      }
+        $Alpha4 = ((($X - floor($X)) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
+        if ( $Alpha4 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi+1,$Alpha4,$R,$G,$B); }
+        }
     }
 
-   /* Draw a semi-transparent pixel */
-   function drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B)
+    /* Draw a semi-transparent pixel */
+    function drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B)
     {
-     if ( isset($this->Mask[$X])) { if ( isset($this->Mask[$X][$Y]) ) { return(0); } }
+        if ( isset($this->Mask[$X])) { if ( isset($this->Mask[$X][$Y]) ) { return(0); } }
 
-     if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
-      return(-1);
+        if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
+        return(-1);
 
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+        if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+        if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+        if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
 
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $AlphaFactor = floor(($Alpha / 100) * $this->Shadowa);
-       $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$AlphaFactor);
-       imagesetpixel($this->Picture,$X+$this->ShadowX,$Y+$this->ShadowY,$ShadowColor);
-      }
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $AlphaFactor = floor(($Alpha / 100) * $this->Shadowa);
+        $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$AlphaFactor);
+        imagesetpixel($this->Picture,$X+$this->ShadowX,$Y+$this->ShadowY,$ShadowColor);
+        }
 
-     $C_Aliased = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-     imagesetpixel($this->Picture,$X,$Y,$C_Aliased);
+        $C_Aliased = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        imagesetpixel($this->Picture,$X,$Y,$C_Aliased);
     }
 
-   /* Convert apha to base 10 */
-   function convertAlpha($AlphaValue)
+    /* Convert apha to base 10 */
+    function convertAlpha($AlphaValue)
     { return((127/100)*(100-$AlphaValue)); }
 
-   /* Allocate a color with transparency */
-   function allocateColor($Picture,$R,$G,$B,$Alpha=100)
+    /* Allocate a color with transparency */
+    function allocateColor($Picture,$R,$G,$B,$Alpha=100)
     {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-     if ( $Alpha < 0 )  { $Alpha = 0; }
-     if ( $Alpha > 100) { $Alpha = 100; }
-
-     $Alpha = $this->convertAlpha($Alpha);
-     return(imagecolorallocatealpha($Picture,$R,$G,$B,$Alpha));
+        if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+        if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+        if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+        if ( $Alpha < 0 )  { $Alpha = 0; }
+        if ( $Alpha > 100) { $Alpha = 100; }
+
+        $Alpha = $this->convertAlpha($Alpha);
+        return(imagecolorallocatealpha($Picture,$R,$G,$B,$Alpha));
     }
 
-   /* Load a PNG file and draw it over the chart */
-   function drawFromPNG($X,$Y,$FileName)
+    /* Load a PNG file and draw it over the chart */
+    function drawFromPNG($X,$Y,$FileName)
     { $this->drawFromPicture(1,$FileName,$X,$Y); }
 
-   /* Load a GIF file and draw it over the chart */
-   function drawFromGIF($X,$Y,$FileName)
+    /* Load a GIF file and draw it over the chart */
+    function drawFromGIF($X,$Y,$FileName)
     { $this->drawFromPicture(2,$FileName,$X,$Y); }
 
-   /* Load a JPEG file and draw it over the chart */
-   function drawFromJPG($X,$Y,$FileName)
+    /* Load a JPEG file and draw it over the chart */
+    function drawFromJPG($X,$Y,$FileName)
     { $this->drawFromPicture(3,$FileName,$X,$Y); }
 
-   function getPicInfo($FileName)
+    function getPicInfo($FileName)
     {
-     $Infos  = getimagesize($FileName);
-     $Width  = $Infos[0];
-     $Height = $Infos[1];
-     $Type   = $Infos["mime"];
+        $Infos  = getimagesize($FileName);
+        $Width  = $Infos[0];
+        $Height = $Infos[1];
+        $Type   = $Infos["mime"];
 
-     if ( $Type == "image/png") { $Type = 1; }
-     if ( $Type == "image/gif") { $Type = 2; }
-     if ( $Type == "image/jpeg ") { $Type = 3; }
+        if ( $Type == "image/png") { $Type = 1; }
+        if ( $Type == "image/gif") { $Type = 2; }
+        if ( $Type == "image/jpeg ") { $Type = 3; }
 
-     return(array($Width,$Height,$Type));
+        return(array($Width,$Height,$Type));
     }
 
-   /* Generic loader function for external pictures */
-   function drawFromPicture($PicType,$FileName,$X,$Y)
+    /* Generic loader function for external pictures */
+    function drawFromPicture($PicType,$FileName,$X,$Y)
     {
-     if ( file_exists($FileName))
-      {
-       list($Width,$Height) = $this->getPicInfo($FileName);
+        if ( file_exists($FileName))
+        {
+        list($Width,$Height) = $this->getPicInfo($FileName);
 
-       if ( $PicType == 1 )
+        if ( $PicType == 1 )
         { $Raster = imagecreatefrompng($FileName); }
-       elseif ( $PicType == 2 )
+        elseif ( $PicType == 2 )
         { $Raster = imagecreatefromgif($FileName); }
-       elseif ( $PicType == 3 )
+        elseif ( $PicType == 3 )
         { $Raster = imagecreatefromjpeg($FileName); }
-       else
+        else
         { return(0); }
 
 
-       $RestoreShadow = $this->Shadow;
-       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
         {
-         $this->Shadow = FALSE;
-         if ( $PicType == 3 )
-          $this->drawFilledRectangle($X+$this->ShadowX,$Y+$this->ShadowY,$X+$Width+$this->ShadowX,$Y+$Height+$this->ShadowY,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
-         else
-          {
-           $TranparentID = imagecolortransparent($Raster);
-           for ($Xc=0;$Xc<=$Width-1;$Xc++)
+            $this->Shadow = FALSE;
+            if ( $PicType == 3 )
+            $this->drawFilledRectangle($X+$this->ShadowX,$Y+$this->ShadowY,$X+$Width+$this->ShadowX,$Y+$Height+$this->ShadowY,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+            else
             {
-             for ($Yc=0;$Yc<=$Height-1;$Yc++)
-              {
-               $RGBa   = imagecolorat($Raster,$Xc,$Yc);
-               $Values = imagecolorsforindex($Raster,$RGBa);
-               if ( $Values["alpha"] < 120 )
+            $TranparentID = imagecolortransparent($Raster);
+            for ($Xc=0;$Xc<=$Width-1;$Xc++)
+            {
+                for ($Yc=0;$Yc<=$Height-1;$Yc++)
+                {
+                $RGBa   = imagecolorat($Raster,$Xc,$Yc);
+                $Values = imagecolorsforindex($Raster,$RGBa);
+                if ( $Values["alpha"] < 120 )
                 {
-                 $AlphaFactor = floor(($this->Shadowa / 100) * ((100 / 127) * (127-$Values["alpha"])));
-                 $this->drawAlphaPixel($X+$Xc+$this->ShadowX,$Y+$Yc+$this->ShadowY,$AlphaFactor,$this->ShadowR,$this->ShadowG,$this->ShadowB);
+                    $AlphaFactor = floor(($this->Shadowa / 100) * ((100 / 127) * (127-$Values["alpha"])));
+                    $this->drawAlphaPixel($X+$Xc+$this->ShadowX,$Y+$Yc+$this->ShadowY,$AlphaFactor,$this->ShadowR,$this->ShadowG,$this->ShadowB);
                 }
-              }
+                }
+            }
             }
-          }
         }
-       $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
 
-       imagecopy($this->Picture,$Raster,$X,$Y,0,0,$Width,$Height);
-       imagedestroy($Raster);
-      }
+        imagecopy($this->Picture,$Raster,$X,$Y,0,0,$Width,$Height);
+        imagedestroy($Raster);
+        }
     }
 
-   /* Draw an arrow */
-   function drawArrow($X1,$Y1,$X2,$Y2,$Format="")
+    /* Draw an arrow */
+    function drawArrow($X1,$Y1,$X2,$Y2,$Format="")
     {
-     $FillR	= isset($Format["FillR"]) ? $Format["FillR"] : 0;
-     $FillG	= isset($Format["FillG"]) ? $Format["FillG"] : 0;
-     $FillB	= isset($Format["FillB"]) ? $Format["FillB"] : 0;
-     $BorderR	= isset($Format["BorderR"]) ? $Format["BorderR"] : $FillR;
-     $BorderG	= isset($Format["BorderG"]) ? $Format["BorderG"] : $FillG;
-     $BorderB	= isset($Format["BorderB"]) ? $Format["BorderB"] : $FillB;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Size	= isset($Format["Size"]) ? $Format["Size"] : 10;
-     $Ratio	= isset($Format["Ratio"]) ? $Format["Ratio"] : .5;
-     $TwoHeads	= isset($Format["TwoHeads"]) ? $Format["TwoHeads"] : FALSE;
-     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : FALSE;
-
-     /* Calculate the line angle */
-     $Angle = $this->getAngle($X1,$Y1,$X2,$Y2);
-
-     /* Override Shadow support, this will be managed internally */
-     $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
-      {
-       $this->Shadow = FALSE;
-       $this->drawArrow($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,array("FillR"=>$this->ShadowR,"FillG"=>$this->ShadowG,"FillB"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Size"=>$Size,"Ratio"=>$Ratio,"TwoHeads"=>$TwoHeads,"Ticks"=>$Ticks));
-      }
-
-     /* Draw the 1st Head */
-     $TailX = cos(($Angle-180)*PI/180)*$Size+$X2;
-     $TailY = sin(($Angle-180)*PI/180)*$Size+$Y2;
-
-     $Points	= "";
-     $Points[]  = $X2; $Points[]  = $Y2;
-     $Points[]	= cos(($Angle-90)*PI/180)*$Size*$Ratio+$TailX; $Points[] = sin(($Angle-90)*PI/180)*$Size*$Ratio+$TailY;
-     $Points[]	= cos(($Angle-270)*PI/180)*$Size*$Ratio+$TailX; $Points[] = sin(($Angle-270)*PI/180)*$Size*$Ratio+$TailY;
-     $Points[]  = $X2; $Points[]  = $Y2;
-
-     /* Visual correction */
-     if ($Angle == 180 || $Angle == 360 ) { $Points[4] = $Points[2]; }
-     if ($Angle == 90 || $Angle == 270 ) { $Points[5] = $Points[3]; }
-
-     $ArrowColor = $this->allocateColor($this->Picture,$FillR,$FillG,$FillB,$Alpha);
-     ImageFilledPolygon($this->Picture,$Points,4,$ArrowColor);
-
-     $this->drawLine($Points[0],$Points[1],$Points[2],$Points[3],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
-     $this->drawLine($Points[2],$Points[3],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
-     $this->drawLine($Points[0],$Points[1],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
-
-     /* Draw the second head */
-     if ( $TwoHeads )
-      {
-       $Angle = $this->getAngle($X2,$Y2,$X1,$Y1);
-
-       $TailX2 = cos(($Angle-180)*PI/180)*$Size+$X1;
-       $TailY2 = sin(($Angle-180)*PI/180)*$Size+$Y1;
-
-       $Points   = "";
-       $Points[] = $X1; $Points[]  = $Y1;
-       $Points[] = cos(($Angle-90)*PI/180)*$Size*$Ratio+$TailX2; $Points[] = sin(($Angle-90)*PI/180)*$Size*$Ratio+$TailY2;
-       $Points[] = cos(($Angle-270)*PI/180)*$Size*$Ratio+$TailX2; $Points[] = sin(($Angle-270)*PI/180)*$Size*$Ratio+$TailY2;
-       $Points[] = $X1; $Points[]  = $Y1;
-
-       /* Visual correction */
-       if ($Angle == 180 || $Angle == 360 ) { $Points[4] = $Points[2]; }
-       if ($Angle == 90 || $Angle == 270 ) { $Points[5] = $Points[3]; }
-
-       $ArrowColor = $this->allocateColor($this->Picture,$FillR,$FillG,$FillB,$Alpha);
-       ImageFilledPolygon($this->Picture,$Points,4,$ArrowColor);
-
-       $this->drawLine($Points[0],$Points[1],$Points[2],$Points[3],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
-       $this->drawLine($Points[2],$Points[3],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
-       $this->drawLine($Points[0],$Points[1],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
-
-       $this->drawLine($TailX,$TailY,$TailX2,$TailY2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-      }
-     else
-      $this->drawLine($X1,$Y1,$TailX,$TailY,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-
-     /* Re-enable shadows */
-     $this->Shadow = $RestoreShadow;
+        $FillR	= isset($Format["FillR"]) ? $Format["FillR"] : 0;
+        $FillG	= isset($Format["FillG"]) ? $Format["FillG"] : 0;
+        $FillB	= isset($Format["FillB"]) ? $Format["FillB"] : 0;
+        $BorderR	= isset($Format["BorderR"]) ? $Format["BorderR"] : $FillR;
+        $BorderG	= isset($Format["BorderG"]) ? $Format["BorderG"] : $FillG;
+        $BorderB	= isset($Format["BorderB"]) ? $Format["BorderB"] : $FillB;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Size	= isset($Format["Size"]) ? $Format["Size"] : 10;
+        $Ratio	= isset($Format["Ratio"]) ? $Format["Ratio"] : .5;
+        $TwoHeads	= isset($Format["TwoHeads"]) ? $Format["TwoHeads"] : FALSE;
+        $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : FALSE;
+
+        /* Calculate the line angle */
+        $Angle = $this->getAngle($X1,$Y1,$X2,$Y2);
+
+        /* Override Shadow support, this will be managed internally */
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+        $this->Shadow = FALSE;
+        $this->drawArrow($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,array("FillR"=>$this->ShadowR,"FillG"=>$this->ShadowG,"FillB"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Size"=>$Size,"Ratio"=>$Ratio,"TwoHeads"=>$TwoHeads,"Ticks"=>$Ticks));
+        }
+
+        /* Draw the 1st Head */
+        $TailX = cos(($Angle-180)*PI/180)*$Size+$X2;
+        $TailY = sin(($Angle-180)*PI/180)*$Size+$Y2;
+
+        $Points	= "";
+        $Points[]  = $X2; $Points[]  = $Y2;
+        $Points[]	= cos(($Angle-90)*PI/180)*$Size*$Ratio+$TailX; $Points[] = sin(($Angle-90)*PI/180)*$Size*$Ratio+$TailY;
+        $Points[]	= cos(($Angle-270)*PI/180)*$Size*$Ratio+$TailX; $Points[] = sin(($Angle-270)*PI/180)*$Size*$Ratio+$TailY;
+        $Points[]  = $X2; $Points[]  = $Y2;
+
+        /* Visual correction */
+        if ($Angle == 180 || $Angle == 360 ) { $Points[4] = $Points[2]; }
+        if ($Angle == 90 || $Angle == 270 ) { $Points[5] = $Points[3]; }
+
+        $ArrowColor = $this->allocateColor($this->Picture,$FillR,$FillG,$FillB,$Alpha);
+        ImageFilledPolygon($this->Picture,$Points,4,$ArrowColor);
+
+        $this->drawLine($Points[0],$Points[1],$Points[2],$Points[3],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+        $this->drawLine($Points[2],$Points[3],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+        $this->drawLine($Points[0],$Points[1],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+
+        /* Draw the second head */
+        if ( $TwoHeads )
+        {
+        $Angle = $this->getAngle($X2,$Y2,$X1,$Y1);
+
+        $TailX2 = cos(($Angle-180)*PI/180)*$Size+$X1;
+        $TailY2 = sin(($Angle-180)*PI/180)*$Size+$Y1;
+
+        $Points   = "";
+        $Points[] = $X1; $Points[]  = $Y1;
+        $Points[] = cos(($Angle-90)*PI/180)*$Size*$Ratio+$TailX2; $Points[] = sin(($Angle-90)*PI/180)*$Size*$Ratio+$TailY2;
+        $Points[] = cos(($Angle-270)*PI/180)*$Size*$Ratio+$TailX2; $Points[] = sin(($Angle-270)*PI/180)*$Size*$Ratio+$TailY2;
+        $Points[] = $X1; $Points[]  = $Y1;
+
+        /* Visual correction */
+        if ($Angle == 180 || $Angle == 360 ) { $Points[4] = $Points[2]; }
+        if ($Angle == 90 || $Angle == 270 ) { $Points[5] = $Points[3]; }
+
+        $ArrowColor = $this->allocateColor($this->Picture,$FillR,$FillG,$FillB,$Alpha);
+        ImageFilledPolygon($this->Picture,$Points,4,$ArrowColor);
+
+        $this->drawLine($Points[0],$Points[1],$Points[2],$Points[3],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+        $this->drawLine($Points[2],$Points[3],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+        $this->drawLine($Points[0],$Points[1],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+
+        $this->drawLine($TailX,$TailY,$TailX2,$TailY2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+        }
+        else
+        $this->drawLine($X1,$Y1,$TailX,$TailY,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+
+        /* Re-enable shadows */
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Draw a label with associated arrow */
-   function drawArrowLabel($X1,$Y1,$Text,$Format="")
+    /* Draw a label with associated arrow */
+    function drawArrowLabel($X1,$Y1,$Text,$Format="")
     {
-     $FillR    = isset($Format["FillR"]) ? $Format["FillR"] : 0;
-     $FillG    = isset($Format["FillG"]) ? $Format["FillG"] : 0;
-     $FillB    = isset($Format["FillB"]) ? $Format["FillB"] : 0;
-     $BorderR  = isset($Format["BorderR"]) ? $Format["BorderR"] : $FillR;
-     $BorderG  = isset($Format["BorderG"]) ? $Format["BorderG"] : $FillG;
-     $BorderB  = isset($Format["BorderB"]) ? $Format["BorderB"] : $FillB;
-     $FontName = isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
-     $FontSize = isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
-     $Alpha    = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Length   = isset($Format["Length"]) ? $Format["Length"] : 50;
-     $Angle    = isset($Format["Angle"]) ? $Format["Angle"] : 315;
-     $Size     = isset($Format["Size"]) ? $Format["Size"] : 10;
-     $Position = isset($Format["Position"]) ? $Format["Position"] : POSITION_TOP;
-     $RoundPos = isset($Format["RoundPos"]) ? $Format["RoundPos"] : FALSE;
-     $Ticks    = isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-
-     $Angle = $Angle % 360;
-
-     $X2 = sin(($Angle+180)*PI/180)*$Length+$X1;
-     $Y2 = cos(($Angle+180)*PI/180)*$Length+$Y1;
-
-     if ( $RoundPos && $Angle > 0 && $Angle < 180 ) { $Y2 = ceil($Y2); }
-     if ( $RoundPos && $Angle > 180 ) { $Y2 = floor($Y2); }
-
-     $this->drawArrow($X2,$Y2,$X1,$Y1,$Format);
-
-     $Size	= imagettfbbox($FontSize,0,$FontName,$Text);
-     $TxtWidth	= max(abs($Size[2]-$Size[0]),abs($Size[0]-$Size[6]));
-     $TxtHeight	= max(abs($Size[1]-$Size[7]),abs($Size[3]-$Size[1]));
-
-     if ( $Angle > 0 && $Angle < 180 )
-      {
-       $this->drawLine($X2,$Y2,$X2-$TxtWidth,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-       if ( $Position == POSITION_TOP )
+        $FillR    = isset($Format["FillR"]) ? $Format["FillR"] : 0;
+        $FillG    = isset($Format["FillG"]) ? $Format["FillG"] : 0;
+        $FillB    = isset($Format["FillB"]) ? $Format["FillB"] : 0;
+        $BorderR  = isset($Format["BorderR"]) ? $Format["BorderR"] : $FillR;
+        $BorderG  = isset($Format["BorderG"]) ? $Format["BorderG"] : $FillG;
+        $BorderB  = isset($Format["BorderB"]) ? $Format["BorderB"] : $FillB;
+        $FontName = isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
+        $FontSize = isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
+        $Alpha    = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Length   = isset($Format["Length"]) ? $Format["Length"] : 50;
+        $Angle    = isset($Format["Angle"]) ? $Format["Angle"] : 315;
+        $Size     = isset($Format["Size"]) ? $Format["Size"] : 10;
+        $Position = isset($Format["Position"]) ? $Format["Position"] : POSITION_TOP;
+        $RoundPos = isset($Format["RoundPos"]) ? $Format["RoundPos"] : FALSE;
+        $Ticks    = isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+
+        $Angle = $Angle % 360;
+
+        $X2 = sin(($Angle+180)*PI/180)*$Length+$X1;
+        $Y2 = cos(($Angle+180)*PI/180)*$Length+$Y1;
+
+        if ( $RoundPos && $Angle > 0 && $Angle < 180 ) { $Y2 = ceil($Y2); }
+        if ( $RoundPos && $Angle > 180 ) { $Y2 = floor($Y2); }
+
+        $this->drawArrow($X2,$Y2,$X1,$Y1,$Format);
+
+        $Size	= imagettfbbox($FontSize,0,$FontName,$Text);
+        $TxtWidth	= max(abs($Size[2]-$Size[0]),abs($Size[0]-$Size[6]));
+        $TxtHeight	= max(abs($Size[1]-$Size[7]),abs($Size[3]-$Size[1]));
+
+        if ( $Angle > 0 && $Angle < 180 )
+        {
+        $this->drawLine($X2,$Y2,$X2-$TxtWidth,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+        if ( $Position == POSITION_TOP )
         $this->drawText($X2,$Y2-2,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_BOTTOMRIGHT));
-       else
+        else
         $this->drawText($X2,$Y2+4,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_TOPRIGHT));
-      }
-     else
-      {
-       $this->drawLine($X2,$Y2,$X2+$TxtWidth,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-       if ( $Position == POSITION_TOP )
+        }
+        else
+        {
+        $this->drawLine($X2,$Y2,$X2+$TxtWidth,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+        if ( $Position == POSITION_TOP )
         $this->drawText($X2,$Y2-2,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
-       else
+        else
         $this->drawText($X2,$Y2+4,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_TOPLEFT));
-      }
+        }
     }
 
-   /* Draw a progress bar filled with specified % */
-   function drawProgress($X,$Y,$Percent,$Format="")
+    /* Draw a progress bar filled with specified % */
+    function drawProgress($X,$Y,$Percent,$Format="")
     {
-     if ( $Percent > 100 ) { $Percent = 100; }
-     if ( $Percent < 0 ) { $Percent = 0; }
-
-     $Width	= isset($Format["Width"]) ? $Format["Width"] : 200;
-     $Height	= isset($Format["Height"]) ? $Format["Height"] : 20;
-     $Orientation = isset($Format["Orientation"]) ? $Format["Orientation"] : ORIENTATION_HORIZONTAL;
-     $ShowLabel = isset($Format["ShowLabel"]) ? $Format["ShowLabel"] : FALSE;
-     $LabelPos	= isset($Format["LabelPos"]) ? $Format["LabelPos"] : LABEL_POS_INSIDE;
-     $Margin    = isset($Format["Margin"]) ? $Format["Margin"] : 10;
-     $R		= isset($Format["R"]) ? $Format["R"] : 130;
-     $G		= isset($Format["G"]) ? $Format["G"] : 130;
-     $B		= isset($Format["B"]) ? $Format["B"] : 130;
-     $RFade	= isset($Format["RFade"]) ? $Format["RFade"] : -1;
-     $GFade	= isset($Format["GFade"]) ? $Format["GFade"] : -1;
-     $BFade	= isset($Format["BFade"]) ? $Format["BFade"] : -1;
-     $BorderR	= isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
-     $BorderG	= isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
-     $BorderB	= isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
-     $BoxBorderR = isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 0;
-     $BoxBorderG = isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 0;
-     $BoxBorderB = isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 0;
-     $BoxBackR	= isset($Format["BoxBackR"]) ? $Format["BoxBackR"] : 255;
-     $BoxBackG	= isset($Format["BoxBackG"]) ? $Format["BoxBackG"] : 255;
-     $BoxBackB	= isset($Format["BoxBackB"]) ? $Format["BoxBackB"] : 255;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $BoxSurrounding = isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : NULL;
-     $NoAngle	= isset($Format["NoAngle"]) ? $Format["NoAngle"] : FALSE;
-
-     if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
-      {
-       $RFade = (($RFade-$R)/100)*$Percent+$R;
-       $GFade = (($GFade-$G)/100)*$Percent+$G;
-       $BFade = (($BFade-$B)/100)*$Percent+$B;
-      }
-
-     if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
-     if ( $BoxSurrounding != NULL ) { $BoxBorderR = $BoxBackR + $Surrounding; $BoxBorderG = $BoxBackG + $Surrounding; $BoxBorderB = $BoxBackB + $Surrounding; }
-
-     if ( $Orientation == ORIENTATION_VERTICAL )
-      {
-       $InnerHeight = (($Height-2)/100)*$Percent;
-       $this->drawFilledRectangle($X,$Y,$X+$Width,$Y-$Height,array("R"=>$BoxBackR,"G"=>$BoxBackG,"B"=>$BoxBackB,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"NoAngle"=>$NoAngle));
-
-       $RestoreShadow = $this->Shadow; $this->Shadow  = FALSE;
-       if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
-        {
-         $GradientOptions = array("StartR"=>$RFade,"StartG"=>$GFade,"StartB"=>$BFade,"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
-         $this->drawGradientArea($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,DIRECTION_VERTICAL,$GradientOptions);
-
-         if ( $Surrounding )
-          $this->drawRectangle($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
-        }
-       else
+        if ( $Percent > 100 ) { $Percent = 100; }
+        if ( $Percent < 0 ) { $Percent = 0; }
+
+        $Width	= isset($Format["Width"]) ? $Format["Width"] : 200;
+        $Height	= isset($Format["Height"]) ? $Format["Height"] : 20;
+        $Orientation = isset($Format["Orientation"]) ? $Format["Orientation"] : ORIENTATION_HORIZONTAL;
+        $ShowLabel = isset($Format["ShowLabel"]) ? $Format["ShowLabel"] : FALSE;
+        $LabelPos	= isset($Format["LabelPos"]) ? $Format["LabelPos"] : LABEL_POS_INSIDE;
+        $Margin    = isset($Format["Margin"]) ? $Format["Margin"] : 10;
+        $R		= isset($Format["R"]) ? $Format["R"] : 130;
+        $G		= isset($Format["G"]) ? $Format["G"] : 130;
+        $B		= isset($Format["B"]) ? $Format["B"] : 130;
+        $RFade	= isset($Format["RFade"]) ? $Format["RFade"] : -1;
+        $GFade	= isset($Format["GFade"]) ? $Format["GFade"] : -1;
+        $BFade	= isset($Format["BFade"]) ? $Format["BFade"] : -1;
+        $BorderR	= isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
+        $BorderG	= isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
+        $BorderB	= isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
+        $BoxBorderR = isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 0;
+        $BoxBorderG = isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 0;
+        $BoxBorderB = isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 0;
+        $BoxBackR	= isset($Format["BoxBackR"]) ? $Format["BoxBackR"] : 255;
+        $BoxBackG	= isset($Format["BoxBackG"]) ? $Format["BoxBackG"] : 255;
+        $BoxBackB	= isset($Format["BoxBackB"]) ? $Format["BoxBackB"] : 255;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $BoxSurrounding = isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : NULL;
+        $NoAngle	= isset($Format["NoAngle"]) ? $Format["NoAngle"] : FALSE;
+
+        if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
+        {
+        $RFade = (($RFade-$R)/100)*$Percent+$R;
+        $GFade = (($GFade-$G)/100)*$Percent+$G;
+        $BFade = (($BFade-$B)/100)*$Percent+$B;
+        }
+
+        if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+        if ( $BoxSurrounding != NULL ) { $BoxBorderR = $BoxBackR + $Surrounding; $BoxBorderG = $BoxBackG + $Surrounding; $BoxBorderB = $BoxBackB + $Surrounding; }
+
+        if ( $Orientation == ORIENTATION_VERTICAL )
+        {
+        $InnerHeight = (($Height-2)/100)*$Percent;
+        $this->drawFilledRectangle($X,$Y,$X+$Width,$Y-$Height,array("R"=>$BoxBackR,"G"=>$BoxBackG,"B"=>$BoxBackB,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"NoAngle"=>$NoAngle));
+
+        $RestoreShadow = $this->Shadow; $this->Shadow  = FALSE;
+        if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
+        {
+            $GradientOptions = array("StartR"=>$RFade,"StartG"=>$GFade,"StartB"=>$BFade,"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
+            $this->drawGradientArea($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,DIRECTION_VERTICAL,$GradientOptions);
+
+            if ( $Surrounding )
+            $this->drawRectangle($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
+        }
+        else
         $this->drawFilledRectangle($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
 
-       $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
 
-       if ( $ShowLabel && $LabelPos == LABEL_POS_BOTTOM )	{ $this->drawText($X+($Width/2),$Y+$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_TOPMIDDLE)); }
-       if ( $ShowLabel && $LabelPos == LABEL_POS_TOP )		{ $this->drawText($X+($Width/2),$Y-$Height-$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE)); }
-       if ( $ShowLabel && $LabelPos == LABEL_POS_INSIDE )	{ $this->drawText($X+($Width/2),$Y-$InnerHeight-$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT,"Angle"=>90)); }
-       if ( $ShowLabel && $LabelPos == LABEL_POS_CENTER )	{ $this->drawText($X+($Width/2),$Y-($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"Angle"=>90)); }
-      }
-     else
-      {
-       if ( $Percent == 100 )
+        if ( $ShowLabel && $LabelPos == LABEL_POS_BOTTOM )	{ $this->drawText($X+($Width/2),$Y+$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_TOPMIDDLE)); }
+        if ( $ShowLabel && $LabelPos == LABEL_POS_TOP )		{ $this->drawText($X+($Width/2),$Y-$Height-$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE)); }
+        if ( $ShowLabel && $LabelPos == LABEL_POS_INSIDE )	{ $this->drawText($X+($Width/2),$Y-$InnerHeight-$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT,"Angle"=>90)); }
+        if ( $ShowLabel && $LabelPos == LABEL_POS_CENTER )	{ $this->drawText($X+($Width/2),$Y-($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"Angle"=>90)); }
+        }
+        else
+        {
+        if ( $Percent == 100 )
         $InnerWidth = $Width-1;
-       else
+        else
         $InnerWidth = (($Width-2)/100)*$Percent;
 
-       $this->drawFilledRectangle($X,$Y,$X+$Width,$Y+$Height,array("R"=>$BoxBackR,"G"=>$BoxBackG,"B"=>$BoxBackB,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"NoAngle"=>$NoAngle));
+        $this->drawFilledRectangle($X,$Y,$X+$Width,$Y+$Height,array("R"=>$BoxBackR,"G"=>$BoxBackG,"B"=>$BoxBackB,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"NoAngle"=>$NoAngle));
 
-       $RestoreShadow = $this->Shadow; $this->Shadow  = FALSE;
-       if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
+        $RestoreShadow = $this->Shadow; $this->Shadow  = FALSE;
+        if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
         {
-         $GradientOptions = array("StartR"=>$R,"StartG"=>$G,"StartB"=>$B,"EndR"=>$RFade,"EndG"=>$GFade,"EndB"=>$BFade);
-         $this->drawGradientArea($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,DIRECTION_HORIZONTAL,$GradientOptions);
+            $GradientOptions = array("StartR"=>$R,"StartG"=>$G,"StartB"=>$B,"EndR"=>$RFade,"EndG"=>$GFade,"EndB"=>$BFade);
+            $this->drawGradientArea($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,DIRECTION_HORIZONTAL,$GradientOptions);
 
-         if ( $Surrounding )
-          $this->drawRectangle($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
+            if ( $Surrounding )
+            $this->drawRectangle($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
         }
-       else
+        else
         $this->drawFilledRectangle($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
  
-       $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
 
-       if ( $ShowLabel && $LabelPos == LABEL_POS_LEFT )		{ $this->drawText($X-$Margin,$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLERIGHT)); }
-       if ( $ShowLabel && $LabelPos == LABEL_POS_RIGHT )	{ $this->drawText($X+$Width+$Margin,$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT)); }
-       if ( $ShowLabel && $LabelPos == LABEL_POS_CENTER )	{ $this->drawText($X+($Width/2),$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE)); }
-       if ( $ShowLabel && $LabelPos == LABEL_POS_INSIDE )	{ $this->drawText($X+$InnerWidth+$Margin,$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT)); }
-      }
+        if ( $ShowLabel && $LabelPos == LABEL_POS_LEFT )		{ $this->drawText($X-$Margin,$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLERIGHT)); }
+        if ( $ShowLabel && $LabelPos == LABEL_POS_RIGHT )	{ $this->drawText($X+$Width+$Margin,$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT)); }
+        if ( $ShowLabel && $LabelPos == LABEL_POS_CENTER )	{ $this->drawText($X+($Width/2),$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE)); }
+        if ( $ShowLabel && $LabelPos == LABEL_POS_INSIDE )	{ $this->drawText($X+$InnerWidth+$Margin,$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT)); }
+        }
     }
 
-   /* Get the legend box size */
-   function getLegendSize($Format="")
+    /* Get the legend box size */
+    function getLegendSize($Format="")
     {
-     $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
-     $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
-     $BoxSize		= isset($Format["BoxSize"]) ? $Format["BoxSize"] : 5;
-     $Margin		= isset($Format["Margin"]) ? $Format["Margin"] : 5;
-     $Style		= isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
-     $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
-     $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 5;
-     $BoxHeight		= isset($Format["BoxHeight"]) ? $Format["BoxHeight"] : 5;
-     $IconAreaWidth	= isset($Format["IconAreaWidth"]) ? $Format["IconAreaWidth"] : $BoxWidth;
-     $IconAreaHeight	= isset($Format["IconAreaHeight"]) ? $Format["IconAreaHeight"] : $BoxHeight;
-     $XSpacing		= isset($Format["XSpacing"]) ? $Format["XSpacing"] : 5;
-
-     $Data = $this->DataSet->getData();
-
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && isset($Serie["Picture"]))
+        $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
+        $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
+        $BoxSize		= isset($Format["BoxSize"]) ? $Format["BoxSize"] : 5;
+        $Margin		= isset($Format["Margin"]) ? $Format["Margin"] : 5;
+        $Style		= isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
+        $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
+        $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 5;
+        $BoxHeight		= isset($Format["BoxHeight"]) ? $Format["BoxHeight"] : 5;
+        $IconAreaWidth	= isset($Format["IconAreaWidth"]) ? $Format["IconAreaWidth"] : $BoxWidth;
+        $IconAreaHeight	= isset($Format["IconAreaHeight"]) ? $Format["IconAreaHeight"] : $BoxHeight;
+        $XSpacing		= isset($Format["XSpacing"]) ? $Format["XSpacing"] : 5;
+
+        $Data = $this->DataSet->getData();
+
+        foreach($Data["Series"] as $SerieName => $Serie)
         {
-         list($PicWidth,$PicHeight) = $this->getPicInfo($Serie["Picture"]);
-         if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
-         if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && isset($Serie["Picture"]))
+        {
+            list($PicWidth,$PicHeight) = $this->getPicInfo($Serie["Picture"]);
+            if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
+            if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
+        }
         }
-      }
 
-     $YStep = max($this->FontSize,$IconAreaHeight) + 5;
-     $XStep = $IconAreaWidth + 5;
-     $XStep = $XSpacing;
+        $YStep = max($this->FontSize,$IconAreaHeight) + 5;
+        $XStep = $IconAreaWidth + 5;
+        $XStep = $XSpacing;
 
-     $X=100; $Y=100;
+        $X=100; $Y=100;
 
-     $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
+        foreach($Data["Series"] as $SerieName => $Serie)
         {
-         if ( $Mode == LEGEND_VERTICAL )
-          {
-           $BoxArray = $this->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Serie["Description"]);
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            if ( $Mode == LEGEND_VERTICAL )
+            {
+            $BoxArray = $this->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Serie["Description"]);
 
-           if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
-           if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
-           if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
+            if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
+            if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
+            if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
 
-           $Lines = preg_split("/\n/",$Serie["Description"]);
-           $vY = $vY + max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
-          {
-           $Lines = preg_split("/\n/",$Serie["Description"]);
-           $Width = "";
-           foreach($Lines as $Key => $Value)
+            $Lines = preg_split("/\n/",$Serie["Description"]);
+            $vY = $vY + max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
+            }
+            elseif ( $Mode == LEGEND_HORIZONTAL )
+            {
+            $Lines = preg_split("/\n/",$Serie["Description"]);
+            $Width = "";
+            foreach($Lines as $Key => $Value)
             {
-             $BoxArray = $this->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
+                $BoxArray = $this->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
 
-             if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
-             if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
-             if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
+                if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
+                if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
+                if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
 
-             $Width[] = $BoxArray[1]["X"];
+                $Width[] = $BoxArray[1]["X"];
             }
 
-           $vX=max($Width)+$XStep;
-          }
+            $vX=max($Width)+$XStep;
+            }
+        }
         }
-      }
-     $vY=$vY-$YStep; $vX=$vX-$XStep;
+        $vY=$vY-$YStep; $vX=$vX-$XStep;
 
-     $TopOffset  = $Y - $Boundaries["T"];
-     if ( $Boundaries["B"]-($vY+$IconAreaHeight) < $TopOffset ) { $Boundaries["B"] = $vY+$IconAreaHeight+$TopOffset; }
+        $TopOffset  = $Y - $Boundaries["T"];
+        if ( $Boundaries["B"]-($vY+$IconAreaHeight) < $TopOffset ) { $Boundaries["B"] = $vY+$IconAreaHeight+$TopOffset; }
 
-     $Width  = ($Boundaries["R"]+$Margin) - ($Boundaries["L"]-$Margin);
-     $Height = ($Boundaries["B"]+$Margin) - ($Boundaries["T"]-$Margin);
+        $Width  = ($Boundaries["R"]+$Margin) - ($Boundaries["L"]-$Margin);
+        $Height = ($Boundaries["B"]+$Margin) - ($Boundaries["T"]-$Margin);
 
-     return(array("Width"=>$Width,"Height"=>$Height));
+        return(array("Width"=>$Width,"Height"=>$Height));
     }
 
-   /* Draw the legend of the active series */
-   function drawLegend($X,$Y,$Format="")
+    /* Draw the legend of the active series */
+    function drawLegend($X,$Y,$Format="")
     {
-     $Family	= isset($Format["Family"]) ? $Format["Family"] : LEGEND_FAMILY_BOX;
-     $FontName	= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
-     $FontSize	= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
-     $FontR	= isset($Format["FontR"]) ? $Format["FontR"] : $this->FontColorR;
-     $FontG	= isset($Format["FontG"]) ? $Format["FontG"] : $this->FontColorG;
-     $FontB	= isset($Format["FontB"]) ? $Format["FontB"] : $this->FontColorB;
-     $BoxWidth	= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 5;
-     $BoxHeight	= isset($Format["BoxHeight"]) ? $Format["BoxHeight"] : 5;
-     $IconAreaWidth	= isset($Format["IconAreaWidth"]) ? $Format["IconAreaWidth"] : $BoxWidth;
-     $IconAreaHeight	= isset($Format["IconAreaHeight"]) ? $Format["IconAreaHeight"] : $BoxHeight;
-     $XSpacing	= isset($Format["XSpacing"]) ? $Format["XSpacing"] : 5;
-     $Margin	= isset($Format["Margin"]) ? $Format["Margin"] : 5;
-     $R		= isset($Format["R"]) ? $Format["R"] : 200;
-     $G		= isset($Format["G"]) ? $Format["G"] : 200;
-     $B		= isset($Format["B"]) ? $Format["B"] : 200;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $BorderR	= isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
-     $BorderG	= isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
-     $BorderB	= isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
-     $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $Style	= isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
-     $Mode	= isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
-
-     if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
-
-     $Data = $this->DataSet->getData();
-
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && isset($Serie["Picture"]))
-        {
-         list($PicWidth,$PicHeight) = $this->getPicInfo($Serie["Picture"]);
-         if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
-         if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
-        }
-      }
-
-     $YStep = max($this->FontSize,$IconAreaHeight) + 5;
-     $XStep = $IconAreaWidth + 5;
-     $XStep = $XSpacing;
-
-     $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         if ( $Mode == LEGEND_VERTICAL )
-          {
-           $BoxArray = $this->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Serie["Description"]);
-
-           if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
-           if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
-           if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
-
-           $Lines = preg_split("/\n/",$Serie["Description"]);
-           $vY = $vY + max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
-          {
-           $Lines = preg_split("/\n/",$Serie["Description"]);
-           $Width = "";
-           foreach($Lines as $Key => $Value)
-            {
-             $BoxArray = $this->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
-
-             if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
-             if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
-             if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
-
-             $Width[] = $BoxArray[1]["X"];
-            }
-
-           $vX=max($Width)+$XStep;
-          }
-        }
-      }
-     $vY=$vY-$YStep; $vX=$vX-$XStep;
-
-     $TopOffset  = $Y - $Boundaries["T"];
-     if ( $Boundaries["B"]-($vY+$IconAreaHeight) < $TopOffset ) { $Boundaries["B"] = $vY+$IconAreaHeight+$TopOffset; }
-
-     if ( $Style == LEGEND_ROUND )
-      $this->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
-     elseif ( $Style == LEGEND_BOX )
-      $this->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
-
-     $RestoreShadow = $this->Shadow; $this->Shadow = FALSE;
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"];
-         $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
-
-         if ( isset($Serie["Picture"]) )
-          {
-           $Picture = $Serie["Picture"];
-           list($PicWidth,$PicHeight) = $this->getPicInfo($Picture);
-           $PicX = $X+$IconAreaWidth/2; $PicY = $Y+$IconAreaHeight/2; 
-
-           $this->drawFromPNG($PicX-$PicWidth/2,$PicY-$PicHeight/2,$Picture);
-          }
-         else
-          {
-           if ( $Family == LEGEND_FAMILY_BOX )
+        $Family	= isset($Format["Family"]) ? $Format["Family"] : LEGEND_FAMILY_BOX;
+        $FontName	= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
+        $FontSize	= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
+        $FontR	= isset($Format["FontR"]) ? $Format["FontR"] : $this->FontColorR;
+        $FontG	= isset($Format["FontG"]) ? $Format["FontG"] : $this->FontColorG;
+        $FontB	= isset($Format["FontB"]) ? $Format["FontB"] : $this->FontColorB;
+        $BoxWidth	= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 5;
+        $BoxHeight	= isset($Format["BoxHeight"]) ? $Format["BoxHeight"] : 5;
+        $IconAreaWidth	= isset($Format["IconAreaWidth"]) ? $Format["IconAreaWidth"] : $BoxWidth;
+        $IconAreaHeight	= isset($Format["IconAreaHeight"]) ? $Format["IconAreaHeight"] : $BoxHeight;
+        $XSpacing	= isset($Format["XSpacing"]) ? $Format["XSpacing"] : 5;
+        $Margin	= isset($Format["Margin"]) ? $Format["Margin"] : 5;
+        $R		= isset($Format["R"]) ? $Format["R"] : 200;
+        $G		= isset($Format["G"]) ? $Format["G"] : 200;
+        $B		= isset($Format["B"]) ? $Format["B"] : 200;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $BorderR	= isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
+        $BorderG	= isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
+        $BorderB	= isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
+        $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $Style	= isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
+        $Mode	= isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
+
+        if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+
+        $Data = $this->DataSet->getData();
+
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && isset($Serie["Picture"]))
+        {
+            list($PicWidth,$PicHeight) = $this->getPicInfo($Serie["Picture"]);
+            if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
+            if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
+        }
+        }
+
+        $YStep = max($this->FontSize,$IconAreaHeight) + 5;
+        $XStep = $IconAreaWidth + 5;
+        $XStep = $XSpacing;
+
+        $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            if ( $Mode == LEGEND_VERTICAL )
             {
-             if ( $BoxWidth != $IconAreaWidth ) { $XOffset = floor(($IconAreaWidth-$BoxWidth)/2); } else { $XOffset = 0; }
-             if ( $BoxHeight != $IconAreaHeight ) { $YOffset = floor(($IconAreaHeight-$BoxHeight)/2); } else { $YOffset = 0; }
+            $BoxArray = $this->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Serie["Description"]);
 
-             $this->drawFilledRectangle($X+1+$XOffset,$Y+1+$YOffset,$X+$BoxWidth+$XOffset+1,$Y+$BoxHeight+1+$YOffset,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
-             $this->drawFilledRectangle($X+$XOffset,$Y+$YOffset,$X+$BoxWidth+$XOffset,$Y+$BoxHeight+$YOffset,array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
+            if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
+            if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
+            if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
+
+            $Lines = preg_split("/\n/",$Serie["Description"]);
+            $vY = $vY + max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
             }
-           elseif ( $Family == LEGEND_FAMILY_CIRCLE )
+            elseif ( $Mode == LEGEND_HORIZONTAL )
             {
-             $this->drawFilledCircle($X+1+$IconAreaWidth/2,$Y+1+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
-             $this->drawFilledCircle($X+$IconAreaWidth/2,$Y+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
-            }
-           elseif ( $Family == LEGEND_FAMILY_LINE )
+            $Lines = preg_split("/\n/",$Serie["Description"]);
+            $Width = "";
+            foreach($Lines as $Key => $Value)
             {
-             $this->drawLine($X+1,$Y+1+$IconAreaHeight/2,$X+1+$IconAreaWidth,$Y+1+$IconAreaHeight/2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20,"Ticks"=>$Ticks,"Weight"=>$Weight));
-             $this->drawLine($X,$Y+$IconAreaHeight/2,$X+$IconAreaWidth,$Y+$IconAreaHeight/2,array("R"=>$R,"G"=>$G,"B"=>$B,"Ticks"=>$Ticks,"Weight"=>$Weight));
-            }
-          }
+                $BoxArray = $this->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
 
-         if ( $Mode == LEGEND_VERTICAL )
-          {
-           $Lines = preg_split("/\n/",$Serie["Description"]);
-           foreach($Lines as $Key => $Value)
-            $this->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontSize"=>$FontSize,"FontName"=>$FontName));
+                if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
+                if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
+                if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
 
-           $Y=$Y+max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
-          {
-           $Lines = preg_split("/\n/",$Serie["Description"]);
-           $Width = "";
-           foreach($Lines as $Key => $Value)
-            {
-             $BoxArray = $this->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontSize"=>$FontSize,"FontName"=>$FontName));
-             $Width[] = $BoxArray[1]["X"];
+                $Width[] = $BoxArray[1]["X"];
+            }
+
+            $vX=max($Width)+$XStep;
             }
-           $X=max($Width)+2+$XStep;
-          }
         }
-      }
+        }
+        $vY=$vY-$YStep; $vX=$vX-$XStep;
 
+        $TopOffset  = $Y - $Boundaries["T"];
+        if ( $Boundaries["B"]-($vY+$IconAreaHeight) < $TopOffset ) { $Boundaries["B"] = $vY+$IconAreaHeight+$TopOffset; }
 
-     $this->Shadow = $RestoreShadow;
-    }
+        if ( $Style == LEGEND_ROUND )
+        $this->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+        elseif ( $Style == LEGEND_BOX )
+        $this->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
 
-   function drawScale($Format="")
-    {
-     $Pos		= isset($Format["Pos"]) ? $Format["Pos"] : SCALE_POS_LEFTRIGHT;
-     $Floating		= isset($Format["Floating"]) ? $Format["Floating"] : FALSE;
-     $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : SCALE_MODE_FLOATING;
-     $RemoveXAxis	= isset($Format["RemoveXAxis"]) ? $Format["RemoveXAxis"] : FALSE;
-     $MinDivHeight	= isset($Format["MinDivHeight"]) ? $Format["MinDivHeight"] : 20;
-     $Factors		= isset($Format["Factors"]) ? $Format["Factors"] : array(1,2,5);
-     $ManualScale	= isset($Format["ManualScale"]) ? $Format["ManualScale"] : array("0"=>array("Min"=>-100,"Max"=>100));
-     $XMargin		= isset($Format["XMargin"]) ? $Format["XMargin"] : AUTO;
-     $YMargin		= isset($Format["YMargin"]) ? $Format["YMargin"] : 0;
-     $ScaleSpacing	= isset($Format["ScaleSpacing"]) ? $Format["ScaleSpacing"] : 15;
-     $InnerTickWidth	= isset($Format["InnerTickWidth"]) ? $Format["InnerTickWidth"] : 2;
-     $OuterTickWidth	= isset($Format["OuterTickWidth"]) ? $Format["OuterTickWidth"] : 2;
-     $DrawXLines	= isset($Format["DrawXLines"]) ? $Format["DrawXLines"] : TRUE;
-     $DrawYLines	= isset($Format["DrawYLines"]) ? $Format["DrawYLines"] : ALL;
-     $GridTicks		= isset($Format["GridTicks"]) ? $Format["GridTicks"] : 4;
-     $GridR		= isset($Format["GridR"]) ? $Format["GridR"] : 255;
-     $GridG		= isset($Format["GridG"]) ? $Format["GridG"] : 255;
-     $GridB		= isset($Format["GridB"]) ? $Format["GridB"] : 255;
-     $GridAlpha		= isset($Format["GridAlpha"]) ? $Format["GridAlpha"] : 40;
-     $AxisRo		= isset($Format["AxisR"]) ? $Format["AxisR"] : 0;
-     $AxisGo		= isset($Format["AxisG"]) ? $Format["AxisG"] : 0;
-     $AxisBo		= isset($Format["AxisB"]) ? $Format["AxisB"] : 0;
-     $AxisAlpha		= isset($Format["AxisAlpha"]) ? $Format["AxisAlpha"] : 100;
-     $TickRo		= isset($Format["TickR"]) ? $Format["TickR"] : 0;
-     $TickGo		= isset($Format["TickG"]) ? $Format["TickG"] : 0;
-     $TickBo		= isset($Format["TickB"]) ? $Format["TickB"] : 0;
-     $TickAlpha		= isset($Format["TickAlpha"]) ? $Format["TickAlpha"] : 100;
-     $DrawSubTicks	= isset($Format["DrawSubTicks"]) ? $Format["DrawSubTicks"] : FALSE;
-     $InnerSubTickWidth	= isset($Format["InnerSubTickWidth"]) ? $Format["InnerSubTickWidth"] : 0;
-     $OuterSubTickWidth	= isset($Format["OuterSubTickWidth"]) ? $Format["OuterSubTickWidth"] : 2;
-     $SubTickR		= isset($Format["SubTickR"]) ? $Format["SubTickR"] : 255;
-     $SubTickG		= isset($Format["SubTickG"]) ? $Format["SubTickG"] : 0;
-     $SubTickB		= isset($Format["SubTickB"]) ? $Format["SubTickB"] : 0;
-     $SubTickAlpha	= isset($Format["SubTickAlpha"]) ? $Format["SubTickAlpha"] : 100;
-     $AutoAxisLabels	= isset($Format["AutoAxisLabels"]) ? $Format["AutoAxisLabels"] : TRUE;
-     $XReleasePercent	= isset($Format["XReleasePercent"]) ? $Format["XReleasePercent"] : 1;
-     $DrawArrows	= isset($Format["DrawArrows"]) ? $Format["DrawArrows"] : FALSE;
-     $ArrowSize         = isset($Format["ArrowSize"]) ? $Format["ArrowSize"] : 8;
-     $CycleBackground	= isset($Format["CycleBackground"]) ? $Format["CycleBackground"] : FALSE;
-     $BackgroundR1	= isset($Format["BackgroundR1"]) ? $Format["BackgroundR1"] : 255;
-     $BackgroundG1	= isset($Format["BackgroundG1"]) ? $Format["BackgroundG1"] : 255;
-     $BackgroundB1	= isset($Format["BackgroundB1"]) ? $Format["BackgroundB1"] : 255;
-     $BackgroundAlpha1	= isset($Format["BackgroundAlpha1"]) ? $Format["BackgroundAlpha1"] : 20;
-     $BackgroundR2	= isset($Format["BackgroundR2"]) ? $Format["BackgroundR2"] : 230;
-     $BackgroundG2	= isset($Format["BackgroundG2"]) ? $Format["BackgroundG2"] : 230;
-     $BackgroundB2	= isset($Format["BackgroundB2"]) ? $Format["BackgroundB2"] : 230;
-     $BackgroundAlpha2	= isset($Format["BackgroundAlpha2"]) ? $Format["BackgroundAlpha2"] : 20;
-     $LabelingMethod	= isset($Format["LabelingMethod"]) ? $Format["LabelingMethod"] : LABELING_ALL;
-     $LabelSkip		= isset($Format["LabelSkip"]) ? $Format["LabelSkip"] : 0;
-     $LabelRotation	= isset($Format["LabelRotation"]) ? $Format["LabelRotation"] : 0;
-     $SkippedAxisTicks	= isset($Format["SkippedAxisTicks"]) ? $Format["SkippedAxisTicks"] : $GridTicks+2;
-     $SkippedAxisR	= isset($Format["SkippedAxisR"]) ? $Format["SkippedAxisR"] : $GridR;
-     $SkippedAxisG	= isset($Format["SkippedAxisG"]) ? $Format["SkippedAxisG"] : $GridG;
-     $SkippedAxisB	= isset($Format["SkippedAxisB"]) ? $Format["SkippedAxisB"] : $GridB;
-     $SkippedAxisAlpha	= isset($Format["SkippedAxisAlpha"]) ? $Format["SkippedAxisAlpha"] : $GridAlpha-30;
-     $SkippedTickR	= isset($Format["SkippedTickR"]) ? $Format["SkippedTickR"] : $TickRo;
-     $SkippedTickG	= isset($Format["SkippedTickG"]) ? $Format["SkippedTickG"] : $TickGo;
-     $SkippedTickB	= isset($Format["SkippedTicksB"]) ? $Format["SkippedTickB"] : $TickBo;
-     $SkippedTickAlpha	= isset($Format["SkippedTickAlpha"]) ? $Format["SkippedTickAlpha"] : $TickAlpha-80;
-     $SkippedInnerTickWidth	= isset($Format["SkippedInnerTickWidth"]) ? $Format["SkippedInnerTickWidth"] : 0;
-     $SkippedOuterTickWidth	= isset($Format["SkippedOuterTickWidth"]) ? $Format["SkippedOuterTickWidth"] : 2;
-
-     /* Floating scale require X & Y margins to be set manually */
-     if ( $Floating && ( $XMargin == AUTO || $YMargin == 0 ) ) { $Floating = FALSE; }
-
-     /* Skip a NOTICE event in case of an empty array */
-     if ( $DrawYLines == NONE || $DrawYLines == FALSE ) { $DrawYLines = array("zarma"=>"31"); }
-
-     /* Define the color for the skipped elements */
-     $SkippedAxisColor = array("R"=>$SkippedAxisR,"G"=>$SkippedAxisG,"B"=>$SkippedAxisB,"Alpha"=>$SkippedAxisAlpha,"Ticks"=>$SkippedAxisTicks);
-     $SkippedTickColor = array("R"=>$SkippedTickR,"G"=>$SkippedTickG,"B"=>$SkippedTickB,"Alpha"=>$SkippedTickAlpha);
-
-     $Data = $this->DataSet->getData();
-     if ( isset($Data["Abscissa"]) ) { $Abscissa = $Data["Abscissa"]; } else { $Abscissa = NULL; }
-
-     /* Unset the abscissa axis, needed if we display multiple charts on the same picture */
-     if ( $Abscissa != NULL )
-      {
-       foreach($Data["Axis"] as $AxisID => $Parameters)
-        { if ($Parameters["Identity"] == AXIS_X) { unset($Data["Axis"][$AxisID]); } }
-      }
+        $RestoreShadow = $this->Shadow; $this->Shadow = FALSE;
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"];
+            $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
 
-     /* Build the scale settings */
-     $GotXAxis = FALSE;
-     foreach($Data["Axis"] as $AxisID => $AxisParameter)
-      {
-       if ( $AxisParameter["Identity"] == AXIS_X ) { $GotXAxis = TRUE; }
+            if ( isset($Serie["Picture"]) )
+            {
+            $Picture = $Serie["Picture"];
+            list($PicWidth,$PicHeight) = $this->getPicInfo($Picture);
+            $PicX = $X+$IconAreaWidth/2; $PicY = $Y+$IconAreaHeight/2; 
 
-       if ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_Y)
-        { $Height = $this->GraphAreaY2-$this->GraphAreaY1 - $YMargin*2; }
-       elseif ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_X)
-        { $Height = $this->GraphAreaX2-$this->GraphAreaX1; }
-       elseif ( $Pos == SCALE_POS_TOPBOTTOM && $AxisParameter["Identity"] == AXIS_Y)
-        { $Height = $this->GraphAreaX2-$this->GraphAreaX1 - $YMargin*2;; }
-       else
-        { $Height = $this->GraphAreaY2-$this->GraphAreaY1; }
+            $this->drawFromPNG($PicX-$PicWidth/2,$PicY-$PicHeight/2,$Picture);
+            }
+            else
+            {
+            if ( $Family == LEGEND_FAMILY_BOX )
+            {
+                if ( $BoxWidth != $IconAreaWidth ) { $XOffset = floor(($IconAreaWidth-$BoxWidth)/2); } else { $XOffset = 0; }
+                if ( $BoxHeight != $IconAreaHeight ) { $YOffset = floor(($IconAreaHeight-$BoxHeight)/2); } else { $YOffset = 0; }
 
-       $AxisMin = ABSOLUTE_MAX; $AxisMax = OUT_OF_SIGHT;
-       if ( $Mode == SCALE_MODE_FLOATING || $Mode == SCALE_MODE_START0 )
-        {
-         foreach($Data["Series"] as $SerieID => $SerieParameter)
-          {
-           if ( $SerieParameter["Axis"] == $AxisID && $Data["Series"][$SerieID]["isDrawable"] && $Data["Abscissa"] != $SerieID)
+                $this->drawFilledRectangle($X+1+$XOffset,$Y+1+$YOffset,$X+$BoxWidth+$XOffset+1,$Y+$BoxHeight+1+$YOffset,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
+                $this->drawFilledRectangle($X+$XOffset,$Y+$YOffset,$X+$BoxWidth+$XOffset,$Y+$BoxHeight+$YOffset,array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
+            }
+            elseif ( $Family == LEGEND_FAMILY_CIRCLE )
             {
-             $AxisMax = max($AxisMax,$Data["Series"][$SerieID]["Max"]);
-             $AxisMin = min($AxisMin,$Data["Series"][$SerieID]["Min"]);
+                $this->drawFilledCircle($X+1+$IconAreaWidth/2,$Y+1+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
+                $this->drawFilledCircle($X+$IconAreaWidth/2,$Y+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
             }
-          }
-         $AutoMargin = (($AxisMax-$AxisMin)/100)*$XReleasePercent;
-
-         $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
-         if ( $Mode == SCALE_MODE_START0 ) { $Data["Axis"][$AxisID]["Min"] = 0; }
+            elseif ( $Family == LEGEND_FAMILY_LINE )
+            {
+                $this->drawLine($X+1,$Y+1+$IconAreaHeight/2,$X+1+$IconAreaWidth,$Y+1+$IconAreaHeight/2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20,"Ticks"=>$Ticks,"Weight"=>$Weight));
+                $this->drawLine($X,$Y+$IconAreaHeight/2,$X+$IconAreaWidth,$Y+$IconAreaHeight/2,array("R"=>$R,"G"=>$G,"B"=>$B,"Ticks"=>$Ticks,"Weight"=>$Weight));
+            }
+            }
+
+            if ( $Mode == LEGEND_VERTICAL )
+            {
+            $Lines = preg_split("/\n/",$Serie["Description"]);
+            foreach($Lines as $Key => $Value)
+            $this->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontSize"=>$FontSize,"FontName"=>$FontName));
+
+            $Y=$Y+max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
+            }
+            elseif ( $Mode == LEGEND_HORIZONTAL )
+            {
+            $Lines = preg_split("/\n/",$Serie["Description"]);
+            $Width = "";
+            foreach($Lines as $Key => $Value)
+            {
+                $BoxArray = $this->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontSize"=>$FontSize,"FontName"=>$FontName));
+                $Width[] = $BoxArray[1]["X"];
+            }
+            $X=max($Width)+2+$XStep;
+            }
+        }
+        }
+
+
+        $this->Shadow = $RestoreShadow;
+    }
+
+    function drawScale($Format="")
+    {
+        $Pos		= isset($Format["Pos"]) ? $Format["Pos"] : SCALE_POS_LEFTRIGHT;
+        $Floating		= isset($Format["Floating"]) ? $Format["Floating"] : FALSE;
+        $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : SCALE_MODE_FLOATING;
+        $RemoveXAxis	= isset($Format["RemoveXAxis"]) ? $Format["RemoveXAxis"] : FALSE;
+        $MinDivHeight	= isset($Format["MinDivHeight"]) ? $Format["MinDivHeight"] : 20;
+        $Factors		= isset($Format["Factors"]) ? $Format["Factors"] : array(1,2,5);
+        $ManualScale	= isset($Format["ManualScale"]) ? $Format["ManualScale"] : array("0"=>array("Min"=>-100,"Max"=>100));
+        $XMargin		= isset($Format["XMargin"]) ? $Format["XMargin"] : AUTO;
+        $YMargin		= isset($Format["YMargin"]) ? $Format["YMargin"] : 0;
+        $ScaleSpacing	= isset($Format["ScaleSpacing"]) ? $Format["ScaleSpacing"] : 15;
+        $InnerTickWidth	= isset($Format["InnerTickWidth"]) ? $Format["InnerTickWidth"] : 2;
+        $OuterTickWidth	= isset($Format["OuterTickWidth"]) ? $Format["OuterTickWidth"] : 2;
+        $DrawXLines	= isset($Format["DrawXLines"]) ? $Format["DrawXLines"] : TRUE;
+        $DrawYLines	= isset($Format["DrawYLines"]) ? $Format["DrawYLines"] : ALL;
+        $GridTicks		= isset($Format["GridTicks"]) ? $Format["GridTicks"] : 4;
+        $GridR		= isset($Format["GridR"]) ? $Format["GridR"] : 255;
+        $GridG		= isset($Format["GridG"]) ? $Format["GridG"] : 255;
+        $GridB		= isset($Format["GridB"]) ? $Format["GridB"] : 255;
+        $GridAlpha		= isset($Format["GridAlpha"]) ? $Format["GridAlpha"] : 40;
+        $AxisRo		= isset($Format["AxisR"]) ? $Format["AxisR"] : 0;
+        $AxisGo		= isset($Format["AxisG"]) ? $Format["AxisG"] : 0;
+        $AxisBo		= isset($Format["AxisB"]) ? $Format["AxisB"] : 0;
+        $AxisAlpha		= isset($Format["AxisAlpha"]) ? $Format["AxisAlpha"] : 100;
+        $TickRo		= isset($Format["TickR"]) ? $Format["TickR"] : 0;
+        $TickGo		= isset($Format["TickG"]) ? $Format["TickG"] : 0;
+        $TickBo		= isset($Format["TickB"]) ? $Format["TickB"] : 0;
+        $TickAlpha		= isset($Format["TickAlpha"]) ? $Format["TickAlpha"] : 100;
+        $DrawSubTicks	= isset($Format["DrawSubTicks"]) ? $Format["DrawSubTicks"] : FALSE;
+        $InnerSubTickWidth	= isset($Format["InnerSubTickWidth"]) ? $Format["InnerSubTickWidth"] : 0;
+        $OuterSubTickWidth	= isset($Format["OuterSubTickWidth"]) ? $Format["OuterSubTickWidth"] : 2;
+        $SubTickR		= isset($Format["SubTickR"]) ? $Format["SubTickR"] : 255;
+        $SubTickG		= isset($Format["SubTickG"]) ? $Format["SubTickG"] : 0;
+        $SubTickB		= isset($Format["SubTickB"]) ? $Format["SubTickB"] : 0;
+        $SubTickAlpha	= isset($Format["SubTickAlpha"]) ? $Format["SubTickAlpha"] : 100;
+        $AutoAxisLabels	= isset($Format["AutoAxisLabels"]) ? $Format["AutoAxisLabels"] : TRUE;
+        $XReleasePercent	= isset($Format["XReleasePercent"]) ? $Format["XReleasePercent"] : 1;
+        $DrawArrows	= isset($Format["DrawArrows"]) ? $Format["DrawArrows"] : FALSE;
+        $ArrowSize         = isset($Format["ArrowSize"]) ? $Format["ArrowSize"] : 8;
+        $CycleBackground	= isset($Format["CycleBackground"]) ? $Format["CycleBackground"] : FALSE;
+        $BackgroundR1	= isset($Format["BackgroundR1"]) ? $Format["BackgroundR1"] : 255;
+        $BackgroundG1	= isset($Format["BackgroundG1"]) ? $Format["BackgroundG1"] : 255;
+        $BackgroundB1	= isset($Format["BackgroundB1"]) ? $Format["BackgroundB1"] : 255;
+        $BackgroundAlpha1	= isset($Format["BackgroundAlpha1"]) ? $Format["BackgroundAlpha1"] : 20;
+        $BackgroundR2	= isset($Format["BackgroundR2"]) ? $Format["BackgroundR2"] : 230;
+        $BackgroundG2	= isset($Format["BackgroundG2"]) ? $Format["BackgroundG2"] : 230;
+        $BackgroundB2	= isset($Format["BackgroundB2"]) ? $Format["BackgroundB2"] : 230;
+        $BackgroundAlpha2	= isset($Format["BackgroundAlpha2"]) ? $Format["BackgroundAlpha2"] : 20;
+        $LabelingMethod	= isset($Format["LabelingMethod"]) ? $Format["LabelingMethod"] : LABELING_ALL;
+        $LabelSkip		= isset($Format["LabelSkip"]) ? $Format["LabelSkip"] : 0;
+        $LabelRotation	= isset($Format["LabelRotation"]) ? $Format["LabelRotation"] : 0;
+        $SkippedAxisTicks	= isset($Format["SkippedAxisTicks"]) ? $Format["SkippedAxisTicks"] : $GridTicks+2;
+        $SkippedAxisR	= isset($Format["SkippedAxisR"]) ? $Format["SkippedAxisR"] : $GridR;
+        $SkippedAxisG	= isset($Format["SkippedAxisG"]) ? $Format["SkippedAxisG"] : $GridG;
+        $SkippedAxisB	= isset($Format["SkippedAxisB"]) ? $Format["SkippedAxisB"] : $GridB;
+        $SkippedAxisAlpha	= isset($Format["SkippedAxisAlpha"]) ? $Format["SkippedAxisAlpha"] : $GridAlpha-30;
+        $SkippedTickR	= isset($Format["SkippedTickR"]) ? $Format["SkippedTickR"] : $TickRo;
+        $SkippedTickG	= isset($Format["SkippedTickG"]) ? $Format["SkippedTickG"] : $TickGo;
+        $SkippedTickB	= isset($Format["SkippedTicksB"]) ? $Format["SkippedTickB"] : $TickBo;
+        $SkippedTickAlpha	= isset($Format["SkippedTickAlpha"]) ? $Format["SkippedTickAlpha"] : $TickAlpha-80;
+        $SkippedInnerTickWidth	= isset($Format["SkippedInnerTickWidth"]) ? $Format["SkippedInnerTickWidth"] : 0;
+        $SkippedOuterTickWidth	= isset($Format["SkippedOuterTickWidth"]) ? $Format["SkippedOuterTickWidth"] : 2;
+
+        /* Floating scale require X & Y margins to be set manually */
+        if ( $Floating && ( $XMargin == AUTO || $YMargin == 0 ) ) { $Floating = FALSE; }
+
+        /* Skip a NOTICE event in case of an empty array */
+        if ( $DrawYLines == NONE || $DrawYLines == FALSE ) { $DrawYLines = array("zarma"=>"31"); }
+
+        /* Define the color for the skipped elements */
+        $SkippedAxisColor = array("R"=>$SkippedAxisR,"G"=>$SkippedAxisG,"B"=>$SkippedAxisB,"Alpha"=>$SkippedAxisAlpha,"Ticks"=>$SkippedAxisTicks);
+        $SkippedTickColor = array("R"=>$SkippedTickR,"G"=>$SkippedTickG,"B"=>$SkippedTickB,"Alpha"=>$SkippedTickAlpha);
+
+        $Data = $this->DataSet->getData();
+        if ( isset($Data["Abscissa"]) ) { $Abscissa = $Data["Abscissa"]; } else { $Abscissa = NULL; }
+
+        /* Unset the abscissa axis, needed if we display multiple charts on the same picture */
+        if ( $Abscissa != NULL )
+        {
+        foreach($Data["Axis"] as $AxisID => $Parameters)
+        { if ($Parameters["Identity"] == AXIS_X) { unset($Data["Axis"][$AxisID]); } }
+        }
+
+        /* Build the scale settings */
+        $GotXAxis = FALSE;
+        foreach($Data["Axis"] as $AxisID => $AxisParameter)
+        {
+        if ( $AxisParameter["Identity"] == AXIS_X ) { $GotXAxis = TRUE; }
+
+        if ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_Y)
+        { $Height = $this->GraphAreaY2-$this->GraphAreaY1 - $YMargin*2; }
+        elseif ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_X)
+        { $Height = $this->GraphAreaX2-$this->GraphAreaX1; }
+        elseif ( $Pos == SCALE_POS_TOPBOTTOM && $AxisParameter["Identity"] == AXIS_Y)
+        { $Height = $this->GraphAreaX2-$this->GraphAreaX1 - $YMargin*2;; }
+        else
+        { $Height = $this->GraphAreaY2-$this->GraphAreaY1; }
+
+        $AxisMin = ABSOLUTE_MAX; $AxisMax = OUT_OF_SIGHT;
+        if ( $Mode == SCALE_MODE_FLOATING || $Mode == SCALE_MODE_START0 )
+        {
+            foreach($Data["Series"] as $SerieID => $SerieParameter)
+            {
+            if ( $SerieParameter["Axis"] == $AxisID && $Data["Series"][$SerieID]["isDrawable"] && $Data["Abscissa"] != $SerieID)
+            {
+                $AxisMax = max($AxisMax,$Data["Series"][$SerieID]["Max"]);
+                $AxisMin = min($AxisMin,$Data["Series"][$SerieID]["Min"]);
+            }
+            }
+            $AutoMargin = (($AxisMax-$AxisMin)/100)*$XReleasePercent;
+
+            $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
+            if ( $Mode == SCALE_MODE_START0 ) { $Data["Axis"][$AxisID]["Min"] = 0; }
         }
-       elseif ( $Mode == SCALE_MODE_MANUAL )
+        elseif ( $Mode == SCALE_MODE_MANUAL )
         {
-         if ( isset($ManualScale[$AxisID]["Min"]) && isset($ManualScale[$AxisID]["Max"]) )
-          {
-           $Data["Axis"][$AxisID]["Min"] = $ManualScale[$AxisID]["Min"];
-           $Data["Axis"][$AxisID]["Max"] = $ManualScale[$AxisID]["Max"];
-          }
-         else
-          { echo "Manual scale boundaries not set."; exit(); }
+            if ( isset($ManualScale[$AxisID]["Min"]) && isset($ManualScale[$AxisID]["Max"]) )
+            {
+            $Data["Axis"][$AxisID]["Min"] = $ManualScale[$AxisID]["Min"];
+            $Data["Axis"][$AxisID]["Max"] = $ManualScale[$AxisID]["Max"];
+            }
+            else
+            { echo "Manual scale boundaries not set."; exit(); }
         }
-       elseif ( $Mode == SCALE_MODE_ADDALL || $Mode == SCALE_MODE_ADDALL_START0 )
+        elseif ( $Mode == SCALE_MODE_ADDALL || $Mode == SCALE_MODE_ADDALL_START0 )
         {
-         $Series = "";
-         foreach($Data["Series"] as $SerieID => $SerieParameter)
-          { if ( $SerieParameter["Axis"] == $AxisID && $SerieParameter["isDrawable"] && $Data["Abscissa"] != $SerieID ) { $Series[$SerieID] = count($Data["Series"][$SerieID]["Data"]); } }
+            $Series = "";
+            foreach($Data["Series"] as $SerieID => $SerieParameter)
+            { if ( $SerieParameter["Axis"] == $AxisID && $SerieParameter["isDrawable"] && $Data["Abscissa"] != $SerieID ) { $Series[$SerieID] = count($Data["Series"][$SerieID]["Data"]); } }
 
-         for ($ID=0;$ID<=max($Series)-1;$ID++)
-          {
-           $PointMin = 0; $PointMax = 0;
-           foreach($Series as $SerieID => $ValuesCount )
+            for ($ID=0;$ID<=max($Series)-1;$ID++)
             {
-             if (isset($Data["Series"][$SerieID]["Data"][$ID]) && $Data["Series"][$SerieID]["Data"][$ID] != NULL )
-              {
-               $Value = $Data["Series"][$SerieID]["Data"][$ID];
-               if ( $Value > 0 ) { $PointMax = $PointMax + $Value; } else { $PointMin = $PointMin + $Value; }
-              }
+            $PointMin = 0; $PointMax = 0;
+            foreach($Series as $SerieID => $ValuesCount )
+            {
+                if (isset($Data["Series"][$SerieID]["Data"][$ID]) && $Data["Series"][$SerieID]["Data"][$ID] != NULL )
+                {
+                $Value = $Data["Series"][$SerieID]["Data"][$ID];
+                if ( $Value > 0 ) { $PointMax = $PointMax + $Value; } else { $PointMin = $PointMin + $Value; }
+                }
+            }
+            $AxisMax = max($AxisMax,$PointMax);
+            $AxisMin = min($AxisMin,$PointMin);
             }
-           $AxisMax = max($AxisMax,$PointMax);
-           $AxisMin = min($AxisMin,$PointMin);
-          }
-         $AutoMargin = (($AxisMax-$AxisMin)/100)*$XReleasePercent;
-         $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
+            $AutoMargin = (($AxisMax-$AxisMin)/100)*$XReleasePercent;
+            $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
         }
-       $MaxDivs = floor($Height/$MinDivHeight);
+        $MaxDivs = floor($Height/$MinDivHeight);
 
-       if ( $Mode == SCALE_MODE_ADDALL_START0 ) { $Data["Axis"][$AxisID]["Min"] = 0; }
+        if ( $Mode == SCALE_MODE_ADDALL_START0 ) { $Data["Axis"][$AxisID]["Min"] = 0; }
 
-       $Scale   = $this->computeScale($Data["Axis"][$AxisID]["Min"],$Data["Axis"][$AxisID]["Max"],$MaxDivs,$Factors,$AxisID);
+        $Scale   = $this->computeScale($Data["Axis"][$AxisID]["Min"],$Data["Axis"][$AxisID]["Max"],$MaxDivs,$Factors,$AxisID);
 
-       $Data["Axis"][$AxisID]["Margin"]    = $AxisParameter["Identity"] == AXIS_X ? $XMargin : $YMargin;
-       $Data["Axis"][$AxisID]["ScaleMin"]  = $Scale["XMin"];
-       $Data["Axis"][$AxisID]["ScaleMax"]  = $Scale["XMax"];
-       $Data["Axis"][$AxisID]["Rows"]      = $Scale["Rows"];
-       $Data["Axis"][$AxisID]["RowHeight"] = $Scale["RowHeight"];
+        $Data["Axis"][$AxisID]["Margin"]    = $AxisParameter["Identity"] == AXIS_X ? $XMargin : $YMargin;
+        $Data["Axis"][$AxisID]["ScaleMin"]  = $Scale["XMin"];
+        $Data["Axis"][$AxisID]["ScaleMax"]  = $Scale["XMax"];
+        $Data["Axis"][$AxisID]["Rows"]      = $Scale["Rows"];
+        $Data["Axis"][$AxisID]["RowHeight"] = $Scale["RowHeight"];
 
-       if ( isset($Scale["Format"]) ) { $Data["Axis"][$AxisID]["Format"] = $Scale["Format"]; }
+        if ( isset($Scale["Format"]) ) { $Data["Axis"][$AxisID]["Format"] = $Scale["Format"]; }
 
-       if ( !isset($Data["Axis"][$AxisID]["Display"]) ) { $Data["Axis"][$AxisID]["Display"] = NULL; }
-       if ( !isset($Data["Axis"][$AxisID]["Format"]) )  { $Data["Axis"][$AxisID]["Format"] = NULL; }
-       if ( !isset($Data["Axis"][$AxisID]["Unit"]) )    { $Data["Axis"][$AxisID]["Unit"] = NULL; }
-      }
+        if ( !isset($Data["Axis"][$AxisID]["Display"]) ) { $Data["Axis"][$AxisID]["Display"] = NULL; }
+        if ( !isset($Data["Axis"][$AxisID]["Format"]) )  { $Data["Axis"][$AxisID]["Format"] = NULL; }
+        if ( !isset($Data["Axis"][$AxisID]["Unit"]) )    { $Data["Axis"][$AxisID]["Unit"] = NULL; }
+        }
 
-     /* Still no X axis */
-     if ( $GotXAxis == FALSE )
-      {
-       if ( $Abscissa != NULL )
+        /* Still no X axis */
+        if ( $GotXAxis == FALSE )
+        {
+        if ( $Abscissa != NULL )
         {
-         $Points = count($Data["Series"][$Abscissa]["Data"]);
-         if ( $AutoAxisLabels )
-          $AxisName = isset($Data["Series"][$Abscissa]["Description"]) ? $Data["Series"][$Abscissa]["Description"] : NULL;
-         else
-          $AxisName = NULL;
+            $Points = count($Data["Series"][$Abscissa]["Data"]);
+            if ( $AutoAxisLabels )
+            $AxisName = isset($Data["Series"][$Abscissa]["Description"]) ? $Data["Series"][$Abscissa]["Description"] : NULL;
+            else
+            $AxisName = NULL;
         }
-       else
+        else
         {
-         $Points = 0;
-         $AxisName = isset($Data["XAxisName"]) ? $Data["XAxisName"] : NULL;
-         foreach($Data["Series"] as $SerieID => $SerieParameter)
-          { if ( $SerieParameter["isDrawable"] ) { $Points = max($Points,count($SerieParameter["Data"])); } }
+            $Points = 0;
+            $AxisName = isset($Data["XAxisName"]) ? $Data["XAxisName"] : NULL;
+            foreach($Data["Series"] as $SerieID => $SerieParameter)
+            { if ( $SerieParameter["isDrawable"] ) { $Points = max($Points,count($SerieParameter["Data"])); } }
         }
 
-       $AxisID = count($Data["Axis"]);
-       $Data["Axis"][$AxisID]["Identity"] = AXIS_X;
-       if ( $Pos == SCALE_POS_LEFTRIGHT ) { $Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_BOTTOM; } else { $Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_LEFT; }
-       if ( isset($Data["AbscissaName"]) ) { $Data["Axis"][$AxisID]["Name"] = $Data["AbscissaName"]; }
-       if ( $XMargin == AUTO )
+        $AxisID = count($Data["Axis"]);
+        $Data["Axis"][$AxisID]["Identity"] = AXIS_X;
+        if ( $Pos == SCALE_POS_LEFTRIGHT ) { $Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_BOTTOM; } else { $Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_LEFT; }
+        if ( isset($Data["AbscissaName"]) ) { $Data["Axis"][$AxisID]["Name"] = $Data["AbscissaName"]; }
+        if ( $XMargin == AUTO )
         {
-         if ( $Pos == SCALE_POS_LEFTRIGHT )
-          { $Height = $this->GraphAreaX2-$this->GraphAreaX1; }
-         else
-          { $Height = $this->GraphAreaY2-$this->GraphAreaY1; }
-
-         if ( $Points == 1 )
-          $Data["Axis"][$AxisID]["Margin"] = $Height / 2;
-         else
-          $Data["Axis"][$AxisID]["Margin"] = ($Height/$Points) / 2;
+            if ( $Pos == SCALE_POS_LEFTRIGHT )
+            { $Height = $this->GraphAreaX2-$this->GraphAreaX1; }
+            else
+            { $Height = $this->GraphAreaY2-$this->GraphAreaY1; }
+
+            if ( $Points == 1 )
+            $Data["Axis"][$AxisID]["Margin"] = $Height / 2;
+            else
+            $Data["Axis"][$AxisID]["Margin"] = ($Height/$Points) / 2;
         }
-       else
+        else
         { $Data["Axis"][$AxisID]["Margin"] = $XMargin; }
-       $Data["Axis"][$AxisID]["Rows"] = $Points-1;
-       if ( !isset($Data["Axis"][$AxisID]["Display"]) ) { $Data["Axis"][$AxisID]["Display"] = NULL; }
-       if ( !isset($Data["Axis"][$AxisID]["Format"]) )  { $Data["Axis"][$AxisID]["Format"] = NULL; }
-       if ( !isset($Data["Axis"][$AxisID]["Unit"]) )    { $Data["Axis"][$AxisID]["Unit"] = NULL; }
-      }
-
-     /* Do we need to reverse the abscissa position? */
-     if ( $Pos != SCALE_POS_LEFTRIGHT )
-      {
-       if ( $Data["AbsicssaPosition"] == AXIS_POSITION_BOTTOM )
+        $Data["Axis"][$AxisID]["Rows"] = $Points-1;
+        if ( !isset($Data["Axis"][$AxisID]["Display"]) ) { $Data["Axis"][$AxisID]["Display"] = NULL; }
+        if ( !isset($Data["Axis"][$AxisID]["Format"]) )  { $Data["Axis"][$AxisID]["Format"] = NULL; }
+        if ( !isset($Data["Axis"][$AxisID]["Unit"]) )    { $Data["Axis"][$AxisID]["Unit"] = NULL; }
+        }
+
+        /* Do we need to reverse the abscissa position? */
+        if ( $Pos != SCALE_POS_LEFTRIGHT )
+        {
+        if ( $Data["AbsicssaPosition"] == AXIS_POSITION_BOTTOM )
         { $Data["AbsicssaPosition"] = AXIS_POSITION_LEFT; }
-       else
+        else
         { $Data["AbsicssaPosition"] = AXIS_POSITION_RIGHT; }
-      }
-     $Data["Axis"][$AxisID]["Position"] = $Data["AbsicssaPosition"];
+        }
+        $Data["Axis"][$AxisID]["Position"] = $Data["AbsicssaPosition"];
 
-     $this->DataSet->saveOrientation($Pos);
-     $this->DataSet->saveAxisConfig($Data["Axis"]);
-     $this->DataSet->saveYMargin($YMargin);
+        $this->DataSet->saveOrientation($Pos);
+        $this->DataSet->saveAxisConfig($Data["Axis"]);
+        $this->DataSet->saveYMargin($YMargin);
 
-     $FontColorRo = $this->FontColorR; $FontColorGo = $this->FontColorG; $FontColorBo = $this->FontColorB;
+        $FontColorRo = $this->FontColorR; $FontColorGo = $this->FontColorG; $FontColorBo = $this->FontColorB;
 
-     $AxisPos["L"] = $this->GraphAreaX1; $AxisPos["R"] = $this->GraphAreaX2; $AxisPos["T"] = $this->GraphAreaY1; $AxisPos["B"] = $this->GraphAreaY2;
-     foreach($Data["Axis"] as $AxisID => $Parameters)
-      {
-       if ( isset($Parameters["Color"]) )
+        $AxisPos["L"] = $this->GraphAreaX1; $AxisPos["R"] = $this->GraphAreaX2; $AxisPos["T"] = $this->GraphAreaY1; $AxisPos["B"] = $this->GraphAreaY2;
+        foreach($Data["Axis"] as $AxisID => $Parameters)
+        {
+        if ( isset($Parameters["Color"]) )
         {
-         $AxisR = $Parameters["Color"]["R"]; $AxisG = $Parameters["Color"]["G"]; $AxisB = $Parameters["Color"]["B"];
-         $TickR = $Parameters["Color"]["R"]; $TickG = $Parameters["Color"]["G"]; $TickB = $Parameters["Color"]["B"];
-         $this->setFontProperties(array("R"=>$Parameters["Color"]["R"],"G"=>$Parameters["Color"]["G"],"B"=>$Parameters["Color"]["B"]));
+            $AxisR = $Parameters["Color"]["R"]; $AxisG = $Parameters["Color"]["G"]; $AxisB = $Parameters["Color"]["B"];
+            $TickR = $Parameters["Color"]["R"]; $TickG = $Parameters["Color"]["G"]; $TickB = $Parameters["Color"]["B"];
+            $this->setFontProperties(array("R"=>$Parameters["Color"]["R"],"G"=>$Parameters["Color"]["G"],"B"=>$Parameters["Color"]["B"]));
         }
-       else
+        else
         {
-         $AxisR = $AxisRo; $AxisG = $AxisGo; $AxisB = $AxisBo;
-         $TickR = $TickRo; $TickG = $TickGo; $TickB = $TickBo;
-         $this->setFontProperties(array("R"=>$FontColorRo,"G"=>$FontColorGo,"B"=>$FontColorBo));
+            $AxisR = $AxisRo; $AxisG = $AxisGo; $AxisB = $AxisBo;
+            $TickR = $TickRo; $TickG = $TickGo; $TickB = $TickBo;
+            $this->setFontProperties(array("R"=>$FontColorRo,"G"=>$FontColorGo,"B"=>$FontColorBo));
         }
 
-       $LastValue = "w00t"; $ID = 1;
-       if ( $Parameters["Identity"] == AXIS_X )
+        $LastValue = "w00t"; $ID = 1;
+        if ( $Parameters["Identity"] == AXIS_X )
         {
-         if ( $Pos == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $Parameters["Position"] == AXIS_POSITION_BOTTOM )
+            if ( $Pos == SCALE_POS_LEFTRIGHT )
             {
-             if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $YLabelOffset = 2; }
-             if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $YLabelOffset = 5; }
-             if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $YLabelOffset = 5; }
-             if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $YLabelOffset = 2; }
+            if ( $Parameters["Position"] == AXIS_POSITION_BOTTOM )
+            {
+                if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $YLabelOffset = 2; }
+                if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $YLabelOffset = 5; }
+                if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $YLabelOffset = 5; }
+                if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $YLabelOffset = 2; }
 
-             if ( !$RemoveXAxis )
-              {
-               if ( $Floating )
+                if ( !$RemoveXAxis )
+                {
+                if ( $Floating )
                 { $FloatingOffset = $YMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                else
                 { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["B"],$this->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-               if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
-              }
+                if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                }
 
-             $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
+                $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
 
-             if ($Parameters["Rows"] == 0 ) { $Step  = $Width; } else { $Step  = $Width / ($Parameters["Rows"]); }
+                if ($Parameters["Rows"] == 0 ) { $Step  = $Width; } else { $Step  = $Width / ($Parameters["Rows"]); }
              
-             $MaxBottom = $AxisPos["B"];
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
-               $YPos  = $AxisPos["B"];
+                $MaxBottom = $AxisPos["B"];
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+                $YPos  = $AxisPos["B"];
 
-               if ( $Abscissa != NULL )
+                if ( $Abscissa != NULL )
                 { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
+                else
                 {
-                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
-                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
-                 else
-                  $Value = $i;
+                    if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
+                    $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                    else
+                    $Value = $i;
                 }
 
-               $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
+                $ID++; $Skipped = TRUE;
+                if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
                 {
-                 $Bounds    = $this->drawText($XPos,$YPos+$OuterTickWidth+$YLabelOffset,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
-                 $TxtBottom = $YPos+$OuterTickWidth+2+($Bounds[0]["Y"]-$Bounds[2]["Y"]);
-                 $MaxBottom = max($MaxBottom,$TxtBottom);
-                 $LastValue = $Value;
-                 $Skipped   = FALSE;
+                    $Bounds    = $this->drawText($XPos,$YPos+$OuterTickWidth+$YLabelOffset,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
+                    $TxtBottom = $YPos+$OuterTickWidth+2+($Bounds[0]["Y"]-$Bounds[2]["Y"]);
+                    $MaxBottom = max($MaxBottom,$TxtBottom);
+                    $LastValue = $Value;
+                    $Skipped   = FALSE;
                 }
 
-               if ( $RemoveXAxis ) { $Skipped   = FALSE; }
+                if ( $RemoveXAxis ) { $Skipped   = FALSE; }
 
-               if ( $Skipped )
+                if ( $Skipped )
                 {
-                 if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$SkippedAxisColor); }
-                 if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos-$SkippedInnerTickWidth,$XPos,$YPos+$SkippedOuterTickWidth,$SkippedTickColor); }
+                    if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$SkippedAxisColor); }
+                    if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos-$SkippedInnerTickWidth,$XPos,$YPos+$SkippedOuterTickWidth,$SkippedTickColor); }
                 }
-               else
+                else
                 {
-                 if ( $DrawXLines && ($XPos != $this->GraphAreaX1 && $XPos != $this->GraphAreaX2) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
-                 if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos-$InnerTickWidth,$XPos,$YPos+$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
+                    if ( $DrawXLines && ($XPos != $this->GraphAreaX1 && $XPos != $this->GraphAreaX2) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                    if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos-$InnerTickWidth,$XPos,$YPos+$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
+                }
                 }
-              }
 
-             if ( isset($Parameters["Name"]) && !$RemoveXAxis)
-              {
-               $YPos   = $MaxBottom+2;
-               $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
-               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_TOPMIDDLE));
-               $MaxBottom = $Bounds[0]["Y"];
+                if ( isset($Parameters["Name"]) && !$RemoveXAxis)
+                {
+                $YPos   = $MaxBottom+2;
+                $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
+                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_TOPMIDDLE));
+                $MaxBottom = $Bounds[0]["Y"];
 
-               $this->DataSet->Data["GraphArea"]["Y2"] = $MaxBottom + $this->FontSize;
-              }
+                $this->DataSet->Data["GraphArea"]["Y2"] = $MaxBottom + $this->FontSize;
+                }
 
-             $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
+                $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
             }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_TOP )
+            elseif ( $Parameters["Position"] == AXIS_POSITION_TOP )
             {
-             if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $YLabelOffset = 2; }
-             if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $YLabelOffset = 2; }
-             if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $YLabelOffset = 5; }
-             if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $YLabelOffset = 5; }
+                if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $YLabelOffset = 2; }
+                if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $YLabelOffset = 2; }
+                if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $YLabelOffset = 5; }
+                if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $YLabelOffset = 5; }
 
-             if ( !$RemoveXAxis )
-              {
-               if ( $Floating )
+                if ( !$RemoveXAxis )
+                {
+                if ( $Floating )
                 { $FloatingOffset = $YMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                else
                 { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["T"],$this->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-               if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
-              }
+                if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                }
 
-             $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
+                $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
 
-             if ($Parameters["Rows"] == 0 ) { $Step  = $Width; } else { $Step  = $Width / $Parameters["Rows"]; }
+                if ($Parameters["Rows"] == 0 ) { $Step  = $Width; } else { $Step  = $Width / $Parameters["Rows"]; }
              
-             $MinTop = $AxisPos["T"];
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
-               $YPos  = $AxisPos["T"];
+                $MinTop = $AxisPos["T"];
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+                $YPos  = $AxisPos["T"];
 
-               if ( $Abscissa != NULL )
+                if ( $Abscissa != NULL )
                 { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
+                else
                 {
-                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
-                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
-                 else
-                  $Value = $i;
+                    if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
+                    $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                    else
+                    $Value = $i;
                 }
 
-               $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
+                $ID++; $Skipped = TRUE;
+                if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
                 {
-                 $Bounds = $this->drawText($XPos,$YPos-$OuterTickWidth-$YLabelOffset,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
-                 $TxtBox = $YPos-$OuterTickWidth-2-($Bounds[0]["Y"]-$Bounds[2]["Y"]);
-                 $MinTop = min($MinTop,$TxtBox);
-                 $LastValue = $Value;
-                 $Skipped   = FALSE;
+                    $Bounds = $this->drawText($XPos,$YPos-$OuterTickWidth-$YLabelOffset,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
+                    $TxtBox = $YPos-$OuterTickWidth-2-($Bounds[0]["Y"]-$Bounds[2]["Y"]);
+                    $MinTop = min($MinTop,$TxtBox);
+                    $LastValue = $Value;
+                    $Skipped   = FALSE;
                 }
 
-               if ( $RemoveXAxis ) { $Skipped   = FALSE; }
+                if ( $RemoveXAxis ) { $Skipped   = FALSE; }
 
-               if ( $Skipped )
+                if ( $Skipped )
                 {
-                 if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$SkippedAxisColor); }
-                 if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos+$SkippedInnerTickWidth,$XPos,$YPos-$SkippedOuterTickWidth,$SkippedTickColor); }
+                    if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$SkippedAxisColor); }
+                    if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos+$SkippedInnerTickWidth,$XPos,$YPos-$SkippedOuterTickWidth,$SkippedTickColor); }
                 }
-               else
+                else
                 {
-                 if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
-                 if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos+$InnerTickWidth,$XPos,$YPos-$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
+                    if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                    if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos+$InnerTickWidth,$XPos,$YPos-$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
                 }
 
-              }
+                }
 
-             if ( isset($Parameters["Name"]) && !$RemoveXAxis )
-              {
-               $YPos   = $MinTop-2;
-               $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
-               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-               $MinTop = $Bounds[2]["Y"];
+                if ( isset($Parameters["Name"]) && !$RemoveXAxis )
+                {
+                $YPos   = $MinTop-2;
+                $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
+                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+                $MinTop = $Bounds[2]["Y"];
 
-               $this->DataSet->Data["GraphArea"]["Y1"] = $MinTop;
-              }
+                $this->DataSet->Data["GraphArea"]["Y1"] = $MinTop;
+                }
 
-             $AxisPos["T"] = $MinTop - $ScaleSpacing;
+                $AxisPos["T"] = $MinTop - $ScaleSpacing;
+            }
             }
-          }
-         elseif ( $Pos == SCALE_POS_TOPBOTTOM )
-          {
-           if ( $Parameters["Position"] == AXIS_POSITION_LEFT )
+            elseif ( $Pos == SCALE_POS_TOPBOTTOM )
             {
-             if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = -2; }
-             if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = -6; }
-             if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = -2; }
-             if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = -5; }
+            if ( $Parameters["Position"] == AXIS_POSITION_LEFT )
+            {
+                if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = -2; }
+                if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = -6; }
+                if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = -2; }
+                if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = -5; }
 
-             if ( !$RemoveXAxis )
-              {
-               if ( $Floating )
+                if ( !$RemoveXAxis )
+                {
+                if ( $Floating )
                 { $FloatingOffset = $YMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                else
                 { $FloatingOffset = 0; $this->drawLine($AxisPos["L"],$this->GraphAreaY1,$AxisPos["L"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-               if ( $DrawArrows ) { $this->drawArrow($AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
-              }
+                if ( $DrawArrows ) { $this->drawArrow($AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                }
 
-             $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
+                $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
 
-             if ($Parameters["Rows"] == 0 ) { $Step  = $Height; } else { $Step   = $Height / $Parameters["Rows"]; }
+                if ($Parameters["Rows"] == 0 ) { $Step  = $Height; } else { $Step   = $Height / $Parameters["Rows"]; }
 
-             $MinLeft = $AxisPos["L"];
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
-               $XPos  = $AxisPos["L"];
+                $MinLeft = $AxisPos["L"];
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
+                $XPos  = $AxisPos["L"];
 
-               if ( $Abscissa != NULL )
+                if ( $Abscissa != NULL )
                 { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
+                else
                 {
-                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
-                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
-                 else
-                  $Value = $i;
+                    if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
+                    $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                    else
+                    $Value = $i;
                 }
 
-               $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
+                $ID++; $Skipped = TRUE;
+                if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
                 {
-                 $Bounds  = $this->drawText($XPos-$OuterTickWidth+$XLabelOffset,$YPos,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
-                 $TxtBox  = $XPos-$OuterTickWidth-2-($Bounds[1]["X"]-$Bounds[0]["X"]);
-                 $MinLeft = min($MinLeft,$TxtBox);
-                 $LastValue = $Value;
-                 $Skipped   = FALSE;
+                    $Bounds  = $this->drawText($XPos-$OuterTickWidth+$XLabelOffset,$YPos,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
+                    $TxtBox  = $XPos-$OuterTickWidth-2-($Bounds[1]["X"]-$Bounds[0]["X"]);
+                    $MinLeft = min($MinLeft,$TxtBox);
+                    $LastValue = $Value;
+                    $Skipped   = FALSE;
                 }
 
-               if ( $RemoveXAxis ) { $Skipped   = FALSE; }
+                if ( $RemoveXAxis ) { $Skipped   = FALSE; }
 
-               if ( $Skipped )
+                if ( $Skipped )
                 {
-                 if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,$SkippedAxisColor); }
-                 if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos-$SkippedOuterTickWidth,$YPos,$XPos+$SkippedInnerTickWidth,$YPos,$SkippedTickColor); }
+                    if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,$SkippedAxisColor); }
+                    if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos-$SkippedOuterTickWidth,$YPos,$XPos+$SkippedInnerTickWidth,$YPos,$SkippedTickColor); }
                 }
-               else
+                else
                 {
-                 if ( $DrawXLines && ($YPos != $this->GraphAreaY1 && $YPos != $this->GraphAreaY2) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
-                 if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos-$OuterTickWidth,$YPos,$XPos+$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
+                    if ( $DrawXLines && ($YPos != $this->GraphAreaY1 && $YPos != $this->GraphAreaY2) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                    if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos-$OuterTickWidth,$YPos,$XPos+$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
                 }
 
-              }
-             if ( isset($Parameters["Name"]) && !$RemoveXAxis )
-              {
-               $XPos   = $MinLeft-2;
-               $YPos   = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
-               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>90));
-               $MinLeft = $Bounds[0]["X"];
+                }
+                if ( isset($Parameters["Name"]) && !$RemoveXAxis )
+                {
+                $XPos   = $MinLeft-2;
+                $YPos   = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
+                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>90));
+                $MinLeft = $Bounds[0]["X"];
 
-               $this->DataSet->Data["GraphArea"]["X1"] = $MinLeft;
-              }
+                $this->DataSet->Data["GraphArea"]["X1"] = $MinLeft;
+                }
 
-             $AxisPos["L"] = $MinLeft - $ScaleSpacing;
+                $AxisPos["L"] = $MinLeft - $ScaleSpacing;
             }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
+            elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
             {
-             if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = 2; }
-             if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = 6; }
-             if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = 5; }
-             if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = 7; }
+                if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = 2; }
+                if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = 6; }
+                if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = 5; }
+                if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = 7; }
 
-             if ( !$RemoveXAxis )
-              {
-               if ( $Floating )
+                if ( !$RemoveXAxis )
+                {
+                if ( $Floating )
                 { $FloatingOffset = $YMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                else
                 { $FloatingOffset = 0; $this->drawLine($AxisPos["R"],$this->GraphAreaY1,$AxisPos["R"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-               if ( $DrawArrows ) { $this->drawArrow($AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
-              }
+                if ( $DrawArrows ) { $this->drawArrow($AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                }
 
-             $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
+                $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
 
-             if ($Parameters["Rows"] == 0 ) { $Step  = $Height; } else { $Step   = $Height / $Parameters["Rows"]; }
+                if ($Parameters["Rows"] == 0 ) { $Step  = $Height; } else { $Step   = $Height / $Parameters["Rows"]; }
              
-             $MaxRight = $AxisPos["R"];
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
-               $XPos  = $AxisPos["R"];
+                $MaxRight = $AxisPos["R"];
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
+                $XPos  = $AxisPos["R"];
 
-               if ( $Abscissa != NULL )
+                if ( $Abscissa != NULL )
                 { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
+                else
                 {
-                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
-                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
-                 else
-                  $Value = $i;
+                    if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
+                    $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                    else
+                    $Value = $i;
                 }
 
-               $ID++; $Skipped = TRUE;
-               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
+                $ID++; $Skipped = TRUE;
+                if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
                 {
-                 $Bounds   = $this->drawText($XPos+$OuterTickWidth+$XLabelOffset,$YPos,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
-                 $TxtBox   = $XPos+$OuterTickWidth+2+($Bounds[1]["X"]-$Bounds[0]["X"]);
-                 $MaxRight = max($MaxRight,$TxtBox);
-                 $LastValue = $Value;
-                 $Skipped   = FALSE;
+                    $Bounds   = $this->drawText($XPos+$OuterTickWidth+$XLabelOffset,$YPos,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
+                    $TxtBox   = $XPos+$OuterTickWidth+2+($Bounds[1]["X"]-$Bounds[0]["X"]);
+                    $MaxRight = max($MaxRight,$TxtBox);
+                    $LastValue = $Value;
+                    $Skipped   = FALSE;
                 }
 
-               if ( $RemoveXAxis ) { $Skipped   = FALSE; }
+                if ( $RemoveXAxis ) { $Skipped   = FALSE; }
 
-               if ( $Skipped )
+                if ( $Skipped )
                 {
-                 if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,$SkippedAxisColor); }
-                 if ( ($SkippedInnerTickWidth != 0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos+$SkippedOuterTickWidth,$YPos,$XPos-$SkippedInnerTickWidth,$YPos,$SkippedTickColor); }
+                    if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,$SkippedAxisColor); }
+                    if ( ($SkippedInnerTickWidth != 0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos+$SkippedOuterTickWidth,$YPos,$XPos-$SkippedInnerTickWidth,$YPos,$SkippedTickColor); }
                 }
-               else
+                else
                 {
-                 if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
-                 if ( ($InnerTickWidth != 0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos+$OuterTickWidth,$YPos,$XPos-$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
+                    if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                    if ( ($InnerTickWidth != 0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos+$OuterTickWidth,$YPos,$XPos-$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
                 }
 
-              }
+                }
 
-             if ( isset($Parameters["Name"]) && !$RemoveXAxis)
-              {
-               $XPos   = $MaxRight+4;
-               $YPos   = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
-               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>270));
-               $MaxRight = $Bounds[1]["X"];
+                if ( isset($Parameters["Name"]) && !$RemoveXAxis)
+                {
+                $XPos   = $MaxRight+4;
+                $YPos   = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
+                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>270));
+                $MaxRight = $Bounds[1]["X"];
 
-               $this->DataSet->Data["GraphArea"]["X2"] = $MaxRight + $this->FontSize;
-              }
+                $this->DataSet->Data["GraphArea"]["X2"] = $MaxRight + $this->FontSize;
+                }
 
-             $AxisPos["R"] = $MaxRight + $ScaleSpacing;
+                $AxisPos["R"] = $MaxRight + $ScaleSpacing;
+            }
             }
-          }
         }
 
 
 
-       if ( $Parameters["Identity"] == AXIS_Y )
+        if ( $Parameters["Identity"] == AXIS_Y )
         {
-         if ( $Pos == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $Parameters["Position"] == AXIS_POSITION_LEFT )
+            if ( $Pos == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $Parameters["Position"] == AXIS_POSITION_LEFT )
             {
 
-             if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
-              { $FloatingOffset = 0; $this->drawLine($AxisPos["L"],$this->GraphAreaY1,$AxisPos["L"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+                if ( $Floating )
+                { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+                else
+                { $FloatingOffset = 0; $this->drawLine($AxisPos["L"],$this->GraphAreaY1,$AxisPos["L"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-             if ( $DrawArrows ) { $this->drawArrow($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                if ( $DrawArrows ) { $this->drawArrow($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
 
-             $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
-             $Step   = $Height / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MinLeft = $AxisPos["L"];
-             $LastY  = NULL;
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $YPos  = $this->GraphAreaY2 - $Parameters["Margin"] - $Step*$i;
-               $XPos  = $AxisPos["L"];
-               $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
+                $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
+                $Step   = $Height / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MinLeft = $AxisPos["L"];
+                $LastY  = NULL;
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $YPos  = $this->GraphAreaY2 - $Parameters["Margin"] - $Step*$i;
+                $XPos  = $AxisPos["L"];
+                $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
 
-               if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
-               if ( $LastY != NULL && $CycleBackground && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($this->GraphAreaX1+$FloatingOffset,$LastY,$this->GraphAreaX2-$FloatingOffset,$YPos,$BGColor); }
+                if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
+                if ( $LastY != NULL && $CycleBackground && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($this->GraphAreaX1+$FloatingOffset,$LastY,$this->GraphAreaX2-$FloatingOffset,$YPos,$BGColor); }
 
-               if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
 
-               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
+                if ( $DrawSubTicks && $i != $Parameters["Rows"] )
                 $this->drawLine($XPos-$OuterSubTickWidth,$YPos-$SubTicksSize,$XPos+$InnerSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
 
-               $this->drawLine($XPos-$OuterTickWidth,$YPos,$XPos+$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
-               $Bounds  = $this->drawText($XPos-$OuterTickWidth-2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
-               $TxtLeft = $XPos-$OuterTickWidth-2-($Bounds[1]["X"]-$Bounds[0]["X"]);
-               $MinLeft = min($MinLeft,$TxtLeft);
+                $this->drawLine($XPos-$OuterTickWidth,$YPos,$XPos+$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
+                $Bounds  = $this->drawText($XPos-$OuterTickWidth-2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
+                $TxtLeft = $XPos-$OuterTickWidth-2-($Bounds[1]["X"]-$Bounds[0]["X"]);
+                $MinLeft = min($MinLeft,$TxtLeft);
 
-               $LastY = $YPos;
-              }
+                $LastY = $YPos;
+                }
 
-             if ( isset($Parameters["Name"]) )
-              {
-               $XPos    = $MinLeft-2;
-               $YPos    = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
-               $Bounds  = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>90));
-               $MinLeft = $Bounds[2]["X"];
+                if ( isset($Parameters["Name"]) )
+                {
+                $XPos    = $MinLeft-2;
+                $YPos    = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
+                $Bounds  = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>90));
+                $MinLeft = $Bounds[2]["X"];
 
-               $this->DataSet->Data["GraphArea"]["X1"] = $MinLeft;
-              }
+                $this->DataSet->Data["GraphArea"]["X1"] = $MinLeft;
+                }
 
-             $AxisPos["L"] = $MinLeft - $ScaleSpacing;
+                $AxisPos["L"] = $MinLeft - $ScaleSpacing;
             }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
+            elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
             {
-             if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
-              { $FloatingOffset = 0; $this->drawLine($AxisPos["R"],$this->GraphAreaY1,$AxisPos["R"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+                if ( $Floating )
+                { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+                else
+                { $FloatingOffset = 0; $this->drawLine($AxisPos["R"],$this->GraphAreaY1,$AxisPos["R"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-             if ( $DrawArrows ) { $this->drawArrow($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                if ( $DrawArrows ) { $this->drawArrow($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
 
-             $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
-             $Step   = $Height / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MaxLeft = $AxisPos["R"];
-             $LastY  = NULL;
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $YPos  = $this->GraphAreaY2 - $Parameters["Margin"] - $Step*$i;
-               $XPos  = $AxisPos["R"];
-               $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
+                $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
+                $Step   = $Height / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MaxLeft = $AxisPos["R"];
+                $LastY  = NULL;
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $YPos  = $this->GraphAreaY2 - $Parameters["Margin"] - $Step*$i;
+                $XPos  = $AxisPos["R"];
+                $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
 
-               if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
-               if ( $LastY != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($this->GraphAreaX1+$FloatingOffset,$LastY,$this->GraphAreaX2-$FloatingOffset,$YPos,$BGColor); }
+                if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
+                if ( $LastY != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($this->GraphAreaX1+$FloatingOffset,$LastY,$this->GraphAreaX2-$FloatingOffset,$YPos,$BGColor); }
 
-               if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
 
-               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
+                if ( $DrawSubTicks && $i != $Parameters["Rows"] )
                 $this->drawLine($XPos-$OuterSubTickWidth,$YPos-$SubTicksSize,$XPos+$InnerSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
 
-               $this->drawLine($XPos-$InnerTickWidth,$YPos,$XPos+$OuterTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
-               $Bounds  = $this->drawText($XPos+$OuterTickWidth+2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
-               $TxtLeft = $XPos+$OuterTickWidth+2+($Bounds[1]["X"]-$Bounds[0]["X"]);
-               $MaxLeft = max($MaxLeft,$TxtLeft);
+                $this->drawLine($XPos-$InnerTickWidth,$YPos,$XPos+$OuterTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
+                $Bounds  = $this->drawText($XPos+$OuterTickWidth+2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
+                $TxtLeft = $XPos+$OuterTickWidth+2+($Bounds[1]["X"]-$Bounds[0]["X"]);
+                $MaxLeft = max($MaxLeft,$TxtLeft);
 
-               $LastY = $YPos;
-              }
+                $LastY = $YPos;
+                }
 
-             if ( isset($Parameters["Name"]) )
-              {
-               $XPos    = $MaxLeft+6;
-               $YPos    = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
-               $Bounds  = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>270));
-               $MaxLeft = $Bounds[2]["X"];
+                if ( isset($Parameters["Name"]) )
+                {
+                $XPos    = $MaxLeft+6;
+                $YPos    = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
+                $Bounds  = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>270));
+                $MaxLeft = $Bounds[2]["X"];
 
-               $this->DataSet->Data["GraphArea"]["X2"] = $MaxLeft + $this->FontSize;
-              }
-             $AxisPos["R"] = $MaxLeft + $ScaleSpacing;
+                $this->DataSet->Data["GraphArea"]["X2"] = $MaxLeft + $this->FontSize;
+                }
+                $AxisPos["R"] = $MaxLeft + $ScaleSpacing;
+            }
             }
-          }
-         elseif ( $Pos == SCALE_POS_TOPBOTTOM )
-          {
-           if ( $Parameters["Position"] == AXIS_POSITION_TOP )
+            elseif ( $Pos == SCALE_POS_TOPBOTTOM )
             {
-             if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
-              { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["T"],$this->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+            if ( $Parameters["Position"] == AXIS_POSITION_TOP )
+            {
+                if ( $Floating )
+                { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+                else
+                { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["T"],$this->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-             if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
 
-             $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
-             $Step   = $Width / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MinTop = $AxisPos["T"];
-             $LastX  = NULL;
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
-               $YPos  = $AxisPos["T"];
-               $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
+                $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
+                $Step   = $Width / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MinTop = $AxisPos["T"];
+                $LastX  = NULL;
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+                $YPos  = $AxisPos["T"];
+                $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
 
-               if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
-               if ( $LastX != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($LastX,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$BGColor); }
+                if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
+                if ( $LastX != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($LastX,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$BGColor); }
 
-               if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
 
-               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
+                if ( $DrawSubTicks && $i != $Parameters["Rows"] )
                 $this->drawLine($XPos+$SubTicksSize,$YPos-$OuterSubTickWidth,$XPos+$SubTicksSize,$YPos+$InnerSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
 
-               $this->drawLine($XPos,$YPos-$OuterTickWidth,$XPos,$YPos+$InnerTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
-               $Bounds    = $this->drawText($XPos,$YPos-$OuterTickWidth-2,$Value,array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-               $TxtHeight = $YPos-$OuterTickWidth-2-($Bounds[1]["Y"]-$Bounds[2]["Y"]);
-               $MinTop    = min($MinTop,$TxtHeight);
+                $this->drawLine($XPos,$YPos-$OuterTickWidth,$XPos,$YPos+$InnerTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
+                $Bounds    = $this->drawText($XPos,$YPos-$OuterTickWidth-2,$Value,array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+                $TxtHeight = $YPos-$OuterTickWidth-2-($Bounds[1]["Y"]-$Bounds[2]["Y"]);
+                $MinTop    = min($MinTop,$TxtHeight);
 
-               $LastX = $XPos;
-              }
+                $LastX = $XPos;
+                }
 
-             if ( isset($Parameters["Name"]) )
-              {
-               $YPos   = $MinTop-2;
-               $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
-               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-               $MinTop = $Bounds[2]["Y"];
+                if ( isset($Parameters["Name"]) )
+                {
+                $YPos   = $MinTop-2;
+                $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
+                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+                $MinTop = $Bounds[2]["Y"];
 
-               $this->DataSet->Data["GraphArea"]["Y1"] = $MinTop;
-              }
+                $this->DataSet->Data["GraphArea"]["Y1"] = $MinTop;
+                }
 
-             $AxisPos["T"] = $MinTop - $ScaleSpacing;
+                $AxisPos["T"] = $MinTop - $ScaleSpacing;
             }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_BOTTOM )
+            elseif ( $Parameters["Position"] == AXIS_POSITION_BOTTOM )
             {
-             if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
-              { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["B"],$this->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+                if ( $Floating )
+                { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+                else
+                { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["B"],$this->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
-             if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+                if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
 
-             $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
-             $Step   = $Width / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MaxBottom = $AxisPos["B"];
-             $LastX  = NULL;
-             for($i=0;$i<=$Parameters["Rows"];$i++)
-              {
-               $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
-               $YPos  = $AxisPos["B"];
-               $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
+                $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
+                $Step   = $Width / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MaxBottom = $AxisPos["B"];
+                $LastX  = NULL;
+                for($i=0;$i<=$Parameters["Rows"];$i++)
+                {
+                $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+                $YPos  = $AxisPos["B"];
+                $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
 
-               if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
-               if ( $LastX != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($LastX,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$BGColor); }
+                if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
+                if ( $LastX != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($LastX,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$BGColor); }
 
-               if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
 
-               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
+                if ( $DrawSubTicks && $i != $Parameters["Rows"] )
                 $this->drawLine($XPos+$SubTicksSize,$YPos-$OuterSubTickWidth,$XPos+$SubTicksSize,$YPos+$InnerSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
 
-               $this->drawLine($XPos,$YPos-$OuterTickWidth,$XPos,$YPos+$InnerTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
-               $Bounds    = $this->drawText($XPos,$YPos+$OuterTickWidth+2,$Value,array("Align"=>TEXT_ALIGN_TOPMIDDLE));
-               $TxtHeight = $YPos+$OuterTickWidth+2+($Bounds[1]["Y"]-$Bounds[2]["Y"]);
-               $MaxBottom = max($MaxBottom,$TxtHeight);
+                $this->drawLine($XPos,$YPos-$OuterTickWidth,$XPos,$YPos+$InnerTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
+                $Bounds    = $this->drawText($XPos,$YPos+$OuterTickWidth+2,$Value,array("Align"=>TEXT_ALIGN_TOPMIDDLE));
+                $TxtHeight = $YPos+$OuterTickWidth+2+($Bounds[1]["Y"]-$Bounds[2]["Y"]);
+                $MaxBottom = max($MaxBottom,$TxtHeight);
 
-               $LastX = $XPos;
-              }
+                $LastX = $XPos;
+                }
 
-             if ( isset($Parameters["Name"]) )
-              {
-               $YPos   = $MaxBottom+2;
-               $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
-               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_TOPMIDDLE));
-               $MaxBottom = $Bounds[0]["Y"];
+                if ( isset($Parameters["Name"]) )
+                {
+                $YPos   = $MaxBottom+2;
+                $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
+                $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_TOPMIDDLE));
+                $MaxBottom = $Bounds[0]["Y"];
 
-               $this->DataSet->Data["GraphArea"]["Y2"] = $MaxBottom + $this->FontSize;
-              }
+                $this->DataSet->Data["GraphArea"]["Y2"] = $MaxBottom + $this->FontSize;
+                }
 
-             $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
+                $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
+            }
             }
-          }
         }
-      }
+        }
     }
 
-   function isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip)
+    function isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip)
     {
-     if ( $LabelingMethod == LABELING_DIFFERENT && $Value != $LastValue ) { return(TRUE); }
-     if ( $LabelingMethod == LABELING_DIFFERENT && $Value == $LastValue ) { return(FALSE); }
-     if ( $LabelingMethod == LABELING_ALL && $LabelSkip == 0 ) { return(TRUE); }
-     if ( $LabelingMethod == LABELING_ALL && ($ID+$LabelSkip) % ($LabelSkip+1) != 1 ) { return(FALSE); }
+        if ( $LabelingMethod == LABELING_DIFFERENT && $Value != $LastValue ) { return(TRUE); }
+        if ( $LabelingMethod == LABELING_DIFFERENT && $Value == $LastValue ) { return(FALSE); }
+        if ( $LabelingMethod == LABELING_ALL && $LabelSkip == 0 ) { return(TRUE); }
+        if ( $LabelingMethod == LABELING_ALL && ($ID+$LabelSkip) % ($LabelSkip+1) != 1 ) { return(FALSE); }
 
-     return(TRUE);
+        return(TRUE);
     }
 
-   /* Compute the scale, check for the best visual factors */
-   function computeScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID=0)
+    /* Compute the scale, check for the best visual factors */
+    function computeScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID=0)
     {
-     /* Compute each factors */
-     $Results = "";
-     foreach ($Factors as $Key => $Factor)
-      $Results[$Factor] = $this->processScale($XMin,$XMax,$MaxDivs,array($Factor),$AxisID);
-
-     /* Remove scales that are creating to much decimals */
-     $GoodScaleFactors = "";
-     foreach ($Results as $Key => $Result)
-      {
-       $Decimals = preg_split("/\./",$Result["RowHeight"]);
-       if ( (!isset($Decimals[1])) || (strlen($Decimals[1]) < 6) ) { $GoodScaleFactors[] = $Key; }
-      }
-
-     /* Found no correct scale, shame,... returns the 1st one as default */
-     if ( $GoodScaleFactors == "" ) { return($Results[$Factors[0]]); }
-
-     /* Find the factor that cause the maximum number of Rows */
-     $MaxRows = 0; $BestFactor = 0;
-     foreach($GoodScaleFactors as $Key => $Factor)
-      { if ( $Results[$Factor]["Rows"] > $MaxRows ) { $MaxRows = $Results[$Factor]["Rows"]; $BestFactor = $Factor; } }
-
-     /* Return the best visual scale */
-     return($Results[$BestFactor]);
+        /* Compute each factors */
+        $Results = "";
+        foreach ($Factors as $Key => $Factor)
+        $Results[$Factor] = $this->processScale($XMin,$XMax,$MaxDivs,array($Factor),$AxisID);
+
+        /* Remove scales that are creating to much decimals */
+        $GoodScaleFactors = "";
+        foreach ($Results as $Key => $Result)
+        {
+        $Decimals = preg_split("/\./",$Result["RowHeight"]);
+        if ( (!isset($Decimals[1])) || (strlen($Decimals[1]) < 6) ) { $GoodScaleFactors[] = $Key; }
+        }
+
+        /* Found no correct scale, shame,... returns the 1st one as default */
+        if ( $GoodScaleFactors == "" ) { return($Results[$Factors[0]]); }
+
+        /* Find the factor that cause the maximum number of Rows */
+        $MaxRows = 0; $BestFactor = 0;
+        foreach($GoodScaleFactors as $Key => $Factor)
+        { if ( $Results[$Factor]["Rows"] > $MaxRows ) { $MaxRows = $Results[$Factor]["Rows"]; $BestFactor = $Factor; } }
+
+        /* Return the best visual scale */
+        return($Results[$BestFactor]);
     }
 
-   /* Compute the best matching scale based on size & factors */
-   function processScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID)
+    /* Compute the best matching scale based on size & factors */
+    function processScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID)
     {
-     $ScaleHeight = abs(ceil($XMax)-floor($XMin));
+        $ScaleHeight = abs(ceil($XMax)-floor($XMin));
 
-     if ( isset($this->DataSet->Data["Axis"][$AxisID]["Format"]) )
-      $Format = $this->DataSet->Data["Axis"][$AxisID]["Format"];
-     else
-      $Format = NULL;
+        if ( isset($this->DataSet->Data["Axis"][$AxisID]["Format"]) )
+        $Format = $this->DataSet->Data["Axis"][$AxisID]["Format"];
+        else
+        $Format = NULL;
 
-     if ( isset($this->DataSet->Data["Axis"][$AxisID]["Display"]) )
-      $Mode = $this->DataSet->Data["Axis"][$AxisID]["Display"];
-     else
-      $Mode = AXIS_FORMAT_DEFAULT;
+        if ( isset($this->DataSet->Data["Axis"][$AxisID]["Display"]) )
+        $Mode = $this->DataSet->Data["Axis"][$AxisID]["Display"];
+        else
+        $Mode = AXIS_FORMAT_DEFAULT;
 
-     $Scale = "";
-     if ( $XMin != $XMax )
-      {
-       $Found = FALSE; $Rescaled = FALSE; $Scaled10Factor = .0001; $Result = 0;
-       while(!$Found)
+        $Scale = "";
+        if ( $XMin != $XMax )
         {
-         foreach($Factors as $Key => $Factor)
-          {
-           if ( !$Found )
+        $Found = FALSE; $Rescaled = FALSE; $Scaled10Factor = .0001; $Result = 0;
+        while(!$Found)
+        {
+            foreach($Factors as $Key => $Factor)
+            {
+            if ( !$Found )
             {
-             if ( !($this->modulo($XMin,$Factor*$Scaled10Factor) == 0) || ($XMin != floor($XMin))) { $XMinRescaled = floor($XMin/($Factor*$Scaled10Factor))*$Factor*$Scaled10Factor; } else { $XMinRescaled = $XMin; }
-             if ( !($this->modulo($XMax,$Factor*$Scaled10Factor) == 0) || ($XMax != floor($XMax))) { $XMaxRescaled = floor($XMax/($Factor*$Scaled10Factor))*$Factor*$Scaled10Factor+($Factor*$Scaled10Factor); } else { $XMaxRescaled = $XMax; }
-             $ScaleHeightRescaled = abs($XMaxRescaled-$XMinRescaled);
+                if ( !($this->modulo($XMin,$Factor*$Scaled10Factor) == 0) || ($XMin != floor($XMin))) { $XMinRescaled = floor($XMin/($Factor*$Scaled10Factor))*$Factor*$Scaled10Factor; } else { $XMinRescaled = $XMin; }
+                if ( !($this->modulo($XMax,$Factor*$Scaled10Factor) == 0) || ($XMax != floor($XMax))) { $XMaxRescaled = floor($XMax/($Factor*$Scaled10Factor))*$Factor*$Scaled10Factor+($Factor*$Scaled10Factor); } else { $XMaxRescaled = $XMax; }
+                $ScaleHeightRescaled = abs($XMaxRescaled-$XMinRescaled);
 
-             if ( !$Found && floor($ScaleHeightRescaled/($Factor*$Scaled10Factor)) <= $MaxDivs ) { $Found = TRUE; $Rescaled = TRUE; $Result = $Factor * $Scaled10Factor; }
+                if ( !$Found && floor($ScaleHeightRescaled/($Factor*$Scaled10Factor)) <= $MaxDivs ) { $Found = TRUE; $Rescaled = TRUE; $Result = $Factor * $Scaled10Factor; }
             }
-          }
-         $Scaled10Factor = $Scaled10Factor * 10;
+            }
+            $Scaled10Factor = $Scaled10Factor * 10;
         }
 
-       /* ReCall Min / Max / Height */
-       if ( $Rescaled ) { $XMin = $XMinRescaled; $XMax = $XMaxRescaled; $ScaleHeight = $ScaleHeightRescaled; }
+        /* ReCall Min / Max / Height */
+        if ( $Rescaled ) { $XMin = $XMinRescaled; $XMax = $XMaxRescaled; $ScaleHeight = $ScaleHeightRescaled; }
 
-       /* Compute rows size */
-       $Rows      = floor($ScaleHeight / $Result); if ( $Rows == 0 ) { $Rows = 1; }
-       $RowHeight = $ScaleHeight / $Rows;
+        /* Compute rows size */
+        $Rows      = floor($ScaleHeight / $Result); if ( $Rows == 0 ) { $Rows = 1; }
+        $RowHeight = $ScaleHeight / $Rows;
 
-       /* Return the results */
-       $Scale["Rows"] = $Rows; $Scale["RowHeight"] = $RowHeight; $Scale["XMin"] = $XMin;  $Scale["XMax"] = $XMax;
+        /* Return the results */
+        $Scale["Rows"] = $Rows; $Scale["RowHeight"] = $RowHeight; $Scale["XMin"] = $XMin;  $Scale["XMax"] = $XMax;
 
-       /* Compute the needed decimals for the metric view to avoid repetition of the same X Axis labels */
-       if ( $Mode == AXIS_FORMAT_METRIC && $Format == NULL )
+        /* Compute the needed decimals for the metric view to avoid repetition of the same X Axis labels */
+        if ( $Mode == AXIS_FORMAT_METRIC && $Format == NULL )
         {
-         $Done = FALSE; $GoodDecimals = 0;
-         for($Decimals=0;$Decimals<=10;$Decimals++)
-          {
-           if ( !$Done )
+            $Done = FALSE; $GoodDecimals = 0;
+            for($Decimals=0;$Decimals<=10;$Decimals++)
+            {
+            if ( !$Done )
             {
-             $LastLabel = "zob"; $ScaleOK = TRUE;
-             for($i=0;$i<=$Rows;$i++)
-              {
-               $Value = $XMin + $i*$RowHeight;
-               $Label = $this->scaleFormat($Value,AXIS_FORMAT_METRIC,$Decimals);
+                $LastLabel = "zob"; $ScaleOK = TRUE;
+                for($i=0;$i<=$Rows;$i++)
+                {
+                $Value = $XMin + $i*$RowHeight;
+                $Label = $this->scaleFormat($Value,AXIS_FORMAT_METRIC,$Decimals);
 
-               if ( $LastLabel == $Label ) { $ScaleOK = FALSE; }
-               $LastLabel = $Label;
-              }
-             if ( $ScaleOK ) { $Done = TRUE; $GoodDecimals = $Decimals; }
+                if ( $LastLabel == $Label ) { $ScaleOK = FALSE; }
+                $LastLabel = $Label;
+                }
+                if ( $ScaleOK ) { $Done = TRUE; $GoodDecimals = $Decimals; }
+            }
             }
-          }
 
-         $Scale["Format"] = $GoodDecimals;
+            $Scale["Format"] = $GoodDecimals;
+        }
         }
-      }
-     else
-      {
-       /* If all values are the same we keep a +1/-1 scale */
-       $Rows = 2; $XMin = $XMax-1; $XMax = $XMax+1; $RowHeight = 1;
+        else
+        {
+        /* If all values are the same we keep a +1/-1 scale */
+        $Rows = 2; $XMin = $XMax-1; $XMax = $XMax+1; $RowHeight = 1;
 
-       /* Return the results */
-       $Scale["Rows"] = $Rows; $Scale["RowHeight"] = $RowHeight; $Scale["XMin"] = $XMin;  $Scale["XMax"] = $XMax;
-      }
+        /* Return the results */
+        $Scale["Rows"] = $Rows; $Scale["RowHeight"] = $RowHeight; $Scale["XMin"] = $XMin;  $Scale["XMax"] = $XMax;
+        }
 
-     return($Scale);
+        return($Scale);
     }
 
-   function modulo($Value1,$Value2)
+    function modulo($Value1,$Value2)
     {
-     if (floor($Value2) == 0) { return(0); }
-     if (floor($Value2) != 0) { return($Value1 % $Value2); }
+        if (floor($Value2) == 0) { return(0); }
+        if (floor($Value2) != 0) { return($Value1 % $Value2); }
 
-     $MinValue = min($Value1,$Value2); $Factor = 10;
-     while ( floor($MinValue*$Factor) == 0 )
-      { $Factor = $Factor * 10; }
+        $MinValue = min($Value1,$Value2); $Factor = 10;
+        while ( floor($MinValue*$Factor) == 0 )
+        { $Factor = $Factor * 10; }
 
-     return(($Value1*$Factor) % ($Value2*$Factor));
+        return(($Value1*$Factor) % ($Value2*$Factor));
     }
 
-   /* Draw an X threshold */
-   function drawXThreshold($Value,$Format="")
+    /* Draw an X threshold */
+    function drawXThreshold($Value,$Format="")
     {
-     $R			= isset($Format["R"]) ? $Format["R"] : 255;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 50;
-     $Weight		= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
-     $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : 6;
-     $Wide		= isset($Format["Wide"]) ? $Format["Wide"] : FALSE;
-     $WideFactor	= isset($Format["WideFactor"]) ? $Format["WideFactor"] : 5;
-     $WriteCaption	= isset($Format["WriteCaption"]) ? $Format["WriteCaption"] : FALSE;
-     $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : NULL;
-     $CaptionAlign	= isset($Format["CaptionAlign"]) ? $Format["CaptionAlign"] : CAPTION_LEFT_TOP;
-     $CaptionOffset     = isset($Format["CaptionOffset"]) ? $Format["CaptionOffset"] : 5;
-     $CaptionR		= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
-     $CaptionG		= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
-     $CaptionB		= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
-     $CaptionAlpha	= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
-     $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
-     $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
-     $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 3;
-     $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
-     $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
-     $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
-     $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
-     $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
-     $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 30;
-     $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
-     $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
-     $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
-     $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
-     $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
-     $ValueIsLabel	= isset($Format["ValueIsLabel"]) ? $Format["ValueIsLabel"] : FALSE;
-
-     $Data           = $this->DataSet->getData();
-     $AbscissaMargin = $this->getAbscissaMargin($Data);
-     $XScale         = $this->scaleGetXSettings();
-
-     if ( is_array($Value) ) { foreach ($Value as $Key => $ID) { $this->drawXThreshold($ID,$Format); } return(0); }
-
-     if ( $ValueIsLabel )
-      {
-       $Format["ValueIsLabel"] = FALSE;
-       foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $SerieValue)
+        $R			= isset($Format["R"]) ? $Format["R"] : 255;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 50;
+        $Weight		= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+        $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : 6;
+        $Wide		= isset($Format["Wide"]) ? $Format["Wide"] : FALSE;
+        $WideFactor	= isset($Format["WideFactor"]) ? $Format["WideFactor"] : 5;
+        $WriteCaption	= isset($Format["WriteCaption"]) ? $Format["WriteCaption"] : FALSE;
+        $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : NULL;
+        $CaptionAlign	= isset($Format["CaptionAlign"]) ? $Format["CaptionAlign"] : CAPTION_LEFT_TOP;
+        $CaptionOffset     = isset($Format["CaptionOffset"]) ? $Format["CaptionOffset"] : 5;
+        $CaptionR		= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
+        $CaptionG		= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
+        $CaptionB		= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
+        $CaptionAlpha	= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
+        $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
+        $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
+        $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 3;
+        $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
+        $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
+        $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
+        $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
+        $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
+        $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 30;
+        $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
+        $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
+        $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
+        $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
+        $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
+        $ValueIsLabel	= isset($Format["ValueIsLabel"]) ? $Format["ValueIsLabel"] : FALSE;
+
+        $Data           = $this->DataSet->getData();
+        $AbscissaMargin = $this->getAbscissaMargin($Data);
+        $XScale         = $this->scaleGetXSettings();
+
+        if ( is_array($Value) ) { foreach ($Value as $Key => $ID) { $this->drawXThreshold($ID,$Format); } return(0); }
+
+        if ( $ValueIsLabel )
+        {
+        $Format["ValueIsLabel"] = FALSE;
+        foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $SerieValue)
         { if ( $SerieValue == $Value ) { $this->drawXThreshold($Key,$Format); } }
 
-       return(0);
-      }
+        return(0);
+        }
 
-     $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
-                              "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
-                              "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha,
-                              "R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha);
+        $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
+                                "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
+                                "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha,
+                                "R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha);
 
-     if ( $Caption == NULL )
-      {
-       if ( isset($Data["Abscissa"]) )
+        if ( $Caption == NULL )
         {
-         if ( isset($Data["Series"][$Data["Abscissa"]]["Data"][$Value]) )
-          $Caption = $Data["Series"][$Data["Abscissa"]]["Data"][$Value];
-         else
-          $Caption = $Value;
+        if ( isset($Data["Abscissa"]) )
+        {
+            if ( isset($Data["Series"][$Data["Abscissa"]]["Data"][$Value]) )
+            $Caption = $Data["Series"][$Data["Abscissa"]]["Data"][$Value];
+            else
+            $Caption = $Value;
         }
-       else
+        else
         $Caption = $Value;
-      }
+        }
 
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
-       $XStep = (($this->GraphAreaX2 - $this->GraphAreaX1) - $XScale[0] *2 ) / $XScale[1];
-       $XPos  = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value;
-       $YPos1 = $this->GraphAreaY1 + $Data["YMargin"];
-       $YPos2 = $this->GraphAreaY2 - $Data["YMargin"];
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+        $XStep = (($this->GraphAreaX2 - $this->GraphAreaX1) - $XScale[0] *2 ) / $XScale[1];
+        $XPos  = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value;
+        $YPos1 = $this->GraphAreaY1 + $Data["YMargin"];
+        $YPos2 = $this->GraphAreaY2 - $Data["YMargin"];
 
-       if ( $XPos >= $this->GraphAreaX1 + $AbscissaMargin && $XPos <= $this->GraphAreaX2 - $AbscissaMargin )
+        if ( $XPos >= $this->GraphAreaX1 + $AbscissaMargin && $XPos <= $this->GraphAreaX2 - $AbscissaMargin )
         {
-         $this->drawLine($XPos,$YPos1,$XPos,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+            $this->drawLine($XPos,$YPos1,$XPos,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
 
-         if ( $Wide )
-          {
-           $this->drawLine($XPos-1,$YPos1,$XPos-1,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-           $this->drawLine($XPos+1,$YPos1,$XPos+1,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-          }
+            if ( $Wide )
+            {
+            $this->drawLine($XPos-1,$YPos1,$XPos-1,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            $this->drawLine($XPos+1,$YPos1,$XPos+1,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            }
 
-         if ( $WriteCaption )
-          {
-           if ( $CaptionAlign == CAPTION_LEFT_TOP )
+            if ( $WriteCaption )
+            {
+            if ( $CaptionAlign == CAPTION_LEFT_TOP )
             { $Y = $YPos1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
-           else 
+            else 
             { $Y = $YPos2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
            
-           $this->drawText($XPos,$Y,$Caption,$CaptionSettings);
-          }
+            $this->drawText($XPos,$Y,$Caption,$CaptionSettings);
+            }
 
-         return(array("X"=>$XPos));
+            return(array("X"=>$XPos));
+        }
         }
-      }
-     elseif( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-      {
-       $XStep = (($this->GraphAreaY2 - $this->GraphAreaY1) - $XScale[0] *2 ) / $XScale[1];
-       $XPos  = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value;
-       $YPos1 = $this->GraphAreaX1 + $Data["YMargin"];
-       $YPos2 = $this->GraphAreaX2 - $Data["YMargin"];
+        elseif( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+        {
+        $XStep = (($this->GraphAreaY2 - $this->GraphAreaY1) - $XScale[0] *2 ) / $XScale[1];
+        $XPos  = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value;
+        $YPos1 = $this->GraphAreaX1 + $Data["YMargin"];
+        $YPos2 = $this->GraphAreaX2 - $Data["YMargin"];
 
-       if ( $XPos >= $this->GraphAreaY1 + $AbscissaMargin && $XPos <= $this->GraphAreaY2 - $AbscissaMargin )
+        if ( $XPos >= $this->GraphAreaY1 + $AbscissaMargin && $XPos <= $this->GraphAreaY2 - $AbscissaMargin )
         {
-         $this->drawLine($YPos1,$XPos,$YPos2,$XPos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+            $this->drawLine($YPos1,$XPos,$YPos2,$XPos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
 
-         if ( $Wide )
-          {
-           $this->drawLine($YPos1,$XPos-1,$YPos2,$XPos-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-           $this->drawLine($YPos1,$XPos+1,$YPos2,$XPos+1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-          }
+            if ( $Wide )
+            {
+            $this->drawLine($YPos1,$XPos-1,$YPos2,$XPos-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            $this->drawLine($YPos1,$XPos+1,$YPos2,$XPos+1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            }
 
-         if ( $WriteCaption )
-          {
-           if ( $CaptionAlign == CAPTION_LEFT_TOP )
+            if ( $WriteCaption )
+            {
+            if ( $CaptionAlign == CAPTION_LEFT_TOP )
             { $Y = $YPos1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-           else 
+            else 
             { $Y = $YPos2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
            
-           $this->drawText($Y,$XPos,$Caption,$CaptionSettings);
-          }
+            $this->drawText($Y,$XPos,$Caption,$CaptionSettings);
+            }
 
-         return(array("X"=>$XPos));
+            return(array("X"=>$XPos));
+        }
         }
-      }
     }
 
-   /* Draw an X threshold area */
-   function drawXThresholdArea($Value1,$Value2,$Format="")
+    /* Draw an X threshold area */
+    function drawXThresholdArea($Value1,$Value2,$Format="")
     {
-     $R		= isset($Format["R"]) ? $Format["R"] : 255;
-     $G		= isset($Format["G"]) ? $Format["G"] : 0;
-     $B		= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 20;
-     $Border    = isset($Format["Border"]) ? $Format["Border"] : TRUE;
-     $BorderR   = isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
-     $BorderG   = isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
-     $BorderB   = isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
-     $BorderAlpha = isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha + 20;
-     $BorderTicks = isset($Format["BorderTicks"]) ? $Format["BorderTicks"] : 2;
-     $AreaName 	= isset($Format["AreaName"]) ? $Format["AreaName"] : NULL;
-     $NameAngle	= isset($Format["NameAngle"]) ? $Format["NameAngle"] : ZONE_NAME_ANGLE_AUTO;
-     $NameR	= isset($Format["NameR"]) ? $Format["NameR"] : 255;
-     $NameG	= isset($Format["NameG"]) ? $Format["NameG"] : 255;
-     $NameB	= isset($Format["NameB"]) ? $Format["NameB"] : 255;
-     $NameAlpha	= isset($Format["NameAlpha"]) ? $Format["NameAlpha"] : 100;
-     $DisableShadowOnArea = isset($Format["DisableShadowOnArea"]) ? $Format["DisableShadowOnArea"] : TRUE;
-
-     $RestoreShadow = $this->Shadow;
-     if ( $DisableShadowOnArea && $this->Shadow ) { $this->Shadow = FALSE; }
-
-     if ($BorderAlpha >100) { $BorderAlpha = 100;}
-
-     $Data           = $this->DataSet->getData();
-     $XScale         = $this->scaleGetXSettings();
-     $AbscissaMargin = $this->getAbscissaMargin($Data);
-
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
-       $XStep = (($this->GraphAreaX2 - $this->GraphAreaX1) - $XScale[0] *2 ) / $XScale[1];
-       $XPos1 = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value1;
-       $XPos2 = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value2;
-       $YPos1 = $this->GraphAreaY1 + $Data["YMargin"];
-       $YPos2 = $this->GraphAreaY2 - $Data["YMargin"];
-
-       if ( $XPos1 < $this->GraphAreaX1 + $XScale[0] ) { $XPos1 = $this->GraphAreaX1 + $XScale[0]; }
-       if ( $XPos1 > $this->GraphAreaX2 - $XScale[0] ) { $XPos1 = $this->GraphAreaX2 - $XScale[0]; }
-       if ( $XPos2 < $this->GraphAreaX1 + $XScale[0] ) { $XPos2 = $this->GraphAreaX1 + $XScale[0]; }
-       if ( $XPos2 > $this->GraphAreaX2 - $XScale[0] ) { $XPos2 = $this->GraphAreaX2 - $XScale[0]; }
-
-       $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-
-       if ( $Border )
-        {
-         $this->drawLine($XPos1,$YPos1,$XPos1,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-         $this->drawLine($XPos2,$YPos1,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-        }
-
-       if ( $AreaName != NULL )
-        {
-         $XPos = ($XPos2-$XPos1)/2 + $XPos1;
-         $YPos = ($YPos2-$YPos1)/2 + $YPos1;
-
-         if ( $NameAngle == ZONE_NAME_ANGLE_AUTO )
-          {
-           $TxtPos   = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$AreaName);
-           $TxtWidth = $TxtPos[1]["X"] - $TxtPos[0]["X"];
-           if ( abs($XPos2 - $XPos1) > $TxtWidth ) { $NameAngle = 0; } else { $NameAngle = 90; }
-          }
-         $this->Shadow = $RestoreShadow;
-         $this->drawText($XPos,$YPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>$NameAngle,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
-         if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
-        }
-
-       $this->Shadow = $RestoreShadow;
-       return(array("X1"=>$XPos1,"X2"=>$XPos2));
-      }
-     elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-      {
-       $XStep = (($this->GraphAreaY2 - $this->GraphAreaY1) - $XScale[0] *2 ) / $XScale[1];
-       $XPos1 = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value1;
-       $XPos2 = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value2;
-       $YPos1 = $this->GraphAreaX1 + $Data["YMargin"];
-       $YPos2 = $this->GraphAreaX2 - $Data["YMargin"];
-
-       if ( $XPos1 < $this->GraphAreaY1 + $XScale[0] ) { $XPos1 = $this->GraphAreaY1 + $XScale[0]; }
-       if ( $XPos1 > $this->GraphAreaY2 - $XScale[0] ) { $XPos1 = $this->GraphAreaY2 - $XScale[0]; }
-       if ( $XPos2 < $this->GraphAreaY1 + $XScale[0] ) { $XPos2 = $this->GraphAreaY1 + $XScale[0]; }
-       if ( $XPos2 > $this->GraphAreaY2 - $XScale[0] ) { $XPos2 = $this->GraphAreaY2 - $XScale[0]; }
-
-       $this->drawFilledRectangle($YPos1,$XPos1,$YPos2,$XPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-
-       if ( $Border )
-        {
-         $this->drawLine($YPos1,$XPos1,$YPos2,$XPos1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-         $this->drawLine($YPos1,$XPos2,$YPos2,$XPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-        }
-
-       if ( $AreaName != NULL )
-        {
-         $XPos = ($XPos2-$XPos1)/2 + $XPos1;
-         $YPos = ($YPos2-$YPos1)/2 + $YPos1;
-
-         $this->Shadow = $RestoreShadow;
-         $this->drawText($YPos,$XPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>0,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
-         if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
-        }
-
-       $this->Shadow = $RestoreShadow;
-       return(array("X1"=>$XPos1,"X2"=>$XPos2));
-      }
+        $R		= isset($Format["R"]) ? $Format["R"] : 255;
+        $G		= isset($Format["G"]) ? $Format["G"] : 0;
+        $B		= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 20;
+        $Border    = isset($Format["Border"]) ? $Format["Border"] : TRUE;
+        $BorderR   = isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
+        $BorderG   = isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
+        $BorderB   = isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
+        $BorderAlpha = isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha + 20;
+        $BorderTicks = isset($Format["BorderTicks"]) ? $Format["BorderTicks"] : 2;
+        $AreaName 	= isset($Format["AreaName"]) ? $Format["AreaName"] : NULL;
+        $NameAngle	= isset($Format["NameAngle"]) ? $Format["NameAngle"] : ZONE_NAME_ANGLE_AUTO;
+        $NameR	= isset($Format["NameR"]) ? $Format["NameR"] : 255;
+        $NameG	= isset($Format["NameG"]) ? $Format["NameG"] : 255;
+        $NameB	= isset($Format["NameB"]) ? $Format["NameB"] : 255;
+        $NameAlpha	= isset($Format["NameAlpha"]) ? $Format["NameAlpha"] : 100;
+        $DisableShadowOnArea = isset($Format["DisableShadowOnArea"]) ? $Format["DisableShadowOnArea"] : TRUE;
+
+        $RestoreShadow = $this->Shadow;
+        if ( $DisableShadowOnArea && $this->Shadow ) { $this->Shadow = FALSE; }
+
+        if ($BorderAlpha >100) { $BorderAlpha = 100;}
+
+        $Data           = $this->DataSet->getData();
+        $XScale         = $this->scaleGetXSettings();
+        $AbscissaMargin = $this->getAbscissaMargin($Data);
+
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+        $XStep = (($this->GraphAreaX2 - $this->GraphAreaX1) - $XScale[0] *2 ) / $XScale[1];
+        $XPos1 = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value1;
+        $XPos2 = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value2;
+        $YPos1 = $this->GraphAreaY1 + $Data["YMargin"];
+        $YPos2 = $this->GraphAreaY2 - $Data["YMargin"];
+
+        if ( $XPos1 < $this->GraphAreaX1 + $XScale[0] ) { $XPos1 = $this->GraphAreaX1 + $XScale[0]; }
+        if ( $XPos1 > $this->GraphAreaX2 - $XScale[0] ) { $XPos1 = $this->GraphAreaX2 - $XScale[0]; }
+        if ( $XPos2 < $this->GraphAreaX1 + $XScale[0] ) { $XPos2 = $this->GraphAreaX1 + $XScale[0]; }
+        if ( $XPos2 > $this->GraphAreaX2 - $XScale[0] ) { $XPos2 = $this->GraphAreaX2 - $XScale[0]; }
+
+        $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+        if ( $Border )
+        {
+            $this->drawLine($XPos1,$YPos1,$XPos1,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+            $this->drawLine($XPos2,$YPos1,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+        }
+
+        if ( $AreaName != NULL )
+        {
+            $XPos = ($XPos2-$XPos1)/2 + $XPos1;
+            $YPos = ($YPos2-$YPos1)/2 + $YPos1;
+
+            if ( $NameAngle == ZONE_NAME_ANGLE_AUTO )
+            {
+            $TxtPos   = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$AreaName);
+            $TxtWidth = $TxtPos[1]["X"] - $TxtPos[0]["X"];
+            if ( abs($XPos2 - $XPos1) > $TxtWidth ) { $NameAngle = 0; } else { $NameAngle = 90; }
+            }
+            $this->Shadow = $RestoreShadow;
+            $this->drawText($XPos,$YPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>$NameAngle,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
+            if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
+        }
+
+        $this->Shadow = $RestoreShadow;
+        return(array("X1"=>$XPos1,"X2"=>$XPos2));
+        }
+        elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+        {
+        $XStep = (($this->GraphAreaY2 - $this->GraphAreaY1) - $XScale[0] *2 ) / $XScale[1];
+        $XPos1 = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value1;
+        $XPos2 = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value2;
+        $YPos1 = $this->GraphAreaX1 + $Data["YMargin"];
+        $YPos2 = $this->GraphAreaX2 - $Data["YMargin"];
+
+        if ( $XPos1 < $this->GraphAreaY1 + $XScale[0] ) { $XPos1 = $this->GraphAreaY1 + $XScale[0]; }
+        if ( $XPos1 > $this->GraphAreaY2 - $XScale[0] ) { $XPos1 = $this->GraphAreaY2 - $XScale[0]; }
+        if ( $XPos2 < $this->GraphAreaY1 + $XScale[0] ) { $XPos2 = $this->GraphAreaY1 + $XScale[0]; }
+        if ( $XPos2 > $this->GraphAreaY2 - $XScale[0] ) { $XPos2 = $this->GraphAreaY2 - $XScale[0]; }
+
+        $this->drawFilledRectangle($YPos1,$XPos1,$YPos2,$XPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+        if ( $Border )
+        {
+            $this->drawLine($YPos1,$XPos1,$YPos2,$XPos1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+            $this->drawLine($YPos1,$XPos2,$YPos2,$XPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+        }
+
+        if ( $AreaName != NULL )
+        {
+            $XPos = ($XPos2-$XPos1)/2 + $XPos1;
+            $YPos = ($YPos2-$YPos1)/2 + $YPos1;
+
+            $this->Shadow = $RestoreShadow;
+            $this->drawText($YPos,$XPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>0,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
+            if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
+        }
+
+        $this->Shadow = $RestoreShadow;
+        return(array("X1"=>$XPos1,"X2"=>$XPos2));
+        }
     }
 
-   /* Draw an Y threshold with the computed scale */
-   function drawThreshold($Value,$Format="")
+    /* Draw an Y threshold with the computed scale */
+    function drawThreshold($Value,$Format="")
     {
-     $AxisID		= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
-     $R			= isset($Format["R"]) ? $Format["R"] : 255;
-     $G			= isset($Format["G"]) ? $Format["G"] : 0;
-     $B			= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 50;
-     $Weight		= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
-     $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : 6;
-     $Wide		= isset($Format["Wide"]) ? $Format["Wide"] : FALSE;
-     $WideFactor	= isset($Format["WideFactor"]) ? $Format["WideFactor"] : 5;
-     $WriteCaption	= isset($Format["WriteCaption"]) ? $Format["WriteCaption"] : FALSE;
-     $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : NULL;
-     $CaptionAlign	= isset($Format["CaptionAlign"]) ? $Format["CaptionAlign"] : CAPTION_LEFT_TOP;
-     $CaptionOffset     = isset($Format["CaptionOffset"]) ? $Format["CaptionOffset"] : 10;
-     $CaptionR		= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
-     $CaptionG		= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
-     $CaptionB		= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
-     $CaptionAlpha	= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
-     $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
-     $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
-     $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 5;
-     $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
-     $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
-     $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
-     $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
-     $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
-     $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 20;
-     $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
-     $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
-     $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
-     $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
-     $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
-     $NoMargin		= isset($Format["NoMargin"]) ? $Format["NoMargin"] : FALSE;
-
-     if ( is_array($Value) ) { foreach ($Value as $Key => $ID) { $this->drawThreshold($ID,$Format); } return(0); }
-
-     $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
-                              "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
-                              "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha,
-                              "R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha);
-
-     $Data           = $this->DataSet->getData();
-     $AbscissaMargin = $this->getAbscissaMargin($Data);
-
-     if ( $NoMargin ) { $AbscissaMargin = 0; }
-     if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
-     if ( $Caption == NULL ) { $Caption = $Value; }
-
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
-       $YPos = $this->scaleComputeY($Value,array("AxisID"=>$AxisID));
-       if ( $YPos >= $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] && $YPos <= $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] )
-        {
-         $X1 = $this->GraphAreaX1 + $AbscissaMargin;
-         $X2 = $this->GraphAreaX2 - $AbscissaMargin;
-
-         $this->drawLine($X1,$YPos,$X2,$YPos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
-
-         if ( $Wide )
-          {
-           $this->drawLine($X1,$YPos-1,$X2,$YPos-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-           $this->drawLine($X1,$YPos+1,$X2,$YPos+1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-          }
-
-         if ( $WriteCaption )
-          {
-           if ( $CaptionAlign == CAPTION_LEFT_TOP )
+        $AxisID		= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
+        $R			= isset($Format["R"]) ? $Format["R"] : 255;
+        $G			= isset($Format["G"]) ? $Format["G"] : 0;
+        $B			= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 50;
+        $Weight		= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+        $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : 6;
+        $Wide		= isset($Format["Wide"]) ? $Format["Wide"] : FALSE;
+        $WideFactor	= isset($Format["WideFactor"]) ? $Format["WideFactor"] : 5;
+        $WriteCaption	= isset($Format["WriteCaption"]) ? $Format["WriteCaption"] : FALSE;
+        $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : NULL;
+        $CaptionAlign	= isset($Format["CaptionAlign"]) ? $Format["CaptionAlign"] : CAPTION_LEFT_TOP;
+        $CaptionOffset     = isset($Format["CaptionOffset"]) ? $Format["CaptionOffset"] : 10;
+        $CaptionR		= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
+        $CaptionG		= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
+        $CaptionB		= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
+        $CaptionAlpha	= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
+        $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
+        $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
+        $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 5;
+        $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
+        $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
+        $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
+        $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
+        $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
+        $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 20;
+        $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
+        $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
+        $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
+        $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
+        $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
+        $NoMargin		= isset($Format["NoMargin"]) ? $Format["NoMargin"] : FALSE;
+
+        if ( is_array($Value) ) { foreach ($Value as $Key => $ID) { $this->drawThreshold($ID,$Format); } return(0); }
+
+        $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
+                                "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
+                                "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha,
+                                "R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha);
+
+        $Data           = $this->DataSet->getData();
+        $AbscissaMargin = $this->getAbscissaMargin($Data);
+
+        if ( $NoMargin ) { $AbscissaMargin = 0; }
+        if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
+        if ( $Caption == NULL ) { $Caption = $Value; }
+
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+        $YPos = $this->scaleComputeY($Value,array("AxisID"=>$AxisID));
+        if ( $YPos >= $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] && $YPos <= $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] )
+        {
+            $X1 = $this->GraphAreaX1 + $AbscissaMargin;
+            $X2 = $this->GraphAreaX2 - $AbscissaMargin;
+
+            $this->drawLine($X1,$YPos,$X2,$YPos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+
+            if ( $Wide )
+            {
+            $this->drawLine($X1,$YPos-1,$X2,$YPos-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            $this->drawLine($X1,$YPos+1,$X2,$YPos+1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            }
+
+            if ( $WriteCaption )
+            {
+            if ( $CaptionAlign == CAPTION_LEFT_TOP )
             { $X = $X1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-           else 
+            else 
             { $X = $X2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
            
-           $this->drawText($X,$YPos,$Caption,$CaptionSettings);
-          }
+            $this->drawText($X,$YPos,$Caption,$CaptionSettings);
+            }
         }
 
-       return(array("Y"=>$YPos));
-      }
+        return(array("Y"=>$YPos));
+        }
 
-     if ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-      {
-       $XPos = $this->scaleComputeY($Value,array("AxisID"=>$AxisID));
-       if ( $XPos >= $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] && $XPos <= $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] )
+        if ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
         {
-         $Y1 = $this->GraphAreaY1 + $AbscissaMargin;
-         $Y2 = $this->GraphAreaY2 - $AbscissaMargin;
+        $XPos = $this->scaleComputeY($Value,array("AxisID"=>$AxisID));
+        if ( $XPos >= $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] && $XPos <= $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] )
+        {
+            $Y1 = $this->GraphAreaY1 + $AbscissaMargin;
+            $Y2 = $this->GraphAreaY2 - $AbscissaMargin;
 
-         $this->drawLine($XPos,$Y1,$XPos,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+            $this->drawLine($XPos,$Y1,$XPos,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
 
-         if ( $Wide )
-          {
-           $this->drawLine($XPos-1,$Y1,$XPos-1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-           $this->drawLine($XPos+1,$Y1,$XPos+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
-          }
+            if ( $Wide )
+            {
+            $this->drawLine($XPos-1,$Y1,$XPos-1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            $this->drawLine($XPos+1,$Y1,$XPos+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+            }
 
-         if ( $WriteCaption )
-          {
-           if ( $CaptionAlign == CAPTION_LEFT_TOP )
+            if ( $WriteCaption )
+            {
+            if ( $CaptionAlign == CAPTION_LEFT_TOP )
             { $Y = $Y1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
-           else 
+            else 
             { $Y = $Y2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
 
-           $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE;
-           $this->drawText($XPos,$Y,$Caption,$CaptionSettings);
-          }
+            $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE;
+            $this->drawText($XPos,$Y,$Caption,$CaptionSettings);
+            }
         }
 
-       return(array("Y"=>$XPos));
-      }
+        return(array("Y"=>$XPos));
+        }
     }
 
-   /* Draw a threshold with the computed scale */
-   function drawThresholdArea($Value1,$Value2,$Format="")
+    /* Draw a threshold with the computed scale */
+    function drawThresholdArea($Value1,$Value2,$Format="")
     {
-     $AxisID	= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
-     $R		= isset($Format["R"]) ? $Format["R"] : 255;
-     $G		= isset($Format["G"]) ? $Format["G"] : 0;
-     $B		= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 20;
-     $Border    = isset($Format["Border"]) ? $Format["Border"] : TRUE;
-     $BorderR   = isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
-     $BorderG   = isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
-     $BorderB   = isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
-     $BorderAlpha = isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha + 20;
-     $BorderTicks = isset($Format["BorderTicks"]) ? $Format["BorderTicks"] : 2;
-     $AreaName 	= isset($Format["AreaName"]) ? $Format["AreaName"] : NULL;
-     $NameAngle	= isset($Format["NameAngle"]) ? $Format["NameAngle"] : ZONE_NAME_ANGLE_AUTO;
-     $NameR	= isset($Format["NameR"]) ? $Format["NameR"] : 255;
-     $NameG	= isset($Format["NameG"]) ? $Format["NameG"] : 255;
-     $NameB	= isset($Format["NameB"]) ? $Format["NameB"] : 255;
-     $NameAlpha	= isset($Format["NameAlpha"]) ? $Format["NameAlpha"] : 100;
-     $DisableShadowOnArea = isset($Format["DisableShadowOnArea"]) ? $Format["DisableShadowOnArea"] : TRUE;
-     $NoMargin	= isset($Format["NoMargin"]) ? $Format["NoMargin"] : FALSE;
-
-     if ($Value1 > $Value2) { list($Value1, $Value2) = array($Value2, $Value1); }
-
-     $RestoreShadow = $this->Shadow;
-     if ( $DisableShadowOnArea && $this->Shadow ) { $this->Shadow = FALSE; }
-
-     if ($BorderAlpha >100) { $BorderAlpha = 100;}
-
-     $Data           = $this->DataSet->getData();
-     $AbscissaMargin = $this->getAbscissaMargin($Data);
-
-     if ( $NoMargin ) { $AbscissaMargin = 0; }
-     if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
-
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
-       $XPos1 = $this->GraphAreaX1 + $AbscissaMargin;
-       $XPos2 = $this->GraphAreaX2 - $AbscissaMargin;
-       $YPos1 = $this->scaleComputeY($Value1,array("AxisID"=>$AxisID));
-       $YPos2 = $this->scaleComputeY($Value2,array("AxisID"=>$AxisID));
-
-       if ( $YPos1 < $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] ) { $YPos1 = $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"]; }
-       if ( $YPos1 > $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] ) { $YPos1 = $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"]; }
-       if ( $YPos2 < $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] ) { $YPos2 = $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"]; }
-       if ( $YPos2 > $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] ) { $YPos2 = $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"]; }
-
-       $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-       if ( $Border )
-        {
-         $this->drawLine($XPos1,$YPos1,$XPos2,$YPos1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-         $this->drawLine($XPos1,$YPos2,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-        }
-
-       if ( $AreaName != NULL )
-        {
-         $XPos = ($XPos2-$XPos1)/2 + $XPos1;
-         $YPos = ($YPos2-$YPos1)/2 + $YPos1;
-         $this->Shadow = $RestoreShadow;
-         $this->drawText($XPos,$YPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>0,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
-         if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
-        }
-
-       $this->Shadow = $RestoreShadow;
-       return(array("Y1"=>$YPos1,"Y2"=>$YPos2));
-      }
-     elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-      {
-       $YPos1 = $this->GraphAreaY1 + $AbscissaMargin;
-       $YPos2 = $this->GraphAreaY2 - $AbscissaMargin;
-       $XPos1 = $this->scaleComputeY($Value1,array("AxisID"=>$AxisID));
-       $XPos2 = $this->scaleComputeY($Value2,array("AxisID"=>$AxisID));
-
-       if ( $XPos1 < $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] ) { $XPos1 = $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"]; }
-       if ( $XPos1 > $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] ) { $XPos1 = $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"]; }
-       if ( $XPos2 < $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] ) { $XPos2 = $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"]; }
-       if ( $XPos2 > $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] ) { $XPos2 = $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"]; }
-
-       $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-       if ( $Border )
-        {
-         $this->drawLine($XPos1,$YPos1,$XPos1,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-         $this->drawLine($XPos2,$YPos1,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
-        }
-
-       if ( $AreaName != NULL )
-        {
-         $XPos = ($YPos2-$YPos1)/2 + $YPos1;
-         $YPos = ($XPos2-$XPos1)/2 + $XPos1;
-
-         if ( $NameAngle == ZONE_NAME_ANGLE_AUTO )
-          {
-           $TxtPos   = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$AreaName);
-           $TxtWidth = $TxtPos[1]["X"] - $TxtPos[0]["X"];
-           if ( abs($XPos2 - $XPos1) > $TxtWidth ) { $NameAngle = 0; } else { $NameAngle = 90; }
-          }
-         $this->Shadow = $RestoreShadow;
-         $this->drawText($YPos,$XPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>$NameAngle,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
-         if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
-        }
-
-       $this->Shadow = $RestoreShadow;
-       return(array("Y1"=>$XPos1,"Y2"=>$XPos2));
-      }
+        $AxisID	= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
+        $R		= isset($Format["R"]) ? $Format["R"] : 255;
+        $G		= isset($Format["G"]) ? $Format["G"] : 0;
+        $B		= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 20;
+        $Border    = isset($Format["Border"]) ? $Format["Border"] : TRUE;
+        $BorderR   = isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
+        $BorderG   = isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
+        $BorderB   = isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
+        $BorderAlpha = isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha + 20;
+        $BorderTicks = isset($Format["BorderTicks"]) ? $Format["BorderTicks"] : 2;
+        $AreaName 	= isset($Format["AreaName"]) ? $Format["AreaName"] : NULL;
+        $NameAngle	= isset($Format["NameAngle"]) ? $Format["NameAngle"] : ZONE_NAME_ANGLE_AUTO;
+        $NameR	= isset($Format["NameR"]) ? $Format["NameR"] : 255;
+        $NameG	= isset($Format["NameG"]) ? $Format["NameG"] : 255;
+        $NameB	= isset($Format["NameB"]) ? $Format["NameB"] : 255;
+        $NameAlpha	= isset($Format["NameAlpha"]) ? $Format["NameAlpha"] : 100;
+        $DisableShadowOnArea = isset($Format["DisableShadowOnArea"]) ? $Format["DisableShadowOnArea"] : TRUE;
+        $NoMargin	= isset($Format["NoMargin"]) ? $Format["NoMargin"] : FALSE;
+
+        if ($Value1 > $Value2) { list($Value1, $Value2) = array($Value2, $Value1); }
+
+        $RestoreShadow = $this->Shadow;
+        if ( $DisableShadowOnArea && $this->Shadow ) { $this->Shadow = FALSE; }
+
+        if ($BorderAlpha >100) { $BorderAlpha = 100;}
+
+        $Data           = $this->DataSet->getData();
+        $AbscissaMargin = $this->getAbscissaMargin($Data);
+
+        if ( $NoMargin ) { $AbscissaMargin = 0; }
+        if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
+
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+        $XPos1 = $this->GraphAreaX1 + $AbscissaMargin;
+        $XPos2 = $this->GraphAreaX2 - $AbscissaMargin;
+        $YPos1 = $this->scaleComputeY($Value1,array("AxisID"=>$AxisID));
+        $YPos2 = $this->scaleComputeY($Value2,array("AxisID"=>$AxisID));
+
+        if ( $YPos1 < $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] ) { $YPos1 = $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"]; }
+        if ( $YPos1 > $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] ) { $YPos1 = $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"]; }
+        if ( $YPos2 < $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] ) { $YPos2 = $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"]; }
+        if ( $YPos2 > $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] ) { $YPos2 = $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"]; }
+
+        $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        if ( $Border )
+        {
+            $this->drawLine($XPos1,$YPos1,$XPos2,$YPos1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+            $this->drawLine($XPos1,$YPos2,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+        }
+
+        if ( $AreaName != NULL )
+        {
+            $XPos = ($XPos2-$XPos1)/2 + $XPos1;
+            $YPos = ($YPos2-$YPos1)/2 + $YPos1;
+            $this->Shadow = $RestoreShadow;
+            $this->drawText($XPos,$YPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>0,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
+            if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
+        }
+
+        $this->Shadow = $RestoreShadow;
+        return(array("Y1"=>$YPos1,"Y2"=>$YPos2));
+        }
+        elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+        {
+        $YPos1 = $this->GraphAreaY1 + $AbscissaMargin;
+        $YPos2 = $this->GraphAreaY2 - $AbscissaMargin;
+        $XPos1 = $this->scaleComputeY($Value1,array("AxisID"=>$AxisID));
+        $XPos2 = $this->scaleComputeY($Value2,array("AxisID"=>$AxisID));
+
+        if ( $XPos1 < $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] ) { $XPos1 = $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"]; }
+        if ( $XPos1 > $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] ) { $XPos1 = $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"]; }
+        if ( $XPos2 < $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] ) { $XPos2 = $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"]; }
+        if ( $XPos2 > $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] ) { $XPos2 = $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"]; }
+
+        $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        if ( $Border )
+        {
+            $this->drawLine($XPos1,$YPos1,$XPos1,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+            $this->drawLine($XPos2,$YPos1,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+        }
+
+        if ( $AreaName != NULL )
+        {
+            $XPos = ($YPos2-$YPos1)/2 + $YPos1;
+            $YPos = ($XPos2-$XPos1)/2 + $XPos1;
+
+            if ( $NameAngle == ZONE_NAME_ANGLE_AUTO )
+            {
+            $TxtPos   = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$AreaName);
+            $TxtWidth = $TxtPos[1]["X"] - $TxtPos[0]["X"];
+            if ( abs($XPos2 - $XPos1) > $TxtWidth ) { $NameAngle = 0; } else { $NameAngle = 90; }
+            }
+            $this->Shadow = $RestoreShadow;
+            $this->drawText($YPos,$XPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>$NameAngle,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
+            if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
+        }
+
+        $this->Shadow = $RestoreShadow;
+        return(array("Y1"=>$XPos1,"Y2"=>$XPos2));
+        }
     }
 
-   function scaleGetXSettings()
+    function scaleGetXSettings()
     {
-     $Data = $this->DataSet->getData();
-     foreach($Data["Axis"] as $AxisID => $Settings)
-      {
-       if ( $Settings["Identity"] == AXIS_X )
+        $Data = $this->DataSet->getData();
+        foreach($Data["Axis"] as $AxisID => $Settings)
+        {
+        if ( $Settings["Identity"] == AXIS_X )
         {
-         $Rows = $Settings["Rows"];
+            $Rows = $Settings["Rows"];
 
-         return(array($Settings["Margin"],$Rows));
+            return(array($Settings["Margin"],$Rows));
+        }
         }
-      }
     }
 
-   function scaleComputeY($Values,$Option="",$ReturnOnly0Height=FALSE)
+    function scaleComputeY($Values,$Option="",$ReturnOnly0Height=FALSE)
     {
-     $AxisID	= isset($Option["AxisID"]) ? $Option["AxisID"] : 0;
-     $SerieName	= isset($Option["SerieName"]) ? $Option["SerieName"] : NULL;
+        $AxisID	= isset($Option["AxisID"]) ? $Option["AxisID"] : 0;
+        $SerieName	= isset($Option["SerieName"]) ? $Option["SerieName"] : NULL;
 
-     $Data = $this->DataSet->getData();
-     if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
+        $Data = $this->DataSet->getData();
+        if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
 
-     if ( $SerieName != NULL ) { $AxisID = $Data["Series"][$SerieName]["Axis"]; }
-     if ( !is_array($Values) ) { $tmp = $Values; $Values = ""; $Values[0] = $tmp; }
+        if ( $SerieName != NULL ) { $AxisID = $Data["Series"][$SerieName]["Axis"]; }
+        if ( !is_array($Values) ) { $tmp = $Values; $Values = ""; $Values[0] = $tmp; }
 
-     $Result = "";
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
-       $Height      = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Data["Axis"][$AxisID]["Margin"]*2;
-       $ScaleHeight = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
-       $Step        = $Height / $ScaleHeight;
+        $Result = "";
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+        $Height      = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Data["Axis"][$AxisID]["Margin"]*2;
+        $ScaleHeight = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
+        $Step        = $Height / $ScaleHeight;
 
-       if ( $ReturnOnly0Height )
+        if ( $ReturnOnly0Height )
         { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $Step * $Value; } } }
-       else
+        else
         { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $this->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"] - ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"])); } } }
-      }
-     else
-      {
-       $Width      = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Data["Axis"][$AxisID]["Margin"]*2;
-       $ScaleWidth = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
-       $Step       = $Width / $ScaleWidth;
-
-       if ( $ReturnOnly0Height )
+        }
+        else
+        {
+        $Width      = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Data["Axis"][$AxisID]["Margin"]*2;
+        $ScaleWidth = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
+        $Step       = $Width / $ScaleWidth;
+
+        if ( $ReturnOnly0Height )
         { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $Step * $Value; } } }
-       else
+        else
         { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $this->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"])); } } }
-      }
+        }
 
-     if ( count($Result) == 1 )
-      return($Result[0]);
-     else
-      return($Result);
+        if ( count($Result) == 1 )
+        return($Result[0]);
+        else
+        return($Result);
     }
 
-   /* Format the axis values */
-   function scaleFormat($Value,$Mode=NULL,$Format=NULL,$Unit=NULL)
+    /* Format the axis values */
+    function scaleFormat($Value,$Mode=NULL,$Format=NULL,$Unit=NULL)
     {
-     if ( $Value == VOID ) { return(""); }
+        if ( $Value == VOID ) { return(""); }
 
-     if ( $Mode == AXIS_FORMAT_CUSTOM )
-      { if ( function_exists($Format) ) { return(call_user_func($Format,$Value)); } }
+        if ( $Mode == AXIS_FORMAT_CUSTOM )
+        { if ( function_exists($Format) ) { return(call_user_func($Format,$Value)); } }
 
-     if ( $Mode == AXIS_FORMAT_DATE )
-      { if ( $Format == NULL ) { $Pattern = "d/m/Y"; } else { $Pattern = $Format; } return(date($Pattern,$Value)); }
+        if ( $Mode == AXIS_FORMAT_DATE )
+        { if ( $Format == NULL ) { $Pattern = "d/m/Y"; } else { $Pattern = $Format; } return(date($Pattern,$Value)); }
 
-     if ( $Mode == AXIS_FORMAT_TIME )
-      { if ( $Format == NULL ) { $Pattern = "H:i:s"; } else { $Pattern = $Format; } return(date($Pattern,$Value)); }
+        if ( $Mode == AXIS_FORMAT_TIME )
+        { if ( $Format == NULL ) { $Pattern = "H:i:s"; } else { $Pattern = $Format; } return(date($Pattern,$Value)); }
 
-     if ( $Mode == AXIS_FORMAT_CURRENCY )
-      { return($Format.number_format($Value,2)); }
+        if ( $Mode == AXIS_FORMAT_CURRENCY )
+        { return($Format.number_format($Value,2)); }
 
-     if ( $Mode == AXIS_FORMAT_METRIC )
-      {
-       if (abs($Value) > 1000000000)
+        if ( $Mode == AXIS_FORMAT_METRIC )
+        {
+        if (abs($Value) > 1000000000)
         return(round($Value/1000000000,$Format)."g".$Unit);
-       if (abs($Value) > 1000000)
+        if (abs($Value) > 1000000)
         return(round($Value/1000000,$Format)."m".$Unit);
-       elseif (abs($Value) >= 1000)
+        elseif (abs($Value) >= 1000)
         return(round($Value/1000,$Format)."k".$Unit);
        
-      }
-     return($Value.$Unit);
+        }
+        return($Value.$Unit);
     }
 
-   /* Write Max value on a chart */
-   function writeBounds($Type=BOUND_BOTH,$Format=NULL)
+    /* Write Max value on a chart */
+    function writeBounds($Type=BOUND_BOTH,$Format=NULL)
     {
-     $MaxLabelTxt	= isset($Format["MaxLabelTxt"]) ? $Format["MaxLabelTxt"] : "max=";
-     $MinLabelTxt	= isset($Format["MinLabelTxt"]) ? $Format["MinLabelTxt"] : "min=";
-     $Decimals		= isset($Format["Decimals"]) ? $Format["Decimals"] : 1;
-     $ExcludedSeries	= isset($Format["ExcludedSeries"]) ? $Format["ExcludedSeries"] : "";
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 4;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $MaxDisplayR	= isset($Format["MaxDisplayR"]) ? $Format["MaxDisplayR"] : 0;
-     $MaxDisplayG	= isset($Format["MaxDisplayG"]) ? $Format["MaxDisplayG"] : 0;
-     $MaxDisplayB	= isset($Format["MaxDisplayB"]) ? $Format["MaxDisplayB"] : 0;
-     $MinDisplayR	= isset($Format["MinDisplayR"]) ? $Format["MinDisplayR"] : 255;
-     $MinDisplayG	= isset($Format["MinDisplayG"]) ? $Format["MinDisplayG"] : 255;
-     $MinDisplayB	= isset($Format["MinDisplayB"]) ? $Format["MinDisplayB"] : 255;
-     $MinLabelPos	= isset($Format["MinLabelPos"]) ? $Format["MinLabelPos"] : BOUND_LABEL_POS_AUTO;
-     $MaxLabelPos	= isset($Format["MaxLabelPos"]) ? $Format["MaxLabelPos"] : BOUND_LABEL_POS_AUTO;
-     $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
-     $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
-     $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 5;
-     $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
-     $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
-     $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
-     $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
-     $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
-     $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 20;
-     $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
-     $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
-     $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
-     $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
-     $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
-
-     $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
-                              "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
-                              "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha);
-
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     $Data = $this->DataSet->getData();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && !isset($ExcludedSeries[$SerieName]))
-        {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
-
-         $MinValue = $this->DataSet->getMin($SerieName);
-         $MaxValue = $this->DataSet->getMax($SerieName);
-
-         $MinPos = VOID; $MaxPos = VOID;
-         foreach($Serie["Data"] as $Key => $Value)
-          { 
-           if ( $Value == $MinValue && $MinPos == VOID ) { $MinPos = $Key; }
-           if ( $Value == $MaxValue ) { $MaxPos = $Key; }
-          }
-
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
-
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           $XStep       = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs;
-           $X           = $this->GraphAreaX1 + $XMargin;
-           $SerieOffset = isset($Serie["XOffset"]) ? $Serie["XOffset"] : 0;
-
-           if ( $Type == BOUND_MAX || $Type == BOUND_BOTH )
-            {
-             if ( $MaxLabelPos == BOUND_LABEL_POS_TOP    || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue >= 0) ) { $YPos  = $PosArray[$MaxPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_BOTTOMMIDDLE; }
-             if ( $MaxLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue < 0) ) { $YPos  = $PosArray[$MaxPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_TOPMIDDLE; }
-
-             $XPos  = $X + $MaxPos*$XStep + $SerieOffset;
-             $Label = $MaxLabelTxt.$this->scaleFormat(round($MaxValue,$Decimals),$Mode,$Format,$Unit);
-
-             $TxtPos  = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$Label);
-             $XOffset = 0; $YOffset = 0;
-             if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = (($this->GraphAreaX1 - $TxtPos[0]["X"])/2); }
-             if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -(($TxtPos[1]["X"] - $this->GraphAreaX2)/2); }
-             if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = $this->GraphAreaY1 - $TxtPos[2]["Y"]; }
-             if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -($TxtPos[0]["Y"] - $this->GraphAreaY2); }
-
-             $CaptionSettings["R"] = $MaxDisplayR; $CaptionSettings["G"] = $MaxDisplayG;
-             $CaptionSettings["B"] = $MaxDisplayB; $CaptionSettings["Align"] = $Align;
-
-             $this->drawText($XPos+$XOffset,$YPos+$YOffset,$Label,$CaptionSettings);
-            }
-
-           if ( $Type == BOUND_MIN || $Type == BOUND_BOTH )
-            {
-             if ( $MinLabelPos == BOUND_LABEL_POS_TOP    || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue >= 0) ) { $YPos  = $PosArray[$MinPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_BOTTOMMIDDLE; }
-             if ( $MinLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue < 0) ) { $YPos  = $PosArray[$MinPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_TOPMIDDLE; }
-
-             $XPos  = $X + $MinPos*$XStep + $SerieOffset;
-             $Label = $MinLabelTxt.$this->scaleFormat(round($MinValue,$Decimals),$Mode,$Format,$Unit);
-
-             $TxtPos  = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$Label);
-             $XOffset = 0; $YOffset = 0;
-             if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = (($this->GraphAreaX1 - $TxtPos[0]["X"])/2); }
-             if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -(($TxtPos[1]["X"] - $this->GraphAreaX2)/2); }
-             if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = $this->GraphAreaY1 - $TxtPos[2]["Y"]; }
-             if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -($TxtPos[0]["Y"] - $this->GraphAreaY2); }
-
-             $CaptionSettings["R"] = $MinDisplayR; $CaptionSettings["G"] = $MinDisplayG;
-             $CaptionSettings["B"] = $MinDisplayB; $CaptionSettings["Align"] = $Align;
+        $MaxLabelTxt	= isset($Format["MaxLabelTxt"]) ? $Format["MaxLabelTxt"] : "max=";
+        $MinLabelTxt	= isset($Format["MinLabelTxt"]) ? $Format["MinLabelTxt"] : "min=";
+        $Decimals		= isset($Format["Decimals"]) ? $Format["Decimals"] : 1;
+        $ExcludedSeries	= isset($Format["ExcludedSeries"]) ? $Format["ExcludedSeries"] : "";
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 4;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $MaxDisplayR	= isset($Format["MaxDisplayR"]) ? $Format["MaxDisplayR"] : 0;
+        $MaxDisplayG	= isset($Format["MaxDisplayG"]) ? $Format["MaxDisplayG"] : 0;
+        $MaxDisplayB	= isset($Format["MaxDisplayB"]) ? $Format["MaxDisplayB"] : 0;
+        $MinDisplayR	= isset($Format["MinDisplayR"]) ? $Format["MinDisplayR"] : 255;
+        $MinDisplayG	= isset($Format["MinDisplayG"]) ? $Format["MinDisplayG"] : 255;
+        $MinDisplayB	= isset($Format["MinDisplayB"]) ? $Format["MinDisplayB"] : 255;
+        $MinLabelPos	= isset($Format["MinLabelPos"]) ? $Format["MinLabelPos"] : BOUND_LABEL_POS_AUTO;
+        $MaxLabelPos	= isset($Format["MaxLabelPos"]) ? $Format["MaxLabelPos"] : BOUND_LABEL_POS_AUTO;
+        $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
+        $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
+        $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 5;
+        $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
+        $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
+        $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
+        $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
+        $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
+        $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 20;
+        $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
+        $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
+        $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
+        $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
+        $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
+
+        $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
+                                "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
+                                "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha);
+
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        $Data = $this->DataSet->getData();
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && !isset($ExcludedSeries[$SerieName]))
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
-             $this->drawText($XPos+$XOffset,$YPos-$DisplayOffset+$YOffset,$Label,$CaptionSettings);
+            $MinValue = $this->DataSet->getMin($SerieName);
+            $MaxValue = $this->DataSet->getMax($SerieName);
+
+            $MinPos = VOID; $MaxPos = VOID;
+            foreach($Serie["Data"] as $Key => $Value)
+            { 
+            if ( $Value == $MinValue && $MinPos == VOID ) { $MinPos = $Key; }
+            if ( $Value == $MaxValue ) { $MaxPos = $Key; }
             }
-          }
-         else
-          {
-           $XStep       = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs;
-           $X           = $this->GraphAreaY1 + $XMargin;
-           $SerieOffset = isset($Serie["XOffset"]) ? $Serie["XOffset"] : 0;
 
-           if ( $Type == BOUND_MAX || $Type == BOUND_BOTH )
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            $XStep       = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs;
+            $X           = $this->GraphAreaX1 + $XMargin;
+            $SerieOffset = isset($Serie["XOffset"]) ? $Serie["XOffset"] : 0;
+
+            if ( $Type == BOUND_MAX || $Type == BOUND_BOTH )
             {
-             if ( $MaxLabelPos == BOUND_LABEL_POS_TOP    || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue >= 0) ) { $YPos  = $PosArray[$MaxPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLELEFT; }
-             if ( $MaxLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue < 0) ) { $YPos  = $PosArray[$MaxPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLERIGHT; }
+                if ( $MaxLabelPos == BOUND_LABEL_POS_TOP    || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue >= 0) ) { $YPos  = $PosArray[$MaxPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_BOTTOMMIDDLE; }
+                if ( $MaxLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue < 0) ) { $YPos  = $PosArray[$MaxPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_TOPMIDDLE; }
 
-             $XPos  = $X + $MaxPos*$XStep + $SerieOffset;
-             $Label = $MaxLabelTxt.$this->scaleFormat($MaxValue,$Mode,$Format,$Unit);
+                $XPos  = $X + $MaxPos*$XStep + $SerieOffset;
+                $Label = $MaxLabelTxt.$this->scaleFormat(round($MaxValue,$Decimals),$Mode,$Format,$Unit);
 
-             $TxtPos  = $this->getTextBox($YPos,$XPos,$this->FontName,$this->FontSize,0,$Label);
-             $XOffset = 0; $YOffset = 0;
-             if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = $this->GraphAreaX1 - $TxtPos[0]["X"]; }
-             if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -($TxtPos[1]["X"] - $this->GraphAreaX2); }
-             if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = ($this->GraphAreaY1 - $TxtPos[2]["Y"])/2; }
-             if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -(($TxtPos[0]["Y"] - $this->GraphAreaY2)/2);}
+                $TxtPos  = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$Label);
+                $XOffset = 0; $YOffset = 0;
+                if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = (($this->GraphAreaX1 - $TxtPos[0]["X"])/2); }
+                if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -(($TxtPos[1]["X"] - $this->GraphAreaX2)/2); }
+                if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = $this->GraphAreaY1 - $TxtPos[2]["Y"]; }
+                if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -($TxtPos[0]["Y"] - $this->GraphAreaY2); }
 
-             $CaptionSettings["R"] = $MaxDisplayR; $CaptionSettings["G"] = $MaxDisplayG;
-             $CaptionSettings["B"] = $MaxDisplayB; $CaptionSettings["Align"] = $Align;
+                $CaptionSettings["R"] = $MaxDisplayR; $CaptionSettings["G"] = $MaxDisplayG;
+                $CaptionSettings["B"] = $MaxDisplayB; $CaptionSettings["Align"] = $Align;
 
-             $this->drawText($YPos+$XOffset,$XPos+$YOffset,$Label,$CaptionSettings);
+                $this->drawText($XPos+$XOffset,$YPos+$YOffset,$Label,$CaptionSettings);
             }
 
-           if ( $Type == BOUND_MIN || $Type == BOUND_BOTH )
+            if ( $Type == BOUND_MIN || $Type == BOUND_BOTH )
             {
-             if ( $MinLabelPos == BOUND_LABEL_POS_TOP    || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue >= 0) ) { $YPos  = $PosArray[$MinPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLELEFT; }
-             if ( $MinLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue < 0) ) { $YPos  = $PosArray[$MinPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLERIGHT; }
+                if ( $MinLabelPos == BOUND_LABEL_POS_TOP    || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue >= 0) ) { $YPos  = $PosArray[$MinPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_BOTTOMMIDDLE; }
+                if ( $MinLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue < 0) ) { $YPos  = $PosArray[$MinPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_TOPMIDDLE; }
 
-             $XPos  = $X + $MinPos*$XStep + $SerieOffset;
-             $Label = $MinLabelTxt.$this->scaleFormat($MinValue,$Mode,$Format,$Unit);
+                $XPos  = $X + $MinPos*$XStep + $SerieOffset;
+                $Label = $MinLabelTxt.$this->scaleFormat(round($MinValue,$Decimals),$Mode,$Format,$Unit);
 
-             $TxtPos  = $this->getTextBox($YPos,$XPos,$this->FontName,$this->FontSize,0,$Label);
-             $XOffset = 0; $YOffset = 0;
-             if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = $this->GraphAreaX1 - $TxtPos[0]["X"]; }
-             if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -($TxtPos[1]["X"] - $this->GraphAreaX2); }
-             if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = ($this->GraphAreaY1 - $TxtPos[2]["Y"])/2; }
-             if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -(($TxtPos[0]["Y"] - $this->GraphAreaY2)/2);}
+                $TxtPos  = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$Label);
+                $XOffset = 0; $YOffset = 0;
+                if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = (($this->GraphAreaX1 - $TxtPos[0]["X"])/2); }
+                if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -(($TxtPos[1]["X"] - $this->GraphAreaX2)/2); }
+                if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = $this->GraphAreaY1 - $TxtPos[2]["Y"]; }
+                if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -($TxtPos[0]["Y"] - $this->GraphAreaY2); }
 
-             $CaptionSettings["R"] = $MinDisplayR; $CaptionSettings["G"] = $MinDisplayG;
-             $CaptionSettings["B"] = $MinDisplayB; $CaptionSettings["Align"] = $Align;
+                $CaptionSettings["R"] = $MinDisplayR; $CaptionSettings["G"] = $MinDisplayG;
+                $CaptionSettings["B"] = $MinDisplayB; $CaptionSettings["Align"] = $Align;
 
-             $this->drawText($YPos+$XOffset,$XPos+$YOffset,$Label,$CaptionSettings);
+                $this->drawText($XPos+$XOffset,$YPos-$DisplayOffset+$YOffset,$Label,$CaptionSettings);
             }
-          }
-        }
-      }
-    }
-
-   /* Draw a plot chart */
-   function drawPlotChart($Format=NULL)
-    {
-     $PlotSize		= isset($Format["PlotSize"]) ? $Format["PlotSize"] : NULL;
-     $PlotBorder	= isset($Format["PlotBorder"]) ? $Format["PlotBorder"] : FALSE;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 50;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 50;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 50;
-     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 30;
-     $BorderSize	= isset($Format["BorderSize"]) ? $Format["BorderSize"] : 2;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 4;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         if ( isset($Serie["Weight"]) ) { $SerieWeight = $Serie["Weight"] + 2; } else { $SerieWeight = 2; }
-         if ( $PlotSize != NULL ) { $SerieWeight = $PlotSize; }
-
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
-         if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
-         if ( isset($Serie["Picture"]) )
-          { $Picture = $Serie["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->getPicInfo($Picture); }
-         else { $Picture = NULL; $PicOffset = 0; }
-
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
-
-         $AxisID	= $Serie["Axis"];
-         $Shape		= $Serie["Shape"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
-
-         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
-
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           if ( $Picture != NULL ) { $PicOffset = $PicHeight / 2; $SerieWeight = 0; }
-           $X = $this->GraphAreaX1 + $XMargin;
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $DisplayValues ) 
-              $this->drawText($X,$Y-$DisplayOffset-$SerieWeight-$BorderSize-$PicOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-
-             if ( $Y != VOID )
-              {
-               if ( $RecordImageMap ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$SerieWeight,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-
-               if ( $Picture != NULL )
-                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
-               else
-                { $this->drawShape($X,$Y,$Shape,$SerieWeight,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha); }
-              }
-             $X = $X + $XStep;
             }
-          }
-         else
-          {
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           if ( $Picture != NULL ) { $PicOffset = $PicWidth / 2; $SerieWeight = 0; }
-           $Y = $this->GraphAreaY1 + $XMargin;
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $X)
+            else
             {
-             if ( $DisplayValues ) 
-              $this->drawText($X+$DisplayOffset+$SerieWeight+$BorderSize+$PicOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-
-             if ( $X != VOID )
-              {
-               if ( $RecordImageMap ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$SerieWeight,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-
-               if ( $Picture != NULL )
-                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
-               else
-                { $this->drawShape($X,$Y,$Shape,$SerieWeight,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha); }
-              }
-             $Y = $Y + $YStep;
-            }
-          }
-        }
-      }
-    }
-
-   /* Draw a spline chart */
-   function drawSplineChart($Format=NULL)
-    {
-     $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : TRUE;
-     $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
-     $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL; // 234
-     $BreakG		= isset($Format["BreakG"]) ? $Format["BreakG"] : NULL; // 55
-     $BreakB		= isset($Format["BreakB"]) ? $Format["BreakB"] : NULL; // 26
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-     $ImageMapPlotSize  = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 5;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
-
-         if ( $BreakR == NULL )
-          $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks);
-         else
-          $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
-
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
-
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
-
-         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
-
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X     = $this->GraphAreaX1 + $XMargin; $WayPoints = "";
-           $Force = $XStep / 5;
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL; $LastX = 1; $LastY = 1;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $DisplayValues ) 
-              $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-	
-             if ( $RecordImageMap && $Y != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+            $XStep       = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs;
+            $X           = $this->GraphAreaY1 + $XMargin;
+            $SerieOffset = isset($Serie["XOffset"]) ? $Serie["XOffset"] : 0;
 
-             if ( $Y == VOID && $LastY != NULL )
-              { $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight)); $WayPoints = ""; }
+            if ( $Type == BOUND_MAX || $Type == BOUND_BOTH )
+            {
+                if ( $MaxLabelPos == BOUND_LABEL_POS_TOP    || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue >= 0) ) { $YPos  = $PosArray[$MaxPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLELEFT; }
+                if ( $MaxLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue < 0) ) { $YPos  = $PosArray[$MaxPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLERIGHT; }
 
-             if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
-              { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); }
+                $XPos  = $X + $MaxPos*$XStep + $SerieOffset;
+                $Label = $MaxLabelTxt.$this->scaleFormat($MaxValue,$Mode,$Format,$Unit);
 
-             if ( $Y != VOID )
-              $WayPoints[] = array($X,$Y);
+                $TxtPos  = $this->getTextBox($YPos,$XPos,$this->FontName,$this->FontSize,0,$Label);
+                $XOffset = 0; $YOffset = 0;
+                if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = $this->GraphAreaX1 - $TxtPos[0]["X"]; }
+                if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -($TxtPos[1]["X"] - $this->GraphAreaX2); }
+                if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = ($this->GraphAreaY1 - $TxtPos[2]["Y"])/2; }
+                if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -(($TxtPos[0]["Y"] - $this->GraphAreaY2)/2);}
 
-             if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
-             if ( $Y == VOID ) { $Y = NULL; }
+                $CaptionSettings["R"] = $MaxDisplayR; $CaptionSettings["G"] = $MaxDisplayG;
+                $CaptionSettings["B"] = $MaxDisplayB; $CaptionSettings["Align"] = $Align;
 
-             $LastX = $X; $LastY = $Y;
-             $X = $X + $XStep;
+                $this->drawText($YPos+$XOffset,$XPos+$YOffset,$Label,$CaptionSettings);
             }
-           $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
-          }
-         else
-          {
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y     = $this->GraphAreaY1 + $XMargin; $WayPoints = "";
-           $Force = $YStep / 5;
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL; $LastX = 1; $LastY = 1;
-           foreach($PosArray as $Key => $X)
+            if ( $Type == BOUND_MIN || $Type == BOUND_BOTH )
             {
-             if ( $DisplayValues ) 
-              $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
-
-             if ( $RecordImageMap && $X != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                if ( $MinLabelPos == BOUND_LABEL_POS_TOP    || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue >= 0) ) { $YPos  = $PosArray[$MinPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLELEFT; }
+                if ( $MinLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue < 0) ) { $YPos  = $PosArray[$MinPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLERIGHT; }
 
-             if ( $X == VOID && $LastX != NULL )
-              { $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight)); $WayPoints = ""; }
+                $XPos  = $X + $MinPos*$XStep + $SerieOffset;
+                $Label = $MinLabelTxt.$this->scaleFormat($MinValue,$Mode,$Format,$Unit);
 
-             if ( $X != VOID && $LastX == NULL && $LastGoodX != NULL && !$BreakVoid )
-              { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); }
+                $TxtPos  = $this->getTextBox($YPos,$XPos,$this->FontName,$this->FontSize,0,$Label);
+                $XOffset = 0; $YOffset = 0;
+                if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = $this->GraphAreaX1 - $TxtPos[0]["X"]; }
+                if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -($TxtPos[1]["X"] - $this->GraphAreaX2); }
+                if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = ($this->GraphAreaY1 - $TxtPos[2]["Y"])/2; }
+                if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -(($TxtPos[0]["Y"] - $this->GraphAreaY2)/2);}
 
-             if ( $X != VOID )
-              $WayPoints[] = array($X,$Y);
+                $CaptionSettings["R"] = $MinDisplayR; $CaptionSettings["G"] = $MinDisplayG;
+                $CaptionSettings["B"] = $MinDisplayB; $CaptionSettings["Align"] = $Align;
 
-             if ( $X != VOID ) { $LastGoodX = $X; $LastGoodY = $Y; }
-             if ( $X == VOID ) { $X = NULL; }
-
-             $LastX = $X; $LastY = $Y;
-             $Y = $Y + $YStep;
+                $this->drawText($YPos+$XOffset,$XPos+$YOffset,$Label,$CaptionSettings);
+            }
             }
-           $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
-          }
         }
-      }
+        }
     }
 
-   /* Draw a filled spline chart */
-   function drawFilledSplineChart($Format=NULL)
+    /* Draw a plot chart */
+    function drawPlotChart($Format=NULL)
     {
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
-     $Threshold		= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        $PlotSize		= isset($Format["PlotSize"]) ? $Format["PlotSize"] : NULL;
+        $PlotBorder	= isset($Format["PlotBorder"]) ? $Format["PlotBorder"] : FALSE;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 50;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 50;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 50;
+        $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 30;
+        $BorderSize	= isset($Format["BorderSize"]) ? $Format["BorderSize"] : 2;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 4;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
         {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+            if ( isset($Serie["Weight"]) ) { $SerieWeight = $Serie["Weight"] + 2; } else { $SerieWeight = 2; }
+            if ( $PlotSize != NULL ) { $SerieWeight = $PlotSize; }
 
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+            if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+            if ( isset($Serie["Picture"]) )
+            { $Picture = $Serie["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->getPicInfo($Picture); }
+            else { $Picture = NULL; $PicOffset = 0; }
 
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-         if ( $AroundZero ) { $YZero = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"])); }
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
-         if ( $Threshold != NULL )
-          {
-           foreach($Threshold as $Key => $Params)
-            {
-             $Threshold[$Key]["MinX"] = $this->scaleComputeY($Params["Min"],array("AxisID"=>$Serie["Axis"]));
-             $Threshold[$Key]["MaxX"] = $this->scaleComputeY($Params["Max"],array("AxisID"=>$Serie["Axis"]));
-            }
-          }
+            $AxisID	= $Serie["Axis"];
+            $Shape		= $Serie["Shape"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
 
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+            if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X     = $this->GraphAreaX1 + $XMargin; $WayPoints = "";
-           $Force = $XStep / 5;
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
 
-           if ( !$AroundZero ) { $YZero = $this->GraphAreaY2-1; }
-           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
-           if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-           $LastX = ""; $LastY = "";
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $Y)
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
             {
-             if ( $DisplayValues ) 
-              $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            if ( $Picture != NULL ) { $PicOffset = $PicHeight / 2; $SerieWeight = 0; }
+            $X = $this->GraphAreaX1 + $XMargin;
 
-             if ( $Y == VOID )
-              {
-               $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $DisplayValues ) 
+                $this->drawText($X,$Y-$DisplayOffset-$SerieWeight-$BorderSize-$PicOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
 
-               if ( $Area != "" )
+                if ( $Y != VOID )
                 {
-                 foreach ($Area as $key => $Points)
-                  {
-                   $Corners = ""; $Corners[] = $Area[$key][0]["X"]; $Corners[] = $YZero;
-                   foreach($Points as $subKey => $Point)
-                    {
-                     if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
-                     $Corners[] = $Point["Y"]+1;
-                    }
-                   $Corners[] = $Points[$subKey]["X"]-1; $Corners[] = $YZero;
+                if ( $RecordImageMap ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$SerieWeight,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-                   $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
-                  }
-                 $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+                if ( $Picture != NULL )
+                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
+                else
+                { $this->drawShape($X,$Y,$Shape,$SerieWeight,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha); }
                 }
-
-               $WayPoints = "";
-              }
-             else
-              $WayPoints[] = array($X,$Y-.5); /* -.5 for AA visual fix */
-
-             $X = $X + $XStep;
+                $X = $X + $XStep;
             }
-           $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
-
-           if ( $Area != "" )
-            {
-             foreach ($Area as $key => $Points)
-              {
-               $Corners = ""; $Corners[] = $Area[$key][0]["X"]; $Corners[] = $YZero;
-               foreach($Points as $subKey => $Point)
-                {
-                 if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
-                 $Corners[] = $Point["Y"]+1;
-                }
-               $Corners[] = $Points[$subKey]["X"]-1; $Corners[] = $YZero;
-
-               $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
-              }
-             $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
             }
-          }
-         else
-          {
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y     = $this->GraphAreaY1 + $XMargin; $WayPoints = "";
-           $Force = $YStep / 5;
-
-           if ( !$AroundZero ) { $YZero = $this->GraphAreaX1+1; }
-           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
-           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $X)
+            else
             {
-             if ( $DisplayValues ) 
-              $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            if ( $Picture != NULL ) { $PicOffset = $PicWidth / 2; $SerieWeight = 0; }
+            $Y = $this->GraphAreaY1 + $XMargin;
 
-             if ( $X == VOID )
-              {
-               $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $X)
+            {
+                if ( $DisplayValues ) 
+                $this->drawText($X+$DisplayOffset+$SerieWeight+$BorderSize+$PicOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
 
-               if ( $Area != "" )
+                if ( $X != VOID )
                 {
-                 foreach ($Area as $key => $Points)
-                  {
-                   $Corners = ""; $Corners[] = $YZero; $Corners[] = $Area[$key][0]["Y"];
-                   foreach($Points as $subKey => $Point)
-                    {
-                     if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
-                     $Corners[] = $Point["Y"];
-                    }
-                   $Corners[] = $YZero; $Corners[] = $Points[$subKey]["Y"]-1;
+                if ( $RecordImageMap ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$SerieWeight,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-                   $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
-                  }
-                 $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-                }
+                if ( $Picture != NULL )
+                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
+                else
+                { $this->drawShape($X,$Y,$Shape,$SerieWeight,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha); }
+                }
+                $Y = $Y + $YStep;
+            }
+            }
+        }
+        }
+    }
 
-               $WayPoints = "";
-              }
-             else
-              $WayPoints[] = array($X,$Y);
+    /* Draw a spline chart */
+    function drawSplineChart($Format=NULL)
+    {
+        $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : TRUE;
+        $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
+        $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL; // 234
+        $BreakG		= isset($Format["BreakG"]) ? $Format["BreakG"] : NULL; // 55
+        $BreakB		= isset($Format["BreakB"]) ? $Format["BreakB"] : NULL; // 26
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+        $ImageMapPlotSize  = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 5;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
 
-             $Y = $Y + $YStep;
-            }
-           $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
+            if ( $BreakR == NULL )
+            $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks);
+            else
+            $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+            if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
 
-           if ( $Area != "" )
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
             {
-             foreach ($Area as $key => $Points)
-              {
-               $Corners = ""; $Corners[] = $YZero; $Corners[] = $Area[$key][0]["Y"];
-               foreach($Points as $subKey => $Point)
-                {
-                 if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
-                 $Corners[] = $Point["Y"];
-                }
-               $Corners[] = $YZero; $Corners[] = $Points[$subKey]["Y"]-1;
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X     = $this->GraphAreaX1 + $XMargin; $WayPoints = "";
+            $Force = $XStep / 5;
 
-               $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
-              }
-             $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL; $LastX = 1; $LastY = 1;
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $DisplayValues ) 
+                $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+	
+                if ( $RecordImageMap && $Y != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+                if ( $Y == VOID && $LastY != NULL )
+                { $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight)); $WayPoints = ""; }
+
+                if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
+                { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); }
+
+                if ( $Y != VOID )
+                $WayPoints[] = array($X,$Y);
+
+                if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+                if ( $Y == VOID ) { $Y = NULL; }
+
+                $LastX = $X; $LastY = $Y;
+                $X = $X + $XStep;
             }
+            $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+            }
+            else
+            {
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y     = $this->GraphAreaY1 + $XMargin; $WayPoints = "";
+            $Force = $YStep / 5;
 
-          }
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL; $LastX = 1; $LastY = 1;
+            foreach($PosArray as $Key => $X)
+            {
+                if ( $DisplayValues ) 
+                $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+
+                if ( $RecordImageMap && $X != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+                if ( $X == VOID && $LastX != NULL )
+                { $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight)); $WayPoints = ""; }
+
+                if ( $X != VOID && $LastX == NULL && $LastGoodX != NULL && !$BreakVoid )
+                { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); }
+
+                if ( $X != VOID )
+                $WayPoints[] = array($X,$Y);
+
+                if ( $X != VOID ) { $LastGoodX = $X; $LastGoodY = $Y; }
+                if ( $X == VOID ) { $X = NULL; }
+
+                $LastX = $X; $LastY = $Y;
+                $Y = $Y + $YStep;
+            }
+            $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+            }
+        }
         }
-      }
     }
 
-   /* Draw a line chart */
-   function drawLineChart($Format=NULL)
+    /* Draw a filled spline chart */
+    function drawFilledSplineChart($Format=NULL)
     {
-     $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : TRUE;
-     $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
-     $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL;
-     $BreakG		= isset($Format["BreakG"]) ? $Format["BreakG"] : NULL;
-     $BreakB		= isset($Format["BreakB"]) ? $Format["BreakB"] : NULL;
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-     $ImageMapPlotSize  = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 5;
-     $ForceColor	= isset($Format["ForceColor"]) ? $Format["ForceColor"] : FALSE;
-     $ForceR		= isset($Format["ForceR"]) ? $Format["ForceR"] : 0;
-     $ForceG		= isset($Format["ForceG"]) ? $Format["ForceG"] : 0;
-     $ForceB		= isset($Format["ForceB"]) ? $Format["ForceB"] : 0;
-     $ForceAlpha	= isset($Format["ForceAlpha"]) ? $Format["ForceAlpha"] : 100;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
+        $Threshold		= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+        foreach($Data["Series"] as $SerieName => $Serie)
         {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
-         if ( $ForceColor )
-          { $R = $ForceR; $G = $ForceG; $B = $ForceB; $Alpha = $ForceAlpha; }
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
 
-         if ( $BreakR == NULL )
-          $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
-         else
-          $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+            if ( $AroundZero ) { $YZero = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"])); }
 
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+            if ( $Threshold != NULL )
+            {
+            foreach($Threshold as $Key => $Params)
+            {
+                $Threshold[$Key]["MinX"] = $this->scaleComputeY($Params["Min"],array("AxisID"=>$Serie["Axis"]));
+                $Threshold[$Key]["MaxX"] = $this->scaleComputeY($Params["Max"],array("AxisID"=>$Serie["Axis"]));
+            }
+            }
 
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X     = $this->GraphAreaX1 + $XMargin; $WayPoints = "";
+            $Force = $XStep / 5;
 
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+            if ( !$AroundZero ) { $YZero = $this->GraphAreaY2-1; }
+            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+            if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
 
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+            $LastX = ""; $LastY = "";
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $DisplayValues ) 
+                $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+                if ( $Y == VOID )
+                {
+                $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
-              {
-               if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
-               $this->drawText($X,$Y-$Offset-$Weight,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
-              }
+                if ( $Area != "" )
+                {
+                    foreach ($Area as $key => $Points)
+                    {
+                    $Corners = ""; $Corners[] = $Area[$key][0]["X"]; $Corners[] = $YZero;
+                    foreach($Points as $subKey => $Point)
+                    {
+                        if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
+                        $Corners[] = $Point["Y"]+1;
+                    }
+                    $Corners[] = $Points[$subKey]["X"]-1; $Corners[] = $YZero;
 
-             if ( $RecordImageMap && $Y != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                    $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
+                    }
+                    $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+                }
 
-             if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
-              $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+                $WayPoints = "";
+                }
+                else
+                $WayPoints[] = array($X,$Y-.5); /* -.5 for AA visual fix */
 
-             if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
-              { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); $LastGoodY = NULL; }
+                $X = $X + $XStep;
+            }
+            $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
 
-             if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
-             if ( $Y == VOID ) { $Y = NULL; }
+            if ( $Area != "" )
+            {
+                foreach ($Area as $key => $Points)
+                {
+                $Corners = ""; $Corners[] = $Area[$key][0]["X"]; $Corners[] = $YZero;
+                foreach($Points as $subKey => $Point)
+                {
+                    if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
+                    $Corners[] = $Point["Y"]+1;
+                }
+                $Corners[] = $Points[$subKey]["X"]-1; $Corners[] = $YZero;
 
-             $LastX = $X; $LastY = $Y;
-             $X = $X + $XStep;
+                $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
+                }
+                $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            }
             }
-          }
-         else
-          {
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+            else
+            {
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y     = $this->GraphAreaY1 + $XMargin; $WayPoints = "";
+            $Force = $YStep / 5;
+
+            if ( !$AroundZero ) { $YZero = $this->GraphAreaX1+1; }
+            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL;
-           foreach($PosArray as $Key => $X)
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $X)
             {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
-              { $this->drawText($X+$DisplayOffset+$Weight,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE)); }
+                if ( $DisplayValues ) 
+                $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+
+                if ( $X == VOID )
+                {
+                $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
+
+                if ( $Area != "" )
+                {
+                    foreach ($Area as $key => $Points)
+                    {
+                    $Corners = ""; $Corners[] = $YZero; $Corners[] = $Area[$key][0]["Y"];
+                    foreach($Points as $subKey => $Point)
+                    {
+                        if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
+                        $Corners[] = $Point["Y"];
+                    }
+                    $Corners[] = $YZero; $Corners[] = $Points[$subKey]["Y"]-1;
+
+                    $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
+                    }
+                    $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+                }
 
-             if ( $RecordImageMap && $X != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                $WayPoints = "";
+                }
+                else
+                $WayPoints[] = array($X,$Y);
 
-             if ( $X != VOID && $LastX != NULL && $LastY != NULL )
-              $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+                $Y = $Y + $YStep;
+            }
+            $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
 
-             if ( $X != VOID && $LastX == NULL && $LastGoodY != NULL && !$BreakVoid )
-              { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); $LastGoodY = NULL; }
+            if ( $Area != "" )
+            {
+                foreach ($Area as $key => $Points)
+                {
+                $Corners = ""; $Corners[] = $YZero; $Corners[] = $Area[$key][0]["Y"];
+                foreach($Points as $subKey => $Point)
+                {
+                    if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
+                    $Corners[] = $Point["Y"];
+                }
+                $Corners[] = $YZero; $Corners[] = $Points[$subKey]["Y"]-1;
 
-             if ( $X != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
-             if ( $X == VOID ) { $X = NULL; }
+                $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
+                }
+                $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            }
 
-             $LastX = $X; $LastY = $Y;
-             $Y = $Y + $YStep;
             }
-          }
         }
-      }
+        }
     }
 
-   /* Draw a line chart */
-   function drawZoneChart($SerieA,$SerieB,$Format=NULL)
+    /* Draw a line chart */
+    function drawLineChart($Format=NULL)
     {
-     $AxisID	= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
-     $LineR	= isset($Format["LineR"]) ? $Format["LineR"] : 150;
-     $LineG	= isset($Format["LineG"]) ? $Format["LineG"] : 150;
-     $LineB	= isset($Format["LineB"]) ? $Format["LineB"] : 150;
-     $LineAlpha	= isset($Format["LineAlpha"]) ? $Format["LineAlpha"] : 50;
-     $LineTicks	= isset($Format["LineTicks"]) ? $Format["LineTicks"] : 1;
-     $AreaR	= isset($Format["AreaR"]) ? $Format["AreaR"] : 150;
-     $AreaG	= isset($Format["AreaG"]) ? $Format["AreaG"] : 150;
-     $AreaB	= isset($Format["AreaB"]) ? $Format["AreaB"] : 150;
-     $AreaAlpha	= isset($Format["AreaAlpha"]) ? $Format["AreaAlpha"] : 5;
+        $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : TRUE;
+        $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
+        $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL;
+        $BreakG		= isset($Format["BreakG"]) ? $Format["BreakG"] : NULL;
+        $BreakB		= isset($Format["BreakB"]) ? $Format["BreakB"] : NULL;
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+        $ImageMapPlotSize  = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 5;
+        $ForceColor	= isset($Format["ForceColor"]) ? $Format["ForceColor"] : FALSE;
+        $ForceR		= isset($Format["ForceR"]) ? $Format["ForceR"] : 0;
+        $ForceG		= isset($Format["ForceG"]) ? $Format["ForceG"] : 0;
+        $ForceB		= isset($Format["ForceB"]) ? $Format["ForceB"] : 0;
+        $ForceAlpha	= isset($Format["ForceAlpha"]) ? $Format["ForceAlpha"] : 100;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+
+            if ( $ForceColor )
+            { $R = $ForceR; $G = $ForceG; $B = $ForceB; $Alpha = $ForceAlpha; }
+
+            if ( $BreakR == NULL )
+            $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+            else
+            $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
 
-     $Data	 = $this->DataSet->getData();
-     if ( !isset($Data["Series"][$SerieA]["Data"]) || !isset($Data["Series"][$SerieB]["Data"]) ) { return(0); }
-     $SerieAData = $Data["Series"][$SerieA]["Data"];
-     $SerieBData = $Data["Series"][$SerieB]["Data"];
+            if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
 
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
 
-     $Mode	= $Data["Axis"][$AxisID]["Display"];
-     $Format	= $Data["Axis"][$AxisID]["Format"];
-     $Unit	= $Data["Axis"][$AxisID]["Unit"];
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-     $PosArrayA = $this->scaleComputeY($SerieAData,array("AxisID"=>$AxisID));
-     $PosArrayB = $this->scaleComputeY($SerieBData,array("AxisID"=>$AxisID));
-     if ( count($PosArrayA) != count($PosArrayB) ) { return(0); }
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL;
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
+                {
+                if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
+                $this->drawText($X,$Y-$Offset-$Weight,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
+                }
+
+                if ( $RecordImageMap && $Y != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+                if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
+                $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+
+                if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
+                { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); $LastGoodY = NULL; }
+
+                if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+                if ( $Y == VOID ) { $Y = NULL; }
+
+                $LastX = $X; $LastY = $Y;
+                $X = $X + $XStep;
+            }
+            }
+            else
+            {
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL;
+            foreach($PosArray as $Key => $X)
+            {
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
+                { $this->drawText($X+$DisplayOffset+$Weight,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE)); }
+
+                if ( $RecordImageMap && $X != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+                if ( $X != VOID && $LastX != NULL && $LastY != NULL )
+                $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+
+                if ( $X != VOID && $LastX == NULL && $LastGoodY != NULL && !$BreakVoid )
+                { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); $LastGoodY = NULL; }
+
+                if ( $X != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+                if ( $X == VOID ) { $X = NULL; }
+
+                $LastX = $X; $LastY = $Y;
+                $Y = $Y + $YStep;
+            }
+            }
+        }
+        }
+    }
 
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      {
-       if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-       $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+    /* Draw a line chart */
+    function drawZoneChart($SerieA,$SerieB,$Format=NULL)
+    {
+        $AxisID	= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
+        $LineR	= isset($Format["LineR"]) ? $Format["LineR"] : 150;
+        $LineG	= isset($Format["LineG"]) ? $Format["LineG"] : 150;
+        $LineB	= isset($Format["LineB"]) ? $Format["LineB"] : 150;
+        $LineAlpha	= isset($Format["LineAlpha"]) ? $Format["LineAlpha"] : 50;
+        $LineTicks	= isset($Format["LineTicks"]) ? $Format["LineTicks"] : 1;
+        $AreaR	= isset($Format["AreaR"]) ? $Format["AreaR"] : 150;
+        $AreaG	= isset($Format["AreaG"]) ? $Format["AreaG"] : 150;
+        $AreaB	= isset($Format["AreaB"]) ? $Format["AreaB"] : 150;
+        $AreaAlpha	= isset($Format["AreaAlpha"]) ? $Format["AreaAlpha"] : 5;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data	 = $this->DataSet->getData();
+        if ( !isset($Data["Series"][$SerieA]["Data"]) || !isset($Data["Series"][$SerieB]["Data"]) ) { return(0); }
+        $SerieAData = $Data["Series"][$SerieA]["Data"];
+        $SerieBData = $Data["Series"][$SerieB]["Data"];
+
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        $Mode	= $Data["Axis"][$AxisID]["Display"];
+        $Format	= $Data["Axis"][$AxisID]["Format"];
+        $Unit	= $Data["Axis"][$AxisID]["Unit"];
+
+        $PosArrayA = $this->scaleComputeY($SerieAData,array("AxisID"=>$AxisID));
+        $PosArrayB = $this->scaleComputeY($SerieBData,array("AxisID"=>$AxisID));
+        if ( count($PosArrayA) != count($PosArrayB) ) { return(0); }
+
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+        if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+        $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
-       $LastX = NULL; $LastY1 = NULL; $LastY2 = NULL;
-       $BoundsA = ""; $BoundsB = "";
-       foreach($PosArrayA as $Key => $Y1)
+        $LastX = NULL; $LastY1 = NULL; $LastY2 = NULL;
+        $BoundsA = ""; $BoundsB = "";
+        foreach($PosArrayA as $Key => $Y1)
         {
-         $Y2 = $PosArrayB[$Key];
+            $Y2 = $PosArrayB[$Key];
 
-         $BoundsA[] = $X; $BoundsA[] = $Y1;
-         $BoundsB[] = $X; $BoundsB[] = $Y2;
+            $BoundsA[] = $X; $BoundsA[] = $Y1;
+            $BoundsB[] = $X; $BoundsB[] = $Y2;
 
-         $LastX = $X;
-         $LastY1 = $Y1; $LastY2 = $Y2;
+            $LastX = $X;
+            $LastY1 = $Y1; $LastY2 = $Y2;
 
-         $X = $X + $XStep;
+            $X = $X + $XStep;
         }
-       $Bounds = array_merge($BoundsA,$this->reversePlots($BoundsB));
-       $this->drawPolygonChart($Bounds,array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"Alpha"=>$AreaAlpha));
+        $Bounds = array_merge($BoundsA,$this->reversePlots($BoundsB));
+        $this->drawPolygonChart($Bounds,array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"Alpha"=>$AreaAlpha));
 
-       for($i=0;$i<=count($BoundsA)-4;$i=$i+2)
+        for($i=0;$i<=count($BoundsA)-4;$i=$i+2)
         {
-         $this->drawLine($BoundsA[$i],$BoundsA[$i+1],$BoundsA[$i+2],$BoundsA[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
-         $this->drawLine($BoundsB[$i],$BoundsB[$i+1],$BoundsB[$i+2],$BoundsB[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
+            $this->drawLine($BoundsA[$i],$BoundsA[$i+1],$BoundsA[$i+2],$BoundsA[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
+            $this->drawLine($BoundsB[$i],$BoundsB[$i+1],$BoundsB[$i+2],$BoundsB[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
         }
-      }
-     else
-      {
-       if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-       $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+        }
+        else
+        {
+        if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+        $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
-       $LastY = NULL; $LastX1 = NULL; $LastX2 = NULL;
-       $BoundsA = ""; $BoundsB = "";
-       foreach($PosArrayA as $Key => $X1)
+        $LastY = NULL; $LastX1 = NULL; $LastX2 = NULL;
+        $BoundsA = ""; $BoundsB = "";
+        foreach($PosArrayA as $Key => $X1)
         {
-         $X2 = $PosArrayB[$Key];
+            $X2 = $PosArrayB[$Key];
 
-         $BoundsA[] = $X1; $BoundsA[] = $Y;
-         $BoundsB[] = $X2; $BoundsB[] = $Y;
+            $BoundsA[] = $X1; $BoundsA[] = $Y;
+            $BoundsB[] = $X2; $BoundsB[] = $Y;
 
-         $LastY = $Y;
-         $LastX1 = $X1; $LastX2 = $X2;
+            $LastY = $Y;
+            $LastX1 = $X1; $LastX2 = $X2;
 
-         $Y = $Y + $YStep;
+            $Y = $Y + $YStep;
         }
-       $Bounds = array_merge($BoundsA,$this->reversePlots($BoundsB));
-       $this->drawPolygonChart($Bounds,array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"Alpha"=>$AreaAlpha));
+        $Bounds = array_merge($BoundsA,$this->reversePlots($BoundsB));
+        $this->drawPolygonChart($Bounds,array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"Alpha"=>$AreaAlpha));
 
-       for($i=0;$i<=count($BoundsA)-4;$i=$i+2)
+        for($i=0;$i<=count($BoundsA)-4;$i=$i+2)
         {
-         $this->drawLine($BoundsA[$i],$BoundsA[$i+1],$BoundsA[$i+2],$BoundsA[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
-         $this->drawLine($BoundsB[$i],$BoundsB[$i+1],$BoundsB[$i+2],$BoundsB[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
+            $this->drawLine($BoundsA[$i],$BoundsA[$i+1],$BoundsA[$i+2],$BoundsA[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
+            $this->drawLine($BoundsB[$i],$BoundsB[$i+1],$BoundsB[$i+2],$BoundsB[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
+        }
         }
-      }
     }
 
-   /* Draw a step chart */
-   function drawStepChart($Format=NULL)
+    /* Draw a step chart */
+    function drawStepChart($Format=NULL)
     {
-     $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : FALSE;
-     $ReCenter		= isset($Format["ReCenter"]) ? $Format["ReCenter"] : TRUE;
-     $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
-     $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL;
-     $BreakG		= isset($Format["BreakG"]) ? $Format["BreakG"] : NULL;
-     $BreakB		= isset($Format["BreakB"]) ? $Format["BreakB"] : NULL;
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] :FALSE;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-     $ImageMapPlotSize  = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 5;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
-
-         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
-
-         if ( $BreakR == NULL )
-          $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
-         else
-          $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
-
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
-
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
-         $Color		= array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
-
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL; $Init = FALSE;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
-              {
-               if ( $Y <= $LastY ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
-               $this->drawText($X,$Y-$Offset-$Weight,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
-              }
-
-             if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
-              {
-               $this->drawLine($LastX,$LastY,$X,$LastY,$Color);
-               $this->drawLine($X,$LastY,$X,$Y,$Color);
-               if ( $ReCenter && $X+$XStep < $this->GraphAreaX2 - $XMargin )
+        $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : FALSE;
+        $ReCenter		= isset($Format["ReCenter"]) ? $Format["ReCenter"] : TRUE;
+        $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
+        $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL;
+        $BreakG		= isset($Format["BreakG"]) ? $Format["BreakG"] : NULL;
+        $BreakB		= isset($Format["BreakB"]) ? $Format["BreakB"] : NULL;
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] :FALSE;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+        $ImageMapPlotSize  = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 5;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+
+            if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
+
+            if ( $BreakR == NULL )
+            $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+            else
+            $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
+            $Color		= array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
+
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL; $Init = FALSE;
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
+                {
+                if ( $Y <= $LastY ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
+                $this->drawText($X,$Y-$Offset-$Weight,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
+                }
+
+                if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
+                {
+                $this->drawLine($LastX,$LastY,$X,$LastY,$Color);
+                $this->drawLine($X,$LastY,$X,$Y,$Color);
+                if ( $ReCenter && $X+$XStep < $this->GraphAreaX2 - $XMargin )
                 {
-                 $this->drawLine($X,$Y,$X+$XStep,$Y,$Color);
-                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X-$ImageMapPlotSize).",".floor($Y-$ImageMapPlotSize).",".floor($X+$XStep+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                    $this->drawLine($X,$Y,$X+$XStep,$Y,$Color);
+                    if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X-$ImageMapPlotSize).",".floor($Y-$ImageMapPlotSize).",".floor($X+$XStep+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
                 }
-               else
+                else
                 { if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); } }
-              }
+                }
 
-             if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
-              { 
-               if ( $ReCenter )
+                if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
+                { 
+                if ( $ReCenter )
                 {
-                 $this->drawLine($LastGoodX+$XStep,$LastGoodY,$X,$LastGoodY,$BreakSettings);
-                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX+$XStep-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastGoodY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                    $this->drawLine($LastGoodX+$XStep,$LastGoodY,$X,$LastGoodY,$BreakSettings);
+                    if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX+$XStep-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastGoodY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
                 }
-               else
+                else
                 {
-                 $this->drawLine($LastGoodX,$LastGoodY,$X,$LastGoodY,$BreakSettings);
-                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastGoodY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                    $this->drawLine($LastGoodX,$LastGoodY,$X,$LastGoodY,$BreakSettings);
+                    if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastGoodY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
                 }
 
-               $this->drawLine($X,$LastGoodY,$X,$Y,$BreakSettings);
-               $LastGoodY = NULL;
-              }
-             elseif( !$BreakVoid && $LastGoodY == NULL && $Y != VOID )
-              {
-              $this->drawLine($this->GraphAreaX1 + $XMargin,$Y,$X,$Y,$BreakSettings);
-               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($this->GraphAreaX1+$XMargin-$ImageMapPlotSize).",".floor($Y-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-              }
-
-             if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
-             if ( $Y == VOID ) { $Y = NULL; }
-
-             if ( !$Init && $ReCenter ) { $X = $X - $XStep/2; $Init = TRUE; }
-             $LastX = $X; $LastY = $Y;
-             if ( $LastX < $this->GraphAreaX1 + $XMargin ) { $LastX = $this->GraphAreaX1 + $XMargin; }
-             $X = $X + $XStep;
-            }
-           if ( $ReCenter )
-            {
-             $this->drawLine($LastX,$LastY,$this->GraphAreaX2 - $XMargin,$LastY,$Color);
-             if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($this->GraphAreaX2-$XMargin+$ImageMapPlotSize).",".floor($LastY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-            }
-          }
-         else
-          {
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL; $Init = FALSE;
-           foreach($PosArray as $Key => $X)
-            {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
-              {
-               if ( $X >= $LastX ) { $Align = TEXT_ALIGN_MIDDLELEFT; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_MIDDLERIGHT; $Offset = -$DisplayOffset; }
-               $this->drawText($X+$Offset+$Weight,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
-              }
-
-             if ( $X != VOID && $LastX != NULL && $LastY != NULL )
-              {
-               $this->drawLine($LastX,$LastY,$LastX,$Y,$Color);
-               $this->drawLine($LastX,$Y,$X,$Y,$Color);
-
-               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($LastX+$XStep+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-              }
-
-             if ( $X != VOID && $LastX == NULL && $LastGoodY != NULL && !$BreakVoid )
-              {
-               $this->drawLine($LastGoodX,$LastGoodY,$LastGoodX,$LastGoodY+$YStep,$Color);
-               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($LastGoodX+$ImageMapPlotSize).",".floor($LastGoodY+$YStep+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-
-               $this->drawLine($LastGoodX,$LastGoodY+$YStep,$LastGoodX,$Y,$BreakSettings);
-               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY+$YStep-$ImageMapPlotSize).",".floor($LastGoodX+$ImageMapPlotSize).",".floor($YStep+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-
-               $this->drawLine($LastGoodX,$Y,$X,$Y,$BreakSettings);
-               $LastGoodY = NULL;
-              }
-             elseif ( $X != VOID && $LastGoodY == NULL && !$BreakVoid )
-              {
-               $this->drawLine($X,$this->GraphAreaY1 + $XMargin,$X,$Y,$BreakSettings);
-               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X-$ImageMapPlotSize).",".floor($this->GraphAreaY1+$XMargin-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-              }
-
-             if ( $X != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
-             if ( $X == VOID ) { $X = NULL; }
-
-             if ( !$Init && $ReCenter ) { $Y = $Y - $YStep/2; $Init = TRUE; }
-             $LastX = $X; $LastY = $Y;
-             if ( $LastY < $this->GraphAreaY1 + $XMargin ) { $LastY = $this->GraphAreaY1 + $XMargin; }
-             $Y = $Y + $YStep;
-            }
-           if ( $ReCenter )
-            {
-             $this->drawLine($LastX,$LastY,$LastX,$this->GraphAreaY2 - $XMargin,$Color);
-             if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($LastX+$ImageMapPlotSize).",".floor($this->GraphAreaY2-$XMargin+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-            }
-          }
-        }
-      }
-    }
+                $this->drawLine($X,$LastGoodY,$X,$Y,$BreakSettings);
+                $LastGoodY = NULL;
+                }
+                elseif( !$BreakVoid && $LastGoodY == NULL && $Y != VOID )
+                {
+                $this->drawLine($this->GraphAreaX1 + $XMargin,$Y,$X,$Y,$BreakSettings);
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($this->GraphAreaX1+$XMargin-$ImageMapPlotSize).",".floor($Y-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                }
 
-   /* Draw a step chart */
-   function drawFilledStepChart($Format=NULL)
-    {
-     $ReCenter		= isset($Format["ReCenter"]) ? $Format["ReCenter"] : TRUE;
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] :FALSE;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $ForceTransparency	= isset($Format["ForceTransparency"]) ? $Format["ForceTransparency"] : NULL;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
+                if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+                if ( $Y == VOID ) { $Y = NULL; }
+
+                if ( !$Init && $ReCenter ) { $X = $X - $XStep/2; $Init = TRUE; }
+                $LastX = $X; $LastY = $Y;
+                if ( $LastX < $this->GraphAreaX1 + $XMargin ) { $LastX = $this->GraphAreaX1 + $XMargin; }
+                $X = $X + $XStep;
+            }
+            if ( $ReCenter )
+            {
+                $this->drawLine($LastX,$LastY,$this->GraphAreaX2 - $XMargin,$LastY,$Color);
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($this->GraphAreaX2-$XMargin+$ImageMapPlotSize).",".floor($LastY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+            }
+            }
+            else
+            {
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL; $Init = FALSE;
+            foreach($PosArray as $Key => $X)
+            {
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
+                {
+                if ( $X >= $LastX ) { $Align = TEXT_ALIGN_MIDDLELEFT; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_MIDDLERIGHT; $Offset = -$DisplayOffset; }
+                $this->drawText($X+$Offset+$Weight,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
+                }
+
+                if ( $X != VOID && $LastX != NULL && $LastY != NULL )
+                {
+                $this->drawLine($LastX,$LastY,$LastX,$Y,$Color);
+                $this->drawLine($LastX,$Y,$X,$Y,$Color);
 
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($LastX+$XStep+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                }
+
+                if ( $X != VOID && $LastX == NULL && $LastGoodY != NULL && !$BreakVoid )
+                {
+                $this->drawLine($LastGoodX,$LastGoodY,$LastGoodX,$LastGoodY+$YStep,$Color);
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($LastGoodX+$ImageMapPlotSize).",".floor($LastGoodY+$YStep+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+                $this->drawLine($LastGoodX,$LastGoodY+$YStep,$LastGoodX,$Y,$BreakSettings);
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY+$YStep-$ImageMapPlotSize).",".floor($LastGoodX+$ImageMapPlotSize).",".floor($YStep+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+                $this->drawLine($LastGoodX,$Y,$X,$Y,$BreakSettings);
+                $LastGoodY = NULL;
+                }
+                elseif ( $X != VOID && $LastGoodY == NULL && !$BreakVoid )
+                {
+                $this->drawLine($X,$this->GraphAreaY1 + $XMargin,$X,$Y,$BreakSettings);
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X-$ImageMapPlotSize).",".floor($this->GraphAreaY1+$XMargin-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                }
+
+                if ( $X != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+                if ( $X == VOID ) { $X = NULL; }
+
+                if ( !$Init && $ReCenter ) { $Y = $Y - $YStep/2; $Init = TRUE; }
+                $LastX = $X; $LastY = $Y;
+                if ( $LastY < $this->GraphAreaY1 + $XMargin ) { $LastY = $this->GraphAreaY1 + $XMargin; }
+                $Y = $Y + $YStep;
+            }
+            if ( $ReCenter )
+            {
+                $this->drawLine($LastX,$LastY,$LastX,$this->GraphAreaY2 - $XMargin,$Color);
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($LastX+$ImageMapPlotSize).",".floor($this->GraphAreaY2-$XMargin+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+            }
+            }
+        }
+        }
+    }
+
+    /* Draw a step chart */
+    function drawFilledStepChart($Format=NULL)
+    {
+        $ReCenter		= isset($Format["ReCenter"]) ? $Format["ReCenter"] : TRUE;
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] :FALSE;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $ForceTransparency	= isset($Format["ForceTransparency"]) ? $Format["ForceTransparency"] : NULL;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
         {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
 
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
 
-         $Color		= array("R"=>$R,"G"=>$G,"B"=>$B);
-         if ( $ForceTransparency != NULL ) { $Color["Alpha"] = $ForceTransparency; } else { $Color["Alpha"] = $Alpha; }
+            $Color		= array("R"=>$R,"G"=>$G,"B"=>$B);
+            if ( $ForceTransparency != NULL ) { $Color["Alpha"] = $ForceTransparency; } else { $Color["Alpha"] = $Alpha; }
 
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-         $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+            $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
 
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
-           if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+            if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
 
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
-           if ( !$AroundZero ) { $YZero = $this->GraphAreaY2-1; }
+            if ( !$AroundZero ) { $YZero = $this->GraphAreaY2-1; }
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL; $Points = ""; $Init = FALSE;
-           foreach($PosArray as $Key => $Y)
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL; $Points = ""; $Init = FALSE;
+            foreach($PosArray as $Key => $Y)
             {
-             if ( $Y == VOID && $LastX != NULL && $LastY != NULL && $Points !="" )
-              {
-               $Points[] = $LastX; $Points[] = $LastY;
-               $Points[] = $X; $Points[] = $LastY;
-               $Points[] = $X; $Points[] = $YZero;
-               $this->drawPolygon($Points,$Color);
-               $Points = "";
-              }
+                if ( $Y == VOID && $LastX != NULL && $LastY != NULL && $Points !="" )
+                {
+                $Points[] = $LastX; $Points[] = $LastY;
+                $Points[] = $X; $Points[] = $LastY;
+                $Points[] = $X; $Points[] = $YZero;
+                $this->drawPolygon($Points,$Color);
+                $Points = "";
+                }
 
-             if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
-              {
-               if ( $Points == "") { $Points[] = $LastX; $Points[] = $YZero; }
-               $Points[] = $LastX; $Points[] = $LastY;
-               $Points[] = $X; $Points[] = $LastY;
-               $Points[] = $X; $Points[] = $Y;
-              }
+                if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
+                {
+                if ( $Points == "") { $Points[] = $LastX; $Points[] = $YZero; }
+                $Points[] = $LastX; $Points[] = $LastY;
+                $Points[] = $X; $Points[] = $LastY;
+                $Points[] = $X; $Points[] = $Y;
+                }
 
-             if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
-             if ( $Y == VOID ) { $Y = NULL; }
+                if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+                if ( $Y == VOID ) { $Y = NULL; }
 
-             if ( !$Init && $ReCenter ) { $X = $X - $XStep/2; $Init = TRUE; }
-             $LastX = $X; $LastY = $Y;
-             if ( $LastX < $this->GraphAreaX1 + $XMargin ) { $LastX = $this->GraphAreaX1 + $XMargin; }
-             $X = $X + $XStep;
+                if ( !$Init && $ReCenter ) { $X = $X - $XStep/2; $Init = TRUE; }
+                $LastX = $X; $LastY = $Y;
+                if ( $LastX < $this->GraphAreaX1 + $XMargin ) { $LastX = $this->GraphAreaX1 + $XMargin; }
+                $X = $X + $XStep;
             }
 
-           if ( $ReCenter )
+            if ( $ReCenter )
             {
-             $Points[] = $LastX+$XStep/2; $Points[] = $LastY;
-             $Points[] = $LastX+$XStep/2; $Points[] = $YZero;
+                $Points[] = $LastX+$XStep/2; $Points[] = $LastY;
+                $Points[] = $LastX+$XStep/2; $Points[] = $YZero;
             }
-           else
+            else
             { $Points[] = $LastX; $Points[] = $YZero; }
 
-           $this->drawPolygon($Points,$Color);
-          }
-         else
-          {
-           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
-           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+            $this->drawPolygon($Points,$Color);
+            }
+            else
+            {
+            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
 
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $LastGoodY = NULL; $LastGoodX = NULL; $Points = "";
-           foreach($PosArray as $Key => $X)
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $LastGoodY = NULL; $LastGoodX = NULL; $Points = "";
+            foreach($PosArray as $Key => $X)
             {
-             if ( $X == VOID && $LastX != NULL && $LastY != NULL && $Points !="" )
-              {
-               $Points[] = $LastX; $Points[] = $LastY;
-               $Points[] = $LastX; $Points[] = $Y;
-               $Points[] = $YZero; $Points[] = $Y;
-               $this->drawPolygon($Points,$Color);
-               $Points = "";
-              }
+                if ( $X == VOID && $LastX != NULL && $LastY != NULL && $Points !="" )
+                {
+                $Points[] = $LastX; $Points[] = $LastY;
+                $Points[] = $LastX; $Points[] = $Y;
+                $Points[] = $YZero; $Points[] = $Y;
+                $this->drawPolygon($Points,$Color);
+                $Points = "";
+                }
 
-             if ( $X != VOID && $LastX != NULL && $LastY != NULL )
-              {
-               if ( $Points == "") { $Points[] = $YZero; $Points[] = $LastY; }
-               $Points[] = $LastX; $Points[] = $LastY;
-               $Points[] = $LastX; $Points[] = $Y;
-               $Points[] = $X; $Points[] = $Y;
-              }
+                if ( $X != VOID && $LastX != NULL && $LastY != NULL )
+                {
+                if ( $Points == "") { $Points[] = $YZero; $Points[] = $LastY; }
+                $Points[] = $LastX; $Points[] = $LastY;
+                $Points[] = $LastX; $Points[] = $Y;
+                $Points[] = $X; $Points[] = $Y;
+                }
 
-             if ( $X != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
-             if ( $X == VOID ) { $X = NULL; }
+                if ( $X != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+                if ( $X == VOID ) { $X = NULL; }
 
-             if ( $LastX == NULL && $ReCenter ) { $Y = $Y - $YStep/2; }
-             $LastX = $X; $LastY = $Y;
-             if ( $LastY < $this->GraphAreaY1 + $XMargin ) { $LastY = $this->GraphAreaY1 + $XMargin; }
-             $Y = $Y + $YStep;
+                if ( $LastX == NULL && $ReCenter ) { $Y = $Y - $YStep/2; }
+                $LastX = $X; $LastY = $Y;
+                if ( $LastY < $this->GraphAreaY1 + $XMargin ) { $LastY = $this->GraphAreaY1 + $XMargin; }
+                $Y = $Y + $YStep;
             }
 
-           if ( $ReCenter )
+            if ( $ReCenter )
             {
-             $Points[] = $LastX; $Points[] = $LastY+$YStep/2;
-             $Points[] = $YZero; $Points[] = $LastY+$YStep/2;
+                $Points[] = $LastX; $Points[] = $LastY+$YStep/2;
+                $Points[] = $YZero; $Points[] = $LastY+$YStep/2;
             }
-           else
+            else
             { $Points[] = $YZero; $Points[] = $LastY; }
 
-           $this->drawPolygon($Points,$Color);
-          }
+            $this->drawPolygon($Points,$Color);
+            }
+        }
         }
-      }
     }
 
-   /* Draw an area chart */
-   function drawAreaChart($Format=NULL)
+    /* Draw an area chart */
+    function drawAreaChart($Format=NULL)
     {
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $ForceTransparency	= isset($Format["ForceTransparency"]) ? $Format["ForceTransparency"] : 25;
-     $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
-     $Threshold		= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
-
-     $Data  = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $ForceTransparency	= isset($Format["ForceTransparency"]) ? $Format["ForceTransparency"] : 25;
+        $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
+        $Threshold		= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data  = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        foreach($Data["Series"] as $SerieName => $Serie)
         {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
 
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-         $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+            $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
 
-         if ( $Threshold != NULL )
-          {
-           foreach($Threshold as $Key => $Params)
+            if ( $Threshold != NULL )
+            {
+            foreach($Threshold as $Key => $Params)
             {
-             $Threshold[$Key]["MinX"] = $this->scaleComputeY($Params["Min"],array("AxisID"=>$Serie["Axis"]));
-             $Threshold[$Key]["MaxX"] = $this->scaleComputeY($Params["Max"],array("AxisID"=>$Serie["Axis"]));
+                $Threshold[$Key]["MinX"] = $this->scaleComputeY($Params["Min"],array("AxisID"=>$Serie["Axis"]));
+                $Threshold[$Key]["MaxX"] = $this->scaleComputeY($Params["Max"],array("AxisID"=>$Serie["Axis"]));
+            }
             }
-          }
 
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
 
-           $Areas = ""; $AreaID = 0; 
-           $Areas[$AreaID][] = $this->GraphAreaX1 + $XMargin;
-           if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
+            $Areas = ""; $AreaID = 0; 
+            $Areas[$AreaID][] = $this->GraphAreaX1 + $XMargin;
+            if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
 
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $Y)
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $Y)
             {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
-              {
-               if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
-               $this->drawText($X,$Y-$Offset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
-              }
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
+                {
+                if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
+                $this->drawText($X,$Y-$Offset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
+                }
 
-             if ( $Y == VOID && isset($Areas[$AreaID]) )
-              {
-               if($LastX == NULL)
+                if ( $Y == VOID && isset($Areas[$AreaID]) )
+                {
+                if($LastX == NULL)
                 { $Areas[$AreaID][] = $X; }
-               else
+                else
                 { $Areas[$AreaID][] = $LastX; }
 
-               if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
-               $AreaID++;
-              }
-             elseif ($Y != VOID)
-              {
-               if ( !isset($Areas[$AreaID]) )
+                if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
+                $AreaID++;
+                }
+                elseif ($Y != VOID)
+                {
+                if ( !isset($Areas[$AreaID]) )
                 {
-                 $Areas[$AreaID][] = $X;
-                 if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
+                    $Areas[$AreaID][] = $X;
+                    if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
                 }
 
-               $Areas[$AreaID][] = $X;
-               $Areas[$AreaID][] = $Y;
-              }
+                $Areas[$AreaID][] = $X;
+                $Areas[$AreaID][] = $Y;
+                }
 
-             $LastX = $X;
-             $X = $X + $XStep;
+                $LastX = $X;
+                $X = $X + $XStep;
             }
-           $Areas[$AreaID][] = $LastX;
-           if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
+            $Areas[$AreaID][] = $LastX;
+            if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
 
-           /* Handle shadows in the areas */
-           if ( $this->Shadow )
+            /* Handle shadows in the areas */
+            if ( $this->Shadow )
             {
-             $ShadowArea = "";
-             foreach($Areas as $Key => $Points)
-              {
-               $ShadowArea[$Key] = "";
-               foreach($Points as $Key2 => $Value)
+                $ShadowArea = "";
+                foreach($Areas as $Key => $Points)
+                {
+                $ShadowArea[$Key] = "";
+                foreach($Points as $Key2 => $Value)
                 {
-                 if ( $Key2 % 2 == 0 )
-                  { $ShadowArea[$Key][] = $Value + $this->ShadowX; }
-                 else
-                  { $ShadowArea[$Key][] = $Value + $this->ShadowY; }
+                    if ( $Key2 % 2 == 0 )
+                    { $ShadowArea[$Key][] = $Value + $this->ShadowX; }
+                    else
+                    { $ShadowArea[$Key][] = $Value + $this->ShadowY; }
                 }
-              }              
+                }              
 
-             foreach($ShadowArea as $Key => $Points)
-              $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+                foreach($ShadowArea as $Key => $Points)
+                $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
             }
 
-           $Alpha = $ForceTransparency != NULL ? $ForceTransparency : $Alpha;
-           $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Threshold"=>$Threshold);
+            $Alpha = $ForceTransparency != NULL ? $ForceTransparency : $Alpha;
+            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Threshold"=>$Threshold);
 
-           foreach($Areas as $Key => $Points)
+            foreach($Areas as $Key => $Points)
             $this->drawPolygonChart($Points,$Color);
-          }
-         else
-          {
-           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
-           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+            }
+            else
+            {
+            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
 
-           $Areas = ""; $AreaID = 0; 
-           if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
-           $Areas[$AreaID][] = $this->GraphAreaY1 + $XMargin;
+            $Areas = ""; $AreaID = 0; 
+            if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
+            $Areas[$AreaID][] = $this->GraphAreaY1 + $XMargin;
 
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y     = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y     = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $X)
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $X)
             {
-             if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
-              {
-               if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
-               $this->drawText($X+$Offset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
-              }
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
+                {
+                if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
+                $this->drawText($X+$Offset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
+                }
 
-             if ( $X == VOID && isset($Areas[$AreaID]) )
-              {
-               if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
+                if ( $X == VOID && isset($Areas[$AreaID]) )
+                {
+                if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
 
-               if($LastY == NULL)
+                if($LastY == NULL)
                 { $Areas[$AreaID][] = $Y; }
-               else
+                else
                 { $Areas[$AreaID][] = $LastY; }
 
-               $AreaID++;
-              }
-             elseif ($X != VOID)
-              {
-               if ( !isset($Areas[$AreaID]) )
+                $AreaID++;
+                }
+                elseif ($X != VOID)
+                {
+                if ( !isset($Areas[$AreaID]) )
                 {
-                 if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
-                 $Areas[$AreaID][] = $Y;
+                    if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
+                    $Areas[$AreaID][] = $Y;
                 }
 
-               $Areas[$AreaID][] = $X;
-               $Areas[$AreaID][] = $Y;
-              }
+                $Areas[$AreaID][] = $X;
+                $Areas[$AreaID][] = $Y;
+                }
 
-             $LastX = $X; $LastY = $Y;
-             $Y = $Y + $YStep;
+                $LastX = $X; $LastY = $Y;
+                $Y = $Y + $YStep;
             }
-           if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
-           $Areas[$AreaID][] = $LastY;
+            if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
+            $Areas[$AreaID][] = $LastY;
 
-           /* Handle shadows in the areas */
-           if ( $this->Shadow )
+            /* Handle shadows in the areas */
+            if ( $this->Shadow )
             {
-             $ShadowArea = "";
-             foreach($Areas as $Key => $Points)
-              {
-               $ShadowArea[$Key] = "";
-               foreach($Points as $Key2 => $Value)
+                $ShadowArea = "";
+                foreach($Areas as $Key => $Points)
+                {
+                $ShadowArea[$Key] = "";
+                foreach($Points as $Key2 => $Value)
                 {
-                 if ( $Key2 % 2 == 0 )
-                  { $ShadowArea[$Key][] = $Value + $this->ShadowX; }
-                 else
-                  { $ShadowArea[$Key][] = $Value + $this->ShadowY; }
+                    if ( $Key2 % 2 == 0 )
+                    { $ShadowArea[$Key][] = $Value + $this->ShadowX; }
+                    else
+                    { $ShadowArea[$Key][] = $Value + $this->ShadowY; }
                 }
-              }              
+                }              
 
-             foreach($ShadowArea as $Key => $Points)
-              $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+                foreach($ShadowArea as $Key => $Points)
+                $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
             }
 
-           $Alpha = $ForceTransparency != NULL ? $ForceTransparency : $Alpha;
-           $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Threshold"=>$Threshold);
+            $Alpha = $ForceTransparency != NULL ? $ForceTransparency : $Alpha;
+            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Threshold"=>$Threshold);
 
-           foreach($Areas as $Key => $Points)
+            foreach($Areas as $Key => $Points)
             $this->drawPolygonChart($Points,$Color);
-          }
+            }
+        }
         }
-      }
     }
 
 
-   /* Draw a bar chart */
-   function drawBarChart($Format=NULL)
+    /* Draw a bar chart */
+    function drawBarChart($Format=NULL)
     {
-     $Floating0Serie	= isset($Format["Floating0Serie"]) ? $Format["Floating0Serie"] : NULL;
-     $Floating0Value	= isset($Format["Floating0Value"]) ? $Format["Floating0Value"] : NULL;
-     $Draw0Line		= isset($Format["Draw0Line"]) ? $Format["Draw0Line"] : FALSE;
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
-     $DisplayOrientation = isset($Format["DisplayOrientation"]) ? $Format["DisplayOrientation"] : ORIENTATION_HORIZONTAL;
-     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayFont	= isset($Format["DisplaySize"]) ? $Format["DisplaySize"] : $this->FontName;
-     $DisplaySize	= isset($Format["DisplaySize"]) ? $Format["DisplaySize"] : $this->FontSize;
-     $DisplayPos	= isset($Format["DisplayPos"]) ? $Format["DisplayPos"] : LABEL_POS_OUTSIDE;
-     $DisplayShadow	= isset($Format["DisplayShadow"]) ? $Format["DisplayShadow"] : TRUE;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
-     $Interleave	= isset($Format["Interleave"]) ? $Format["Interleave"] : .5;
-     $Rounded		= isset($Format["Rounded"]) ? $Format["Rounded"] : FALSE;
-     $RoundRadius	= isset($Format["RoundRadius"]) ? $Format["RoundRadius"] : 4;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
-     $Gradient		= isset($Format["Gradient"]) ? $Format["Gradient"] : FALSE;
-     $GradientMode	= isset($Format["GradientMode"]) ? $Format["GradientMode"] : GRADIENT_SIMPLE;
-     $GradientAlpha	= isset($Format["GradientAlpha"]) ? $Format["GradientAlpha"] : 20;
-     $GradientStartR	= isset($Format["GradientStartR"]) ? $Format["GradientStartR"] : 255;
-     $GradientStartG	= isset($Format["GradientStartG"]) ? $Format["GradientStartG"] : 255;
-     $GradientStartB	= isset($Format["GradientStartB"]) ? $Format["GradientStartB"] : 255;
-     $GradientEndR	= isset($Format["GradientEndR"]) ? $Format["GradientEndR"] : 0;
-     $GradientEndG	= isset($Format["GradientEndG"]) ? $Format["GradientEndG"] : 0;
-     $GradientEndB	= isset($Format["GradientEndB"]) ? $Format["GradientEndB"] : 0;
-     $TxtMargin		= isset($Format["TxtMargin"]) ? $Format["TxtMargin"] : 6;
-     $OverrideColors	= isset($Format["OverrideColors"]) ? $Format["OverrideColors"] : NULL;
-     $OverrideSurrounding = isset($Format["OverrideSurrounding"]) ? $Format["OverrideSurrounding"] : 30;
-     $InnerSurrounding	= isset($Format["InnerSurrounding"]) ? $Format["InnerSurrounding"] : NULL;
-     $InnerBorderR	= isset($Format["InnerBorderR"]) ? $Format["InnerBorderR"] : -1;
-     $InnerBorderG	= isset($Format["InnerBorderG"]) ? $Format["InnerBorderG"] : -1;
-     $InnerBorderB	= isset($Format["InnerBorderB"]) ? $Format["InnerBorderB"] : -1;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     if ( $OverrideColors != NULL )
-      {
-       $OverrideColors = $this->validatePalette($OverrideColors,$OverrideSurrounding);
-       $this->DataSet->saveExtendedData("Palette",$OverrideColors);
-      }
-
-     $RestoreShadow = $this->Shadow;
-
-     $SeriesCount  = $this->countDrawableSeries();
-     $CurrentSerie = 0;
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
-         if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-         if ( $InnerSurrounding != NULL ) { $InnerBorderR = $R+$InnerSurrounding; $InnerBorderG = $G+$InnerSurrounding; $InnerBorderB = $B+$InnerSurrounding; }
-         if ( $InnerBorderR == -1 ) { $InnerColor = NULL; } else { $InnerColor = array("R"=>$InnerBorderR,"G"=>$InnerBorderG,"B"=>$InnerBorderB); }
-         $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB);
-
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
-
-         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
-
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-
-         if ( $Floating0Value != NULL )
-          { $YZero = $this->scaleComputeY($Floating0Value,array("AxisID"=>$Serie["Axis"])); }
-         else
-          { $YZero = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"])); }
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
-           if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
-
-           if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin;
-
-           if ( $AroundZero ) { $Y1 = $YZero; } else { $Y1 = $this->GraphAreaY2-1; }
-           if ( $XDivs == 0 ) { $XSize = ($this->GraphAreaX2-$this->GraphAreaX1)/($SeriesCount+$Interleave); } else { $XSize   = ($XStep / ($SeriesCount+$Interleave) ); }
-
-           $XOffset = -($XSize*$SeriesCount)/2 + $CurrentSerie * $XSize;
-           if ( $X + $XOffset <= $this->GraphAreaX1 ) { $XOffset = $this->GraphAreaX1 - $X + 1 ; }
-
-           $this->DataSet->Data["Series"][$SerieName]["XOffset"] = $XOffset + $XSize / 2;
-
-           if ( $Rounded || $BorderR != -1) { $XSpace = 1; } else { $XSpace = 0; }
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-
-           $ID = 0;
-           foreach($PosArray as $Key => $Y2)
-            {
-             if ( $Floating0Serie != NULL )
-              {
-               if ( isset($Data["Series"][$Floating0Serie]["Data"][$Key]) )
+        $Floating0Serie	= isset($Format["Floating0Serie"]) ? $Format["Floating0Serie"] : NULL;
+        $Floating0Value	= isset($Format["Floating0Value"]) ? $Format["Floating0Value"] : NULL;
+        $Draw0Line		= isset($Format["Draw0Line"]) ? $Format["Draw0Line"] : FALSE;
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+        $DisplayOrientation = isset($Format["DisplayOrientation"]) ? $Format["DisplayOrientation"] : ORIENTATION_HORIZONTAL;
+        $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayFont	= isset($Format["DisplaySize"]) ? $Format["DisplaySize"] : $this->FontName;
+        $DisplaySize	= isset($Format["DisplaySize"]) ? $Format["DisplaySize"] : $this->FontSize;
+        $DisplayPos	= isset($Format["DisplayPos"]) ? $Format["DisplayPos"] : LABEL_POS_OUTSIDE;
+        $DisplayShadow	= isset($Format["DisplayShadow"]) ? $Format["DisplayShadow"] : TRUE;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
+        $Interleave	= isset($Format["Interleave"]) ? $Format["Interleave"] : .5;
+        $Rounded		= isset($Format["Rounded"]) ? $Format["Rounded"] : FALSE;
+        $RoundRadius	= isset($Format["RoundRadius"]) ? $Format["RoundRadius"] : 4;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+        $Gradient		= isset($Format["Gradient"]) ? $Format["Gradient"] : FALSE;
+        $GradientMode	= isset($Format["GradientMode"]) ? $Format["GradientMode"] : GRADIENT_SIMPLE;
+        $GradientAlpha	= isset($Format["GradientAlpha"]) ? $Format["GradientAlpha"] : 20;
+        $GradientStartR	= isset($Format["GradientStartR"]) ? $Format["GradientStartR"] : 255;
+        $GradientStartG	= isset($Format["GradientStartG"]) ? $Format["GradientStartG"] : 255;
+        $GradientStartB	= isset($Format["GradientStartB"]) ? $Format["GradientStartB"] : 255;
+        $GradientEndR	= isset($Format["GradientEndR"]) ? $Format["GradientEndR"] : 0;
+        $GradientEndG	= isset($Format["GradientEndG"]) ? $Format["GradientEndG"] : 0;
+        $GradientEndB	= isset($Format["GradientEndB"]) ? $Format["GradientEndB"] : 0;
+        $TxtMargin		= isset($Format["TxtMargin"]) ? $Format["TxtMargin"] : 6;
+        $OverrideColors	= isset($Format["OverrideColors"]) ? $Format["OverrideColors"] : NULL;
+        $OverrideSurrounding = isset($Format["OverrideSurrounding"]) ? $Format["OverrideSurrounding"] : 30;
+        $InnerSurrounding	= isset($Format["InnerSurrounding"]) ? $Format["InnerSurrounding"] : NULL;
+        $InnerBorderR	= isset($Format["InnerBorderR"]) ? $Format["InnerBorderR"] : -1;
+        $InnerBorderG	= isset($Format["InnerBorderG"]) ? $Format["InnerBorderG"] : -1;
+        $InnerBorderB	= isset($Format["InnerBorderB"]) ? $Format["InnerBorderB"] : -1;
+        $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        if ( $OverrideColors != NULL )
+        {
+        $OverrideColors = $this->validatePalette($OverrideColors,$OverrideSurrounding);
+        $this->DataSet->saveExtendedData("Palette",$OverrideColors);
+        }
+
+        $RestoreShadow = $this->Shadow;
+
+        $SeriesCount  = $this->countDrawableSeries();
+        $CurrentSerie = 0;
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+            if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+            if ( $InnerSurrounding != NULL ) { $InnerBorderR = $R+$InnerSurrounding; $InnerBorderG = $G+$InnerSurrounding; $InnerBorderB = $B+$InnerSurrounding; }
+            if ( $InnerBorderR == -1 ) { $InnerColor = NULL; } else { $InnerColor = array("R"=>$InnerBorderR,"G"=>$InnerBorderG,"B"=>$InnerBorderB); }
+            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB);
+
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+            if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
+
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+            if ( $Floating0Value != NULL )
+            { $YZero = $this->scaleComputeY($Floating0Value,array("AxisID"=>$Serie["Axis"])); }
+            else
+            { $YZero = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"])); }
+
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+            if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
+
+            if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin;
+
+            if ( $AroundZero ) { $Y1 = $YZero; } else { $Y1 = $this->GraphAreaY2-1; }
+            if ( $XDivs == 0 ) { $XSize = ($this->GraphAreaX2-$this->GraphAreaX1)/($SeriesCount+$Interleave); } else { $XSize   = ($XStep / ($SeriesCount+$Interleave) ); }
+
+            $XOffset = -($XSize*$SeriesCount)/2 + $CurrentSerie * $XSize;
+            if ( $X + $XOffset <= $this->GraphAreaX1 ) { $XOffset = $this->GraphAreaX1 - $X + 1 ; }
+
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = $XOffset + $XSize / 2;
+
+            if ( $Rounded || $BorderR != -1) { $XSpace = 1; } else { $XSpace = 0; }
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+
+            $ID = 0;
+            foreach($PosArray as $Key => $Y2)
+            {
+                if ( $Floating0Serie != NULL )
+                {
+                if ( isset($Data["Series"][$Floating0Serie]["Data"][$Key]) )
                 { $Value = $Data["Series"][$Floating0Serie]["Data"][$Key]; }
-               else
+                else
                 { $Value = 0; }
 
-               $YZero = $this->scaleComputeY($Value,array("AxisID"=>$Serie["Axis"]));
-               if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
-               if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
+                $YZero = $this->scaleComputeY($Value,array("AxisID"=>$Serie["Axis"]));
+                if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+                if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
 
-               if ( $AroundZero ) { $Y1 = $YZero; } else { $Y1 = $this->GraphAreaY2-1; }
-              }
+                if ( $AroundZero ) { $Y1 = $YZero; } else { $Y1 = $this->GraphAreaY2-1; }
+                }
 
-             if ( $OverrideColors != NULL )
-              { if ( isset($OverrideColors[$ID]) ) { $Color = array("R"=>$OverrideColors[$ID]["R"],"G"=>$OverrideColors[$ID]["G"],"B"=>$OverrideColors[$ID]["B"],"Alpha"=>$OverrideColors[$ID]["Alpha"],"BorderR"=>$OverrideColors[$ID]["BorderR"],"BorderG"=>$OverrideColors[$ID]["BorderG"],"BorderB"=>$OverrideColors[$ID]["BorderB"]); } else { $Color = $this->getRandomColor(); } }
+                if ( $OverrideColors != NULL )
+                { if ( isset($OverrideColors[$ID]) ) { $Color = array("R"=>$OverrideColors[$ID]["R"],"G"=>$OverrideColors[$ID]["G"],"B"=>$OverrideColors[$ID]["B"],"Alpha"=>$OverrideColors[$ID]["Alpha"],"BorderR"=>$OverrideColors[$ID]["BorderR"],"BorderG"=>$OverrideColors[$ID]["BorderG"],"BorderB"=>$OverrideColors[$ID]["BorderB"]); } else { $Color = $this->getRandomColor(); } }
 
-             if ( $Y2 != VOID )
-              {
-               $BarHeight = $Y1 - $Y2;
+                if ( $Y2 != VOID )
+                {
+                $BarHeight = $Y1 - $Y2;
 
-               if ( $Serie["Data"][$Key] == 0 )
+                if ( $Serie["Data"][$Key] == 0 )
                 {
-                 $this->drawLine($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y1,$Color);
-                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset+$XSpace).",".floor($Y1-1).",".floor($X+$XOffset+$XSize-$XSpace).",".floor($Y1+1),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                    $this->drawLine($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y1,$Color);
+                    if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset+$XSpace).",".floor($Y1-1).",".floor($X+$XOffset+$XSize-$XSpace).",".floor($Y1+1),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
                 }
-               else
+                else
                 {
-                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset+$XSpace).",".floor($Y1).",".floor($X+$XOffset+$XSize-$XSpace).",".floor($Y2),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                    if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset+$XSpace).",".floor($Y1).",".floor($X+$XOffset+$XSize-$XSpace).",".floor($Y2),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-                 if ( $Rounded )
-                  $this->drawRoundedFilledRectangle($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,$RoundRadius,$Color);
-                 else
-                  {
-                   $this->drawFilledRectangle($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,$Color);
+                    if ( $Rounded )
+                    $this->drawRoundedFilledRectangle($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,$RoundRadius,$Color);
+                    else
+                    {
+                    $this->drawFilledRectangle($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,$Color);
 
-                   if ( $InnerColor != NULL ) { $this->drawRectangle($X+$XOffset+$XSpace+1,min($Y1,$Y2)+1,$X+$XOffset+$XSize-$XSpace-1,max($Y1,$Y2)-1,$InnerColor); }
+                    if ( $InnerColor != NULL ) { $this->drawRectangle($X+$XOffset+$XSpace+1,min($Y1,$Y2)+1,$X+$XOffset+$XSize-$XSpace-1,max($Y1,$Y2)-1,$InnerColor); }
 
-                   if ( $Gradient )
+                    if ( $Gradient )
                     {
-                     $this->Shadow  = FALSE;
+                        $this->Shadow  = FALSE;
 
-                     if ( $GradientMode == GRADIENT_SIMPLE )
-                      {
-                       if ( $Serie["Data"][$Key] >= 0 )
+                        if ( $GradientMode == GRADIENT_SIMPLE )
+                        {
+                        if ( $Serie["Data"][$Key] >= 0 )
                         $GradienColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                       else
+                        else
                         $GradienColor = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
 
-                       $this->drawGradientArea($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,DIRECTION_VERTICAL,$GradienColor);
-                      }
-                     elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
-                      {
-                       $GradienColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
-                       $GradienColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                       $XSpan = floor($XSize / 3);
-
-                       $this->drawGradientArea($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSpan-$XSpace,$Y2,DIRECTION_HORIZONTAL,$GradienColor1);
-                       $this->drawGradientArea($X+$XOffset+$XSpan+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,DIRECTION_HORIZONTAL,$GradienColor2);
-                      }
-                     $this->Shadow = $RestoreShadow;
+                        $this->drawGradientArea($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,DIRECTION_VERTICAL,$GradienColor);
+                        }
+                        elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                        {
+                        $GradienColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                        $GradienColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                        $XSpan = floor($XSize / 3);
+
+                        $this->drawGradientArea($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSpan-$XSpace,$Y2,DIRECTION_HORIZONTAL,$GradienColor1);
+                        $this->drawGradientArea($X+$XOffset+$XSpan+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,DIRECTION_HORIZONTAL,$GradienColor2);
+                        }
+                        $this->Shadow = $RestoreShadow;
+                    }
                     }
-                  }
 
-                 if ( $Draw0Line )
-                  {
-                   $Line0Color = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20);
+                    if ( $Draw0Line )
+                    {
+                    $Line0Color = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20);
 
-                   if ( abs($Y1 - $Y2) > 3 ) { $Line0Width = 3; } else { $Line0Width = 1; }
-                   if ( $Y1 - $Y2 < 0 ) { $Line0Width = -$Line0Width; }
+                    if ( abs($Y1 - $Y2) > 3 ) { $Line0Width = 3; } else { $Line0Width = 1; }
+                    if ( $Y1 - $Y2 < 0 ) { $Line0Width = -$Line0Width; }
 
-                   $this->drawFilledRectangle($X+$XOffset+$XSpace,floor($Y1),$X+$XOffset+$XSize-$XSpace,floor($Y1)-$Line0Width,$Line0Color);
-                   $this->drawLine($X+$XOffset+$XSpace,floor($Y1),$X+$XOffset+$XSize-$XSpace,floor($Y1),$Line0Color);
-                  }
+                    $this->drawFilledRectangle($X+$XOffset+$XSpace,floor($Y1),$X+$XOffset+$XSize-$XSpace,floor($Y1)-$Line0Width,$Line0Color);
+                    $this->drawLine($X+$XOffset+$XSpace,floor($Y1),$X+$XOffset+$XSize-$XSpace,floor($Y1),$Line0Color);
+                    }
                 }
 
-               if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
                 {
-                 if ( $DisplayShadow ) { $this->Shadow = TRUE; }
-
-                 $Caption    = $this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit);
-                 $TxtPos     = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,90,$Caption);
-                 $TxtHeight  = $TxtPos[0]["Y"] - $TxtPos[1]["Y"] + $TxtMargin;
-
-                 if ( $DisplayPos == LABEL_POS_INSIDE && abs($TxtHeight) < abs($BarHeight) )
-                  {
-                   $CenterX = (($X+$XOffset+$XSize-$XSpace)-($X+$XOffset+$XSpace))/2 + $X+$XOffset+$XSpace;
-                   $CenterY = ($Y2-$Y1)/2 + $Y1;
-
-                   $this->drawText($CenterX,$CenterY,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"Angle"=>90));
-                  }
-                 else
-                  {
-                   if ( $Serie["Data"][$Key] >= 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
-                   $this->drawText($X+$XOffset+$XSize/2,$Y2-$Offset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align,"FontSize"=>$DisplaySize));
-                  }
-
-                 $this->Shadow = $RestoreShadow;
+                    if ( $DisplayShadow ) { $this->Shadow = TRUE; }
+
+                    $Caption    = $this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit);
+                    $TxtPos     = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,90,$Caption);
+                    $TxtHeight  = $TxtPos[0]["Y"] - $TxtPos[1]["Y"] + $TxtMargin;
+
+                    if ( $DisplayPos == LABEL_POS_INSIDE && abs($TxtHeight) < abs($BarHeight) )
+                    {
+                    $CenterX = (($X+$XOffset+$XSize-$XSpace)-($X+$XOffset+$XSpace))/2 + $X+$XOffset+$XSpace;
+                    $CenterY = ($Y2-$Y1)/2 + $Y1;
+
+                    $this->drawText($CenterX,$CenterY,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"Angle"=>90));
+                    }
+                    else
+                    {
+                    if ( $Serie["Data"][$Key] >= 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
+                    $this->drawText($X+$XOffset+$XSize/2,$Y2-$Offset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align,"FontSize"=>$DisplaySize));
+                    }
+
+                    $this->Shadow = $RestoreShadow;
+                }
                 }
-              }
 
-             $X = $X + $XStep;
-             $ID++;
+                $X = $X + $XStep;
+                $ID++;
+            }
             }
-          }
-         else
-          {
-           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
-           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+            else
+            {
+            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
 
-           if ( $XDivs == 0 ) { $YStep = 0; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            if ( $XDivs == 0 ) { $YStep = 0; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
            
-           $Y = $this->GraphAreaY1 + $XMargin;
+            $Y = $this->GraphAreaY1 + $XMargin;
 
-           if ( $AroundZero ) { $X1 = $YZero; } else { $X1 = $this->GraphAreaX1+1; }
-           if ( $XDivs == 0 ) { $YSize = ($this->GraphAreaY2-$this->GraphAreaY1)/($SeriesCount+$Interleave); } else { $YSize   = ($YStep / ($SeriesCount+$Interleave) ); }
+            if ( $AroundZero ) { $X1 = $YZero; } else { $X1 = $this->GraphAreaX1+1; }
+            if ( $XDivs == 0 ) { $YSize = ($this->GraphAreaY2-$this->GraphAreaY1)/($SeriesCount+$Interleave); } else { $YSize   = ($YStep / ($SeriesCount+$Interleave) ); }
            
-           $YOffset = -($YSize*$SeriesCount)/2 + $CurrentSerie * $YSize;
-           if ( $Y + $YOffset <= $this->GraphAreaY1 ) { $YOffset = $this->GraphAreaY1 - $Y + 1 ; }
+            $YOffset = -($YSize*$SeriesCount)/2 + $CurrentSerie * $YSize;
+            if ( $Y + $YOffset <= $this->GraphAreaY1 ) { $YOffset = $this->GraphAreaY1 - $Y + 1 ; }
 
-           $this->DataSet->Data["Series"][$SerieName]["XOffset"] = $YOffset + $YSize / 2;
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = $YOffset + $YSize / 2;
 
-           if ( $Rounded || $BorderR != -1 ) { $YSpace = 1; } else { $YSpace = 0; }
+            if ( $Rounded || $BorderR != -1 ) { $YSpace = 1; } else { $YSpace = 0; }
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
 
-           $ID = 0 ;
-           foreach($PosArray as $Key => $X2)
+            $ID = 0 ;
+            foreach($PosArray as $Key => $X2)
             {
-             if ( $Floating0Serie != NULL )
-              {
-               if ( isset($Data["Series"][$Floating0Serie]["Data"][$Key]) )
+                if ( $Floating0Serie != NULL )
+                {
+                if ( isset($Data["Series"][$Floating0Serie]["Data"][$Key]) )
                 $Value = $Data["Series"][$Floating0Serie]["Data"][$Key];
-               else { $Value = 0; }
+                else { $Value = 0; }
+
+                $YZero = $this->scaleComputeY($Value,array("AxisID"=>$Serie["Axis"]));
+                if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+                if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+                if ( $AroundZero ) { $X1 = $YZero; } else { $X1 = $this->GraphAreaX1+1; }
+                }
+
+                if ( $OverrideColors != NULL )
+                { if ( isset($OverrideColors[$ID]) ) { $Color = array("R"=>$OverrideColors[$ID]["R"],"G"=>$OverrideColors[$ID]["G"],"B"=>$OverrideColors[$ID]["B"],"Alpha"=>$OverrideColors[$ID]["Alpha"],"BorderR"=>$OverrideColors[$ID]["BorderR"],"BorderG"=>$OverrideColors[$ID]["BorderG"],"BorderB"=>$OverrideColors[$ID]["BorderB"]); } else { $Color = $this->getRandomColor(); } }
+
+                if ( $X2 != VOID )
+                {
+                $BarWidth = $X2 - $X1;
+
+                if ( $Serie["Data"][$Key] == 0 )
+                {
+                    $this->drawLine($X1,$Y+$YOffset+$YSpace,$X1,$Y+$YOffset+$YSize-$YSpace,$Color);
+                    if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1-1).",".floor($Y+$YOffset+$YSpace).",".floor($X1+1).",".floor($Y+$YOffset+$YSize-$YSpace),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                }
+                else
+                {
+                    if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1).",".floor($Y+$YOffset+$YSpace).",".floor($X2).",".floor($Y+$YOffset+$YSize-$YSpace),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+                    if ( $Rounded )
+                    $this->drawRoundedFilledRectangle($X1+1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,$RoundRadius,$Color);
+                    else
+                    {
+                    $this->drawFilledRectangle($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,$Color);
+
+                    if ( $InnerColor != NULL ) { $this->drawRectangle(min($X1,$X2)+1,$Y+$YOffset+$YSpace+1,max($X1,$X2)-1,$Y+$YOffset+$YSize-$YSpace-1,$InnerColor); }
+
+                    if ( $Gradient )
+                    {
+                        $this->Shadow  = FALSE;
+
+                        if ( $GradientMode == GRADIENT_SIMPLE )
+                        {
+                        if ( $Serie["Data"][$Key] >= 0 )
+                        $GradienColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                        else
+                        $GradienColor = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+
+                        $this->drawGradientArea($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,DIRECTION_HORIZONTAL,$GradienColor);
+                        }
+                        elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                        {
+                        $GradienColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                        $GradienColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                        $YSpan = floor($YSize / 3);
+
+                        $this->drawGradientArea($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSpan-$YSpace,DIRECTION_VERTICAL,$GradienColor1);
+                        $this->drawGradientArea($X1,$Y+$YOffset+$YSpan,$X2,$Y+$YOffset+$YSize-$YSpace,DIRECTION_VERTICAL,$GradienColor2);
+                        }
+                        $this->Shadow = $RestoreShadow;
+                    }
+                    }
+
+                    if ( $Draw0Line )
+                    {
+                    $Line0Color = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20);
+
+                    if ( abs($X1 - $X2) > 3 ) { $Line0Width = 3; } else { $Line0Width = 1; }
+                    if ( $X2 - $X1 < 0 ) { $Line0Width = -$Line0Width; }
+
+                    $this->drawFilledRectangle(floor($X1),$Y+$YOffset+$YSpace,floor($X1)+$Line0Width,$Y+$YOffset+$YSize-$YSpace,$Line0Color);
+                    $this->drawLine(floor($X1),$Y+$YOffset+$YSpace,floor($X1),$Y+$YOffset+$YSize-$YSpace,$Line0Color);
+                    }
+                }
+
+                if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
+                {
+                    if ( $DisplayShadow ) { $this->Shadow = TRUE; }
+
+                    $Caption   = $this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit);
+                    $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
+                    $TxtWidth  = $TxtPos[1]["X"] - $TxtPos[0]["X"] + $TxtMargin;
+
+                    if ( $DisplayPos == LABEL_POS_INSIDE && abs($TxtWidth) < abs($BarWidth) )
+                    {
+                    $CenterX = ($X2-$X1)/2 + $X1;
+                    $CenterY = (($Y+$YOffset+$YSize-$YSpace)-($Y+$YOffset+$YSpace))/2 + ($Y+$YOffset+$YSpace);
+
+                    $this->drawText($CenterX,$CenterY,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize));
+                    }
+                    else
+                    {
+                    if ( $Serie["Data"][$Key] >= 0 ) { $Align = TEXT_ALIGN_MIDDLELEFT; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_MIDDLERIGHT; $Offset = -$DisplayOffset; }
+                    $this->drawText($X2+$Offset,$Y+$YOffset+$YSize/2,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align,"FontSize"=>$DisplaySize));
+                    }
+
+                    $this->Shadow = $RestoreShadow;
+                }
+                }
+                $Y = $Y + $YStep;
+                $ID++;
+            }
+            }
+            $CurrentSerie++;
+        }
+        }
+    }
+
+    /* Draw a bar chart */
+    function drawStackedBarChart($Format=NULL)
+    {
+        $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+        $DisplayOrientation = isset($Format["DisplayOrientation"]) ? $Format["DisplayOrientation"] : ORIENTATION_AUTO;
+        $DisplayRound      = isset($Format["DisplayRound"]) ? $Format["DisplayRound"] : 0;
+        $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+        $DisplayFont	= isset($Format["DisplayFont"]) ? $Format["DisplayFont"] : $this->FontName;
+        $DisplaySize	= isset($Format["DisplaySize"]) ? $Format["DisplaySize"] : $this->FontSize;
+        $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+        $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+        $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+        $Interleave	= isset($Format["Interleave"]) ? $Format["Interleave"] : .5;
+        $Rounded		= isset($Format["Rounded"]) ? $Format["Rounded"] : FALSE;
+        $RoundRadius	= isset($Format["RoundRadius"]) ? $Format["RoundRadius"] : 4;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+        $Gradient		= isset($Format["Gradient"]) ? $Format["Gradient"] : FALSE;
+        $GradientMode	= isset($Format["GradientMode"]) ? $Format["GradientMode"] : GRADIENT_SIMPLE;
+        $GradientAlpha	= isset($Format["GradientAlpha"]) ? $Format["GradientAlpha"] : 20;
+        $GradientStartR	= isset($Format["GradientStartR"]) ? $Format["GradientStartR"] : 255;
+        $GradientStartG	= isset($Format["GradientStartG"]) ? $Format["GradientStartG"] : 255;
+        $GradientStartB	= isset($Format["GradientStartB"]) ? $Format["GradientStartB"] : 255;
+        $GradientEndR	= isset($Format["GradientEndR"]) ? $Format["GradientEndR"] : 0;
+        $GradientEndG	= isset($Format["GradientEndG"]) ? $Format["GradientEndG"] : 0;
+        $GradientEndB	= isset($Format["GradientEndB"]) ? $Format["GradientEndB"] : 0;
+        $InnerSurrounding	= isset($Format["InnerSurrounding"]) ? $Format["InnerSurrounding"] : NULL;
+        $InnerBorderR	= isset($Format["InnerBorderR"]) ? $Format["InnerBorderR"] : -1;
+        $InnerBorderG	= isset($Format["InnerBorderG"]) ? $Format["InnerBorderG"] : -1;
+        $InnerBorderB	= isset($Format["InnerBorderB"]) ? $Format["InnerBorderB"] : -1;
+        $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+        $FontFactor	= isset($Format["FontFactor"]) ? $Format["FontFactor"] : 8;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_STACKED;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        $RestoreShadow = $this->Shadow;
+
+        $LastX = ""; $LastY = "";
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+            if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = 255; $DisplayG = 255; $DisplayB = 255; }
+            if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+            if ( $InnerSurrounding != NULL ) { $InnerBorderR = $R+$InnerSurrounding; $InnerBorderG = $G+$InnerSurrounding; $InnerBorderB = $B+$InnerSurrounding; }
+            if ( $InnerBorderR == -1 ) { $InnerColor = NULL; } else { $InnerColor = array("R"=>$InnerBorderR,"G"=>$InnerBorderG,"B"=>$InnerBorderB); }
 
-               $YZero = $this->scaleComputeY($Value,array("AxisID"=>$Serie["Axis"]));
-               if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
-               if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
-               if ( $AroundZero ) { $X1 = $YZero; } else { $X1 = $this->GraphAreaX1+1; }
-              }
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
 
-             if ( $OverrideColors != NULL )
-              { if ( isset($OverrideColors[$ID]) ) { $Color = array("R"=>$OverrideColors[$ID]["R"],"G"=>$OverrideColors[$ID]["G"],"B"=>$OverrideColors[$ID]["B"],"Alpha"=>$OverrideColors[$ID]["Alpha"],"BorderR"=>$OverrideColors[$ID]["BorderR"],"BorderG"=>$OverrideColors[$ID]["BorderG"],"BorderB"=>$OverrideColors[$ID]["BorderB"]); } else { $Color = $this->getRandomColor(); } }
+            if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
 
-             if ( $X2 != VOID )
-              {
-               $BarWidth = $X2 - $X1;
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]),TRUE);
+            $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
 
-               if ( $Serie["Data"][$Key] == 0 )
-                {
-                 $this->drawLine($X1,$Y+$YOffset+$YSpace,$X1,$Y+$YOffset+$YSize-$YSpace,$Color);
-                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1-1).",".floor($Y+$YOffset+$YSpace).",".floor($X1+1).",".floor($Y+$YOffset+$YSize-$YSpace),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-                }
-               else
-                {
-                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1).",".floor($Y+$YOffset+$YSpace).",".floor($X2).",".floor($Y+$YOffset+$YSize-$YSpace),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-                 if ( $Rounded )
-                  $this->drawRoundedFilledRectangle($X1+1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,$RoundRadius,$Color);
-                 else
-                  {
-                   $this->drawFilledRectangle($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,$Color);
+            $Color = array("TransCorner"=>TRUE,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB);
 
-                   if ( $InnerColor != NULL ) { $this->drawRectangle(min($X1,$X2)+1,$Y+$YOffset+$YSpace+1,max($X1,$X2)-1,$Y+$YOffset+$YSize-$YSpace-1,$InnerColor); }
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
 
-                   if ( $Gradient )
-                    {
-                     $this->Shadow  = FALSE;
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X     = $this->GraphAreaX1 + $XMargin;
 
-                     if ( $GradientMode == GRADIENT_SIMPLE )
-                      {
-                       if ( $Serie["Data"][$Key] >= 0 )
-                        $GradienColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                       else
-                        $GradienColor = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+            $XSize   = ($XStep / (1+$Interleave) );
+            $XOffset = -($XSize/2);
 
-                       $this->drawGradientArea($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,DIRECTION_HORIZONTAL,$GradienColor);
-                      }
-                     elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
-                      {
-                       $GradienColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
-                       $GradienColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                       $YSpan = floor($YSize / 3);
-
-                       $this->drawGradientArea($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSpan-$YSpace,DIRECTION_VERTICAL,$GradienColor1);
-                       $this->drawGradientArea($X1,$Y+$YOffset+$YSpan,$X2,$Y+$YOffset+$YSize-$YSpace,DIRECTION_VERTICAL,$GradienColor2);
-                      }
-                     $this->Shadow = $RestoreShadow;
-                    }
-                  }
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $Height)
+            {
+                if ( $Height != VOID && $Serie["Data"][$Key] != 0 )
+                {
+                if ( $Serie["Data"][$Key] > 0 ) { $Pos = "+"; } else { $Pos = "-"; }
 
-                 if ( $Draw0Line )
-                  {
-                   $Line0Color = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20);
+                if ( !isset($LastY[$Key] ) ) { $LastY[$Key] = ""; }
+                if ( !isset($LastY[$Key][$Pos] ) ) { $LastY[$Key][$Pos] = $YZero; }
 
-                   if ( abs($X1 - $X2) > 3 ) { $Line0Width = 3; } else { $Line0Width = 1; }
-                   if ( $X2 - $X1 < 0 ) { $Line0Width = -$Line0Width; }
+                $Y1 = $LastY[$Key][$Pos];
+                $Y2 = $Y1 - $Height;
 
-                   $this->drawFilledRectangle(floor($X1),$Y+$YOffset+$YSpace,floor($X1)+$Line0Width,$Y+$YOffset+$YSize-$YSpace,$Line0Color);
-                   $this->drawLine(floor($X1),$Y+$YOffset+$YSpace,floor($X1),$Y+$YOffset+$YSize-$YSpace,$Line0Color);
-                  }
-                }
+                if ( ($Rounded || $BorderR != -1) && ($Pos == "+" && $Y1 != $YZero) ) { $YSpaceUp = 1; } else { $YSpaceUp = 0; }
+                if ( ($Rounded || $BorderR != -1) && ($Pos == "-" && $Y1 != $YZero) ) { $YSpaceDown = 1; } else { $YSpaceDown = 0; }
 
-               if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
-                {
-                 if ( $DisplayShadow ) { $this->Shadow = TRUE; }
-
-                 $Caption   = $this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit);
-                 $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
-                 $TxtWidth  = $TxtPos[1]["X"] - $TxtPos[0]["X"] + $TxtMargin;
-
-                 if ( $DisplayPos == LABEL_POS_INSIDE && abs($TxtWidth) < abs($BarWidth) )
-                  {
-                   $CenterX = ($X2-$X1)/2 + $X1;
-                   $CenterY = (($Y+$YOffset+$YSize-$YSpace)-($Y+$YOffset+$YSpace))/2 + ($Y+$YOffset+$YSpace);
-
-                   $this->drawText($CenterX,$CenterY,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize));
-                  }
-                 else
-                  {
-                   if ( $Serie["Data"][$Key] >= 0 ) { $Align = TEXT_ALIGN_MIDDLELEFT; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_MIDDLERIGHT; $Offset = -$DisplayOffset; }
-                   $this->drawText($X2+$Offset,$Y+$YOffset+$YSize/2,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align,"FontSize"=>$DisplaySize));
-                  }
-
-                 $this->Shadow = $RestoreShadow;
-                }
-              }
-             $Y = $Y + $YStep;
-             $ID++;
-            }
-          }
-         $CurrentSerie++;
-        }
-      }
-    }
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset).",".floor($Y1-$YSpaceUp+$YSpaceDown).",".floor($X+$XOffset+$XSize).",".floor($Y2),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-   /* Draw a bar chart */
-   function drawStackedBarChart($Format=NULL)
-    {
-     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
-     $DisplayOrientation = isset($Format["DisplayOrientation"]) ? $Format["DisplayOrientation"] : ORIENTATION_AUTO;
-     $DisplayRound      = isset($Format["DisplayRound"]) ? $Format["DisplayRound"] : 0;
-     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
-     $DisplayFont	= isset($Format["DisplayFont"]) ? $Format["DisplayFont"] : $this->FontName;
-     $DisplaySize	= isset($Format["DisplaySize"]) ? $Format["DisplaySize"] : $this->FontSize;
-     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
-     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
-     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
-     $Interleave	= isset($Format["Interleave"]) ? $Format["Interleave"] : .5;
-     $Rounded		= isset($Format["Rounded"]) ? $Format["Rounded"] : FALSE;
-     $RoundRadius	= isset($Format["RoundRadius"]) ? $Format["RoundRadius"] : 4;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
-     $Gradient		= isset($Format["Gradient"]) ? $Format["Gradient"] : FALSE;
-     $GradientMode	= isset($Format["GradientMode"]) ? $Format["GradientMode"] : GRADIENT_SIMPLE;
-     $GradientAlpha	= isset($Format["GradientAlpha"]) ? $Format["GradientAlpha"] : 20;
-     $GradientStartR	= isset($Format["GradientStartR"]) ? $Format["GradientStartR"] : 255;
-     $GradientStartG	= isset($Format["GradientStartG"]) ? $Format["GradientStartG"] : 255;
-     $GradientStartB	= isset($Format["GradientStartB"]) ? $Format["GradientStartB"] : 255;
-     $GradientEndR	= isset($Format["GradientEndR"]) ? $Format["GradientEndR"] : 0;
-     $GradientEndG	= isset($Format["GradientEndG"]) ? $Format["GradientEndG"] : 0;
-     $GradientEndB	= isset($Format["GradientEndB"]) ? $Format["GradientEndB"] : 0;
-     $InnerSurrounding	= isset($Format["InnerSurrounding"]) ? $Format["InnerSurrounding"] : NULL;
-     $InnerBorderR	= isset($Format["InnerBorderR"]) ? $Format["InnerBorderR"] : -1;
-     $InnerBorderG	= isset($Format["InnerBorderG"]) ? $Format["InnerBorderG"] : -1;
-     $InnerBorderB	= isset($Format["InnerBorderB"]) ? $Format["InnerBorderB"] : -1;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-     $FontFactor	= isset($Format["FontFactor"]) ? $Format["FontFactor"] : 8;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_STACKED;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     $RestoreShadow = $this->Shadow;
-
-     $LastX = ""; $LastY = "";
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
-         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = 255; $DisplayG = 255; $DisplayB = 255; }
-         if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-         if ( $InnerSurrounding != NULL ) { $InnerBorderR = $R+$InnerSurrounding; $InnerBorderG = $G+$InnerSurrounding; $InnerBorderB = $B+$InnerSurrounding; }
-         if ( $InnerBorderR == -1 ) { $InnerColor = NULL; } else { $InnerColor = array("R"=>$InnerBorderR,"G"=>$InnerBorderG,"B"=>$InnerBorderB); }
-
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
-
-         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
-
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]),TRUE);
-         $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
-
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
-
-         $Color = array("TransCorner"=>TRUE,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB);
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
-           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
-
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X     = $this->GraphAreaX1 + $XMargin;
-
-           $XSize   = ($XStep / (1+$Interleave) );
-           $XOffset = -($XSize/2);
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $Height)
-            {
-             if ( $Height != VOID && $Serie["Data"][$Key] != 0 )
-              {
-               if ( $Serie["Data"][$Key] > 0 ) { $Pos = "+"; } else { $Pos = "-"; }
-
-               if ( !isset($LastY[$Key] ) ) { $LastY[$Key] = ""; }
-               if ( !isset($LastY[$Key][$Pos] ) ) { $LastY[$Key][$Pos] = $YZero; }
-
-               $Y1 = $LastY[$Key][$Pos];
-               $Y2 = $Y1 - $Height;
-
-               if ( ($Rounded || $BorderR != -1) && ($Pos == "+" && $Y1 != $YZero) ) { $YSpaceUp = 1; } else { $YSpaceUp = 0; }
-               if ( ($Rounded || $BorderR != -1) && ($Pos == "-" && $Y1 != $YZero) ) { $YSpaceDown = 1; } else { $YSpaceDown = 0; }
-
-               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset).",".floor($Y1-$YSpaceUp+$YSpaceDown).",".floor($X+$XOffset+$XSize).",".floor($Y2),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-
-               if ( $Rounded )
+                if ( $Rounded )
                 $this->drawRoundedFilledRectangle($X+$XOffset,$Y1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2,$RoundRadius,$Color);
-               else
+                else
                 {
-                 $this->drawFilledRectangle($X+$XOffset,$Y1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2,$Color);
+                    $this->drawFilledRectangle($X+$XOffset,$Y1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2,$Color);
 
-                 if ( $InnerColor != NULL ) { $RestoreShadow = $this->Shadow; $this->Shadow = FALSE; $this->drawRectangle(min($X+$XOffset+1,$X+$XOffset+$XSize),min($Y1-$YSpaceUp+$YSpaceDown,$Y2)+1,max($X+$XOffset+1,$X+$XOffset+$XSize)-1,max($Y1-$YSpaceUp+$YSpaceDown,$Y2)-1,$InnerColor); $this->Shadow = $RestoreShadow;}
+                    if ( $InnerColor != NULL ) { $RestoreShadow = $this->Shadow; $this->Shadow = FALSE; $this->drawRectangle(min($X+$XOffset+1,$X+$XOffset+$XSize),min($Y1-$YSpaceUp+$YSpaceDown,$Y2)+1,max($X+$XOffset+1,$X+$XOffset+$XSize)-1,max($Y1-$YSpaceUp+$YSpaceDown,$Y2)-1,$InnerColor); $this->Shadow = $RestoreShadow;}
 
-                 if ( $Gradient )
-                  {
-                   $this->Shadow  = FALSE;
+                    if ( $Gradient )
+                    {
+                    $this->Shadow  = FALSE;
 
-                   if ( $GradientMode == GRADIENT_SIMPLE )
+                    if ( $GradientMode == GRADIENT_SIMPLE )
                     {
-                     $GradientColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                     $this->drawGradientArea($X+$XOffset,$Y1-1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2+1,DIRECTION_VERTICAL,$GradientColor);
+                        $GradientColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                        $this->drawGradientArea($X+$XOffset,$Y1-1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2+1,DIRECTION_VERTICAL,$GradientColor);
                     }
-                   elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                    elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
                     {
-                     $GradientColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
-                     $GradientColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                     $XSpan = floor($XSize / 3);
+                        $GradientColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                        $GradientColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                        $XSpan = floor($XSize / 3);
 
-                     $this->drawGradientArea($X+$XOffset-.5,$Y1-.5-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSpan,$Y2+.5,DIRECTION_HORIZONTAL,$GradientColor1);
-                     $this->drawGradientArea($X+$XSpan+$XOffset-.5,$Y1-.5-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2+.5,DIRECTION_HORIZONTAL,$GradientColor2);
+                        $this->drawGradientArea($X+$XOffset-.5,$Y1-.5-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSpan,$Y2+.5,DIRECTION_HORIZONTAL,$GradientColor1);
+                        $this->drawGradientArea($X+$XSpan+$XOffset-.5,$Y1-.5-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2+.5,DIRECTION_HORIZONTAL,$GradientColor2);
+                    }
+                    $this->Shadow = $RestoreShadow;
                     }
-                   $this->Shadow = $RestoreShadow;
-                  }
                 }
 
-               if ( $DisplayValues )
+                if ( $DisplayValues )
                 {
-                 $BarHeight = abs($Y2-$Y1)-2;
-                 $BarWidth  = $XSize+($XOffset/2)-$FontFactor;
+                    $BarHeight = abs($Y2-$Y1)-2;
+                    $BarWidth  = $XSize+($XOffset/2)-$FontFactor;
 
-                 $Caption   = $this->scaleFormat(round($Serie["Data"][$Key],$DisplayRound),$Mode,$Format,$Unit);
-                 $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
-                 $TxtHeight = abs($TxtPos[2]["Y"] - $TxtPos[0]["Y"]);
-                 $TxtWidth  = abs($TxtPos[1]["X"] - $TxtPos[0]["X"]);
+                    $Caption   = $this->scaleFormat(round($Serie["Data"][$Key],$DisplayRound),$Mode,$Format,$Unit);
+                    $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
+                    $TxtHeight = abs($TxtPos[2]["Y"] - $TxtPos[0]["Y"]);
+                    $TxtWidth  = abs($TxtPos[1]["X"] - $TxtPos[0]["X"]);
 
-                 $XCenter = ( ($X+$XOffset+$XSize) - ($X+$XOffset) ) / 2 + $X+$XOffset;
-                 $YCenter = ( ($Y2) - ($Y1-$YSpaceUp+$YSpaceDown) ) / 2 + $Y1-$YSpaceUp+$YSpaceDown;
+                    $XCenter = ( ($X+$XOffset+$XSize) - ($X+$XOffset) ) / 2 + $X+$XOffset;
+                    $YCenter = ( ($Y2) - ($Y1-$YSpaceUp+$YSpaceDown) ) / 2 + $Y1-$YSpaceUp+$YSpaceDown;
 
-                 $Done = FALSE;
-                 if ( $DisplayOrientation == ORIENTATION_HORIZONTAL || $DisplayOrientation == ORIENTATION_AUTO )
-                  {
-                   if ( $TxtHeight < $BarHeight && $TxtWidth < $BarWidth  )
+                    $Done = FALSE;
+                    if ( $DisplayOrientation == ORIENTATION_HORIZONTAL || $DisplayOrientation == ORIENTATION_AUTO )
                     {
-                     $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
-                     $Done = TRUE;
+                    if ( $TxtHeight < $BarHeight && $TxtWidth < $BarWidth  )
+                    {
+                        $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
+                        $Done = TRUE;
+                    }
                     }
-                  }
 
-                 if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) )
-                  {
-                   if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  )
+                    if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) )
+                    {
+                    if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  )
                     $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Angle"=>90,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
-                  }
+                    }
                 }
 
-               $LastY[$Key][$Pos] = $Y2;
-              }
+                $LastY[$Key][$Pos] = $Y2;
+                }
 
-             $X = $X + $XStep;
+                $X = $X + $XStep;
+            }
             }
-          }
-         else
-          {
-           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
-           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+            else
+            {
+            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
 
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y     = $this->GraphAreaY1 + $XMargin;
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y     = $this->GraphAreaY1 + $XMargin;
 
-           $YSize   = $YStep / (1+$Interleave);
-           $YOffset = -($YSize/2);
+            $YSize   = $YStep / (1+$Interleave);
+            $YOffset = -($YSize/2);
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           foreach($PosArray as $Key => $Width)
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            foreach($PosArray as $Key => $Width)
             {
-             if ( $Width != VOID && $Serie["Data"][$Key] != 0 )
-              {
-               if ( $Serie["Data"][$Key] > 0 ) { $Pos = "+"; } else { $Pos = "-"; }
+                if ( $Width != VOID && $Serie["Data"][$Key] != 0 )
+                {
+                if ( $Serie["Data"][$Key] > 0 ) { $Pos = "+"; } else { $Pos = "-"; }
 
-               if ( !isset($LastX[$Key] ) ) { $LastX[$Key] = ""; }
-               if ( !isset($LastX[$Key][$Pos] ) ) { $LastX[$Key][$Pos] = $YZero; }
+                if ( !isset($LastX[$Key] ) ) { $LastX[$Key] = ""; }
+                if ( !isset($LastX[$Key][$Pos] ) ) { $LastX[$Key][$Pos] = $YZero; }
 
-               $X1 = $LastX[$Key][$Pos];
-               $X2 = $X1 + $Width;
+                $X1 = $LastX[$Key][$Pos];
+                $X2 = $X1 + $Width;
 
-               if ( ($Rounded || $BorderR != -1) && ($Pos == "+" && $X1 != $YZero) ) { $XSpaceLeft = 2; } else { $XSpaceLeft = 0; }
-               if ( ($Rounded || $BorderR != -1) && ($Pos == "-" && $X1 != $YZero) ) { $XSpaceRight = 2; } else { $XSpaceRight = 0; }
+                if ( ($Rounded || $BorderR != -1) && ($Pos == "+" && $X1 != $YZero) ) { $XSpaceLeft = 2; } else { $XSpaceLeft = 0; }
+                if ( ($Rounded || $BorderR != -1) && ($Pos == "-" && $X1 != $YZero) ) { $XSpaceRight = 2; } else { $XSpaceRight = 0; }
 
-               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1+$XSpaceLeft).",".floor($Y+$YOffset).",".floor($X2-$XSpaceRight).",".floor($Y+$YOffset+$YSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1+$XSpaceLeft).",".floor($Y+$YOffset).",".floor($X2-$XSpaceRight).",".floor($Y+$YOffset+$YSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-               if ( $Rounded )
+                if ( $Rounded )
                 $this->drawRoundedFilledRectangle($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,$RoundRadius,$Color);
-               else
+                else
                 {
-                 $this->drawFilledRectangle($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,$Color);
+                    $this->drawFilledRectangle($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,$Color);
 
-                 if ( $InnerColor != NULL ) { $RestoreShadow = $this->Shadow; $this->Shadow = FALSE; $this->drawRectangle(min($X1+$XSpaceLeft,$X2-$XSpaceRight)+1,min($Y+$YOffset,$Y+$YOffset+$YSize)+1,max($X1+$XSpaceLeft,$X2-$XSpaceRight)-1,max($Y+$YOffset,$Y+$YOffset+$YSize)-1,$InnerColor); $this->Shadow = $RestoreShadow;}
+                    if ( $InnerColor != NULL ) { $RestoreShadow = $this->Shadow; $this->Shadow = FALSE; $this->drawRectangle(min($X1+$XSpaceLeft,$X2-$XSpaceRight)+1,min($Y+$YOffset,$Y+$YOffset+$YSize)+1,max($X1+$XSpaceLeft,$X2-$XSpaceRight)-1,max($Y+$YOffset,$Y+$YOffset+$YSize)-1,$InnerColor); $this->Shadow = $RestoreShadow;}
 
-                 if ( $Gradient )
-                  {
-                   $this->Shadow  = FALSE;
+                    if ( $Gradient )
+                    {
+                    $this->Shadow  = FALSE;
 
-                   if ( $GradientMode == GRADIENT_SIMPLE )
+                    if ( $GradientMode == GRADIENT_SIMPLE )
                     {
-                     $GradientColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                     $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,DIRECTION_HORIZONTAL,$GradientColor);
+                        $GradientColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                        $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,DIRECTION_HORIZONTAL,$GradientColor);
                     }
-                   elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                    elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
                     {
-                     $GradientColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
-                     $GradientColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                     $YSpan = floor($YSize / 3);
+                        $GradientColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                        $GradientColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                        $YSpan = floor($YSize / 3);
 
-                     $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSpan,DIRECTION_VERTICAL,$GradientColor1);
-                     $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset+$YSpan,$X2-$XSpaceRight,$Y+$YOffset+$YSize,DIRECTION_VERTICAL,$GradientColor2);
+                        $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSpan,DIRECTION_VERTICAL,$GradientColor1);
+                        $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset+$YSpan,$X2-$XSpaceRight,$Y+$YOffset+$YSize,DIRECTION_VERTICAL,$GradientColor2);
+                    }
+                    $this->Shadow = $RestoreShadow;
                     }
-                   $this->Shadow = $RestoreShadow;
-                  }
                 }
 
-               if ( $DisplayValues )
+                if ( $DisplayValues )
                 {
-                 $BarWidth = abs($X2-$X1)-$FontFactor;
-                 $BarHeight = $YSize+($YOffset/2)-$FontFactor/2;
-                 $Caption   = $this->scaleFormat(round($Serie["Data"][$Key],$DisplayRound),$Mode,$Format,$Unit);
-                 $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
-                 $TxtHeight = abs($TxtPos[2]["Y"] - $TxtPos[0]["Y"]);
-                 $TxtWidth  = abs($TxtPos[1]["X"] - $TxtPos[0]["X"]);
-
-                 $XCenter  = ( $X2 - $X1 ) / 2 + $X1;
-                 $YCenter  = ( ($Y+$YOffset+$YSize) - ($Y+$YOffset) ) / 2 + $Y+$YOffset;
-
-                 $Done = FALSE;
-                 if ( $DisplayOrientation == ORIENTATION_HORIZONTAL || $DisplayOrientation == ORIENTATION_AUTO )
-                  {
-                   if ( $TxtHeight < $BarHeight && $TxtWidth < $BarWidth  )
+                    $BarWidth = abs($X2-$X1)-$FontFactor;
+                    $BarHeight = $YSize+($YOffset/2)-$FontFactor/2;
+                    $Caption   = $this->scaleFormat(round($Serie["Data"][$Key],$DisplayRound),$Mode,$Format,$Unit);
+                    $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
+                    $TxtHeight = abs($TxtPos[2]["Y"] - $TxtPos[0]["Y"]);
+                    $TxtWidth  = abs($TxtPos[1]["X"] - $TxtPos[0]["X"]);
+
+                    $XCenter  = ( $X2 - $X1 ) / 2 + $X1;
+                    $YCenter  = ( ($Y+$YOffset+$YSize) - ($Y+$YOffset) ) / 2 + $Y+$YOffset;
+
+                    $Done = FALSE;
+                    if ( $DisplayOrientation == ORIENTATION_HORIZONTAL || $DisplayOrientation == ORIENTATION_AUTO )
                     {
-                     $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
-                     $Done = TRUE;
+                    if ( $TxtHeight < $BarHeight && $TxtWidth < $BarWidth  )
+                    {
+                        $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
+                        $Done = TRUE;
+                    }
                     }
-                  }
 
-                 if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) )
-                  {
-                   if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  )
+                    if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) )
+                    {
+                    if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  )
                     $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Angle"=>90,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
-                  }
+                    }
                 }
 
-               $LastX[$Key][$Pos] = $X2;
-              }
+                $LastX[$Key][$Pos] = $X2;
+                }
 
-             $Y = $Y + $YStep;
+                $Y = $Y + $YStep;
+            }
             }
-          }
         }
-      }
+        }
     }
 
-   /* Draw a stacked area chart */
-   function drawStackedAreaChart($Format=NULL)
+    /* Draw a stacked area chart */
+    function drawStackedAreaChart($Format=NULL)
     {
-     $DrawLine		= isset($Format["DrawLine"]) ? $Format["DrawLine"] : FALSE;
-     $LineSurrounding	= isset($Format["LineSurrounding"]) ? $Format["LineSurrounding"] : NULL;
-     $LineR		= isset($Format["LineR"]) ? $Format["LineR"] : VOID;
-     $LineG		= isset($Format["LineG"]) ? $Format["LineG"] : VOID;
-     $LineB		= isset($Format["LineB"]) ? $Format["LineB"] : VOID;
-     $LineAlpha		= isset($Format["LineAlpha"]) ? $Format["LineAlpha"] : 100;
-     $DrawPlot		= isset($Format["DrawPlot"]) ? $Format["DrawPlot"] : FALSE;
-     $PlotRadius	= isset($Format["PlotRadius"]) ? $Format["PlotRadius"] : 2;
-     $PlotBorder	= isset($Format["PlotBorder"]) ? $Format["PlotBorder"] : 1;
-     $PlotBorderSurrounding = isset($Format["PlotBorderSurrounding"]) ? $Format["PlotBorderSurrounding"] : NULL;
-     $PlotBorderR	= isset($Format["PlotBorderR"]) ? $Format["PlotBorderR"] : 0;
-     $PlotBorderG	= isset($Format["PlotBorderG"]) ? $Format["PlotBorderG"] : 0;
-     $PlotBorderB	= isset($Format["PlotBorderB"]) ? $Format["PlotBorderB"] : 0;
-     $PlotBorderAlpha	= isset($Format["PlotBorderAlpha"]) ? $Format["PlotBorderAlpha"] : 50;
-     $ForceTransparency	= isset($Format["ForceTransparency"]) ? $Format["ForceTransparency"] : NULL;
-
-     $this->LastChartLayout = CHART_LAST_LAYOUT_STACKED;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     $RestoreShadow = $this->Shadow;
-     $this->Shadow  = FALSE;
-
-     /* Build the offset data series */
-     $OffsetData    = "";
-     $OverallOffset = "";
-     $SerieOrder    = "";
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         $SerieOrder[] = $SerieName;
-
-         foreach($Serie["Data"] as $Key => $Value)
-          {
-           if ( $Value == VOID ) { $Value = 0; }
-           if ($Value >= 0) { $Sign = "+"; } else { $Sign = "-"; }
-           if ( !isset($OverallOffset[$Key]) || !isset($OverallOffset[$Key][$Sign]) ) { $OverallOffset[$Key][$Sign] = 0; }
-
-           if ( $Sign == "+" )
+        $DrawLine		= isset($Format["DrawLine"]) ? $Format["DrawLine"] : FALSE;
+        $LineSurrounding	= isset($Format["LineSurrounding"]) ? $Format["LineSurrounding"] : NULL;
+        $LineR		= isset($Format["LineR"]) ? $Format["LineR"] : VOID;
+        $LineG		= isset($Format["LineG"]) ? $Format["LineG"] : VOID;
+        $LineB		= isset($Format["LineB"]) ? $Format["LineB"] : VOID;
+        $LineAlpha		= isset($Format["LineAlpha"]) ? $Format["LineAlpha"] : 100;
+        $DrawPlot		= isset($Format["DrawPlot"]) ? $Format["DrawPlot"] : FALSE;
+        $PlotRadius	= isset($Format["PlotRadius"]) ? $Format["PlotRadius"] : 2;
+        $PlotBorder	= isset($Format["PlotBorder"]) ? $Format["PlotBorder"] : 1;
+        $PlotBorderSurrounding = isset($Format["PlotBorderSurrounding"]) ? $Format["PlotBorderSurrounding"] : NULL;
+        $PlotBorderR	= isset($Format["PlotBorderR"]) ? $Format["PlotBorderR"] : 0;
+        $PlotBorderG	= isset($Format["PlotBorderG"]) ? $Format["PlotBorderG"] : 0;
+        $PlotBorderB	= isset($Format["PlotBorderB"]) ? $Format["PlotBorderB"] : 0;
+        $PlotBorderAlpha	= isset($Format["PlotBorderAlpha"]) ? $Format["PlotBorderAlpha"] : 50;
+        $ForceTransparency	= isset($Format["ForceTransparency"]) ? $Format["ForceTransparency"] : NULL;
+
+        $this->LastChartLayout = CHART_LAST_LAYOUT_STACKED;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        $RestoreShadow = $this->Shadow;
+        $this->Shadow  = FALSE;
+
+        /* Build the offset data series */
+        $OffsetData    = "";
+        $OverallOffset = "";
+        $SerieOrder    = "";
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $SerieOrder[] = $SerieName;
+
+            foreach($Serie["Data"] as $Key => $Value)
+            {
+            if ( $Value == VOID ) { $Value = 0; }
+            if ($Value >= 0) { $Sign = "+"; } else { $Sign = "-"; }
+            if ( !isset($OverallOffset[$Key]) || !isset($OverallOffset[$Key][$Sign]) ) { $OverallOffset[$Key][$Sign] = 0; }
+
+            if ( $Sign == "+" )
             { $Data["Series"][$SerieName]["Data"][$Key] = $Value + $OverallOffset[$Key][$Sign]; }
-           else
+            else
             { $Data["Series"][$SerieName]["Data"][$Key] = $Value - $OverallOffset[$Key][$Sign]; }
 
-           $OverallOffset[$Key][$Sign] = $OverallOffset[$Key][$Sign] + abs($Value);
-          }
+            $OverallOffset[$Key][$Sign] = $OverallOffset[$Key][$Sign] + abs($Value);
+            }
         } 
-      }
-     $SerieOrder = array_reverse($SerieOrder);
+        }
+        $SerieOrder = array_reverse($SerieOrder);
 
-     $LastX = ""; $LastY = "";
-     foreach($SerieOrder as $Key => $SerieName)
-      {
-       $Serie = $Data["Series"][$SerieName];
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        $LastX = ""; $LastY = "";
+        foreach($SerieOrder as $Key => $SerieName)
         {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
-         if ( $ForceTransparency != NULL ) { $Alpha = $ForceTransparency; }
+        $Serie = $Data["Series"][$SerieName];
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+            if ( $ForceTransparency != NULL ) { $Alpha = $ForceTransparency; }
 
-         $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
 
-         if ( $LineSurrounding != NULL )
-          $LineColor = array("R"=>$R+$LineSurrounding,"G"=>$G+$LineSurrounding,"B"=>$B+$LineSurrounding,"Alpha"=>$Alpha);
-         elseif ( $LineR != VOID )
-          $LineColor = array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha);
-         else
-          $LineColor = $Color;
+            if ( $LineSurrounding != NULL )
+            $LineColor = array("R"=>$R+$LineSurrounding,"G"=>$G+$LineSurrounding,"B"=>$B+$LineSurrounding,"Alpha"=>$Alpha);
+            elseif ( $LineR != VOID )
+            $LineColor = array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha);
+            else
+            $LineColor = $Color;
 
-         if ( $PlotBorderSurrounding != NULL )
-          $PlotBorderColor = array("R"=>$R+$PlotBorderSurrounding,"G"=>$G+$PlotBorderSurrounding,"B"=>$B+$PlotBorderSurrounding,"Alpha"=>$PlotBorderAlpha);
-         else
-          $PlotBorderColor = array("R"=>$PlotBorderR,"G"=>$PlotBorderG,"B"=>$PlotBorderB,"Alpha"=>$PlotBorderAlpha);
+            if ( $PlotBorderSurrounding != NULL )
+            $PlotBorderColor = array("R"=>$R+$PlotBorderSurrounding,"G"=>$G+$PlotBorderSurrounding,"B"=>$B+$PlotBorderSurrounding,"Alpha"=>$PlotBorderAlpha);
+            else
+            $PlotBorderColor = array("R"=>$PlotBorderR,"G"=>$PlotBorderG,"B"=>$PlotBorderB,"Alpha"=>$PlotBorderAlpha);
 
-         $AxisID	= $Serie["Axis"];
-         $Mode		= $Data["Axis"][$AxisID]["Display"];
-         $Format	= $Data["Axis"][$AxisID]["Format"];
-         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+            $AxisID	= $Serie["Axis"];
+            $Mode		= $Data["Axis"][$AxisID]["Display"];
+            $Format	= $Data["Axis"][$AxisID]["Format"];
+            $Unit		= $Data["Axis"][$AxisID]["Unit"];
 
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]),TRUE);
-         $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]),TRUE);
+            $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
 
-         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+            $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
-           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
+            if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
 
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin;
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin;
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
 
-           $Plots = ""; $Plots[] = $X; $Plots[] = $YZero;
-           foreach($PosArray as $Key => $Height)
+            $Plots = ""; $Plots[] = $X; $Plots[] = $YZero;
+            foreach($PosArray as $Key => $Height)
             {
-             if ( $Height != VOID ) { $Plots[] = $X; $Plots[] = $YZero-$Height; }
-             $X = $X + $XStep;
+                if ( $Height != VOID ) { $Plots[] = $X; $Plots[] = $YZero-$Height; }
+                $X = $X + $XStep;
             }
-           $Plots[] = $X-$XStep; $Plots[] = $YZero;
+            $Plots[] = $X-$XStep; $Plots[] = $YZero;
 
-           $this->drawPolygon($Plots,$Color);
+            $this->drawPolygon($Plots,$Color);
 
-           $this->Shadow = $RestoreShadow;
-           if ( $DrawLine ) { for($i=2; $i<=count($Plots)-6; $i=$i+2) { $this->drawLine($Plots[$i],$Plots[$i+1],$Plots[$i+2],$Plots[$i+3],$LineColor); } }
-           if ( $DrawPlot )
+            $this->Shadow = $RestoreShadow;
+            if ( $DrawLine ) { for($i=2; $i<=count($Plots)-6; $i=$i+2) { $this->drawLine($Plots[$i],$Plots[$i+1],$Plots[$i+2],$Plots[$i+3],$LineColor); } }
+            if ( $DrawPlot )
             {
-             for($i=2; $i<=count($Plots)-4; $i=$i+2)
-              {
-               if ( $PlotBorder != 0 )
+                for($i=2; $i<=count($Plots)-4; $i=$i+2)
+                {
+                if ( $PlotBorder != 0 )
                 { $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius+$PlotBorder,$PlotBorderColor); }
 
-               $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius,$Color);
-              }
+                $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius,$Color);
+                }
+            }
+            $this->Shadow = FALSE;
             }
-           $this->Shadow = FALSE;
-          }
-         elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-          {
-           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
-           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+            elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+            {
+            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
 
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y = $this->GraphAreaY1 + $XMargin;
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y = $this->GraphAreaY1 + $XMargin;
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
 
-           $Plots = ""; $Plots[] = $YZero; $Plots[] = $Y;
-           foreach($PosArray as $Key => $Height)
+            $Plots = ""; $Plots[] = $YZero; $Plots[] = $Y;
+            foreach($PosArray as $Key => $Height)
             {
-             if ( $Height != VOID ) { $Plots[] = $YZero+$Height; $Plots[] = $Y; }
-             $Y = $Y + $YStep;
+                if ( $Height != VOID ) { $Plots[] = $YZero+$Height; $Plots[] = $Y; }
+                $Y = $Y + $YStep;
             }
-           $Plots[] = $YZero; $Plots[] = $Y-$YStep;
+            $Plots[] = $YZero; $Plots[] = $Y-$YStep;
 
-           $this->drawPolygon($Plots,$Color);
+            $this->drawPolygon($Plots,$Color);
 
-           $this->Shadow = $RestoreShadow;
-           if ( $DrawLine ) { for($i=2; $i<=count($Plots)-6; $i=$i+2) { $this->drawLine($Plots[$i],$Plots[$i+1],$Plots[$i+2],$Plots[$i+3],$LineColor); } }
-           if ( $DrawPlot )
+            $this->Shadow = $RestoreShadow;
+            if ( $DrawLine ) { for($i=2; $i<=count($Plots)-6; $i=$i+2) { $this->drawLine($Plots[$i],$Plots[$i+1],$Plots[$i+2],$Plots[$i+3],$LineColor); } }
+            if ( $DrawPlot )
             {
-             for($i=2; $i<=count($Plots)-4; $i=$i+2)
-              {
-               if ( $PlotBorder != 0 )
+                for($i=2; $i<=count($Plots)-4; $i=$i+2)
+                {
+                if ( $PlotBorder != 0 )
                 { $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius+$PlotBorder,$PlotBorderColor); }
 
-               $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius,$Color);
-              }
+                $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius,$Color);
+                }
+            }
+            $this->Shadow = FALSE;
             }
-           $this->Shadow = FALSE;
-          }
         }
-      }
-     $this->Shadow = $RestoreShadow;
+        }
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Returns a random color */
-   function getRandomColor($Alpha=100)
+    /* Returns a random color */
+    function getRandomColor($Alpha=100)
     { return(array("R"=>rand(0,255),"G"=>rand(0,255),"B"=>rand(0,255),"Alpha"=>$Alpha)); }
  
-   /* Validate a palette */
-   function validatePalette($Colors,$Surrounding=NULL)
+    /* Validate a palette */
+    function validatePalette($Colors,$Surrounding=NULL)
     {
-     $Result = "";
+        $Result = "";
 
-     if ( !is_array($Colors) ) { return($this->getRandomColor()); }
+        if ( !is_array($Colors) ) { return($this->getRandomColor()); }
 
-     foreach($Colors as $Key => $Values)
-      {
-       if ( isset($Values["R"]) ) { $Result[$Key]["R"] = $Values["R"]; } else { $Result[$Key]["R"] = rand(0,255); }
-       if ( isset($Values["G"]) ) { $Result[$Key]["G"] = $Values["G"]; } else { $Result[$Key]["G"] = rand(0,255); }
-       if ( isset($Values["B"]) ) { $Result[$Key]["B"] = $Values["B"]; } else { $Result[$Key]["B"] = rand(0,255); }
-       if ( isset($Values["Alpha"]) ) { $Result[$Key]["Alpha"] = $Values["Alpha"]; } else { $Result[$Key]["Alpha"] = 100; }
+        foreach($Colors as $Key => $Values)
+        {
+        if ( isset($Values["R"]) ) { $Result[$Key]["R"] = $Values["R"]; } else { $Result[$Key]["R"] = rand(0,255); }
+        if ( isset($Values["G"]) ) { $Result[$Key]["G"] = $Values["G"]; } else { $Result[$Key]["G"] = rand(0,255); }
+        if ( isset($Values["B"]) ) { $Result[$Key]["B"] = $Values["B"]; } else { $Result[$Key]["B"] = rand(0,255); }
+        if ( isset($Values["Alpha"]) ) { $Result[$Key]["Alpha"] = $Values["Alpha"]; } else { $Result[$Key]["Alpha"] = 100; }
 
-       if ( $Surrounding != NULL )
+        if ( $Surrounding != NULL )
         {
-         $Result[$Key]["BorderR"] = $Result[$Key]["R"] + $Surrounding;
-         $Result[$Key]["BorderG"] = $Result[$Key]["G"] + $Surrounding;
-         $Result[$Key]["BorderB"] = $Result[$Key]["B"] + $Surrounding;
+            $Result[$Key]["BorderR"] = $Result[$Key]["R"] + $Surrounding;
+            $Result[$Key]["BorderG"] = $Result[$Key]["G"] + $Surrounding;
+            $Result[$Key]["BorderB"] = $Result[$Key]["B"] + $Surrounding;
         }
-       else
+        else
         {
-         if ( isset($Values["BorderR"]) )     { $Result[$Key]["BorderR"] = $Values["BorderR"]; } else { $Result[$Key]["BorderR"] = $Result[$Key]["R"]; }
-         if ( isset($Values["BorderG"]) )     { $Result[$Key]["BorderG"] = $Values["BorderG"]; } else { $Result[$Key]["BorderG"] = $Result[$Key]["G"]; }
-         if ( isset($Values["BorderB"]) )     { $Result[$Key]["BorderB"] = $Values["BorderB"]; } else { $Result[$Key]["BorderB"] = $Result[$Key]["B"]; }
-         if ( isset($Values["BorderAlpha"]) ) { $Result[$Key]["BorderAlpha"] = $Values["BorderAlpha"]; } else { $Result[$Key]["BorderAlpha"] = $Result[$Key]["Alpha"]; }
+            if ( isset($Values["BorderR"]) )     { $Result[$Key]["BorderR"] = $Values["BorderR"]; } else { $Result[$Key]["BorderR"] = $Result[$Key]["R"]; }
+            if ( isset($Values["BorderG"]) )     { $Result[$Key]["BorderG"] = $Values["BorderG"]; } else { $Result[$Key]["BorderG"] = $Result[$Key]["G"]; }
+            if ( isset($Values["BorderB"]) )     { $Result[$Key]["BorderB"] = $Values["BorderB"]; } else { $Result[$Key]["BorderB"] = $Result[$Key]["B"]; }
+            if ( isset($Values["BorderAlpha"]) ) { $Result[$Key]["BorderAlpha"] = $Values["BorderAlpha"]; } else { $Result[$Key]["BorderAlpha"] = $Result[$Key]["Alpha"]; }
+        }
         }
-      }
 
-     return($Result);
+        return($Result);
     }
 
-   /* Draw the derivative chart associated to the data series */
-   function drawDerivative($Format=NULL)
+    /* Draw the derivative chart associated to the data series */
+    function drawDerivative($Format=NULL)
     {
-     $Offset		= isset($Format["Offset"]) ? $Format["Offset"] : 10;
-     $SerieSpacing	= isset($Format["SerieSpacing"]) ? $Format["SerieSpacing"] : 3;
-     $DerivativeHeight	= isset($Format["DerivativeHeight"]) ? $Format["DerivativeHeight"] : 4;
-     $ShadedSlopeBox	= isset($Format["ShadedSlopeBox"]) ? $Format["ShadedSlopeBox"] : FALSE;
-     $DrawBackground	= isset($Format["DrawBackground"]) ? $Format["DrawBackground"] : TRUE;
-     $BackgroundR	= isset($Format["BackgroundR"]) ? $Format["BackgroundR"] : 255;
-     $BackgroundG	= isset($Format["BackgroundG"]) ? $Format["BackgroundG"] : 255;
-     $BackgroundB	= isset($Format["BackgroundB"]) ? $Format["BackgroundB"] : 255;
-     $BackgroundAlpha	= isset($Format["BackgroundAlpha"]) ? $Format["BackgroundAlpha"] : 20;
-     $DrawBorder	= isset($Format["DrawBorder"]) ? $Format["DrawBorder"] : TRUE;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 0;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 0;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 0;
-     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 100;
-     $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : TRUE;
-     $CaptionHeight	= isset($Format["CaptionHeight"]) ? $Format["CaptionHeight"] : 10;
-     $CaptionWidth	= isset($Format["CaptionWidth"]) ? $Format["CaptionWidth"] : 20;
-     $CaptionMargin	= isset($Format["CaptionMargin"]) ? $Format["CaptionMargin"] : 4;
-     $CaptionLine	= isset($Format["CaptionLine"]) ? $Format["CaptionLine"] : FALSE;
-     $CaptionBox	= isset($Format["CaptionBox"]) ? $Format["CaptionBox"] : FALSE;
-     $CaptionBorderR	= isset($Format["CaptionBorderR"]) ? $Format["CaptionBorderR"] : 0;
-     $CaptionBorderG	= isset($Format["CaptionBorderG"]) ? $Format["CaptionBorderG"] : 0;
-     $CaptionBorderB	= isset($Format["CaptionBorderB"]) ? $Format["CaptionBorderB"] : 0;
-     $CaptionFillR	= isset($Format["CaptionFillR"]) ? $Format["CaptionFillR"] : 255;
-     $CaptionFillG	= isset($Format["CaptionFillG"]) ? $Format["CaptionFillG"] : 255;
-     $CaptionFillB	= isset($Format["CaptionFillB"]) ? $Format["CaptionFillB"] : 255;
-     $CaptionFillAlpha	= isset($Format["CaptionFillAlpha"]) ? $Format["CaptionFillAlpha"] : 80;
-     $PositiveSlopeStartR	= isset($Format["PositiveSlopeStartR"]) ? $Format["PositiveSlopeStartR"] : 184;
-     $PositiveSlopeStartG	= isset($Format["PositiveSlopeStartG"]) ? $Format["PositiveSlopeStartG"] : 234;
-     $PositiveSlopeStartB	= isset($Format["PositiveSlopeStartB"]) ? $Format["PositiveSlopeStartB"] : 88;
-     $PositiveSlopeEndR		= isset($Format["PositiveSlopeStartR"]) ? $Format["PositiveSlopeStartR"] : 239;
-     $PositiveSlopeEndG		= isset($Format["PositiveSlopeStartG"]) ? $Format["PositiveSlopeStartG"] : 31;
-     $PositiveSlopeEndB		= isset($Format["PositiveSlopeStartB"]) ? $Format["PositiveSlopeStartB"] : 36;
-     $NegativeSlopeStartR	= isset($Format["NegativeSlopeStartR"]) ? $Format["NegativeSlopeStartR"] : 184;
-     $NegativeSlopeStartG	= isset($Format["NegativeSlopeStartG"]) ? $Format["NegativeSlopeStartG"] : 234;
-     $NegativeSlopeStartB	= isset($Format["NegativeSlopeStartB"]) ? $Format["NegativeSlopeStartB"] : 88;
-     $NegativeSlopeEndR		= isset($Format["NegativeSlopeStartR"]) ? $Format["NegativeSlopeStartR"] : 67;
-     $NegativeSlopeEndG		= isset($Format["NegativeSlopeStartG"]) ? $Format["NegativeSlopeStartG"] : 124;
-     $NegativeSlopeEndB		= isset($Format["NegativeSlopeStartB"]) ? $Format["NegativeSlopeStartB"] : 227;
-
-     $Data = $this->DataSet->getData();
-
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      $YPos = $this->DataSet->Data["GraphArea"]["Y2"] + $Offset;
-     else
-      $XPos = $this->DataSet->Data["GraphArea"]["X2"] + $Offset;
-
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
-
-         $AxisID   = $Serie["Axis"];
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $Caption )
-            {
-             if ( $CaptionLine ) 
-              {
-               $StartX = floor($this->GraphAreaX1-$CaptionWidth+$XMargin-$CaptionMargin);
-               $EndX   = floor($this->GraphAreaX1-$CaptionMargin+$XMargin);
-
-               $CaptionSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
-               if ( $CaptionBox ) { $this->drawFilledRectangle($StartX,$YPos,$EndX,$YPos+$CaptionHeight,array("R"=>$CaptionFillR,"G"=>$CaptionFillG,"B"=>$CaptionFillB,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB,"Alpha"=>$CaptionFillAlpha)); }
-               $this->drawLine($StartX+2,$YPos+($CaptionHeight/2),$EndX-2,$YPos+($CaptionHeight/2),$CaptionSettings);
-              }
-             else
-              $this->drawFilledRectangle($this->GraphAreaX1-$CaptionWidth+$XMargin-$CaptionMargin,$YPos,$this->GraphAreaX1-$CaptionMargin+$XMargin,$YPos+$CaptionHeight,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
-            }
-
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin;
-
-           $TopY    = $YPos + ($CaptionHeight/2) - ($DerivativeHeight/2);
-           $BottomY = $YPos + ($CaptionHeight/2) + ($DerivativeHeight/2);
-
-           $StartX  = floor($this->GraphAreaX1+$XMargin);
-           $EndX    = floor($this->GraphAreaX2-$XMargin);
-
-           if ( $DrawBackground ) { $this->drawFilledRectangle($StartX-1,$TopY-1,$EndX+1,$BottomY+1,array("R"=>$BackgroundR,"G"=>$BackgroundG,"B"=>$BackgroundB,"Alpha"=>$BackgroundAlpha)); }
-           if ( $DrawBorder ) { $this->drawRectangle($StartX-1,$TopY-1,$EndX+1,$BottomY+1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-
-           $RestoreShadow = $this->Shadow;
-           $this->Shadow  = FALSE;
-
-           /* Determine the Max slope index */
-           $LastX = NULL; $LastY = NULL; $MinSlope = 0; $MaxSlope = 1;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $Y != VOID && $LastX != NULL )
-              { $Slope = ($LastY - $Y); if ( $Slope > $MaxSlope ) { $MaxSlope = $Slope; } if ( $Slope < $MinSlope ) { $MinSlope = $Slope; } }
-
-             if ( $Y == VOID )
-              { $LastX = NULL; $LastY = NULL; }
-             else
-              { $LastX = $X; $LastY = $Y; }
-            }
-
-           $LastX = NULL; $LastY = NULL; $LastColor = NULL;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $Y != VOID && $LastY != NULL )
-              {
-               $Slope = ($LastY - $Y);
-
-               if ( $Slope >= 0 )
+        $Offset		= isset($Format["Offset"]) ? $Format["Offset"] : 10;
+        $SerieSpacing	= isset($Format["SerieSpacing"]) ? $Format["SerieSpacing"] : 3;
+        $DerivativeHeight	= isset($Format["DerivativeHeight"]) ? $Format["DerivativeHeight"] : 4;
+        $ShadedSlopeBox	= isset($Format["ShadedSlopeBox"]) ? $Format["ShadedSlopeBox"] : FALSE;
+        $DrawBackground	= isset($Format["DrawBackground"]) ? $Format["DrawBackground"] : TRUE;
+        $BackgroundR	= isset($Format["BackgroundR"]) ? $Format["BackgroundR"] : 255;
+        $BackgroundG	= isset($Format["BackgroundG"]) ? $Format["BackgroundG"] : 255;
+        $BackgroundB	= isset($Format["BackgroundB"]) ? $Format["BackgroundB"] : 255;
+        $BackgroundAlpha	= isset($Format["BackgroundAlpha"]) ? $Format["BackgroundAlpha"] : 20;
+        $DrawBorder	= isset($Format["DrawBorder"]) ? $Format["DrawBorder"] : TRUE;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 0;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 0;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 0;
+        $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 100;
+        $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : TRUE;
+        $CaptionHeight	= isset($Format["CaptionHeight"]) ? $Format["CaptionHeight"] : 10;
+        $CaptionWidth	= isset($Format["CaptionWidth"]) ? $Format["CaptionWidth"] : 20;
+        $CaptionMargin	= isset($Format["CaptionMargin"]) ? $Format["CaptionMargin"] : 4;
+        $CaptionLine	= isset($Format["CaptionLine"]) ? $Format["CaptionLine"] : FALSE;
+        $CaptionBox	= isset($Format["CaptionBox"]) ? $Format["CaptionBox"] : FALSE;
+        $CaptionBorderR	= isset($Format["CaptionBorderR"]) ? $Format["CaptionBorderR"] : 0;
+        $CaptionBorderG	= isset($Format["CaptionBorderG"]) ? $Format["CaptionBorderG"] : 0;
+        $CaptionBorderB	= isset($Format["CaptionBorderB"]) ? $Format["CaptionBorderB"] : 0;
+        $CaptionFillR	= isset($Format["CaptionFillR"]) ? $Format["CaptionFillR"] : 255;
+        $CaptionFillG	= isset($Format["CaptionFillG"]) ? $Format["CaptionFillG"] : 255;
+        $CaptionFillB	= isset($Format["CaptionFillB"]) ? $Format["CaptionFillB"] : 255;
+        $CaptionFillAlpha	= isset($Format["CaptionFillAlpha"]) ? $Format["CaptionFillAlpha"] : 80;
+        $PositiveSlopeStartR	= isset($Format["PositiveSlopeStartR"]) ? $Format["PositiveSlopeStartR"] : 184;
+        $PositiveSlopeStartG	= isset($Format["PositiveSlopeStartG"]) ? $Format["PositiveSlopeStartG"] : 234;
+        $PositiveSlopeStartB	= isset($Format["PositiveSlopeStartB"]) ? $Format["PositiveSlopeStartB"] : 88;
+        $PositiveSlopeEndR		= isset($Format["PositiveSlopeStartR"]) ? $Format["PositiveSlopeStartR"] : 239;
+        $PositiveSlopeEndG		= isset($Format["PositiveSlopeStartG"]) ? $Format["PositiveSlopeStartG"] : 31;
+        $PositiveSlopeEndB		= isset($Format["PositiveSlopeStartB"]) ? $Format["PositiveSlopeStartB"] : 36;
+        $NegativeSlopeStartR	= isset($Format["NegativeSlopeStartR"]) ? $Format["NegativeSlopeStartR"] : 184;
+        $NegativeSlopeStartG	= isset($Format["NegativeSlopeStartG"]) ? $Format["NegativeSlopeStartG"] : 234;
+        $NegativeSlopeStartB	= isset($Format["NegativeSlopeStartB"]) ? $Format["NegativeSlopeStartB"] : 88;
+        $NegativeSlopeEndR		= isset($Format["NegativeSlopeStartR"]) ? $Format["NegativeSlopeStartR"] : 67;
+        $NegativeSlopeEndG		= isset($Format["NegativeSlopeStartG"]) ? $Format["NegativeSlopeStartG"] : 124;
+        $NegativeSlopeEndB		= isset($Format["NegativeSlopeStartB"]) ? $Format["NegativeSlopeStartB"] : 227;
+
+        $Data = $this->DataSet->getData();
+
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        $YPos = $this->DataSet->Data["GraphArea"]["Y2"] + $Offset;
+        else
+        $XPos = $this->DataSet->Data["GraphArea"]["X2"] + $Offset;
+
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+
+            $AxisID   = $Serie["Axis"];
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $Caption )
+            {
+                if ( $CaptionLine ) 
+                {
+                $StartX = floor($this->GraphAreaX1-$CaptionWidth+$XMargin-$CaptionMargin);
+                $EndX   = floor($this->GraphAreaX1-$CaptionMargin+$XMargin);
+
+                $CaptionSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
+                if ( $CaptionBox ) { $this->drawFilledRectangle($StartX,$YPos,$EndX,$YPos+$CaptionHeight,array("R"=>$CaptionFillR,"G"=>$CaptionFillG,"B"=>$CaptionFillB,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB,"Alpha"=>$CaptionFillAlpha)); }
+                $this->drawLine($StartX+2,$YPos+($CaptionHeight/2),$EndX-2,$YPos+($CaptionHeight/2),$CaptionSettings);
+                }
+                else
+                $this->drawFilledRectangle($this->GraphAreaX1-$CaptionWidth+$XMargin-$CaptionMargin,$YPos,$this->GraphAreaX1-$CaptionMargin+$XMargin,$YPos+$CaptionHeight,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
+            }
+
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin;
+
+            $TopY    = $YPos + ($CaptionHeight/2) - ($DerivativeHeight/2);
+            $BottomY = $YPos + ($CaptionHeight/2) + ($DerivativeHeight/2);
+
+            $StartX  = floor($this->GraphAreaX1+$XMargin);
+            $EndX    = floor($this->GraphAreaX2-$XMargin);
+
+            if ( $DrawBackground ) { $this->drawFilledRectangle($StartX-1,$TopY-1,$EndX+1,$BottomY+1,array("R"=>$BackgroundR,"G"=>$BackgroundG,"B"=>$BackgroundB,"Alpha"=>$BackgroundAlpha)); }
+            if ( $DrawBorder ) { $this->drawRectangle($StartX-1,$TopY-1,$EndX+1,$BottomY+1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+
+            $RestoreShadow = $this->Shadow;
+            $this->Shadow  = FALSE;
+
+            /* Determine the Max slope index */
+            $LastX = NULL; $LastY = NULL; $MinSlope = 0; $MaxSlope = 1;
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $Y != VOID && $LastX != NULL )
+                { $Slope = ($LastY - $Y); if ( $Slope > $MaxSlope ) { $MaxSlope = $Slope; } if ( $Slope < $MinSlope ) { $MinSlope = $Slope; } }
+
+                if ( $Y == VOID )
+                { $LastX = NULL; $LastY = NULL; }
+                else
+                { $LastX = $X; $LastY = $Y; }
+            }
+
+            $LastX = NULL; $LastY = NULL; $LastColor = NULL;
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $Y != VOID && $LastY != NULL )
+                {
+                $Slope = ($LastY - $Y);
+
+                if ( $Slope >= 0 )
                 {
-                 $SlopeIndex = (100 / $MaxSlope) * $Slope;
-                 $R = (($PositiveSlopeEndR - $PositiveSlopeStartR)/100)*$SlopeIndex+$PositiveSlopeStartR;
-                 $G = (($PositiveSlopeEndG - $PositiveSlopeStartG)/100)*$SlopeIndex+$PositiveSlopeStartG;
-                 $B = (($PositiveSlopeEndB - $PositiveSlopeStartB)/100)*$SlopeIndex+$PositiveSlopeStartB;
+                    $SlopeIndex = (100 / $MaxSlope) * $Slope;
+                    $R = (($PositiveSlopeEndR - $PositiveSlopeStartR)/100)*$SlopeIndex+$PositiveSlopeStartR;
+                    $G = (($PositiveSlopeEndG - $PositiveSlopeStartG)/100)*$SlopeIndex+$PositiveSlopeStartG;
+                    $B = (($PositiveSlopeEndB - $PositiveSlopeStartB)/100)*$SlopeIndex+$PositiveSlopeStartB;
                 }
-               elseif ( $Slope < 0 )
+                elseif ( $Slope < 0 )
                 {
-                 $SlopeIndex = (100 / abs($MinSlope)) * abs($Slope);
-                 $R = (($NegativeSlopeEndR - $NegativeSlopeStartR)/100)*$SlopeIndex+$NegativeSlopeStartR;
-                 $G = (($NegativeSlopeEndG - $NegativeSlopeStartG)/100)*$SlopeIndex+$NegativeSlopeStartG;
-                 $B = (($NegativeSlopeEndB - $NegativeSlopeStartB)/100)*$SlopeIndex+$NegativeSlopeStartB;
+                    $SlopeIndex = (100 / abs($MinSlope)) * abs($Slope);
+                    $R = (($NegativeSlopeEndR - $NegativeSlopeStartR)/100)*$SlopeIndex+$NegativeSlopeStartR;
+                    $G = (($NegativeSlopeEndG - $NegativeSlopeStartG)/100)*$SlopeIndex+$NegativeSlopeStartG;
+                    $B = (($NegativeSlopeEndB - $NegativeSlopeStartB)/100)*$SlopeIndex+$NegativeSlopeStartB;
                 }
 
-               $Color = array("R"=>$R,"G"=>$G,"B"=>$B);
+                $Color = array("R"=>$R,"G"=>$G,"B"=>$B);
 
-               if ( $ShadedSlopeBox && $LastColor != NULL ) // && $Slope != 0
+                if ( $ShadedSlopeBox && $LastColor != NULL ) // && $Slope != 0
                 {
-                 $GradientSettings = array("StartR"=>$LastColor["R"],"StartG"=>$LastColor["G"],"StartB"=>$LastColor["B"],"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
-                 $this->drawGradientArea($LastX,$TopY,$X,$BottomY,DIRECTION_HORIZONTAL,$GradientSettings);
+                    $GradientSettings = array("StartR"=>$LastColor["R"],"StartG"=>$LastColor["G"],"StartB"=>$LastColor["B"],"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
+                    $this->drawGradientArea($LastX,$TopY,$X,$BottomY,DIRECTION_HORIZONTAL,$GradientSettings);
                 }
-               elseif ( !$ShadedSlopeBox || $LastColor == NULL ) // || $Slope == 0
+                elseif ( !$ShadedSlopeBox || $LastColor == NULL ) // || $Slope == 0
                 $this->drawFilledRectangle(floor($LastX),$TopY,floor($X),$BottomY,$Color);
 
-               $LastColor = $Color;
-              }
+                $LastColor = $Color;
+                }
 
-             if ( $Y == VOID )
-              { $LastY = NULL; }
-             else
-              { $LastX = $X; $LastY = $Y; }
+                if ( $Y == VOID )
+                { $LastY = NULL; }
+                else
+                { $LastX = $X; $LastY = $Y; }
 
-             $X = $X + $XStep;
+                $X = $X + $XStep;
             }
 
-           $YPos = $YPos + $CaptionHeight + $SerieSpacing;
-          }
-         else
-          {
-           if ( $Caption )
+            $YPos = $YPos + $CaptionHeight + $SerieSpacing;
+            }
+            else
+            {
+            if ( $Caption )
             {
-             $StartY = floor($this->GraphAreaY1-$CaptionWidth+$XMargin-$CaptionMargin);
-             $EndY   = floor($this->GraphAreaY1-$CaptionMargin+$XMargin);
-             if ( $CaptionLine ) 
-              {
-               $CaptionSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
-               if ( $CaptionBox ) { $this->drawFilledRectangle($XPos,$StartY,$XPos+$CaptionHeight,$EndY,array("R"=>$CaptionFillR,"G"=>$CaptionFillG,"B"=>$CaptionFillB,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB,"Alpha"=>$CaptionFillAlpha)); }
-               $this->drawLine($XPos+($CaptionHeight/2),$StartY+2,$XPos+($CaptionHeight/2),$EndY-2,$CaptionSettings);
-              }
-             else
-              $this->drawFilledRectangle($XPos,$StartY,$XPos+$CaptionHeight,$EndY,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
+                $StartY = floor($this->GraphAreaY1-$CaptionWidth+$XMargin-$CaptionMargin);
+                $EndY   = floor($this->GraphAreaY1-$CaptionMargin+$XMargin);
+                if ( $CaptionLine ) 
+                {
+                $CaptionSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
+                if ( $CaptionBox ) { $this->drawFilledRectangle($XPos,$StartY,$XPos+$CaptionHeight,$EndY,array("R"=>$CaptionFillR,"G"=>$CaptionFillG,"B"=>$CaptionFillB,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB,"Alpha"=>$CaptionFillAlpha)); }
+                $this->drawLine($XPos+($CaptionHeight/2),$StartY+2,$XPos+($CaptionHeight/2),$EndY-2,$CaptionSettings);
+                }
+                else
+                $this->drawFilledRectangle($XPos,$StartY,$XPos+$CaptionHeight,$EndY,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
             }
 
 
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y = $this->GraphAreaY1 + $XMargin;
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y = $this->GraphAreaY1 + $XMargin;
 
-           $TopX    = $XPos + ($CaptionHeight/2) - ($DerivativeHeight/2);
-           $BottomX = $XPos + ($CaptionHeight/2) + ($DerivativeHeight/2);
+            $TopX    = $XPos + ($CaptionHeight/2) - ($DerivativeHeight/2);
+            $BottomX = $XPos + ($CaptionHeight/2) + ($DerivativeHeight/2);
 
-           $StartY  = floor($this->GraphAreaY1+$XMargin);
-           $EndY    = floor($this->GraphAreaY2-$XMargin);
+            $StartY  = floor($this->GraphAreaY1+$XMargin);
+            $EndY    = floor($this->GraphAreaY2-$XMargin);
 
-           if ( $DrawBackground ) { $this->drawFilledRectangle($TopX-1,$StartY-1,$BottomX+1,$EndY+1,array("R"=>$BackgroundR,"G"=>$BackgroundG,"B"=>$BackgroundB,"Alpha"=>$BackgroundAlpha)); }
-           if ( $DrawBorder ) { $this->drawRectangle($TopX-1,$StartY-1,$BottomX+1,$EndY+1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
+            if ( $DrawBackground ) { $this->drawFilledRectangle($TopX-1,$StartY-1,$BottomX+1,$EndY+1,array("R"=>$BackgroundR,"G"=>$BackgroundG,"B"=>$BackgroundB,"Alpha"=>$BackgroundAlpha)); }
+            if ( $DrawBorder ) { $this->drawRectangle($TopX-1,$StartY-1,$BottomX+1,$EndY+1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
 
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
 
-           $RestoreShadow = $this->Shadow;
-           $this->Shadow  = FALSE;
+            $RestoreShadow = $this->Shadow;
+            $this->Shadow  = FALSE;
 
-           /* Determine the Max slope index */
-           $LastX = NULL; $LastY = NULL; $MinSlope = 0; $MaxSlope = 1;
-           foreach($PosArray as $Key => $X)
+            /* Determine the Max slope index */
+            $LastX = NULL; $LastY = NULL; $MinSlope = 0; $MaxSlope = 1;
+            foreach($PosArray as $Key => $X)
             {
-             if ( $X != VOID && $LastX != NULL )
-              { $Slope = ($X - $LastX); if ( $Slope > $MaxSlope ) { $MaxSlope = $Slope; } if ( $Slope < $MinSlope ) { $MinSlope = $Slope; } }
+                if ( $X != VOID && $LastX != NULL )
+                { $Slope = ($X - $LastX); if ( $Slope > $MaxSlope ) { $MaxSlope = $Slope; } if ( $Slope < $MinSlope ) { $MinSlope = $Slope; } }
 
-             if ( $X == VOID )
-              { $LastX = NULL; }
-             else
-              { $LastX = $X; }
+                if ( $X == VOID )
+                { $LastX = NULL; }
+                else
+                { $LastX = $X; }
             }
 
-           $LastX = NULL; $LastY = NULL; $LastColor = NULL;
-           foreach($PosArray as $Key => $X)
+            $LastX = NULL; $LastY = NULL; $LastColor = NULL;
+            foreach($PosArray as $Key => $X)
             {
-             if ( $X != VOID && $LastX != NULL )
-              {
-               $Slope = ($X - $LastX);
+                if ( $X != VOID && $LastX != NULL )
+                {
+                $Slope = ($X - $LastX);
 
-               if ( $Slope >= 0 )
+                if ( $Slope >= 0 )
                 {
-                 $SlopeIndex = (100 / $MaxSlope) * $Slope;
-                 $R = (($PositiveSlopeEndR - $PositiveSlopeStartR)/100)*$SlopeIndex+$PositiveSlopeStartR;
-                 $G = (($PositiveSlopeEndG - $PositiveSlopeStartG)/100)*$SlopeIndex+$PositiveSlopeStartG;
-                 $B = (($PositiveSlopeEndB - $PositiveSlopeStartB)/100)*$SlopeIndex+$PositiveSlopeStartB;
+                    $SlopeIndex = (100 / $MaxSlope) * $Slope;
+                    $R = (($PositiveSlopeEndR - $PositiveSlopeStartR)/100)*$SlopeIndex+$PositiveSlopeStartR;
+                    $G = (($PositiveSlopeEndG - $PositiveSlopeStartG)/100)*$SlopeIndex+$PositiveSlopeStartG;
+                    $B = (($PositiveSlopeEndB - $PositiveSlopeStartB)/100)*$SlopeIndex+$PositiveSlopeStartB;
                 }
-               elseif ( $Slope < 0 )
+                elseif ( $Slope < 0 )
                 {
-                 $SlopeIndex = (100 / abs($MinSlope)) * abs($Slope);
-                 $R = (($NegativeSlopeEndR - $NegativeSlopeStartR)/100)*$SlopeIndex+$NegativeSlopeStartR;
-                 $G = (($NegativeSlopeEndG - $NegativeSlopeStartG)/100)*$SlopeIndex+$NegativeSlopeStartG;
-                 $B = (($NegativeSlopeEndB - $NegativeSlopeStartB)/100)*$SlopeIndex+$NegativeSlopeStartB;
+                    $SlopeIndex = (100 / abs($MinSlope)) * abs($Slope);
+                    $R = (($NegativeSlopeEndR - $NegativeSlopeStartR)/100)*$SlopeIndex+$NegativeSlopeStartR;
+                    $G = (($NegativeSlopeEndG - $NegativeSlopeStartG)/100)*$SlopeIndex+$NegativeSlopeStartG;
+                    $B = (($NegativeSlopeEndB - $NegativeSlopeStartB)/100)*$SlopeIndex+$NegativeSlopeStartB;
                 }
 
-               $Color = array("R"=>$R,"G"=>$G,"B"=>$B);
+                $Color = array("R"=>$R,"G"=>$G,"B"=>$B);
 
-               if ( $ShadedSlopeBox && $LastColor != NULL )
+                if ( $ShadedSlopeBox && $LastColor != NULL )
                 {
-                 $GradientSettings = array("StartR"=>$LastColor["R"],"StartG"=>$LastColor["G"],"StartB"=>$LastColor["B"],"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
+                    $GradientSettings = array("StartR"=>$LastColor["R"],"StartG"=>$LastColor["G"],"StartB"=>$LastColor["B"],"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
 
-                 $this->drawGradientArea($TopX,$LastY,$BottomX,$Y,DIRECTION_VERTICAL,$GradientSettings);
+                    $this->drawGradientArea($TopX,$LastY,$BottomX,$Y,DIRECTION_VERTICAL,$GradientSettings);
                 }
-               elseif ( !$ShadedSlopeBox || $LastColor == NULL ) 
+                elseif ( !$ShadedSlopeBox || $LastColor == NULL ) 
                 $this->drawFilledRectangle($TopX,floor($LastY),$BottomX,floor($Y),$Color);
 
-               $LastColor = $Color;
-              }
+                $LastColor = $Color;
+                }
 
-             if ( $X == VOID )
-              { $LastX = NULL; }
-             else
-              { $LastX = $X; $LastY = $Y; }
+                if ( $X == VOID )
+                { $LastX = NULL; }
+                else
+                { $LastX = $X; $LastY = $Y; }
 
-             $Y = $Y + $XStep;
+                $Y = $Y + $XStep;
             }
 
-           $XPos = $XPos + $CaptionHeight + $SerieSpacing;
-          }
+            $XPos = $XPos + $CaptionHeight + $SerieSpacing;
+            }
 
-         $this->Shadow = $RestoreShadow;
+            $this->Shadow = $RestoreShadow;
+        }
         }
-      }
     }
 
-   /* Draw the line of best fit */
-   function drawBestFit($Format="")
+    /* Draw the line of best fit */
+    function drawBestFit($Format="")
     {
-     $OverrideTicks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
-     $OverrideR		= isset($Format["R"]) ? $Format["R"] : VOID;
-     $OverrideG		= isset($Format["G"]) ? $Format["G"] : VOID;
-     $OverrideB		= isset($Format["B"]) ? $Format["B"] : VOID;
-     $OverrideAlpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : VOID;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     foreach($Data["Series"] as $SerieName => $Serie)
-      {
-       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
-        {
-         if ( $OverrideR != VOID && $OverrideG != VOID && $OverrideB != VOID ) { $R = $OverrideR; $G = $OverrideG; $B = $OverrideB; } else { $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; }
-         if ( $OverrideTicks == NULL ) { $Ticks = $Serie["Ticks"]; } else { $Ticks = $OverrideTicks; }
-         if ( $OverrideAlpha == VOID ) { $Alpha = $Serie["Color"]["Alpha"]; } else { $Alpha = $OverrideAlpha; }
-
-         $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks);
-
-         $AxisID   = $Serie["Axis"];
-         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
-
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
-           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-           $X = $this->GraphAreaX1 + $XMargin;
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $Sxy = 0; $Sx = 0; $Sy = 0; $Sxx = 0;
-           foreach($PosArray as $Key => $Y)
-            {
-             if ( $Y != VOID )
-              {
-               $Sxy = $Sxy + $X*$Y;
-               $Sx  = $Sx + $X;
-               $Sy  = $Sy + $Y;
-               $Sxx = $Sxx + $X*$X;
-              }
-
-             $X = $X + $XStep;
-            }
-           $n = count($this->DataSet->stripVOID($PosArray)); //$n = count($PosArray);
-           $M = (($n*$Sxy)-($Sx*$Sy)) / (($n*$Sxx)-($Sx*$Sx));
-           $B = (($Sy)-($M*$Sx))/($n);
-
-           $X1 = $this->GraphAreaX1 + $XMargin;
-           $Y1 = $M * $X1 + $B;
-           $X2 = $this->GraphAreaX2 - $XMargin;
-           $Y2 = $M * $X2 + $B;
-
-           if ( $Y1 < $this->GraphAreaY1 ) { $X1 = $X1 + ($this->GraphAreaY1-$Y1); $Y1 = $this->GraphAreaY1; }
-           if ( $Y1 > $this->GraphAreaY2 ) { $X1 = $X1 + ($Y1-$this->GraphAreaY2); $Y1 = $this->GraphAreaY2; }
-           if ( $Y2 < $this->GraphAreaY1 ) { $X2 = $X2 - ($this->GraphAreaY1-$Y2); $Y2 = $this->GraphAreaY1; }
-           if ( $Y2 > $this->GraphAreaY2 ) { $X2 = $X2 - ($Y2-$this->GraphAreaY2); $Y2 = $this->GraphAreaY2; }
-
-           $this->drawLine($X1,$Y1,$X2,$Y2,$Color);
-          }
-         else
-          {
-           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-           $Y = $this->GraphAreaY1 + $XMargin;
-
-           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
-           $Sxy = 0; $Sx = 0; $Sy = 0; $Sxx = 0;
-           foreach($PosArray as $Key => $X)
-            {
-             if ( $X != VOID )
-              {
-               $Sxy = $Sxy + $X*$Y;
-               $Sx  = $Sx + $Y;
-               $Sy  = $Sy + $X;
-               $Sxx = $Sxx + $Y*$Y;
-              }
-
-             $Y = $Y + $YStep;
-            }
-           $n = count($this->DataSet->stripVOID($PosArray)); //$n = count($PosArray);
-           $M = (($n*$Sxy)-($Sx*$Sy)) / (($n*$Sxx)-($Sx*$Sx));
-           $B = (($Sy)-($M*$Sx))/($n);
-
-           $Y1 = $this->GraphAreaY1 + $XMargin;
-           $X1 = $M * $Y1 + $B;
-           $Y2 = $this->GraphAreaY2 - $XMargin;
-           $X2 = $M * $Y2 + $B;
-
-           if ( $X1 < $this->GraphAreaX1 ) { $Y1 = $Y1 + ($this->GraphAreaX1-$X1); $X1 = $this->GraphAreaX1; }
-           if ( $X1 > $this->GraphAreaX2 ) { $Y1 = $Y1 + ($X1-$this->GraphAreaX2); $X1 = $this->GraphAreaX2; }
-           if ( $X2 < $this->GraphAreaX1 ) { $Y2 = $Y2 - ($this->GraphAreaY1-$X2); $X2 = $this->GraphAreaX1; }
-           if ( $X2 > $this->GraphAreaX2 ) { $Y2 = $Y2 - ($X2-$this->GraphAreaX2); $X2 = $this->GraphAreaX2; }
-
-           $this->drawLine($X1,$Y1,$X2,$Y2,$Color);
-          }
-        }
-      }
+        $OverrideTicks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+        $OverrideR		= isset($Format["R"]) ? $Format["R"] : VOID;
+        $OverrideG		= isset($Format["G"]) ? $Format["G"] : VOID;
+        $OverrideB		= isset($Format["B"]) ? $Format["B"] : VOID;
+        $OverrideAlpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : VOID;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        foreach($Data["Series"] as $SerieName => $Serie)
+        {
+        if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+            if ( $OverrideR != VOID && $OverrideG != VOID && $OverrideB != VOID ) { $R = $OverrideR; $G = $OverrideG; $B = $OverrideB; } else { $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; }
+            if ( $OverrideTicks == NULL ) { $Ticks = $Serie["Ticks"]; } else { $Ticks = $OverrideTicks; }
+            if ( $OverrideAlpha == VOID ) { $Alpha = $Serie["Color"]["Alpha"]; } else { $Alpha = $OverrideAlpha; }
+
+            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks);
+
+            $AxisID   = $Serie["Axis"];
+            $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+            if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+            {
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin;
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $Sxy = 0; $Sx = 0; $Sy = 0; $Sxx = 0;
+            foreach($PosArray as $Key => $Y)
+            {
+                if ( $Y != VOID )
+                {
+                $Sxy = $Sxy + $X*$Y;
+                $Sx  = $Sx + $X;
+                $Sy  = $Sy + $Y;
+                $Sxx = $Sxx + $X*$X;
+                }
+
+                $X = $X + $XStep;
+            }
+            $n = count($this->DataSet->stripVOID($PosArray)); //$n = count($PosArray);
+            $M = (($n*$Sxy)-($Sx*$Sy)) / (($n*$Sxx)-($Sx*$Sx));
+            $B = (($Sy)-($M*$Sx))/($n);
+
+            $X1 = $this->GraphAreaX1 + $XMargin;
+            $Y1 = $M * $X1 + $B;
+            $X2 = $this->GraphAreaX2 - $XMargin;
+            $Y2 = $M * $X2 + $B;
+
+            if ( $Y1 < $this->GraphAreaY1 ) { $X1 = $X1 + ($this->GraphAreaY1-$Y1); $Y1 = $this->GraphAreaY1; }
+            if ( $Y1 > $this->GraphAreaY2 ) { $X1 = $X1 + ($Y1-$this->GraphAreaY2); $Y1 = $this->GraphAreaY2; }
+            if ( $Y2 < $this->GraphAreaY1 ) { $X2 = $X2 - ($this->GraphAreaY1-$Y2); $Y2 = $this->GraphAreaY1; }
+            if ( $Y2 > $this->GraphAreaY2 ) { $X2 = $X2 - ($Y2-$this->GraphAreaY2); $Y2 = $this->GraphAreaY2; }
+
+            $this->drawLine($X1,$Y1,$X2,$Y2,$Color);
+            }
+            else
+            {
+            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y = $this->GraphAreaY1 + $XMargin;
+
+            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+            $Sxy = 0; $Sx = 0; $Sy = 0; $Sxx = 0;
+            foreach($PosArray as $Key => $X)
+            {
+                if ( $X != VOID )
+                {
+                $Sxy = $Sxy + $X*$Y;
+                $Sx  = $Sx + $Y;
+                $Sy  = $Sy + $X;
+                $Sxx = $Sxx + $Y*$Y;
+                }
+
+                $Y = $Y + $YStep;
+            }
+            $n = count($this->DataSet->stripVOID($PosArray)); //$n = count($PosArray);
+            $M = (($n*$Sxy)-($Sx*$Sy)) / (($n*$Sxx)-($Sx*$Sx));
+            $B = (($Sy)-($M*$Sx))/($n);
+
+            $Y1 = $this->GraphAreaY1 + $XMargin;
+            $X1 = $M * $Y1 + $B;
+            $Y2 = $this->GraphAreaY2 - $XMargin;
+            $X2 = $M * $Y2 + $B;
+
+            if ( $X1 < $this->GraphAreaX1 ) { $Y1 = $Y1 + ($this->GraphAreaX1-$X1); $X1 = $this->GraphAreaX1; }
+            if ( $X1 > $this->GraphAreaX2 ) { $Y1 = $Y1 + ($X1-$this->GraphAreaX2); $X1 = $this->GraphAreaX2; }
+            if ( $X2 < $this->GraphAreaX1 ) { $Y2 = $Y2 - ($this->GraphAreaY1-$X2); $X2 = $this->GraphAreaX1; }
+            if ( $X2 > $this->GraphAreaX2 ) { $Y2 = $Y2 - ($X2-$this->GraphAreaX2); $X2 = $this->GraphAreaX2; }
+
+            $this->drawLine($X1,$Y1,$X2,$Y2,$Color);
+            }
+        }
+        }
     }
 
-   /* Write labels */
-   function writeLabel($SeriesName,$Indexes,$Format="")
+    /* Write labels */
+    function writeLabel($SeriesName,$Indexes,$Format="")
     {
-     $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
-     $ForceLabels	= isset($Format["ForceLabels"]) ? $Format["ForceLabels"] : NULL;
-     $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
-     $DrawVerticalLine	= isset($Format["DrawVerticalLine"]) ? $Format["DrawVerticalLine"] : FALSE;
-     $VerticalLineR	= isset($Format["VerticalLineR"]) ? $Format["VerticalLineR"] : 0;
-     $VerticalLineG	= isset($Format["VerticalLineG"]) ? $Format["VerticalLineG"] : 0;
-     $VerticalLineB	= isset($Format["VerticalLineB"]) ? $Format["VerticalLineB"] : 0;
-     $VerticalLineAlpha	= isset($Format["VerticalLineAlpha"]) ? $Format["VerticalLineAlpha"] : 40;
-     $VerticalLineTicks	= isset($Format["VerticalLineTicks"]) ? $Format["VerticalLineTicks"] : 2;
-
-     $Data = $this->DataSet->getData();
-     list($XMargin,$XDivs) = $this->scaleGetXSettings();
-
-     if ( !is_array($Indexes) )    { $Index = $Indexes; $Indexes = ""; $Indexes[] = $Index; }
-     if ( !is_array($SeriesName) ) { $SerieName = $SeriesName; $SeriesName = ""; $SeriesName[] = $SerieName; }
-     if ( $ForceLabels != NULL && !is_array($ForceLabels) ) { $ForceLabel = $ForceLabels; $ForceLabels = ""; $ForceLabels[] = $ForceLabel; }
-
-     foreach ($Indexes as $Key => $Index)
-      {
-       $Series = "";
-
-       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-        {
-         if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
-         $X = $this->GraphAreaX1 + $XMargin + $Index * $XStep;
-
-         if ( $DrawVerticalLine ) { $this->drawLine($X,$this->GraphAreaY1+$Data["YMargin"],$X,$this->GraphAreaY2-$Data["YMargin"],array("R"=>$VerticalLineR,"G"=>$VerticalLineG,"B"=>$VerticalLineB,"Alpha"=>$VerticalLineAlpha,"Ticks"=>$VerticalLineTicks)); }
-
-         $MinY = $this->GraphAreaY2;
-         foreach ($SeriesName as $iKey => $SerieName)
-          {
-           if ( isset($Data["Series"][$SerieName]["Data"][$Index]) )
-            {
-             $AxisID      = $Data["Series"][$SerieName]["Axis"];
-
-             if ( $OverrideTitle != NULL)
-              $Description = $OverrideTitle;
-             elseif ( count($SeriesName) == 1 )
-              {
-               if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
+        $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
+        $ForceLabels	= isset($Format["ForceLabels"]) ? $Format["ForceLabels"] : NULL;
+        $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
+        $DrawVerticalLine	= isset($Format["DrawVerticalLine"]) ? $Format["DrawVerticalLine"] : FALSE;
+        $VerticalLineR	= isset($Format["VerticalLineR"]) ? $Format["VerticalLineR"] : 0;
+        $VerticalLineG	= isset($Format["VerticalLineG"]) ? $Format["VerticalLineG"] : 0;
+        $VerticalLineB	= isset($Format["VerticalLineB"]) ? $Format["VerticalLineB"] : 0;
+        $VerticalLineAlpha	= isset($Format["VerticalLineAlpha"]) ? $Format["VerticalLineAlpha"] : 40;
+        $VerticalLineTicks	= isset($Format["VerticalLineTicks"]) ? $Format["VerticalLineTicks"] : 2;
+
+        $Data = $this->DataSet->getData();
+        list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+        if ( !is_array($Indexes) )    { $Index = $Indexes; $Indexes = ""; $Indexes[] = $Index; }
+        if ( !is_array($SeriesName) ) { $SerieName = $SeriesName; $SeriesName = ""; $SeriesName[] = $SerieName; }
+        if ( $ForceLabels != NULL && !is_array($ForceLabels) ) { $ForceLabel = $ForceLabels; $ForceLabels = ""; $ForceLabels[] = $ForceLabel; }
+
+        foreach ($Indexes as $Key => $Index)
+        {
+        $Series = "";
+
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+            $X = $this->GraphAreaX1 + $XMargin + $Index * $XStep;
+
+            if ( $DrawVerticalLine ) { $this->drawLine($X,$this->GraphAreaY1+$Data["YMargin"],$X,$this->GraphAreaY2-$Data["YMargin"],array("R"=>$VerticalLineR,"G"=>$VerticalLineG,"B"=>$VerticalLineB,"Alpha"=>$VerticalLineAlpha,"Ticks"=>$VerticalLineTicks)); }
+
+            $MinY = $this->GraphAreaY2;
+            foreach ($SeriesName as $iKey => $SerieName)
+            {
+            if ( isset($Data["Series"][$SerieName]["Data"][$Index]) )
+            {
+                $AxisID      = $Data["Series"][$SerieName]["Axis"];
+
+                if ( $OverrideTitle != NULL)
+                $Description = $OverrideTitle;
+                elseif ( count($SeriesName) == 1 )
+                {
+                if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
                 $Description = $Data["Series"][$SerieName]["Description"]." - ".$Data["Series"][$Data["Abscissa"]]["Data"][$Index];
-               else
+                else
                 $Description = $Data["Series"][$SerieName]["Description"];
-              }
-             elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
-              $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
-
-             $AxisMode     = $Data["Axis"][$AxisID]["Display"];
-             $AxisFormat   = $Data["Axis"][$AxisID]["Format"];
-             $AxisUnit     = $Data["Axis"][$AxisID]["Unit"];
-
-             $Serie = "";
-             $Serie["R"] = $Data["Series"][$SerieName]["Color"]["R"];
-             $Serie["G"] = $Data["Series"][$SerieName]["Color"]["G"];
-             $Serie["B"] = $Data["Series"][$SerieName]["Color"]["B"];
-             $Serie["Alpha"] = $Data["Series"][$SerieName]["Color"]["Alpha"];
-
-             if ( count($SeriesName) == 1 && isset($Data["Series"][$SerieName]["XOffset"]) )
-              $SerieOffset = $Data["Series"][$SerieName]["XOffset"];
-             else
-              $SerieOffset = 0;
-
-             $Value = $Data["Series"][$SerieName]["Data"][$Index];
-             if ( $Value == VOID ) { $Value = "NaN"; }
-
-             if ( $ForceLabels != NULL )
-              $Caption = isset($ForceLabels[$Key]) ? $ForceLabels[$Key] : "Not set";
-             else
-              $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
-
-             if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED )
-              {
-               if ( $Value >=0 ) { $LookFor = "+"; } else { $LookFor = "-"; }
-
-               $Value = 0; $Done = FALSE;
-               foreach($Data["Series"] as $Name => $SerieLookup)
+                }
+                elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
+                $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
+
+                $AxisMode     = $Data["Axis"][$AxisID]["Display"];
+                $AxisFormat   = $Data["Axis"][$AxisID]["Format"];
+                $AxisUnit     = $Data["Axis"][$AxisID]["Unit"];
+
+                $Serie = "";
+                $Serie["R"] = $Data["Series"][$SerieName]["Color"]["R"];
+                $Serie["G"] = $Data["Series"][$SerieName]["Color"]["G"];
+                $Serie["B"] = $Data["Series"][$SerieName]["Color"]["B"];
+                $Serie["Alpha"] = $Data["Series"][$SerieName]["Color"]["Alpha"];
+
+                if ( count($SeriesName) == 1 && isset($Data["Series"][$SerieName]["XOffset"]) )
+                $SerieOffset = $Data["Series"][$SerieName]["XOffset"];
+                else
+                $SerieOffset = 0;
+
+                $Value = $Data["Series"][$SerieName]["Data"][$Index];
+                if ( $Value == VOID ) { $Value = "NaN"; }
+
+                if ( $ForceLabels != NULL )
+                $Caption = isset($ForceLabels[$Key]) ? $ForceLabels[$Key] : "Not set";
+                else
+                $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
+
+                if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED )
+                {
+                if ( $Value >=0 ) { $LookFor = "+"; } else { $LookFor = "-"; }
+
+                $Value = 0; $Done = FALSE;
+                foreach($Data["Series"] as $Name => $SerieLookup)
                 {
-                 if ( $SerieLookup["isDrawable"] == TRUE && $Name != $Data["Abscissa"] && !$Done )
-                  {
-                   if ( isset($Data["Series"][$Name]["Data"][$Index]) && $Data["Series"][$Name]["Data"][$Index] != VOID )
+                    if ( $SerieLookup["isDrawable"] == TRUE && $Name != $Data["Abscissa"] && !$Done )
+                    {
+                    if ( isset($Data["Series"][$Name]["Data"][$Index]) && $Data["Series"][$Name]["Data"][$Index] != VOID )
                     {
-                     if ($Data["Series"][$Name]["Data"][$Index] >= 0 && $LookFor == "+" ) { $Value = $Value + $Data["Series"][$Name]["Data"][$Index]; }
-                     if ($Data["Series"][$Name]["Data"][$Index] < 0 && $LookFor == "-" )  { $Value = $Value - $Data["Series"][$Name]["Data"][$Index]; }
-                     if ($Name == $SerieName ) { $Done = TRUE; }
+                        if ($Data["Series"][$Name]["Data"][$Index] >= 0 && $LookFor == "+" ) { $Value = $Value + $Data["Series"][$Name]["Data"][$Index]; }
+                        if ($Data["Series"][$Name]["Data"][$Index] < 0 && $LookFor == "-" )  { $Value = $Value - $Data["Series"][$Name]["Data"][$Index]; }
+                        if ($Name == $SerieName ) { $Done = TRUE; }
                     }
-                  }
+                    }
+                }
                 }
-              }
 
-             $X = floor($this->GraphAreaX1 + $XMargin + $Index * $XStep + $SerieOffset);
-             $Y = floor($this->scaleComputeY($Value,array("AxisID"=>$AxisID)));
+                $X = floor($this->GraphAreaX1 + $XMargin + $Index * $XStep + $SerieOffset);
+                $Y = floor($this->scaleComputeY($Value,array("AxisID"=>$AxisID)));
 
-             if ($Y < $MinY) { $MinY = $Y; }
+                if ($Y < $MinY) { $MinY = $Y; }
 
-             if ( $DrawPoint == LABEL_POINT_CIRCLE )
-              $this->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
-             elseif ( $DrawPoint == LABEL_POINT_BOX )
-              $this->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+                if ( $DrawPoint == LABEL_POINT_CIRCLE )
+                $this->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+                elseif ( $DrawPoint == LABEL_POINT_BOX )
+                $this->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
 
-             $Series[] = array("Format"=>$Serie,"Caption"=>$Caption);
+                $Series[] = array("Format"=>$Serie,"Caption"=>$Caption);
             }
-          }
-         $this->drawLabelBox($X,$MinY-3,$Description,$Series,$Format);
+            }
+            $this->drawLabelBox($X,$MinY-3,$Description,$Series,$Format);
 
         }
-       else
+        else
         {
-         if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
-         $Y = $this->GraphAreaY1 + $XMargin + $Index * $XStep;
+            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+            $Y = $this->GraphAreaY1 + $XMargin + $Index * $XStep;
 
-         if ( $DrawVerticalLine ) { $this->drawLine($this->GraphAreaX1+$Data["YMargin"],$Y,$this->GraphAreaX2-$Data["YMargin"],$Y,array("R"=>$VerticalLineR,"G"=>$VerticalLineG,"B"=>$VerticalLineB,"Alpha"=>$VerticalLineAlpha,"Ticks"=>$VerticalLineTicks)); }
+            if ( $DrawVerticalLine ) { $this->drawLine($this->GraphAreaX1+$Data["YMargin"],$Y,$this->GraphAreaX2-$Data["YMargin"],$Y,array("R"=>$VerticalLineR,"G"=>$VerticalLineG,"B"=>$VerticalLineB,"Alpha"=>$VerticalLineAlpha,"Ticks"=>$VerticalLineTicks)); }
 
-         $MinX = $this->GraphAreaX2;
-         foreach ($SeriesName as $Key => $SerieName)
-          {
-           if ( isset($Data["Series"][$SerieName]["Data"][$Index]) )
+            $MinX = $this->GraphAreaX2;
+            foreach ($SeriesName as $Key => $SerieName)
+            {
+            if ( isset($Data["Series"][$SerieName]["Data"][$Index]) )
             {
-             $AxisID      = $Data["Series"][$SerieName]["Axis"];
+                $AxisID      = $Data["Series"][$SerieName]["Axis"];
 
-             if ( $OverrideTitle != NULL)
-              $Description = $OverrideTitle;
-             elseif ( count($SeriesName) == 1 )
-              {
-               if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
+                if ( $OverrideTitle != NULL)
+                $Description = $OverrideTitle;
+                elseif ( count($SeriesName) == 1 )
+                {
+                if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
                 $Description = $Data["Series"][$SerieName]["Description"]." - ".$Data["Series"][$Data["Abscissa"]]["Data"][$Index];
-               else
+                else
                 $Description = $Data["Series"][$SerieName]["Description"];
-              }
-             elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
-              $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
-
-             $AxisMode     = $Data["Axis"][$AxisID]["Display"];
-             $AxisFormat   = $Data["Axis"][$AxisID]["Format"];
-             $AxisUnit     = $Data["Axis"][$AxisID]["Unit"];
-
-             $Serie = "";
-             if ( isset($Data["Extended"]["Palette"][$Index] ) )
-              {
-               $Serie["R"] = $Data["Extended"]["Palette"][$Index]["R"];
-               $Serie["G"] = $Data["Extended"]["Palette"][$Index]["G"];
-               $Serie["B"] = $Data["Extended"]["Palette"][$Index]["B"];
-               $Serie["Alpha"] = $Data["Extended"]["Palette"][$Index]["Alpha"];
-              }
-             else
-              {
-               $Serie["R"] = $Data["Series"][$SerieName]["Color"]["R"];
-               $Serie["G"] = $Data["Series"][$SerieName]["Color"]["G"];
-               $Serie["B"] = $Data["Series"][$SerieName]["Color"]["B"];
-               $Serie["Alpha"] = $Data["Series"][$SerieName]["Color"]["Alpha"];
-              }
-
-             if ( count($SeriesName) == 1 && isset($Data["Series"][$SerieName]["XOffset"]) )
-              $SerieOffset = $Data["Series"][$SerieName]["XOffset"];
-             else
-              $SerieOffset = 0;
-
-             $Value = $Data["Series"][$SerieName]["Data"][$Index];
-             if ( $ForceLabels != NULL )
-              $Caption = isset($ForceLabels[$Key]) ? $ForceLabels[$Key] : "Not set";
-             else
-              $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
-             if ( $Value == VOID ) { $Value = "NaN"; }
-
-             if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED )
-              {
-               if ( $Value >=0 ) { $LookFor = "+"; } else { $LookFor = "-"; }
-
-               $Value = 0; $Done = FALSE;
-               foreach($Data["Series"] as $Name => $SerieLookup)
+                }
+                elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
+                $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
+
+                $AxisMode     = $Data["Axis"][$AxisID]["Display"];
+                $AxisFormat   = $Data["Axis"][$AxisID]["Format"];
+                $AxisUnit     = $Data["Axis"][$AxisID]["Unit"];
+
+                $Serie = "";
+                if ( isset($Data["Extended"]["Palette"][$Index] ) )
+                {
+                $Serie["R"] = $Data["Extended"]["Palette"][$Index]["R"];
+                $Serie["G"] = $Data["Extended"]["Palette"][$Index]["G"];
+                $Serie["B"] = $Data["Extended"]["Palette"][$Index]["B"];
+                $Serie["Alpha"] = $Data["Extended"]["Palette"][$Index]["Alpha"];
+                }
+                else
+                {
+                $Serie["R"] = $Data["Series"][$SerieName]["Color"]["R"];
+                $Serie["G"] = $Data["Series"][$SerieName]["Color"]["G"];
+                $Serie["B"] = $Data["Series"][$SerieName]["Color"]["B"];
+                $Serie["Alpha"] = $Data["Series"][$SerieName]["Color"]["Alpha"];
+                }
+
+                if ( count($SeriesName) == 1 && isset($Data["Series"][$SerieName]["XOffset"]) )
+                $SerieOffset = $Data["Series"][$SerieName]["XOffset"];
+                else
+                $SerieOffset = 0;
+
+                $Value = $Data["Series"][$SerieName]["Data"][$Index];
+                if ( $ForceLabels != NULL )
+                $Caption = isset($ForceLabels[$Key]) ? $ForceLabels[$Key] : "Not set";
+                else
+                $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
+                if ( $Value == VOID ) { $Value = "NaN"; }
+
+                if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED )
+                {
+                if ( $Value >=0 ) { $LookFor = "+"; } else { $LookFor = "-"; }
+
+                $Value = 0; $Done = FALSE;
+                foreach($Data["Series"] as $Name => $SerieLookup)
                 {
-                 if ( $SerieLookup["isDrawable"] == TRUE && $Name != $Data["Abscissa"] && !$Done )
-                  {
-                   if ( isset($Data["Series"][$Name]["Data"][$Index]) && $Data["Series"][$Name]["Data"][$Index] != VOID )
+                    if ( $SerieLookup["isDrawable"] == TRUE && $Name != $Data["Abscissa"] && !$Done )
+                    {
+                    if ( isset($Data["Series"][$Name]["Data"][$Index]) && $Data["Series"][$Name]["Data"][$Index] != VOID )
                     {
-                     if ($Data["Series"][$Name]["Data"][$Index] >= 0 && $LookFor == "+" ) { $Value = $Value + $Data["Series"][$Name]["Data"][$Index]; }
-                     if ($Data["Series"][$Name]["Data"][$Index] < 0 && $LookFor == "-" )  { $Value = $Value - $Data["Series"][$Name]["Data"][$Index]; }
-                     if ($Name == $SerieName ) { $Done = TRUE; }
+                        if ($Data["Series"][$Name]["Data"][$Index] >= 0 && $LookFor == "+" ) { $Value = $Value + $Data["Series"][$Name]["Data"][$Index]; }
+                        if ($Data["Series"][$Name]["Data"][$Index] < 0 && $LookFor == "-" )  { $Value = $Value - $Data["Series"][$Name]["Data"][$Index]; }
+                        if ($Name == $SerieName ) { $Done = TRUE; }
                     }
-                  }
+                    }
+                }
                 }
-              }
 
-             $X = floor($this->scaleComputeY($Value,array("AxisID"=>$AxisID)));
-             $Y = floor($this->GraphAreaY1 + $XMargin + $Index * $XStep + $SerieOffset);
+                $X = floor($this->scaleComputeY($Value,array("AxisID"=>$AxisID)));
+                $Y = floor($this->GraphAreaY1 + $XMargin + $Index * $XStep + $SerieOffset);
 
-             if ($X < $MinX) { $MinX = $X; }
+                if ($X < $MinX) { $MinX = $X; }
 
-             if ( $DrawPoint == LABEL_POINT_CIRCLE )
-              $this->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
-             elseif ( $DrawPoint == LABEL_POINT_BOX )
-              $this->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+                if ( $DrawPoint == LABEL_POINT_CIRCLE )
+                $this->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+                elseif ( $DrawPoint == LABEL_POINT_BOX )
+                $this->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
 
-             $Series[] = array("Format"=>$Serie,"Caption"=>$Caption);
+                $Series[] = array("Format"=>$Serie,"Caption"=>$Caption);
             }
-          }
-         $this->drawLabelBox($MinX,$Y-3,$Description,$Series,$Format);
+            }
+            $this->drawLabelBox($MinX,$Y-3,$Description,$Series,$Format);
 
         }
-      }
+        }
     }
 
-   /* Draw a label box */
-   function drawLabelBox($X,$Y,$Title,$Captions,$Format="")
+    /* Draw a label box */
+    function drawLabelBox($X,$Y,$Title,$Captions,$Format="")
     {
-     $NoTitle		= isset($Format["NoTitle"]) ? $Format["NoTitle"] : NULL;
-     $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 50;
-     $DrawSerieColor	= isset($Format["DrawSerieColor"]) ? $Format["DrawSerieColor"] : TRUE;
-     $SerieR		= isset($Format["SerieR"]) ? $Format["SerieR"] : NULL;
-     $SerieG		= isset($Format["SerieG"]) ? $Format["SerieG"] : NULL;
-     $SerieB		= isset($Format["SerieB"]) ? $Format["SerieB"] : NULL;
-     $SerieAlpha	= isset($Format["SerieAlpha"]) ? $Format["SerieAlpha"] : NULL;
-     $SerieBoxSize	= isset($Format["SerieBoxSize"]) ? $Format["SerieBoxSize"] : 6;
-     $SerieBoxSpacing	= isset($Format["SerieBoxSpacing"]) ? $Format["SerieBoxSpacing"] : 4;
-     $VerticalMargin	= isset($Format["VerticalMargin"]) ? $Format["VerticalMargin"] : 10;
-     $HorizontalMargin	= isset($Format["HorizontalMargin"]) ? $Format["HorizontalMargin"] : 8;
-     $R			= isset($Format["R"]) ? $Format["R"] : $this->FontColorR;
-     $G			= isset($Format["G"]) ? $Format["G"] : $this->FontColorG;
-     $B			= isset($Format["B"]) ? $Format["B"] : $this->FontColorB;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->FontColorA;
-     $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
-     $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
-     $TitleMode		= isset($Format["TitleMode"]) ? $Format["TitleMode"] : LABEL_TITLE_NOBACKGROUND;
-     $TitleR		= isset($Format["TitleR"]) ? $Format["TitleR"] : $R;
-     $TitleG		= isset($Format["TitleG"]) ? $Format["TitleG"] : $G;
-     $TitleB		= isset($Format["TitleB"]) ? $Format["TitleB"] : $B;
-     $TitleBackgroundR	= isset($Format["TitleBackgroundR"]) ? $Format["TitleBackgroundR"] : 0;
-     $TitleBackgroundG	= isset($Format["TitleBackgroundG"]) ? $Format["TitleBackgroundG"] : 0;
-     $TitleBackgroundB	= isset($Format["TitleBackgroundB"]) ? $Format["TitleBackgroundB"] : 0;
-     $GradientStartR	= isset($Format["GradientStartR"]) ? $Format["GradientStartR"] : 255;
-     $GradientStartG	= isset($Format["GradientStartG"]) ? $Format["GradientStartG"] : 255;
-     $GradientStartB	= isset($Format["GradientStartB"]) ? $Format["GradientStartB"] : 255;
-     $GradientEndR	= isset($Format["GradientEndR"]) ? $Format["GradientEndR"] : 220;
-     $GradientEndG	= isset($Format["GradientEndG"]) ? $Format["GradientEndG"] : 220;
-     $GradientEndB	= isset($Format["GradientEndB"]) ? $Format["GradientEndB"] : 220;
-
-     if ( !$DrawSerieColor ) { $SerieBoxSize = 0; $SerieBoxSpacing = 0; }
-
-     $TxtPos      = $this->getTextBox($X,$Y,$FontName,$FontSize,0,$Title);
-     $TitleWidth  = ($TxtPos[1]["X"] - $TxtPos[0]["X"])+$VerticalMargin*2;
-     $TitleHeight = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]);
-
-     if ( $NoTitle ) { $TitleWidth = 0; $TitleHeight = 0; }
-
-     $CaptionWidth = 0; $CaptionHeight = -$HorizontalMargin;
-     foreach($Captions as $Key =>$Caption)
-      {
-       $TxtPos        = $this->getTextBox($X,$Y,$FontName,$FontSize,0,$Caption["Caption"]);
-       $CaptionWidth  = max($CaptionWidth,($TxtPos[1]["X"] - $TxtPos[0]["X"])+$VerticalMargin*2);
-       $CaptionHeight = $CaptionHeight + max(($TxtPos[0]["Y"] - $TxtPos[2]["Y"]),($SerieBoxSize+2)) + $HorizontalMargin;
-      }
-
-     if ( $CaptionHeight <= 5 ) { $CaptionHeight = $CaptionHeight + $HorizontalMargin/2; }
-
-     if ( $DrawSerieColor ) { $CaptionWidth = $CaptionWidth + $SerieBoxSize + $SerieBoxSpacing; }
-
-     $BoxWidth = max($BoxWidth,$TitleWidth,$CaptionWidth);
-
-     $XMin = $X - 5 - floor(($BoxWidth-10) / 2);
-     $XMax = $X + 5 + floor(($BoxWidth-10) / 2);
-
-     $RestoreShadow = $this->Shadow;
-     if ( $this->Shadow == TRUE )
-      {
-       $this->Shadow = FALSE;
-
-       $Poly = "";
-       $Poly[] = $X+$this->ShadowX; $Poly[] = $Y+$this->ShadowX;
-       $Poly[] = $X+5+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
-       $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
-
-       if ( $NoTitle )
-        {
-         $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2+$this->ShadowX;
-         $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2+$this->ShadowX;
-        }
-       else
-        {
-         $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3+$this->ShadowX;
-         $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3+$this->ShadowX;
-        }
-
-       $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
-       $Poly[] = $X-5+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
-       $this->drawPolygon($Poly,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
-      }
-
-     /* Draw the background */
-     $GradientSettings = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB);
-     if ( $NoTitle )
-      $this->drawGradientArea($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-6,DIRECTION_VERTICAL,$GradientSettings);
-     else
-      $this->drawGradientArea($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-6,DIRECTION_VERTICAL,$GradientSettings);
-     $Poly = ""; $Poly[] = $X; $Poly[] = $Y; $Poly[] = $X-5; $Poly[] = $Y-5; $Poly[] = $X+5; $Poly[] = $Y-5;
-     $this->drawPolygon($Poly,array("R"=>$GradientEndR,"G"=>$GradientEndG,"B"=>$GradientEndB,"NoBorder"=>TRUE));
-
-     /* Outer border */
-     $OuterBorderColor = $this->allocateColor($this->Picture,100,100,100,100);
-     imageline($this->Picture,$XMin,$Y-5,$X-5,$Y-5,$OuterBorderColor);
-     imageline($this->Picture,$X,$Y,$X-5,$Y-5,$OuterBorderColor);
-     imageline($this->Picture,$X,$Y,$X+5,$Y-5,$OuterBorderColor);
-     imageline($this->Picture,$X+5,$Y-5,$XMax,$Y-5,$OuterBorderColor);
-     if ( $NoTitle )
-      {
-       imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMin,$Y-5,$OuterBorderColor);
-       imageline($this->Picture,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-5,$OuterBorderColor);
-       imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$OuterBorderColor);
-      }
-     else
-      {
-       imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMin,$Y-5,$OuterBorderColor);
-       imageline($this->Picture,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5,$OuterBorderColor);
-       imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$OuterBorderColor);
-      }
-
-     /* Inner border */
-     $InnerBorderColor = $this->allocateColor($this->Picture,255,255,255,100);
-     imageline($this->Picture,$XMin+1,$Y-6,$X-5,$Y-6,$InnerBorderColor);
-     imageline($this->Picture,$X,$Y-1,$X-5,$Y-6,$InnerBorderColor);
-     imageline($this->Picture,$X,$Y-1,$X+5,$Y-6,$InnerBorderColor);
-     imageline($this->Picture,$X+5,$Y-6,$XMax-1,$Y-6,$InnerBorderColor);
-     if ( $NoTitle )
-      {
-       imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMin+1,$Y-6,$InnerBorderColor);
-       imageline($this->Picture,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax-1,$Y-6,$InnerBorderColor);
-       imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$InnerBorderColor);
-      }
-     else
-      {
-       imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMin+1,$Y-6,$InnerBorderColor);
-       imageline($this->Picture,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax-1,$Y-6,$InnerBorderColor);
-       imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$InnerBorderColor);
-      }
-
-     /* Draw the separator line */
-     if ( $TitleMode == LABEL_TITLE_NOBACKGROUND && !$NoTitle )
-      {
-       $YPos    = $Y-7-$CaptionHeight-$HorizontalMargin-$HorizontalMargin/2;
-       $XMargin = $VerticalMargin / 2;
-       $this->drawLine($XMin+$XMargin,$YPos+1,$XMax-$XMargin,$YPos+1,array("R"=>$GradientEndR,"G"=>$GradientEndG,"B"=>$GradientEndB));
-       $this->drawLine($XMin+$XMargin,$YPos,$XMax-$XMargin,$YPos,array("R"=>$GradientStartR,"G"=>$GradientStartG,"B"=>$GradientStartB));
-      }
-     elseif ( $TitleMode == LABEL_TITLE_BACKGROUND )
-      {
-       $this->drawFilledRectangle($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2,array("R"=>$TitleBackgroundR,"G"=>$TitleBackgroundG,"B"=>$TitleBackgroundB));
-       imageline($this->Picture,$XMin+1,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2+1,$XMax-1,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2+1,$InnerBorderColor);
-      }
-
-     /* Write the description */
-     if ( !$NoTitle )
-      $this->drawText($XMin+$VerticalMargin,$Y-7-$CaptionHeight-$HorizontalMargin*2,$Title,array("Align"=>TEXT_ALIGN_BOTTOMLEFT,"R"=>$TitleR,"G"=>$TitleG,"B"=>$TitleB));
-
-     /* Write the value */
-     $YPos = $Y-5-$HorizontalMargin; $XPos = $XMin+$VerticalMargin+$SerieBoxSize+$SerieBoxSpacing;
-     foreach($Captions as $Key => $Caption)
-      {
-       $CaptionTxt    = $Caption["Caption"];
-       $TxtPos        = $this->getTextBox($XPos,$YPos,$FontName,$FontSize,0,$CaptionTxt);
-       $CaptionHeight = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]);
-
-       /* Write the serie color if needed */
-       if ( $DrawSerieColor )
-        {
-         $BoxSettings = array("R"=>$Caption["Format"]["R"],"G"=>$Caption["Format"]["G"],"B"=>$Caption["Format"]["B"],"Alpha"=>$Caption["Format"]["Alpha"],"BorderR"=>0,"BorderG"=>0,"BorderB"=>0);
-         $this->drawFilledRectangle($XMin+$VerticalMargin,$YPos-$SerieBoxSize,$XMin+$VerticalMargin+$SerieBoxSize,$YPos,$BoxSettings);
-        }
-
-       $this->drawText($XPos,$YPos,$CaptionTxt,array("Align"=>TEXT_ALIGN_BOTTOMLEFT));
-
-       $YPos = $YPos - $CaptionHeight - $HorizontalMargin;
-      }
-
-     $this->Shadow = $RestoreShadow;
+        $NoTitle		= isset($Format["NoTitle"]) ? $Format["NoTitle"] : NULL;
+        $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 50;
+        $DrawSerieColor	= isset($Format["DrawSerieColor"]) ? $Format["DrawSerieColor"] : TRUE;
+        $SerieR		= isset($Format["SerieR"]) ? $Format["SerieR"] : NULL;
+        $SerieG		= isset($Format["SerieG"]) ? $Format["SerieG"] : NULL;
+        $SerieB		= isset($Format["SerieB"]) ? $Format["SerieB"] : NULL;
+        $SerieAlpha	= isset($Format["SerieAlpha"]) ? $Format["SerieAlpha"] : NULL;
+        $SerieBoxSize	= isset($Format["SerieBoxSize"]) ? $Format["SerieBoxSize"] : 6;
+        $SerieBoxSpacing	= isset($Format["SerieBoxSpacing"]) ? $Format["SerieBoxSpacing"] : 4;
+        $VerticalMargin	= isset($Format["VerticalMargin"]) ? $Format["VerticalMargin"] : 10;
+        $HorizontalMargin	= isset($Format["HorizontalMargin"]) ? $Format["HorizontalMargin"] : 8;
+        $R			= isset($Format["R"]) ? $Format["R"] : $this->FontColorR;
+        $G			= isset($Format["G"]) ? $Format["G"] : $this->FontColorG;
+        $B			= isset($Format["B"]) ? $Format["B"] : $this->FontColorB;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->FontColorA;
+        $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
+        $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
+        $TitleMode		= isset($Format["TitleMode"]) ? $Format["TitleMode"] : LABEL_TITLE_NOBACKGROUND;
+        $TitleR		= isset($Format["TitleR"]) ? $Format["TitleR"] : $R;
+        $TitleG		= isset($Format["TitleG"]) ? $Format["TitleG"] : $G;
+        $TitleB		= isset($Format["TitleB"]) ? $Format["TitleB"] : $B;
+        $TitleBackgroundR	= isset($Format["TitleBackgroundR"]) ? $Format["TitleBackgroundR"] : 0;
+        $TitleBackgroundG	= isset($Format["TitleBackgroundG"]) ? $Format["TitleBackgroundG"] : 0;
+        $TitleBackgroundB	= isset($Format["TitleBackgroundB"]) ? $Format["TitleBackgroundB"] : 0;
+        $GradientStartR	= isset($Format["GradientStartR"]) ? $Format["GradientStartR"] : 255;
+        $GradientStartG	= isset($Format["GradientStartG"]) ? $Format["GradientStartG"] : 255;
+        $GradientStartB	= isset($Format["GradientStartB"]) ? $Format["GradientStartB"] : 255;
+        $GradientEndR	= isset($Format["GradientEndR"]) ? $Format["GradientEndR"] : 220;
+        $GradientEndG	= isset($Format["GradientEndG"]) ? $Format["GradientEndG"] : 220;
+        $GradientEndB	= isset($Format["GradientEndB"]) ? $Format["GradientEndB"] : 220;
+
+        if ( !$DrawSerieColor ) { $SerieBoxSize = 0; $SerieBoxSpacing = 0; }
+
+        $TxtPos      = $this->getTextBox($X,$Y,$FontName,$FontSize,0,$Title);
+        $TitleWidth  = ($TxtPos[1]["X"] - $TxtPos[0]["X"])+$VerticalMargin*2;
+        $TitleHeight = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]);
+
+        if ( $NoTitle ) { $TitleWidth = 0; $TitleHeight = 0; }
+
+        $CaptionWidth = 0; $CaptionHeight = -$HorizontalMargin;
+        foreach($Captions as $Key =>$Caption)
+        {
+        $TxtPos        = $this->getTextBox($X,$Y,$FontName,$FontSize,0,$Caption["Caption"]);
+        $CaptionWidth  = max($CaptionWidth,($TxtPos[1]["X"] - $TxtPos[0]["X"])+$VerticalMargin*2);
+        $CaptionHeight = $CaptionHeight + max(($TxtPos[0]["Y"] - $TxtPos[2]["Y"]),($SerieBoxSize+2)) + $HorizontalMargin;
+        }
+
+        if ( $CaptionHeight <= 5 ) { $CaptionHeight = $CaptionHeight + $HorizontalMargin/2; }
+
+        if ( $DrawSerieColor ) { $CaptionWidth = $CaptionWidth + $SerieBoxSize + $SerieBoxSpacing; }
+
+        $BoxWidth = max($BoxWidth,$TitleWidth,$CaptionWidth);
+
+        $XMin = $X - 5 - floor(($BoxWidth-10) / 2);
+        $XMax = $X + 5 + floor(($BoxWidth-10) / 2);
+
+        $RestoreShadow = $this->Shadow;
+        if ( $this->Shadow == TRUE )
+        {
+        $this->Shadow = FALSE;
+
+        $Poly = "";
+        $Poly[] = $X+$this->ShadowX; $Poly[] = $Y+$this->ShadowX;
+        $Poly[] = $X+5+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
+        $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
+
+        if ( $NoTitle )
+        {
+            $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2+$this->ShadowX;
+            $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2+$this->ShadowX;
+        }
+        else
+        {
+            $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3+$this->ShadowX;
+            $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3+$this->ShadowX;
+        }
+
+        $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
+        $Poly[] = $X-5+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
+        $this->drawPolygon($Poly,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+        }
+
+        /* Draw the background */
+        $GradientSettings = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB);
+        if ( $NoTitle )
+        $this->drawGradientArea($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-6,DIRECTION_VERTICAL,$GradientSettings);
+        else
+        $this->drawGradientArea($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-6,DIRECTION_VERTICAL,$GradientSettings);
+        $Poly = ""; $Poly[] = $X; $Poly[] = $Y; $Poly[] = $X-5; $Poly[] = $Y-5; $Poly[] = $X+5; $Poly[] = $Y-5;
+        $this->drawPolygon($Poly,array("R"=>$GradientEndR,"G"=>$GradientEndG,"B"=>$GradientEndB,"NoBorder"=>TRUE));
+
+        /* Outer border */
+        $OuterBorderColor = $this->allocateColor($this->Picture,100,100,100,100);
+        imageline($this->Picture,$XMin,$Y-5,$X-5,$Y-5,$OuterBorderColor);
+        imageline($this->Picture,$X,$Y,$X-5,$Y-5,$OuterBorderColor);
+        imageline($this->Picture,$X,$Y,$X+5,$Y-5,$OuterBorderColor);
+        imageline($this->Picture,$X+5,$Y-5,$XMax,$Y-5,$OuterBorderColor);
+        if ( $NoTitle )
+        {
+        imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMin,$Y-5,$OuterBorderColor);
+        imageline($this->Picture,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-5,$OuterBorderColor);
+        imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$OuterBorderColor);
+        }
+        else
+        {
+        imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMin,$Y-5,$OuterBorderColor);
+        imageline($this->Picture,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5,$OuterBorderColor);
+        imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$OuterBorderColor);
+        }
+
+        /* Inner border */
+        $InnerBorderColor = $this->allocateColor($this->Picture,255,255,255,100);
+        imageline($this->Picture,$XMin+1,$Y-6,$X-5,$Y-6,$InnerBorderColor);
+        imageline($this->Picture,$X,$Y-1,$X-5,$Y-6,$InnerBorderColor);
+        imageline($this->Picture,$X,$Y-1,$X+5,$Y-6,$InnerBorderColor);
+        imageline($this->Picture,$X+5,$Y-6,$XMax-1,$Y-6,$InnerBorderColor);
+        if ( $NoTitle )
+        {
+        imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMin+1,$Y-6,$InnerBorderColor);
+        imageline($this->Picture,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax-1,$Y-6,$InnerBorderColor);
+        imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$InnerBorderColor);
+        }
+        else
+        {
+        imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMin+1,$Y-6,$InnerBorderColor);
+        imageline($this->Picture,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax-1,$Y-6,$InnerBorderColor);
+        imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$InnerBorderColor);
+        }
+
+        /* Draw the separator line */
+        if ( $TitleMode == LABEL_TITLE_NOBACKGROUND && !$NoTitle )
+        {
+        $YPos    = $Y-7-$CaptionHeight-$HorizontalMargin-$HorizontalMargin/2;
+        $XMargin = $VerticalMargin / 2;
+        $this->drawLine($XMin+$XMargin,$YPos+1,$XMax-$XMargin,$YPos+1,array("R"=>$GradientEndR,"G"=>$GradientEndG,"B"=>$GradientEndB));
+        $this->drawLine($XMin+$XMargin,$YPos,$XMax-$XMargin,$YPos,array("R"=>$GradientStartR,"G"=>$GradientStartG,"B"=>$GradientStartB));
+        }
+        elseif ( $TitleMode == LABEL_TITLE_BACKGROUND )
+        {
+        $this->drawFilledRectangle($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2,array("R"=>$TitleBackgroundR,"G"=>$TitleBackgroundG,"B"=>$TitleBackgroundB));
+        imageline($this->Picture,$XMin+1,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2+1,$XMax-1,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2+1,$InnerBorderColor);
+        }
+
+        /* Write the description */
+        if ( !$NoTitle )
+        $this->drawText($XMin+$VerticalMargin,$Y-7-$CaptionHeight-$HorizontalMargin*2,$Title,array("Align"=>TEXT_ALIGN_BOTTOMLEFT,"R"=>$TitleR,"G"=>$TitleG,"B"=>$TitleB));
+
+        /* Write the value */
+        $YPos = $Y-5-$HorizontalMargin; $XPos = $XMin+$VerticalMargin+$SerieBoxSize+$SerieBoxSpacing;
+        foreach($Captions as $Key => $Caption)
+        {
+        $CaptionTxt    = $Caption["Caption"];
+        $TxtPos        = $this->getTextBox($XPos,$YPos,$FontName,$FontSize,0,$CaptionTxt);
+        $CaptionHeight = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]);
+
+        /* Write the serie color if needed */
+        if ( $DrawSerieColor )
+        {
+            $BoxSettings = array("R"=>$Caption["Format"]["R"],"G"=>$Caption["Format"]["G"],"B"=>$Caption["Format"]["B"],"Alpha"=>$Caption["Format"]["Alpha"],"BorderR"=>0,"BorderG"=>0,"BorderB"=>0);
+            $this->drawFilledRectangle($XMin+$VerticalMargin,$YPos-$SerieBoxSize,$XMin+$VerticalMargin+$SerieBoxSize,$YPos,$BoxSettings);
+        }
+
+        $this->drawText($XPos,$YPos,$CaptionTxt,array("Align"=>TEXT_ALIGN_BOTTOMLEFT));
+
+        $YPos = $YPos - $CaptionHeight - $HorizontalMargin;
+        }
+
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Draw a basic shape */
-   function drawShape($X,$Y,$Shape,$PlotSize,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha)
+    /* Draw a basic shape */
+    function drawShape($X,$Y,$Shape,$PlotSize,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha)
     {
-     if ( $Shape == SERIE_SHAPE_FILLEDCIRCLE )
-      {
-       if ( $PlotBorder ) { $this->drawFilledCircle($X,$Y,$PlotSize+$BorderSize,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
-       $this->drawFilledCircle($X,$Y,$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_FILLEDSQUARE )
-      {
-       if ( $PlotBorder ) { $this->drawFilledRectangle($X-$PlotSize-$BorderSize,$Y-$PlotSize-$BorderSize,$X+$PlotSize+$BorderSize,$Y+$PlotSize+$BorderSize,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
-       $this->drawFilledRectangle($X-$PlotSize,$Y-$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_FILLEDTRIANGLE )
-      {
-       if ( $PlotBorder )
-        {
-         $Pos = ""; $Pos[]=$X; $Pos[]=$Y-$PlotSize-$BorderSize; $Pos[]=$X-$PlotSize-$BorderSize; $Pos[]=$Y+$PlotSize+$BorderSize; $Pos[]=$X+$PlotSize+$BorderSize; $Pos[]=$Y+$PlotSize+$BorderSize;
-         $this->drawPolygon($Pos,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha));
-        }
-
-       $Pos = ""; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X-$PlotSize; $Pos[]=$Y+$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y+$PlotSize;
-       $this->drawPolygon($Pos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_TRIANGLE )
-      {
-       $this->drawLine($X,$Y-$PlotSize,$X-$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-       $this->drawLine($X-$PlotSize,$Y+$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-       $this->drawLine($X+$PlotSize,$Y+$PlotSize,$X,$Y-$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_SQUARE )
-      $this->drawRectangle($X-$PlotSize,$Y-$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-     elseif ( $Shape == SERIE_SHAPE_CIRCLE )
-      $this->drawCircle($X,$Y,$PlotSize,$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-     elseif ( $Shape == SERIE_SHAPE_DIAMOND )
-      {
-       $Pos = ""; $Pos[]=$X-$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize;
-       $this->drawPolygon($Pos,array("NoFill"=>TRUE,"BorderR"=>$R,"BorderG"=>$G,"BorderB"=>$B,"BorderAlpha"=>$Alpha));
-      }      
-     elseif ( $Shape == SERIE_SHAPE_FILLEDDIAMOND )
-      {
-       if ( $PlotBorder )
-        {
-         $Pos = ""; $Pos[]=$X-$PlotSize-$BorderSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize-$BorderSize; $Pos[]=$X+$PlotSize+$BorderSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize+$BorderSize;
-         $this->drawPolygon($Pos,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha));
-        }
-
-       $Pos = ""; $Pos[]=$X-$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize;
-       $this->drawPolygon($Pos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }      
+        if ( $Shape == SERIE_SHAPE_FILLEDCIRCLE )
+        {
+        if ( $PlotBorder ) { $this->drawFilledCircle($X,$Y,$PlotSize+$BorderSize,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
+        $this->drawFilledCircle($X,$Y,$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        }
+        elseif ( $Shape == SERIE_SHAPE_FILLEDSQUARE )
+        {
+        if ( $PlotBorder ) { $this->drawFilledRectangle($X-$PlotSize-$BorderSize,$Y-$PlotSize-$BorderSize,$X+$PlotSize+$BorderSize,$Y+$PlotSize+$BorderSize,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
+        $this->drawFilledRectangle($X-$PlotSize,$Y-$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        }
+        elseif ( $Shape == SERIE_SHAPE_FILLEDTRIANGLE )
+        {
+        if ( $PlotBorder )
+        {
+            $Pos = ""; $Pos[]=$X; $Pos[]=$Y-$PlotSize-$BorderSize; $Pos[]=$X-$PlotSize-$BorderSize; $Pos[]=$Y+$PlotSize+$BorderSize; $Pos[]=$X+$PlotSize+$BorderSize; $Pos[]=$Y+$PlotSize+$BorderSize;
+            $this->drawPolygon($Pos,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha));
+        }
+
+        $Pos = ""; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X-$PlotSize; $Pos[]=$Y+$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y+$PlotSize;
+        $this->drawPolygon($Pos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        }
+        elseif ( $Shape == SERIE_SHAPE_TRIANGLE )
+        {
+        $this->drawLine($X,$Y-$PlotSize,$X-$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        $this->drawLine($X-$PlotSize,$Y+$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        $this->drawLine($X+$PlotSize,$Y+$PlotSize,$X,$Y-$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        }
+        elseif ( $Shape == SERIE_SHAPE_SQUARE )
+        $this->drawRectangle($X-$PlotSize,$Y-$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        elseif ( $Shape == SERIE_SHAPE_CIRCLE )
+        $this->drawCircle($X,$Y,$PlotSize,$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        elseif ( $Shape == SERIE_SHAPE_DIAMOND )
+        {
+        $Pos = ""; $Pos[]=$X-$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize;
+        $this->drawPolygon($Pos,array("NoFill"=>TRUE,"BorderR"=>$R,"BorderG"=>$G,"BorderB"=>$B,"BorderAlpha"=>$Alpha));
+        }      
+        elseif ( $Shape == SERIE_SHAPE_FILLEDDIAMOND )
+        {
+        if ( $PlotBorder )
+        {
+            $Pos = ""; $Pos[]=$X-$PlotSize-$BorderSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize-$BorderSize; $Pos[]=$X+$PlotSize+$BorderSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize+$BorderSize;
+            $this->drawPolygon($Pos,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha));
+        }
+
+        $Pos = ""; $Pos[]=$X-$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize;
+        $this->drawPolygon($Pos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        }      
     }
 
-   function drawPolygonChart($Points,$Format="")
+    function drawPolygonChart($Points,$Format="")
     {
-     $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;
-     $NoFill		= isset($Format["NoFill"]) ? $Format["NoFill"] : FALSE;
-     $NoBorder		= isset($Format["NoBorder"]) ? $Format["NoBorder"] : FALSE;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
-     $BorderAlpha 	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha / 2;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $Threshold         = isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
-
-     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
-
-     $RestoreShadow = $this->Shadow;
-     $this->Shadow = FALSE;
-
-     $AllIntegers = TRUE;
-     for($i=0;$i<=count($Points)-2;$i=$i+2)
-      { if ( $this->getFirstDecimal($Points[$i+1]) != 0 ) { $AllIntegers = FALSE; } }
-
-     /* Convert polygon to segments */
-     $Segments = "";
-     for($i=2;$i<=count($Points)-2;$i=$i+2)
-      { $Segments[] = array("X1"=>$Points[$i-2],"Y1"=>$Points[$i-1],"X2"=>$Points[$i],"Y2"=>$Points[$i+1]); }
-     $Segments[] = array("X1"=>$Points[$i-2],"Y1"=>$Points[$i-1],"X2"=>$Points[0],"Y2"=>$Points[1]);
-
-     /* Simplify straight lines */
-     $Result = ""; $inHorizon = FALSE; $LastX = VOID;
-     foreach($Segments as $Key => $Pos)
-      {
-       if ( $Pos["Y1"] != $Pos["Y2"] )
-        {
-         if ( $inHorizon ) { $inHorizon = FALSE; $Result[] = array("X1"=>$LastX,"Y1"=>$Pos["Y1"],"X2"=>$Pos["X1"],"Y2"=>$Pos["Y1"]); }
-
-         $Result[] = array("X1"=>$Pos["X1"],"Y1"=>$Pos["Y1"],"X2"=>$Pos["X2"],"Y2"=>$Pos["Y2"]);
-        }
-       else { if ( !$inHorizon ) { $inHorizon = TRUE; $LastX = $Pos["X1"];} }
-      }
-     $Segments = $Result;
-
-     /* Do we have something to draw */
-     if ( $Segments == "" ) { return(0); }
-
-     /* For segments debugging purpose */
-     //foreach($Segments as $Key => $Pos)
-     // echo $Pos["X1"].",".$Pos["Y1"].",".$Pos["X2"].",".$Pos["Y2"]."\r\n";
-
-     /* Find out the min & max Y boundaries */
-     $MinY = OUT_OF_SIGHT; $MaxY = OUT_OF_SIGHT;
-     foreach($Segments as $Key => $Coords)
-      {
-       if ( $MinY == OUT_OF_SIGHT || $MinY > min($Coords["Y1"],$Coords["Y2"]) ) { $MinY = min($Coords["Y1"],$Coords["Y2"]); }
-       if ( $MaxY == OUT_OF_SIGHT || $MaxY < max($Coords["Y1"],$Coords["Y2"]) ) { $MaxY = max($Coords["Y1"],$Coords["Y2"]); }
-      }
-
-     if ( $AllIntegers ) { $YStep = 1; } else { $YStep = .5; }
-
-     $MinY = floor($MinY); $MaxY = floor($MaxY);
-
-     /* Scan each Y lines */
-     $DefaultColor = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-     $DebugLine = 0; $DebugColor = $this->allocateColor($this->Picture,255,0,0,100);
-
-     $MinY = floor($MinY); $MaxY = floor($MaxY); $YStep = 1; 
-
-     if ( !$NoFill )
-      {
-       //if ( $DebugLine ) { $MinY = $DebugLine; $MaxY = $DebugLine; }
-       for($Y=$MinY;$Y<=$MaxY;$Y=$Y+$YStep)
-        {
-         $Intersections = ""; $LastSlope = NULL; $RestoreLast = "-";
-         foreach($Segments as $Key => $Coords)
-          {
-           $X1 = $Coords["X1"]; $X2 = $Coords["X2"]; $Y1 = $Coords["Y1"]; $Y2 = $Coords["Y2"];
-
-           if ( min($Y1,$Y2) <= $Y && max($Y1,$Y2) >= $Y )
-            {
-             if ( $Y1 == $Y2 )
-              { $X = $X1; }
-             else
-              { $X = $X1 + ( ($Y-$Y1)*$X2 - ($Y-$Y1)*$X1 ) / ($Y2-$Y1); }
-
-             $X = floor($X);
-
-             if ( $X2 == $X1 )
-              { $Slope = "!"; }
-             else
-              {
-               $SlopeC = ($Y2 - $Y1) / ($X2 - $X1);
-               if( $SlopeC == 0 )
+        $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;
+        $NoFill		= isset($Format["NoFill"]) ? $Format["NoFill"] : FALSE;
+        $NoBorder		= isset($Format["NoBorder"]) ? $Format["NoBorder"] : FALSE;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
+        $BorderAlpha 	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha / 2;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $Threshold         = isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
+
+        if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+
+        $RestoreShadow = $this->Shadow;
+        $this->Shadow = FALSE;
+
+        $AllIntegers = TRUE;
+        for($i=0;$i<=count($Points)-2;$i=$i+2)
+        { if ( $this->getFirstDecimal($Points[$i+1]) != 0 ) { $AllIntegers = FALSE; } }
+
+        /* Convert polygon to segments */
+        $Segments = "";
+        for($i=2;$i<=count($Points)-2;$i=$i+2)
+        { $Segments[] = array("X1"=>$Points[$i-2],"Y1"=>$Points[$i-1],"X2"=>$Points[$i],"Y2"=>$Points[$i+1]); }
+        $Segments[] = array("X1"=>$Points[$i-2],"Y1"=>$Points[$i-1],"X2"=>$Points[0],"Y2"=>$Points[1]);
+
+        /* Simplify straight lines */
+        $Result = ""; $inHorizon = FALSE; $LastX = VOID;
+        foreach($Segments as $Key => $Pos)
+        {
+        if ( $Pos["Y1"] != $Pos["Y2"] )
+        {
+            if ( $inHorizon ) { $inHorizon = FALSE; $Result[] = array("X1"=>$LastX,"Y1"=>$Pos["Y1"],"X2"=>$Pos["X1"],"Y2"=>$Pos["Y1"]); }
+
+            $Result[] = array("X1"=>$Pos["X1"],"Y1"=>$Pos["Y1"],"X2"=>$Pos["X2"],"Y2"=>$Pos["Y2"]);
+        }
+        else { if ( !$inHorizon ) { $inHorizon = TRUE; $LastX = $Pos["X1"];} }
+        }
+        $Segments = $Result;
+
+        /* Do we have something to draw */
+        if ( $Segments == "" ) { return(0); }
+
+        /* For segments debugging purpose */
+        //foreach($Segments as $Key => $Pos)
+        // echo $Pos["X1"].",".$Pos["Y1"].",".$Pos["X2"].",".$Pos["Y2"]."\r\n";
+
+        /* Find out the min & max Y boundaries */
+        $MinY = OUT_OF_SIGHT; $MaxY = OUT_OF_SIGHT;
+        foreach($Segments as $Key => $Coords)
+        {
+        if ( $MinY == OUT_OF_SIGHT || $MinY > min($Coords["Y1"],$Coords["Y2"]) ) { $MinY = min($Coords["Y1"],$Coords["Y2"]); }
+        if ( $MaxY == OUT_OF_SIGHT || $MaxY < max($Coords["Y1"],$Coords["Y2"]) ) { $MaxY = max($Coords["Y1"],$Coords["Y2"]); }
+        }
+
+        if ( $AllIntegers ) { $YStep = 1; } else { $YStep = .5; }
+
+        $MinY = floor($MinY); $MaxY = floor($MaxY);
+
+        /* Scan each Y lines */
+        $DefaultColor = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+        $DebugLine = 0; $DebugColor = $this->allocateColor($this->Picture,255,0,0,100);
+
+        $MinY = floor($MinY); $MaxY = floor($MaxY); $YStep = 1; 
+
+        if ( !$NoFill )
+        {
+        //if ( $DebugLine ) { $MinY = $DebugLine; $MaxY = $DebugLine; }
+        for($Y=$MinY;$Y<=$MaxY;$Y=$Y+$YStep)
+        {
+            $Intersections = ""; $LastSlope = NULL; $RestoreLast = "-";
+            foreach($Segments as $Key => $Coords)
+            {
+            $X1 = $Coords["X1"]; $X2 = $Coords["X2"]; $Y1 = $Coords["Y1"]; $Y2 = $Coords["Y2"];
+
+            if ( min($Y1,$Y2) <= $Y && max($Y1,$Y2) >= $Y )
+            {
+                if ( $Y1 == $Y2 )
+                { $X = $X1; }
+                else
+                { $X = $X1 + ( ($Y-$Y1)*$X2 - ($Y-$Y1)*$X1 ) / ($Y2-$Y1); }
+
+                $X = floor($X);
+
+                if ( $X2 == $X1 )
+                { $Slope = "!"; }
+                else
+                {
+                $SlopeC = ($Y2 - $Y1) / ($X2 - $X1);
+                if( $SlopeC == 0 )
                 { $Slope = "="; }
-               elseif( $SlopeC > 0 )
+                elseif( $SlopeC > 0 )
                 { $Slope = "+"; }
-               elseif ( $SlopeC < 0 )
+                elseif ( $SlopeC < 0 )
                 { $Slope = "-"; }
-              }
+                }
 
-             if ( !is_array($Intersections) )
-              { $Intersections[] = $X; }
-             elseif( !in_array($X,$Intersections) )
-              { $Intersections[] = $X; }
-             elseif( in_array($X,$Intersections) )
-              {
-               if ($Y == $DebugLine) { echo $Slope."/".$LastSlope."(".$X.") "; }
+                if ( !is_array($Intersections) )
+                { $Intersections[] = $X; }
+                elseif( !in_array($X,$Intersections) )
+                { $Intersections[] = $X; }
+                elseif( in_array($X,$Intersections) )
+                {
+                if ($Y == $DebugLine) { echo $Slope."/".$LastSlope."(".$X.") "; }
 
-               if ( $Slope == "=" && $LastSlope == "-"  )                             { $Intersections[] = $X; }
-               if ( $Slope != $LastSlope && $LastSlope != "!" && $LastSlope != "=" )  { $Intersections[] = $X; }
-               if ( $Slope != $LastSlope && $LastSlope == "!" && $Slope == "+" )      { $Intersections[] = $X; }
-              }
+                if ( $Slope == "=" && $LastSlope == "-"  )                             { $Intersections[] = $X; }
+                if ( $Slope != $LastSlope && $LastSlope != "!" && $LastSlope != "=" )  { $Intersections[] = $X; }
+                if ( $Slope != $LastSlope && $LastSlope == "!" && $Slope == "+" )      { $Intersections[] = $X; }
+                }
 
-             if ( is_array($Intersections) && in_array($X,$Intersections) && $LastSlope == "=" && ($Slope == "-" )) { $Intersections[] = $X; }
+                if ( is_array($Intersections) && in_array($X,$Intersections) && $LastSlope == "=" && ($Slope == "-" )) { $Intersections[] = $X; }
 
-             $LastSlope = $Slope;
+                $LastSlope = $Slope;
+            }
             }
-          }
-         if ( $RestoreLast != "-" ) { $Intersections[] = $RestoreLast; echo "@".$Y."\r\n"; }
+            if ( $RestoreLast != "-" ) { $Intersections[] = $RestoreLast; echo "@".$Y."\r\n"; }
 
-         if ( is_array($Intersections) )
-          {
-           sort($Intersections);
+            if ( is_array($Intersections) )
+            {
+            sort($Intersections);
 
-           if ($Y == $DebugLine) { print_r($Intersections); }
+            if ($Y == $DebugLine) { print_r($Intersections); }
 
-           /* Remove NULL plots */
-           $Result = "";
-           for($i=0;$i<=count($Intersections)-1;$i=$i+2)
+            /* Remove NULL plots */
+            $Result = "";
+            for($i=0;$i<=count($Intersections)-1;$i=$i+2)
             {
-             if ( isset($Intersections[$i+1]) )
-              { if ( $Intersections[$i] != $Intersections[$i+1] ) { $Result[] = $Intersections[$i]; $Result[] = $Intersections[$i+1]; } }
+                if ( isset($Intersections[$i+1]) )
+                { if ( $Intersections[$i] != $Intersections[$i+1] ) { $Result[] = $Intersections[$i]; $Result[] = $Intersections[$i+1]; } }
             }
 
-           if ( is_array($Result) )
+            if ( is_array($Result) )
             {
-             $Intersections = $Result;
+                $Intersections = $Result;
 
-             $LastX = OUT_OF_SIGHT;
-             foreach($Intersections as $Key => $X)
-              {
-               if ( $LastX == OUT_OF_SIGHT )
+                $LastX = OUT_OF_SIGHT;
+                foreach($Intersections as $Key => $X)
+                {
+                if ( $LastX == OUT_OF_SIGHT )
                 $LastX = $X;
-               elseif ( $LastX != OUT_OF_SIGHT )
+                elseif ( $LastX != OUT_OF_SIGHT )
                 {
-                 if ( $this->getFirstDecimal($LastX) > 1 ) { $LastX++; }
+                    if ( $this->getFirstDecimal($LastX) > 1 ) { $LastX++; }
 
-                 $Color = $DefaultColor;
-                 if ( $Threshold != NULL )
-                  {
-                   foreach($Threshold as $Key => $Parameters)
+                    $Color = $DefaultColor;
+                    if ( $Threshold != NULL )
                     {
-                     if ( $Y <= $Parameters["MinX"] && $Y >= $Parameters["MaxX"])
-                      {
-                       if ( isset($Parameters["R"]) ) { $R = $Parameters["R"]; } else { $R = 0; }
-                       if ( isset($Parameters["G"]) ) { $G = $Parameters["G"]; } else { $G = 0; }
-                       if ( isset($Parameters["B"]) ) { $B = $Parameters["B"]; } else { $B = 0; }
-                       if ( isset($Parameters["Alpha"]) ) { $Alpha = $Parameters["Alpha"]; } else { $Alpha = 100; }
-                       $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
-                      }
+                    foreach($Threshold as $Key => $Parameters)
+                    {
+                        if ( $Y <= $Parameters["MinX"] && $Y >= $Parameters["MaxX"])
+                        {
+                        if ( isset($Parameters["R"]) ) { $R = $Parameters["R"]; } else { $R = 0; }
+                        if ( isset($Parameters["G"]) ) { $G = $Parameters["G"]; } else { $G = 0; }
+                        if ( isset($Parameters["B"]) ) { $B = $Parameters["B"]; } else { $B = 0; }
+                        if ( isset($Parameters["Alpha"]) ) { $Alpha = $Parameters["Alpha"]; } else { $Alpha = 100; }
+                        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+                        }
+                    }
                     }
-                  }
 
-                 imageline($this->Picture,$LastX,$Y,$X,$Y,$Color);
+                    imageline($this->Picture,$LastX,$Y,$X,$Y,$Color);
 
-                 if ( $Y == $DebugLine) { imageline($this->Picture,$LastX,$Y,$X,$Y,$DebugColor); }
+                    if ( $Y == $DebugLine) { imageline($this->Picture,$LastX,$Y,$X,$Y,$DebugColor); }
 
-                 $LastX = OUT_OF_SIGHT;
+                    $LastX = OUT_OF_SIGHT;
                 }
-              }
+                }
+            }
             }
-          }
         }
-      }
+        }
 
-     /* Draw the polygon border, if required */
-     if ( !$NoBorder)
-      {
-       foreach($Segments as $Key => $Coords)
+        /* Draw the polygon border, if required */
+        if ( !$NoBorder)
+        {
+        foreach($Segments as $Key => $Coords)
         $this->drawLine($Coords["X1"],$Coords["Y1"],$Coords["X2"],$Coords["Y2"],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Threshold"=>$Threshold));
-      }
+        }
 
-     $this->Shadow = $RestoreShadow;
+        $this->Shadow = $RestoreShadow;
     }
 
-   /* Return the abscissa margin */
-   function getAbscissaMargin($Data)
+    /* Return the abscissa margin */
+    function getAbscissaMargin($Data)
     {
-     foreach($Data["Axis"] as $AxisID => $Values) { if ( $Values["Identity"] == AXIS_X ) { return($Values["Margin"]); } }
-     return(0);
+        foreach($Data["Axis"] as $AxisID => $Values) { if ( $Values["Identity"] == AXIS_X ) { return($Values["Margin"]); } }
+        return(0);
     }
 
-  }
+    }
 ?>
\ No newline at end of file

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

Doc Comments +17 added lines

@@ -82,6 +82,12 @@ 
    var $LastChartLayout	= CHART_LAST_LAYOUT_REGULAR;	// Last layout : regular or stacked
 
    /* Class constructor */
+
+   /**
+    * @param integer $XSize
+    * @param integer $YSize
+    * @param pData $DataSet
+    */
    function pImage($XSize,$YSize,$DataSet=NULL,$TransparentBackground=FALSE)
     {
      $this->TransparentBackground = $TransparentBackground;
@@ -126,6 +132,13 @@ 
     }
 
    /* Set the graph area position */
+
+   /**
+    * @param integer $X1
+    * @param integer $Y1
+    * @param integer $X2
+    * @param integer $Y2
+    */
    function setGraphArea($X1,$Y1,$X2,$Y2)
     {
      if ( $X2 < $X1 || $X1 == $X2 || $Y2 < $Y1 || $Y1 == $Y2 ) { return(-1); }
@@ -145,6 +158,10 @@ 
     { return($this->YSize); }
 
    /* Render the picture to a file */
+
+   /**
+    * @param string $FileName
+    */
    function render($FileName)
     {
      if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }

Indentation +361 added lines, -361 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pDraw - pChart core class
 
      Version     : 2.1.3
@@ -13,460 +13,460 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- /* The GD extension is mandatory */
- if (!extension_loaded('gd') && !extension_loaded('gd2'))
-  {
-   echo "GD extension must be loaded. \r\n";
-   exit();
-  }
-
- /* Image map handling */
- define("IMAGE_MAP_STORAGE_FILE"	, 680001);
- define("IMAGE_MAP_STORAGE_SESSION"	, 680002);
-
- /* Last generated chart layout */
- define("CHART_LAST_LAYOUT_REGULAR"	, 680011);
- define("CHART_LAST_LAYOUT_STACKED"	, 680012);
-
- /* ImageMap string delimiter */
- define("IMAGE_MAP_DELIMITER"		, chr(1));
-
- class pImage extends pDraw
-  {
-   /* Image settings, size, quality, .. */
-   var $XSize		= NULL;				// Width of the picture
-   var $YSize		= NULL;				// Height of the picture
-   var $Picture		= NULL;				// GD picture object
-   var $Antialias	= TRUE;				// Turn antialias on or off
-   var $AntialiasQuality  = 0;				// Quality of the antialiasing implementation (0-1)
-   var $Mask		= "";				// Already drawn pixels mask (Filled circle implementation)
-   var $TransparentBackground = FALSE;			// Just to know if we need to flush the alpha channels when rendering
-
-   /* Graph area settings */
-   var $GraphAreaX1	= NULL;				// Graph area X origin
-   var $GraphAreaY1	= NULL;				// Graph area Y origin
-   var $GraphAreaX2	= NULL;				// Graph area bottom right X position
-   var $GraphAreaY2	= NULL;				// Graph area bottom right Y position
-
-   /* Scale settings */
-   var $ScaleMinDivHeight = 20;				// Minimum height for scame divs
-
-   /* Font properties */
-   var $FontName	= "sites/all/libraries/fonts/DejaVuSans.ttf";	// Default font file
-   var $FontSize	= 12;				// Default font size
-   var $FontBox		= NULL;				// Return the bounding box of the last written string
-   var $FontColorR	= 0;				// Default color settings
-   var $FontColorG	= 0;				// Default color settings
-   var $FontColorB	= 0;				// Default color settings
-   var $FontColorA	= 100;				// Default transparency
-
-   /* Shadow properties */
-   var $Shadow		= FALSE;			// Turn shadows on or off
-   var $ShadowX		= NULL;				// X Offset of the shadow
-   var $ShadowY		= NULL;				// Y Offset of the shadow
-   var $ShadowR		= NULL;				// R component of the shadow
-   var $ShadowG		= NULL;				// G component of the shadow
-   var $ShadowB		= NULL;				// B component of the shadow
-   var $Shadowa		= NULL;				// Alpha level of the shadow
-
-   /* Image map */
-   var $ImageMap	= NULL;				// Aray containing the image map
-   var $ImageMapIndex	= "pChart";			// Name of the session array
-   var $ImageMapStorageMode = NULL;			// Save the current imagemap storage mode
-   var $ImageMapAutoDelete  = TRUE;			// Automatic deletion of the image map temp files
-
-   /* Data Set */
-   var $DataSet		= NULL;				// Attached dataset
-
-   /* Last generated chart info */
-   var $LastChartLayout	= CHART_LAST_LAYOUT_REGULAR;	// Last layout : regular or stacked
-
-   /* Class constructor */
-   function pImage($XSize,$YSize,$DataSet=NULL,$TransparentBackground=FALSE)
+    /* The GD extension is mandatory */
+    if (!extension_loaded('gd') && !extension_loaded('gd2'))
     {
-     $this->TransparentBackground = $TransparentBackground;
-
-     if ( $DataSet != NULL ) { $this->DataSet = $DataSet; }
-
-     $this->XSize   = $XSize;
-     $this->YSize   = $YSize;
-     $this->Picture = imagecreatetruecolor($XSize,$YSize);
-
-     if ( $this->TransparentBackground )
-      {
-       imagealphablending($this->Picture,FALSE);
-       imagefilledrectangle($this->Picture, 0,0,$XSize, $YSize, imagecolorallocatealpha($this->Picture, 255, 255, 255, 127));
-       imagealphablending($this->Picture,TRUE);
-       imagesavealpha($this->Picture,true); 
-      }
-     else
-      {
-       $C_White = $this->AllocateColor($this->Picture,255,255,255);
-       imagefilledrectangle($this->Picture,0,0,$XSize,$YSize,$C_White);
-      }
+    echo "GD extension must be loaded. \r\n";
+    exit();
     }
 
-   /* Enable / Disable and set shadow properties */
-   function setShadow($Enabled=TRUE,$Format="")
+    /* Image map handling */
+    define("IMAGE_MAP_STORAGE_FILE"	, 680001);
+    define("IMAGE_MAP_STORAGE_SESSION"	, 680002);
+
+    /* Last generated chart layout */
+    define("CHART_LAST_LAYOUT_REGULAR"	, 680011);
+    define("CHART_LAST_LAYOUT_STACKED"	, 680012);
+
+    /* ImageMap string delimiter */
+    define("IMAGE_MAP_DELIMITER"		, chr(1));
+
+    class pImage extends pDraw
+    {
+    /* Image settings, size, quality, .. */
+    var $XSize		= NULL;				// Width of the picture
+    var $YSize		= NULL;				// Height of the picture
+    var $Picture		= NULL;				// GD picture object
+    var $Antialias	= TRUE;				// Turn antialias on or off
+    var $AntialiasQuality  = 0;				// Quality of the antialiasing implementation (0-1)
+    var $Mask		= "";				// Already drawn pixels mask (Filled circle implementation)
+    var $TransparentBackground = FALSE;			// Just to know if we need to flush the alpha channels when rendering
+
+    /* Graph area settings */
+    var $GraphAreaX1	= NULL;				// Graph area X origin
+    var $GraphAreaY1	= NULL;				// Graph area Y origin
+    var $GraphAreaX2	= NULL;				// Graph area bottom right X position
+    var $GraphAreaY2	= NULL;				// Graph area bottom right Y position
+
+    /* Scale settings */
+    var $ScaleMinDivHeight = 20;				// Minimum height for scame divs
+
+    /* Font properties */
+    var $FontName	= "sites/all/libraries/fonts/DejaVuSans.ttf";	// Default font file
+    var $FontSize	= 12;				// Default font size
+    var $FontBox		= NULL;				// Return the bounding box of the last written string
+    var $FontColorR	= 0;				// Default color settings
+    var $FontColorG	= 0;				// Default color settings
+    var $FontColorB	= 0;				// Default color settings
+    var $FontColorA	= 100;				// Default transparency
+
+    /* Shadow properties */
+    var $Shadow		= FALSE;			// Turn shadows on or off
+    var $ShadowX		= NULL;				// X Offset of the shadow
+    var $ShadowY		= NULL;				// Y Offset of the shadow
+    var $ShadowR		= NULL;				// R component of the shadow
+    var $ShadowG		= NULL;				// G component of the shadow
+    var $ShadowB		= NULL;				// B component of the shadow
+    var $Shadowa		= NULL;				// Alpha level of the shadow
+
+    /* Image map */
+    var $ImageMap	= NULL;				// Aray containing the image map
+    var $ImageMapIndex	= "pChart";			// Name of the session array
+    var $ImageMapStorageMode = NULL;			// Save the current imagemap storage mode
+    var $ImageMapAutoDelete  = TRUE;			// Automatic deletion of the image map temp files
+
+    /* Data Set */
+    var $DataSet		= NULL;				// Attached dataset
+
+    /* Last generated chart info */
+    var $LastChartLayout	= CHART_LAST_LAYOUT_REGULAR;	// Last layout : regular or stacked
+
+    /* Class constructor */
+    function pImage($XSize,$YSize,$DataSet=NULL,$TransparentBackground=FALSE)
     {
-     $X	    = isset($Format["X"]) ? $Format["X"] : 2;
-     $Y	    = isset($Format["Y"]) ? $Format["Y"] : 2;
-     $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"] : 10;
-
-     $this->Shadow  = $Enabled;
-     $this->ShadowX = $X;
-     $this->ShadowY = $Y;
-     $this->ShadowR = $R;
-     $this->ShadowG = $G;
-     $this->ShadowB = $B;
-     $this->Shadowa = $Alpha;
+        $this->TransparentBackground = $TransparentBackground;
+
+        if ( $DataSet != NULL ) { $this->DataSet = $DataSet; }
+
+        $this->XSize   = $XSize;
+        $this->YSize   = $YSize;
+        $this->Picture = imagecreatetruecolor($XSize,$YSize);
+
+        if ( $this->TransparentBackground )
+        {
+        imagealphablending($this->Picture,FALSE);
+        imagefilledrectangle($this->Picture, 0,0,$XSize, $YSize, imagecolorallocatealpha($this->Picture, 255, 255, 255, 127));
+        imagealphablending($this->Picture,TRUE);
+        imagesavealpha($this->Picture,true); 
+        }
+        else
+        {
+        $C_White = $this->AllocateColor($this->Picture,255,255,255);
+        imagefilledrectangle($this->Picture,0,0,$XSize,$YSize,$C_White);
+        }
     }
 
-   /* Set the graph area position */
-   function setGraphArea($X1,$Y1,$X2,$Y2)
+    /* Enable / Disable and set shadow properties */
+    function setShadow($Enabled=TRUE,$Format="")
     {
-     if ( $X2 < $X1 || $X1 == $X2 || $Y2 < $Y1 || $Y1 == $Y2 ) { return(-1); }
+        $X	    = isset($Format["X"]) ? $Format["X"] : 2;
+        $Y	    = isset($Format["Y"]) ? $Format["Y"] : 2;
+        $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"] : 10;
+
+        $this->Shadow  = $Enabled;
+        $this->ShadowX = $X;
+        $this->ShadowY = $Y;
+        $this->ShadowR = $R;
+        $this->ShadowG = $G;
+        $this->ShadowB = $B;
+        $this->Shadowa = $Alpha;
+    }
 
-     $this->GraphAreaX1 = $X1; $this->DataSet->Data["GraphArea"]["X1"] = $X1;
-     $this->GraphAreaY1 = $Y1; $this->DataSet->Data["GraphArea"]["Y1"] = $Y1;
-     $this->GraphAreaX2 = $X2; $this->DataSet->Data["GraphArea"]["X2"] = $X2;
-     $this->GraphAreaY2 = $Y2; $this->DataSet->Data["GraphArea"]["Y2"] = $Y2;
+    /* Set the graph area position */
+    function setGraphArea($X1,$Y1,$X2,$Y2)
+    {
+        if ( $X2 < $X1 || $X1 == $X2 || $Y2 < $Y1 || $Y1 == $Y2 ) { return(-1); }
+
+        $this->GraphAreaX1 = $X1; $this->DataSet->Data["GraphArea"]["X1"] = $X1;
+        $this->GraphAreaY1 = $Y1; $this->DataSet->Data["GraphArea"]["Y1"] = $Y1;
+        $this->GraphAreaX2 = $X2; $this->DataSet->Data["GraphArea"]["X2"] = $X2;
+        $this->GraphAreaY2 = $Y2; $this->DataSet->Data["GraphArea"]["Y2"] = $Y2;
     }
 
-   /* Return the width of the picture */
-   function getWidth()
+    /* Return the width of the picture */
+    function getWidth()
     { return($this->XSize); }
 
-   /* Return the heigth of the picture */
-   function getHeight()
+    /* Return the heigth of the picture */
+    function getHeight()
     { return($this->YSize); }
 
-   /* Render the picture to a file */
-   function render($FileName)
+    /* Render the picture to a file */
+    function render($FileName)
     {
-     if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
-     imagepng($this->Picture,$FileName);
+        if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
+        imagepng($this->Picture,$FileName);
     }
 
-   /* Render the picture to a web browser stream */
-   function stroke($BrowserExpire=FALSE)
+    /* Render the picture to a web browser stream */
+    function stroke($BrowserExpire=FALSE)
     {
-     if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
+        if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
 
-     if ( $BrowserExpire )
-      {
-       header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-       header("Cache-Control: no-cache");
-       header("Pragma: no-cache");
-      }
+        if ( $BrowserExpire )
+        {
+        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+        header("Cache-Control: no-cache");
+        header("Pragma: no-cache");
+        }
 
-     header('Content-type: image/png');
-     imagepng($this->Picture);
+        header('Content-type: image/png');
+        imagepng($this->Picture);
     }
 
-   /* Automatic output method based on the calling interface */
-   function autoOutput($FileName="output.png")
+    /* Automatic output method based on the calling interface */
+    function autoOutput($FileName="output.png")
     {
-     if (php_sapi_name() == "cli")
-      $this->Render($FileName);
-     else
-      $this->Stroke();
+        if (php_sapi_name() == "cli")
+        $this->Render($FileName);
+        else
+        $this->Stroke();
     }
 
-   /* Return the length between two points */
-   function getLength($X1,$Y1,$X2,$Y2)
+    /* Return the length between two points */
+    function getLength($X1,$Y1,$X2,$Y2)
     { return(sqrt(pow(max($X1,$X2)-min($X1,$X2),2)+pow(max($Y1,$Y2)-min($Y1,$Y2),2))); }
 
-   /* Return the orientation of a line */
-   function getAngle($X1,$Y1,$X2,$Y2)
+    /* Return the orientation of a line */
+    function getAngle($X1,$Y1,$X2,$Y2)
     {
-     $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1;$Angle = rad2deg(atan2($Opposite,$Adjacent));
-     if ($Angle > 0) { return($Angle); } else { return(360-abs($Angle)); }
+        $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1;$Angle = rad2deg(atan2($Opposite,$Adjacent));
+        if ($Angle > 0) { return($Angle); } else { return(360-abs($Angle)); }
     }
 
-   /* Return the surrounding box of text area */
-   function getTextBox_deprecated($X,$Y,$FontName,$FontSize,$Angle,$Text)
+    /* Return the surrounding box of text area */
+    function getTextBox_deprecated($X,$Y,$FontName,$FontSize,$Angle,$Text)
     {
-     $Size    = imagettfbbox($FontSize,$Angle,$FontName,$Text);
-     $Width   = $this->getLength($Size[0],$Size[1],$Size[2],$Size[3])+1;
-     $Height  = $this->getLength($Size[2],$Size[3],$Size[4],$Size[5])+1;
+        $Size    = imagettfbbox($FontSize,$Angle,$FontName,$Text);
+        $Width   = $this->getLength($Size[0],$Size[1],$Size[2],$Size[3])+1;
+        $Height  = $this->getLength($Size[2],$Size[3],$Size[4],$Size[5])+1;
 
-     $RealPos[0]["X"] = $X; $RealPos[0]["Y"] = $Y;
-     $RealPos[1]["X"] = cos((360-$Angle)*PI/180)*$Width + $RealPos[0]["X"]; $RealPos[1]["Y"] = sin((360-$Angle)*PI/180)*$Width + $RealPos[0]["Y"];
-     $RealPos[2]["X"] = cos((270-$Angle)*PI/180)*$Height + $RealPos[1]["X"]; $RealPos[2]["Y"] = sin((270-$Angle)*PI/180)*$Height + $RealPos[1]["Y"];
-     $RealPos[3]["X"] = cos((180-$Angle)*PI/180)*$Width + $RealPos[2]["X"]; $RealPos[3]["Y"] = sin((180-$Angle)*PI/180)*$Width + $RealPos[2]["Y"];
+        $RealPos[0]["X"] = $X; $RealPos[0]["Y"] = $Y;
+        $RealPos[1]["X"] = cos((360-$Angle)*PI/180)*$Width + $RealPos[0]["X"]; $RealPos[1]["Y"] = sin((360-$Angle)*PI/180)*$Width + $RealPos[0]["Y"];
+        $RealPos[2]["X"] = cos((270-$Angle)*PI/180)*$Height + $RealPos[1]["X"]; $RealPos[2]["Y"] = sin((270-$Angle)*PI/180)*$Height + $RealPos[1]["Y"];
+        $RealPos[3]["X"] = cos((180-$Angle)*PI/180)*$Width + $RealPos[2]["X"]; $RealPos[3]["Y"] = sin((180-$Angle)*PI/180)*$Width + $RealPos[2]["Y"];
 
-     $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"] = $RealPos[0]["X"];	$RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"] = $RealPos[0]["Y"];
-     $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"] = $RealPos[1]["X"];	$RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"] = $RealPos[1]["Y"];
+        $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"] = $RealPos[0]["X"];	$RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"] = $RealPos[0]["Y"];
+        $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"] = $RealPos[1]["X"];	$RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"] = $RealPos[1]["Y"];
 
-     return($RealPos);
+        return($RealPos);
     }
 
-   /* Return the surrounding box of text area */
-   function getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text)
+    /* Return the surrounding box of text area */
+    function getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text)
     {
-     $coords = imagettfbbox($FontSize, 0, $FontName, $Text);
-
-     $a = deg2rad($Angle); $ca = cos($a); $sa = sin($a); $RealPos = array();
-     for($i = 0; $i < 7; $i += 2)
-      {
-       $RealPos[$i/2]["X"] = $X + round($coords[$i] * $ca + $coords[$i+1] * $sa);
-       $RealPos[$i/2]["Y"] = $Y + round($coords[$i+1] * $ca - $coords[$i] * $sa);
-      }
-
-     $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"]	= $RealPos[0]["X"];	$RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"]	= $RealPos[0]["Y"];
-     $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"]	= $RealPos[1]["X"];	$RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"]	= $RealPos[1]["Y"];
-     $RealPos[TEXT_ALIGN_TOPLEFT]["X"]		= $RealPos[3]["X"];	$RealPos[TEXT_ALIGN_TOPLEFT]["Y"]	= $RealPos[3]["Y"];
-     $RealPos[TEXT_ALIGN_TOPRIGHT]["X"]		= $RealPos[2]["X"];	$RealPos[TEXT_ALIGN_TOPRIGHT]["Y"]	= $RealPos[2]["Y"];
-     $RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["X"]	= ($RealPos[1]["X"]-$RealPos[0]["X"])/2+$RealPos[0]["X"];	$RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["Y"]	= ($RealPos[0]["Y"]-$RealPos[1]["Y"])/2+$RealPos[1]["Y"];
-     $RealPos[TEXT_ALIGN_TOPMIDDLE]["X"]	= ($RealPos[2]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"];	$RealPos[TEXT_ALIGN_TOPMIDDLE]["Y"]	= ($RealPos[3]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
-     $RealPos[TEXT_ALIGN_MIDDLELEFT]["X"]	= ($RealPos[0]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"];	$RealPos[TEXT_ALIGN_MIDDLELEFT]["Y"]	= ($RealPos[0]["Y"]-$RealPos[3]["Y"])/2+$RealPos[3]["Y"];
-     $RealPos[TEXT_ALIGN_MIDDLERIGHT]["X"]	= ($RealPos[1]["X"]-$RealPos[2]["X"])/2+$RealPos[2]["X"];	$RealPos[TEXT_ALIGN_MIDDLERIGHT]["Y"]	= ($RealPos[1]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
-     $RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["X"]	= ($RealPos[1]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"];	$RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["Y"]	= ($RealPos[0]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
-
-     return($RealPos);
+        $coords = imagettfbbox($FontSize, 0, $FontName, $Text);
+
+        $a = deg2rad($Angle); $ca = cos($a); $sa = sin($a); $RealPos = array();
+        for($i = 0; $i < 7; $i += 2)
+        {
+        $RealPos[$i/2]["X"] = $X + round($coords[$i] * $ca + $coords[$i+1] * $sa);
+        $RealPos[$i/2]["Y"] = $Y + round($coords[$i+1] * $ca - $coords[$i] * $sa);
+        }
+
+        $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"]	= $RealPos[0]["X"];	$RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"]	= $RealPos[0]["Y"];
+        $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"]	= $RealPos[1]["X"];	$RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"]	= $RealPos[1]["Y"];
+        $RealPos[TEXT_ALIGN_TOPLEFT]["X"]		= $RealPos[3]["X"];	$RealPos[TEXT_ALIGN_TOPLEFT]["Y"]	= $RealPos[3]["Y"];
+        $RealPos[TEXT_ALIGN_TOPRIGHT]["X"]		= $RealPos[2]["X"];	$RealPos[TEXT_ALIGN_TOPRIGHT]["Y"]	= $RealPos[2]["Y"];
+        $RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["X"]	= ($RealPos[1]["X"]-$RealPos[0]["X"])/2+$RealPos[0]["X"];	$RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["Y"]	= ($RealPos[0]["Y"]-$RealPos[1]["Y"])/2+$RealPos[1]["Y"];
+        $RealPos[TEXT_ALIGN_TOPMIDDLE]["X"]	= ($RealPos[2]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"];	$RealPos[TEXT_ALIGN_TOPMIDDLE]["Y"]	= ($RealPos[3]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
+        $RealPos[TEXT_ALIGN_MIDDLELEFT]["X"]	= ($RealPos[0]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"];	$RealPos[TEXT_ALIGN_MIDDLELEFT]["Y"]	= ($RealPos[0]["Y"]-$RealPos[3]["Y"])/2+$RealPos[3]["Y"];
+        $RealPos[TEXT_ALIGN_MIDDLERIGHT]["X"]	= ($RealPos[1]["X"]-$RealPos[2]["X"])/2+$RealPos[2]["X"];	$RealPos[TEXT_ALIGN_MIDDLERIGHT]["Y"]	= ($RealPos[1]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
+        $RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["X"]	= ($RealPos[1]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"];	$RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["Y"]	= ($RealPos[0]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
+
+        return($RealPos);
     }
 
-   /* Set current font properties */
-   function setFontProperties($Format="")
+    /* Set current font properties */
+    function setFontProperties($Format="")
     {
-     $R		= isset($Format["R"]) ? $Format["R"] : -1;
-     $G		= isset($Format["G"]) ? $Format["G"] : -1;
-     $B		= isset($Format["B"]) ? $Format["B"] : -1;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $FontName	= isset($Format["FontName"]) ? $Format["FontName"] : NULL;
-     $FontSize	= isset($Format["FontSize"]) ? $Format["FontSize"] : NULL;
-
-     if ( $R != -1)       {  $this->FontColorR = $R; }
-     if ( $G != -1)       {  $this->FontColorG = $G; }
-     if ( $B != -1)       {  $this->FontColorB = $B; }
-     if ( $Alpha != NULL) {  $this->FontColorA = $Alpha; }
-
-     if ( $FontName != NULL  )
-      $this->FontName = $FontName;
+        $R		= isset($Format["R"]) ? $Format["R"] : -1;
+        $G		= isset($Format["G"]) ? $Format["G"] : -1;
+        $B		= isset($Format["B"]) ? $Format["B"] : -1;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $FontName	= isset($Format["FontName"]) ? $Format["FontName"] : NULL;
+        $FontSize	= isset($Format["FontSize"]) ? $Format["FontSize"] : NULL;
+
+        if ( $R != -1)       {  $this->FontColorR = $R; }
+        if ( $G != -1)       {  $this->FontColorG = $G; }
+        if ( $B != -1)       {  $this->FontColorB = $B; }
+        if ( $Alpha != NULL) {  $this->FontColorA = $Alpha; }
+
+        if ( $FontName != NULL  )
+        $this->FontName = $FontName;
  
-     if ( $FontSize != NULL  )
-      $this->FontSize = $FontSize;
+        if ( $FontSize != NULL  )
+        $this->FontSize = $FontSize;
     }
 
-   /* Returns the 1st decimal values (used to correct AA bugs) */
-   function getFirstDecimal($Value)
+    /* Returns the 1st decimal values (used to correct AA bugs) */
+    function getFirstDecimal($Value)
     {
-     $Values = preg_split("/\./",$Value);
-     if ( isset($Values[1]) ) { return(substr($Values[1],0,1)); } else { return(0); }
+        $Values = preg_split("/\./",$Value);
+        if ( isset($Values[1]) ) { return(substr($Values[1],0,1)); } else { return(0); }
     }
 
-   /* Attach a dataset to your pChart Object */
-   function setDataSet(&$DataSet)
+    /* Attach a dataset to your pChart Object */
+    function setDataSet(&$DataSet)
     { $this->DataSet = $DataSet; }
 
-   /* Print attached dataset contents to STDOUT */
-   function printDataSet()
+    /* Print attached dataset contents to STDOUT */
+    function printDataSet()
     { print_r($this->DataSet); }
 
-   /* Initialise the image map methods */
-   function initialiseImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
+    /* Initialise the image map methods */
+    function initialiseImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
     {
-     $this->ImageMapIndex 		= $Name;
-     $this->ImageMapStorageMode		= $StorageMode;
-
-     if ($StorageMode == IMAGE_MAP_STORAGE_SESSION)
-      {
-       if(!isset($_SESSION)) { session_start(); }
-       $_SESSION[$this->ImageMapIndex]    = NULL;
-      }
-     elseif($StorageMode == IMAGE_MAP_STORAGE_FILE)
-      {
-       $this->ImageMapFileName 		= $UniqueID;
-       $this->ImageMapStorageFolder	= $StorageFolder;
-
-       if (file_exists($StorageFolder."/".$UniqueID.".map")) { unlink($StorageFolder."/".$UniqueID.".map"); }
-      }
+        $this->ImageMapIndex 		= $Name;
+        $this->ImageMapStorageMode		= $StorageMode;
+
+        if ($StorageMode == IMAGE_MAP_STORAGE_SESSION)
+        {
+        if(!isset($_SESSION)) { session_start(); }
+        $_SESSION[$this->ImageMapIndex]    = NULL;
+        }
+        elseif($StorageMode == IMAGE_MAP_STORAGE_FILE)
+        {
+        $this->ImageMapFileName 		= $UniqueID;
+        $this->ImageMapStorageFolder	= $StorageFolder;
+
+        if (file_exists($StorageFolder."/".$UniqueID.".map")) { unlink($StorageFolder."/".$UniqueID.".map"); }
+        }
     }
 
-   /* Add a zone to the image map */
-   function addToImageMap($Type,$Plots,$Color=NULL,$Title=NULL,$Message=NULL,$HTMLEncode=FALSE)
+    /* Add a zone to the image map */
+    function addToImageMap($Type,$Plots,$Color=NULL,$Title=NULL,$Message=NULL,$HTMLEncode=FALSE)
     {
-     if ( $this->ImageMapStorageMode == NULL ) { $this->initialiseImageMap(); }
-
-     /* Encode the characters in the imagemap in HTML standards */
-     $Title   = str_replace("&#8364;","\u20AC",$Title);
-     $Title   = htmlentities($Title,ENT_QUOTES,"ISO-8859-15");
-     if ( $HTMLEncode )
-      {
-       $Message = htmlentities($Message,ENT_QUOTES,"ISO-8859-15");
-       $Message = str_replace("&lt;","<",$Message);
-       $Message = str_replace("&gt;",">",$Message);
-      }
-
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
-      {
-       if(!isset($_SESSION)) { $this->initialiseImageMap(); }
-       $_SESSION[$this->ImageMapIndex][] = array($Type,$Plots,$Color,$Title,$Message);
-      }
-     elseif($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE)
-      {
-       $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'a');
-       fwrite($Handle, $Type.IMAGE_MAP_DELIMITER.$Plots.IMAGE_MAP_DELIMITER.$Color.IMAGE_MAP_DELIMITER.$Title.IMAGE_MAP_DELIMITER.$Message."\r\n");
-       fclose($Handle);
-      }
+        if ( $this->ImageMapStorageMode == NULL ) { $this->initialiseImageMap(); }
+
+        /* Encode the characters in the imagemap in HTML standards */
+        $Title   = str_replace("&#8364;","\u20AC",$Title);
+        $Title   = htmlentities($Title,ENT_QUOTES,"ISO-8859-15");
+        if ( $HTMLEncode )
+        {
+        $Message = htmlentities($Message,ENT_QUOTES,"ISO-8859-15");
+        $Message = str_replace("&lt;","<",$Message);
+        $Message = str_replace("&gt;",">",$Message);
+        }
+
+        if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+        {
+        if(!isset($_SESSION)) { $this->initialiseImageMap(); }
+        $_SESSION[$this->ImageMapIndex][] = array($Type,$Plots,$Color,$Title,$Message);
+        }
+        elseif($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE)
+        {
+        $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'a');
+        fwrite($Handle, $Type.IMAGE_MAP_DELIMITER.$Plots.IMAGE_MAP_DELIMITER.$Color.IMAGE_MAP_DELIMITER.$Title.IMAGE_MAP_DELIMITER.$Message."\r\n");
+        fclose($Handle);
+        }
     }
 
-   /* Remove VOID values from an imagemap custom values array */
-   function removeVOIDFromArray($SerieName, $Values)
+    /* Remove VOID values from an imagemap custom values array */
+    function removeVOIDFromArray($SerieName, $Values)
     {
-     if ( !isset($this->DataSet->Data["Series"][$SerieName]) ) { return(-1); }
+        if ( !isset($this->DataSet->Data["Series"][$SerieName]) ) { return(-1); }
 
-     $Result = "";
-     foreach($this->DataSet->Data["Series"][$SerieName]["Data"] as $Key => $Value)
-      { if ( $Value != VOID && isset($Values[$Key]) ) { $Result[] = $Values[$Key]; } }
-     return($Result);
+        $Result = "";
+        foreach($this->DataSet->Data["Series"][$SerieName]["Data"] as $Key => $Value)
+        { if ( $Value != VOID && isset($Values[$Key]) ) { $Result[] = $Values[$Key]; } }
+        return($Result);
     }
 
-   /* Replace the title of one image map serie */
-   function replaceImageMapTitle($OldTitle, $NewTitle)
+    /* Replace the title of one image map serie */
+    function replaceImageMapTitle($OldTitle, $NewTitle)
     {
-     if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
+        if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
 
-     if ( is_array($NewTitle) ) { $NewTitle = $this->removeVOIDFromArray($OldTitle, $NewTitle); }
+        if ( is_array($NewTitle) ) { $NewTitle = $this->removeVOIDFromArray($OldTitle, $NewTitle); }
  
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
-      {
-       if(!isset($_SESSION)) { return(-1); }
-       if ( is_array($NewTitle) )
+        if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+        {
+        if(!isset($_SESSION)) { return(-1); }
+        if ( is_array($NewTitle) )
         { $ID = 0; foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID])) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle[$ID]; $ID++; } } }
-       else
+        else
         { foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle; } } }
-      }
-     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
-      {
-       $TempArray = "";
-       $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
-       if ($Handle)
+        }
+        elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
+        {
+        $TempArray = "";
+        $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
+        if ($Handle)
         {
-         while (($Buffer = fgets($Handle, 4096)) !== false)
-          {
-           $Fields      = split(IMAGE_MAP_DELIMITER,str_replace(array(chr(10),chr(13)),"",$Buffer));
-           $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
-          }
-         fclose($Handle);
-
-         if ( is_array($NewTitle) )
-          { $ID = 0; foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID]) ) { $TempArray[$Key][3] = $NewTitle[$ID]; $ID++; } } }
-         else
-          { foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $TempArray[$Key][3] = $NewTitle; } } }
-
-         $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
-         foreach($TempArray as $Key => $Settings)
-          { fwrite($Handle, $Settings[0].IMAGE_MAP_DELIMITER.$Settings[1].IMAGE_MAP_DELIMITER.$Settings[2].IMAGE_MAP_DELIMITER.$Settings[3].IMAGE_MAP_DELIMITER.$Settings[4]."\r\n"); }
-         fclose($Handle);
+            while (($Buffer = fgets($Handle, 4096)) !== false)
+            {
+            $Fields      = split(IMAGE_MAP_DELIMITER,str_replace(array(chr(10),chr(13)),"",$Buffer));
+            $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
+            }
+            fclose($Handle);
+
+            if ( is_array($NewTitle) )
+            { $ID = 0; foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID]) ) { $TempArray[$Key][3] = $NewTitle[$ID]; $ID++; } } }
+            else
+            { foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $TempArray[$Key][3] = $NewTitle; } } }
+
+            $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
+            foreach($TempArray as $Key => $Settings)
+            { fwrite($Handle, $Settings[0].IMAGE_MAP_DELIMITER.$Settings[1].IMAGE_MAP_DELIMITER.$Settings[2].IMAGE_MAP_DELIMITER.$Settings[3].IMAGE_MAP_DELIMITER.$Settings[4]."\r\n"); }
+            fclose($Handle);
+        }
         }
-      }
     }
 
-   /* Replace the values of the image map contents */
-   function replaceImageMapValues($Title, $Values)
+    /* Replace the values of the image map contents */
+    function replaceImageMapValues($Title, $Values)
     {
-     if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
-
-     $Values = $this->removeVOIDFromArray($Title, $Values);
-     $ID = 0; 
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
-      {
-       if(!isset($_SESSION)) { return(-1); }
-       foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $_SESSION[$this->ImageMapIndex][$Key][4] = $Values[$ID]; } $ID++; } }
-      }
-     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
-      {
-       $TempArray = "";
-       $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
-       if ($Handle)
+        if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
+
+        $Values = $this->removeVOIDFromArray($Title, $Values);
+        $ID = 0; 
+        if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+        {
+        if(!isset($_SESSION)) { return(-1); }
+        foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $_SESSION[$this->ImageMapIndex][$Key][4] = $Values[$ID]; } $ID++; } }
+        }
+        elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
         {
-         while (($Buffer = fgets($Handle, 4096)) !== false)
-          {
-           $Fields      = split(IMAGE_MAP_DELIMITER,str_replace(array(chr(10),chr(13)),"",$Buffer));
-           $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
-          }
-         fclose($Handle);
-
-         foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $TempArray[$Key][4] = $Values[$ID]; } $ID++; } }
-
-         $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
-         foreach($TempArray as $Key => $Settings)
-          { fwrite($Handle, $Settings[0].IMAGE_MAP_DELIMITER.$Settings[1].IMAGE_MAP_DELIMITER.$Settings[2].IMAGE_MAP_DELIMITER.$Settings[3].IMAGE_MAP_DELIMITER.$Settings[4]."\r\n"); }
-         fclose($Handle);
+        $TempArray = "";
+        $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
+        if ($Handle)
+        {
+            while (($Buffer = fgets($Handle, 4096)) !== false)
+            {
+            $Fields      = split(IMAGE_MAP_DELIMITER,str_replace(array(chr(10),chr(13)),"",$Buffer));
+            $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
+            }
+            fclose($Handle);
+
+            foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $TempArray[$Key][4] = $Values[$ID]; } $ID++; } }
+
+            $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
+            foreach($TempArray as $Key => $Settings)
+            { fwrite($Handle, $Settings[0].IMAGE_MAP_DELIMITER.$Settings[1].IMAGE_MAP_DELIMITER.$Settings[2].IMAGE_MAP_DELIMITER.$Settings[3].IMAGE_MAP_DELIMITER.$Settings[4]."\r\n"); }
+            fclose($Handle);
+        }
         }
-      }
     }
 
-   /* Dump the image map */
-   function dumpImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
+    /* Dump the image map */
+    function dumpImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
     {
-     $this->ImageMapIndex 		= $Name;
-     $this->ImageMapStorageMode		= $StorageMode;
+        $this->ImageMapIndex 		= $Name;
+        $this->ImageMapStorageMode		= $StorageMode;
 
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
-      {
-       if(!isset($_SESSION)) { session_start(); }
-       if ( $_SESSION[$Name] != NULL )
+        if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+        {
+        if(!isset($_SESSION)) { session_start(); }
+        if ( $_SESSION[$Name] != NULL )
         {
-         foreach($_SESSION[$Name] as $Key => $Params)
-          { echo $Params[0].IMAGE_MAP_DELIMITER.$Params[1].IMAGE_MAP_DELIMITER.$Params[2].IMAGE_MAP_DELIMITER.$Params[3].IMAGE_MAP_DELIMITER.$Params[4]."\r\n"; }
+            foreach($_SESSION[$Name] as $Key => $Params)
+            { echo $Params[0].IMAGE_MAP_DELIMITER.$Params[1].IMAGE_MAP_DELIMITER.$Params[2].IMAGE_MAP_DELIMITER.$Params[3].IMAGE_MAP_DELIMITER.$Params[4]."\r\n"; }
         }
-      }
-     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
-      {
-       if (file_exists($StorageFolder."/".$UniqueID.".map"))
+        }
+        elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
+        {
+        if (file_exists($StorageFolder."/".$UniqueID.".map"))
         {
-         $Handle = @fopen($StorageFolder."/".$UniqueID.".map", "r");
-         if ($Handle) { while (($Buffer = fgets($Handle, 4096)) !== false) { echo $Buffer; } }
-         fclose($Handle);
+            $Handle = @fopen($StorageFolder."/".$UniqueID.".map", "r");
+            if ($Handle) { while (($Buffer = fgets($Handle, 4096)) !== false) { echo $Buffer; } }
+            fclose($Handle);
 
-         if ( $this->ImageMapAutoDelete ) { unlink($StorageFolder."/".$UniqueID.".map"); }
+            if ( $this->ImageMapAutoDelete ) { unlink($StorageFolder."/".$UniqueID.".map"); }
+        }
         }
-      }
 
-     /* When the image map is returned to the client, the script ends */
-     exit();
+        /* When the image map is returned to the client, the script ends */
+        exit();
     }
 
-   /* Return the HTML converted color from the RGB composite values */
-   function toHTMLColor($R,$G,$B)
+    /* Return the HTML converted color from the RGB composite values */
+    function toHTMLColor($R,$G,$B)
     {
-     $R=intval($R); $G=intval($G); $B=intval($B);
-     $R=dechex($R<0?0:($R>255?255:$R)); $G=dechex($G<0?0:($G>255?255:$G));$B=dechex($B<0?0:($B>255?255:$B));
-     $Color="#".(strlen($R) < 2?'0':'').$R; $Color.=(strlen($G) < 2?'0':'').$G; $Color.= (strlen($B) < 2?'0':'').$B;
-     return($Color);
+        $R=intval($R); $G=intval($G); $B=intval($B);
+        $R=dechex($R<0?0:($R>255?255:$R)); $G=dechex($G<0?0:($G>255?255:$G));$B=dechex($B<0?0:($B>255?255:$B));
+        $Color="#".(strlen($R) < 2?'0':'').$R; $Color.=(strlen($G) < 2?'0':'').$G; $Color.= (strlen($B) < 2?'0':'').$B;
+        return($Color);
     }
 
-   /* Reverse an array of points */
-   function reversePlots($Plots)
+    /* Reverse an array of points */
+    function reversePlots($Plots)
     {
-     $Result = "";
-     for($i=count($Plots)-2;$i>=0;$i=$i-2) { $Result[] = $Plots[$i]; $Result[] = $Plots[$i+1]; }
-     return($Result);
+        $Result = "";
+        for($i=count($Plots)-2;$i>=0;$i=$i-2) { $Result[] = $Plots[$i]; $Result[] = $Plots[$i+1]; }
+        return($Result);
     }
 
-   /* Mirror Effect */
-   function drawAreaMirror($X,$Y,$Width,$Height,$Format="")
+    /* Mirror Effect */
+    function drawAreaMirror($X,$Y,$Width,$Height,$Format="")
     {
-     $StartAlpha	= isset($Format["StartAlpha"]) ? $Format["StartAlpha"] : 80;
-     $EndAlpha		= isset($Format["EndAlpha"]) ? $Format["EndAlpha"] : 0;
+        $StartAlpha	= isset($Format["StartAlpha"]) ? $Format["StartAlpha"] : 80;
+        $EndAlpha		= isset($Format["EndAlpha"]) ? $Format["EndAlpha"] : 0;
 
-     $AlphaStep = ($StartAlpha-$EndAlpha)/$Height;
+        $AlphaStep = ($StartAlpha-$EndAlpha)/$Height;
 
-     $Picture = imagecreatetruecolor($this->XSize,$this->YSize);
-     imagecopy($Picture,$this->Picture,0,0,0,0,$this->XSize,$this->YSize);
+        $Picture = imagecreatetruecolor($this->XSize,$this->YSize);
+        imagecopy($Picture,$this->Picture,0,0,0,0,$this->XSize,$this->YSize);
      
-     for($i=1;$i<=$Height;$i++)
-      {
-       if ( $Y+($i-1) < $this->YSize && $Y-$i > 0 ) { imagecopymerge($Picture,$this->Picture,$X,$Y+($i-1),$X,$Y-$i,$Width,1,$StartAlpha-$AlphaStep*$i); }
-      }
+        for($i=1;$i<=$Height;$i++)
+        {
+        if ( $Y+($i-1) < $this->YSize && $Y-$i > 0 ) { imagecopymerge($Picture,$this->Picture,$X,$Y+($i-1),$X,$Y-$i,$Width,1,$StartAlpha-$AlphaStep*$i); }
+        }
 
-     imagecopy($this->Picture,$Picture,0,0,0,0,$this->XSize,$this->YSize);
+        imagecopy($this->Picture,$Picture,0,0,0,0,$this->XSize,$this->YSize);
+    }
     }
-  }
 ?>
\ No newline at end of file