? fusioncharts-remove_br-486190-0.patch
Index: fusioncharts.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/fusioncharts/fusioncharts.module,v
retrieving revision 1.14.2.11
diff -u -p -r1.14.2.11 fusioncharts.module
--- fusioncharts.module	21 Apr 2009 10:19:23 -0000	1.14.2.11
+++ fusioncharts.module	9 Jun 2009 11:05:34 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: fusioncharts.module,v 1.14.2.11 2009/04/21 10:19:23 aaron1234nz Exp $ 
+// $Id: fusioncharts.module,v 1.14.2.11 2009/04/21 10:19:23 aaron1234nz Exp $
 /**
  * @file
  * Provides integration between the Fusion Charts free package and Drupal
@@ -22,7 +22,7 @@ function fusioncharts_menu() {
     'page callback' => 'fusioncharts_data_jscallback',
     'type' => MENU_CALLBACK,
     'access arguments' => array('access content'),
-  ); 
+  );
   return $items;
 }
 
@@ -47,7 +47,7 @@ function fusioncharts_data() {
     $callbackfn = strtolower($param);
     $callback_data = call_user_func($callbackfn .'_fusionchart_callback', $args);
   }
-  
+
   if (isset($callback_data->query)) {
     $data = fusioncharts_prepare_data_query($callback_data);
   }
@@ -55,7 +55,7 @@ function fusioncharts_data() {
     $data = $callback_data->data;
   }
   $data = (array)$data;
-  
+
   //populate some colors into attributes if none are set
   if (!isset($callback_data->attributes['color'])) {
     $attributes  = fusioncharts_settings('fusioncharts-defattr');
@@ -66,8 +66,8 @@ function fusioncharts_data() {
       }
     }
   }
-  
-  $str_xml = "\n<graph";
+
+  $str_xml = "<graph";
   foreach ((array)$callback_data->settings as $key => $value) {
     if ($value === '') { //exclude unset keys
     }
@@ -75,7 +75,7 @@ function fusioncharts_data() {
       $str_xml .= " ". $key ."='". fusioncharts_entities($value) ."'";
     }
   }
-  $str_xml .= ">\n";
+  $str_xml .= ">";
   //build the data structure
   switch ($callback_data->chart_type) {
     case 'Column 3D':
@@ -89,7 +89,7 @@ function fusioncharts_data() {
     case 'Funnel Chart':
       $str_xml .= _fusioncharts_data_single($data, $callback_data->attributes, $jsid);
       break;
-      
+
     case 'Multi-series Column 2D':
     case 'Multi-series Column 3D':
     case 'Multi-series Line 2D':
@@ -101,38 +101,38 @@ function fusioncharts_data() {
     case 'Stacked Area 2D':
       $str_xml .= _fusioncharts_data_multi($data, $callback_data->attributes, $jsid);
       break;
-      
+
     case 'Multi-series Column 2D + Line - Dual Y Axis':
     case 'Multi-series Column 3D + Line - Dual Y Axis':
       $str_xml .= _fusioncharts_data_combination($data, $callback_data->attributes, $jsid);
       break;
-      
+
     case 'Candlestick Chart':
       break;
-           
+
     case 'Gantt Chart':
       break;
   }
   if (isset($callback_data->attributes['trendline'])) {
-    $str_xml .= "<trendlines>\n";
+    $str_xml .= "<trendlines>";
     if (is_array($callback_data->attributes['trendline'][0])) {
       foreach ($callback_data->attributes['trendline'] as $line) {
         $attrs = '';
         foreach ($line as $atrib => $value) {
           $attrs .= "$atrib='$value'";
         }
-        $str_xml .= "<line $attrs />\n";
+        $str_xml .= "<line $attrs />";
       }
     }
     else {
       foreach ($callback_data->attributes['trendline'] as $atrib => $value) {
         $attrs .= "$atrib='$value' ";
       }
-      $str_xml .= "<line $attrs />\n";
+      $str_xml .= "<line $attrs />";
     }
-    $str_xml .= "</trendlines>\n";
+    $str_xml .= "</trendlines>";
   }
-  $str_xml .= "</graph>\n";
+  $str_xml .= "</graph>";
   $callback_data->xml = $str_xml;
   return $callback_data;
 }
@@ -183,7 +183,7 @@ function fusioncharts_prepare_data_query
         $i++;
       }
       break;
-  
+
     case 'Multi-series Column 2D':
     case 'Multi-series Column 3D':
     case 'Multi-series Line 2D':
@@ -200,7 +200,7 @@ function fusioncharts_prepare_data_query
         $i++;
       }
       break;
-  
+
     case 'Multi-series Column 2D + Line - Dual Y Axis':
     case 'Multi-series Column 3D + Line - Dual Y Axis':
       while ($row = db_fetch_object($result)) {
@@ -211,7 +211,7 @@ function fusioncharts_prepare_data_query
         $i++;
       }
       break;
-  
+
     case 'Candlestick Chart':
       //probably too complex for a simple query
       break;
@@ -219,7 +219,7 @@ function fusioncharts_prepare_data_query
     case 'Gantt Chart':
       //probably too complex for a simple query
       break;
-  }     
+  }
   return (array)$data;
 }
 
@@ -230,18 +230,18 @@ function fusioncharts_prepare_data_query
  * @param array $data Data to be converted to XML
  * @param array $attributes See api.txt for details
  * @param string $jsid javascript id
- * @return string XML 
+ * @return string XML
  */
 function _fusioncharts_data_single($data, $attributes = array(), $jsid = NULL) {
   //validate and reform the data as necessary
   //for single series charts the validation needed is:
   // * that the value column is numeric
   // * that there is a value for each series
-  
+
   foreach ($data as $column) {
     if ($column[0] != '' && is_numeric($column[1])) {
       $clean_data[] = $column;
-    } 
+    }
     elseif ($column[0] != '' && !is_numeric($column[1])) {
       drupal_set_message(t('Data row @row did not validate.  Please check it', array('@row' => $column[0])));
     }
@@ -269,7 +269,7 @@ function _fusioncharts_data_single($data
     if (isset($attributes['showName'][$column[0]])) {
       $showname = "showName='{$attributes['showName'][$column[0]]}'";
     }
-    $str_xml .= "<set name='". fusioncharts_entities(trim($column[0])) ."' value='{$column[1]}' $color $link $hovertext $alpha $showname />\n";
+    $str_xml .= "<set name='". fusioncharts_entities(trim($column[0])) ."' value='{$column[1]}' $color $link $hovertext $alpha $showname />";
     $c++;
   }
   return $str_xml;
@@ -281,7 +281,7 @@ function _fusioncharts_data_single($data
  * @param array $data Data to be converted to XML
  * @param array $attributes See api.txt for details
  * @param string $jsid javascript id
- * @return string XML 
+ * @return string XML
  */
 function _fusioncharts_data_multi($data, $attributes = array(), $jsid=NULL) {
   //validate and reform the data as necessary
@@ -319,7 +319,7 @@ function _fusioncharts_data_multi($data,
       $categories[] = $column[1];
       $value[] = $column[2];
     }
-    $str_xml .= "<categories>\n";
+    $str_xml .= "<categories>";
     $category = array_unique($categories);
     if (end($category) == '') {
       array_pop($category);
@@ -327,31 +327,31 @@ function _fusioncharts_data_multi($data,
     $category_count = count($category);
     $total_results = count($value);
     foreach ($category as $this_category) {
-      $str_xml .= "<category name='". fusioncharts_entities(trim($this_category)) ."' />\n";
+      $str_xml .= "<category name='". fusioncharts_entities(trim($this_category)) ."' />";
     }
-    $str_xml .= "</categories>\n"; 
+    $str_xml .= "</categories>";
     for ($i=0; $i<$total_results; $i+=$category_count) {
       if ($series[$i] != '') {
         if (isset($attributes['color'][$c])) {
           $color = "color='{$attributes['color'][$c]}'";
         }
-        $str_xml .= "<dataset seriesName='". fusioncharts_entities(trim($series[$i])) ."' $color>\n";
+        $str_xml .= "<dataset seriesName='". fusioncharts_entities(trim($series[$i])) ."' $color>";
         for ($j=$i; $j<($i+$category_count); $j++) {
           unset($link);
           if ($value[$j] != '') {
             if (isset($attributes['callback'])) {
               $link = "link='JavaScript:fusioncharts_clickbar(&quot;$jsid&quot;, &quot;{$attributes['callback']}&quot;, &quot;{$series[$j]}&quot;, &quot;{$categories[$j]}&quot;)'";
-            }            
+            }
             if (is_string($attributes['link'][$series[$j]])) {
               $link = "link='". urlencode($attributes['link'][$series[$j]]) ."'";
             }
             elseif (isset($attributes['link'][$series[$j]][$categories[$j]])) {
               $link = "link='". urlencode($attributes['link'][$series[$j]][$categories[$j]]) ."'";
             }
-            $str_xml .= "<set value='{$value[$j]}' $link />\n";
+            $str_xml .= "<set value='{$value[$j]}' $link />";
           }
         }
-      $str_xml .= "</dataset>\n";
+      $str_xml .= "</dataset>";
       $c++;
       }
     }
@@ -365,7 +365,7 @@ function _fusioncharts_data_multi($data,
  * @param array $data Data to be converted to XML
  * @param array $attributes See api.txt for details
  * @param string $jsid javascript id
- * @return string XML 
+ * @return string XML
  */
 function _fusioncharts_data_combination($data, $attributes = array(), $jsid=NULL) {
   //validate and reform the data as necessary
@@ -421,7 +421,7 @@ function _fusioncharts_data_combination(
       $axis[] = $column[2];
       $value[] = $column[3];
     }
-    $str_xml .= "<categories>\n";
+    $str_xml .= "<categories>";
     $categories = array_unique($categories);
     if (end($categories) == '') {
       array_pop($categories);
@@ -430,15 +430,15 @@ function _fusioncharts_data_combination(
     $dataset_count = count(array_unique($category));
     $total_results = count($value);
     foreach ($categories as $this_category) {
-      $str_xml .= "<category name='". fusioncharts_entities(trim($this_category)) ."' />\n";
+      $str_xml .= "<category name='". fusioncharts_entities(trim($this_category)) ."' />";
     }
-    $str_xml .= "</categories>\n"; 
+    $str_xml .= "</categories>";
     for ($i=0; $i<$total_results; $i+=$dataset_count) {
       if ($series[$i] != '') {
         if (isset($attributes['color'][$c])) {
           $color = "color='{$attributes['color'][$c]}'";
         }
-        $str_xml .= "<dataset seriesName='". fusioncharts_entities(trim($series[$i])) ."' $color parentYAxis='$axis[$i]'>\n";
+        $str_xml .= "<dataset seriesName='". fusioncharts_entities(trim($series[$i])) ."' $color parentYAxis='$axis[$i]'>";
         for ($j=$i; $j<($i+$category_count); $j++) {
           if ($value[$j] != '') {
           unset($link);
@@ -451,10 +451,10 @@ function _fusioncharts_data_combination(
             elseif (isset($attributes['link'][$series[$j]][$categories[$j]])) {
               $link = "link='". urlencode($attributes['link'][$series[$j]][$categories[$j]]) ."'";
             }
-            $str_xml .= "<set value='{$value[$j]}' $link />\n";
+            $str_xml .= "<set value='{$value[$j]}' $link />";
           }
         }
-      $str_xml .= "</dataset>\n";
+      $str_xml .= "</dataset>";
       $c++;
       }
     }
@@ -470,7 +470,7 @@ function _fusioncharts_data_combination(
  * @param array $args Any further parameters that get passed to the callback function (in the case of $param being a callback function)  optional
  * @return string the HTML to render the chart
  */
-function theme_fusionchart($param, $jsid = NULL, $args = array()) {  
+function theme_fusionchart($param, $jsid = NULL, $args = array()) {
   static $fusioncharts_id; //incremental ID of each chart (static in case there is more then one chart on a page)
   if (!isset($fusioncharts_id)) {
     $fusioncharts_id = 1;
@@ -479,7 +479,7 @@ function theme_fusionchart($param, $jsid
     $jsid = "DrupalFusionChart_". $fusioncharts_id++;
   }
   $fc_data = fusioncharts_data($jsid, $param, $args);
-  
+
   $chart_file = array(
     'Column 3D' => 'FCF_Column3D.swf',
     'Column 2D' => 'FCF_Column2D.swf',
@@ -513,13 +513,13 @@ function theme_fusionchart($param, $jsid
   $flashsource = base_path() . drupal_get_path('module', 'fusioncharts') ."/FusionChartsFree/Charts/". $chart_file[$fc_data->chart_type];
   drupal_add_js(drupal_get_path('module', 'fusioncharts') .'/FusionChartsFree/JSClass/FusionCharts.js', 'module');
   drupal_add_js(drupal_get_path('module', 'fusioncharts') .'/fusioncharts.js', 'module');
-  return renderChartHTML($flashsource, "", $fc_data->xml, $jsid, $fc_data->width, $fc_data->height);  
+  return renderChartHTML($flashsource, "", $fc_data->xml, $jsid, $fc_data->width, $fc_data->height);
 }
 
 /**
  * Backwards compatability function
  */
-function fusioncharts_render($param, $jsid = NULL, $args = array()) {  
+function fusioncharts_render($param, $jsid = NULL, $args = array()) {
   return theme('fusionchart', $param, $jsid, $args);
 }
 
@@ -548,7 +548,7 @@ function fusioncharts_theme($existing, $
  */
 function fusioncharts_settings($type) {
   switch ($type) {
-    case 'fusioncharts': 
+    case 'fusioncharts':
       return array(
         'Single Series Charts' => array(
           'Column 3D' => 'Column 3D',
@@ -629,7 +629,7 @@ function fusioncharts_settings($type) {
         'showAlternateVGridColor' => '0',
         'alternateVGridColor' => '#000000',
       );
-      
+
       case 'fusioncharts-defattr':
         return array(
           'color' => array(
@@ -649,7 +649,7 @@ function fusioncharts_settings($type) {
         );
     }
 }
- 
+
 /**
  * Implementation of hook_requirements().
  */
@@ -695,7 +695,7 @@ if (!function_exists('ahah_render')) {
     $form = form_builder($_POST['form_id'], $form, $form_state);
     // Render the new output.
     $new_form = $form[$name];
-    return drupal_render($new_form); 
+    return drupal_render($new_form);
   }
 }
 
@@ -710,4 +710,4 @@ function fusioncharts_entities($string) 
   $entities = array("%25", "%26", "%27", "%3A", "%2F", "%40");
   $string = htmlentities($string, ENT_QUOTES, 'UTF-8');
   return str_replace($original, $entities, $string);
-}
\ No newline at end of file
+}