New features:

* Initial Port to Drupal 7

charts.admin.inc

@@ -48,7 +48,7 @@ function _charts_color_form_complete(&$form, $default) {
     );
   }
 
-  drupal_add_js(drupal_get_path('module', 'charts') .'/charts_color.js');
+  drupal_add_js(drupal_get_path('module', 'charts') . '/charts_color.js');
   drupal_add_js(array('chartsColorCustom' => t('Custom')), 'setting');
 }
 
@@ -110,7 +110,7 @@ function _charts_module_invoke_all() {
   unset($args[0]);
   $return = array();
   foreach (module_implements($hook) as $module) {
-    $function = $module .'_'. $hook;
+    $function = $module . '_' . $hook;
     $result = call_user_func_array($function, $args);
     if (isset($result) && is_array($result)) {
       $return += $result;
@@ -227,7 +227,7 @@ function _charts_settings_page_submit(&$form, &$form_state) {
   // merge between the chart data and the defaults easier on every
   // chart display.
   foreach ($settings as $index => $value) {
-    $default['#'. $index] = $value;
+    $default['#' . $index] = $value;
   }
 
   // Save the data into database

charts.hooks.inc

+<?php
+// $Id$
+/**
+ * @author Bruno Massa http://drupal.org/user/67164
+ * @file
+ * Transform DATA into INFORMATION using beautiful CHARTS.
+ *
+ * @note only cachable hooks are here.
+ */
+
+/**
+ * Implementation of hook_chart_types().
+ */
+function charts_chart_types() {
+  return array(
+    'line2D'  => t('Line 2D'),
+    'hbar2D'  => t('Horizontal Bar 2D'),
+    'vbar2D'  => t('Vertical Bar 2D'),
+    'pie2D'   => t('Pie 2D'),
+    'pie3D'   => t('Pie 3D'),
+  );
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function charts_menu() {
+  $items['admin/settings/charts'] = array(
+    'access arguments'  => array('set default settings for charts'),
+    'description'     => 'Set the default behaviour and look of all your charts',
+    'page callback'   => 'drupal_get_form',
+    'page arguments'  => array('_charts_settings_page'),
+    'title'           => 'Charts'
+  );
+  return $items;
+}
+
+/**
+ * Implementation of hook_perm().
+ */
+function charts_perm() {
+  return array('set default settings for charts');
+}
+
+/**
+ * Implementation of hook_theme().
+ */
+function charts_theme() {
+  return array(
+    'charts_settings_color' => array(
+      'arguments' => array('form' => NULL),
+    ),
+  );
+}
+
+/**
+ * Implementation of hook_views_api().
+ */
+function charts_views_api() {
+  return array(
+    'api' => 2,
+    'path' => drupal_get_path('module', 'charts') . '/views',
+  );
+}

charts.inc

@@ -73,7 +73,9 @@ function _charts_chart(&$data) {
  */
 function _chart_series_attributes(&$data, &$value, &$settings) {
   foreach ($settings['#series_attributes'] as $attribute) {
-    $data[$attribute] = $settings[$attribute][$value];
+    if (isset($settings[$attribute][$value])) {
+      $data[$attribute] = $settings[$attribute][$value];
+    }
   }
 }
 

charts.info

 ; $Id$
-core            = "6.x"
+core            = "7.x"
 description     = "Transform DATA into INFORMATION using beautiful CHARTS."
+files[]         = charts.module
+files[]         = charts.admin.inc
+files[]         = charts.inc
+files[]         = charts.hooks.inc
+files[]         = charts.install
 name            = "Charts"
-package         = "Charts"
+package         = "Charts"
\ No newline at end of file

charts.install

@@ -6,7 +6,7 @@
  * Install and unistall functions for this module
  */
 
-DEFINE(CHARTS_MINIMUM_PHP, '5.2.0');
+DEFINE('CHARTS_MINIMUM_PHP', '5.2.0');
 
 /**
  * Implementation of hook_uninstall().

charts.module

@@ -5,7 +5,6 @@
  * @file
  * Transform DATA into INFORMATION using beautiful CHARTS.
  *
- * @note only hooks are here.
  * @note For instructions about the API, see chart_api.txt file.
  */
 
@@ -23,59 +22,3 @@ function charts_chart(&$data) {
   module_load_include('inc', 'charts');
   return _charts_chart($data);
 }
-
-/**
- * Immplementation of hook_chart_types().
- */
-function charts_chart_types() {
-  return array(
-    'line2D'  => t('Line 2D'),
-    'hbar2D'  => t('Horizontal Bar 2D'),
-    'vbar2D'  => t('Vertical Bar 2D'),
-    'pie2D'   => t('Pie 2D'),
-    'pie3D'   => t('Pie 3D'),
-  );
-}
-
-/**
- * Implementation of hook_menu().
- */
-function charts_menu() {
-  $items['admin/settings/charts'] = array(
-    'access arguments'  => array('set default settings for charts'),
-    'description'     => 'Set the default behaviour and look of all your charts',
-    'file'            => 'charts.admin.inc',
-    'page callback'   => 'drupal_get_form',
-    'page arguments'  => array('_charts_settings_page'),
-    'title'           => 'Charts'
-  );
-  return $items;
-}
-
-/**
- * Implementation of hook_perm().
- */
-function charts_perm() {
-  return array('set default settings for charts');
-}
-
-/**
- * Implementation of hook_theme().
- */
-function charts_theme() {
-  return array(
-    'charts_settings_color' => array(
-      'arguments' => array('form' => NULL),
-    ),
-  );
-}
-
-/**
- * Implementation of hook_views_api().
- */
-function charts_views_api() {
-  return array(
-    'api' => 2,
-    'path' => drupal_get_path('module', 'charts') .'/views',
-  );
-}

charts_system/charts_system.hooks.inc

+<?php
+// $Id$
+/**
+ * @author Bruno Massa http://drupal.org/user/67164
+ * @author TJ (based on his Chart module)
+ * @file
+ * Use Charts for Drupal administration
+ */
+
+/**
+ * Implementation of hook_menu().
+ */
+function charts_system_menu() {
+  $items['admin/reports/charts'] = array(
+    'access arguments'  => array('access site reports'),
+    'file'              => 'charts_system.inc',
+    'page callback'     => '_charts_system_charts',
+    'page arguments'    => array('nodes'),
+    'title'             => 'Charts'
+  );
+  $items['admin/reports/charts/nodes'] = array(
+    'access arguments'  => array('access site reports'),
+    'file'              => 'charts_system.inc',
+    'page callback'     => '_charts_system_charts',
+    'page arguments'    => array('nodes'),
+    'title'             => 'Nodes',
+    'type'              => MENU_DEFAULT_LOCAL_TASK
+  );
+  $items['admin/reports/charts/users'] = array(
+    'access arguments'  => array('access site reports'),
+    'file'              => 'charts_system.inc',
+    'page callback'     => '_charts_system_charts',
+    'page arguments'    => array('users'),
+    'title'             => 'Users',
+    'type'              => MENU_LOCAL_TASK
+  );
+  $items['admin/reports/charts/watchdog'] = array(
+    'access arguments'  => array('access site reports'),
+    'file'              => 'charts_system.inc',
+    'page callback'     => '_charts_system_charts',
+    'page arguments'    => array('watchdog'),
+    'title'             => 'Watchdog',
+    'type'              => MENU_LOCAL_TASK
+  );
+
+  return $items;
+}

charts_system/charts_system.inc

@@ -81,7 +81,7 @@ function _charts_system_charts($ctype) {
       break;
   }
 
-  return '<div id="charts-system">'. $output .'</div>';
+  return '<div id="charts-system">' . $output . '</div>';
 }
 
 /**
@@ -109,7 +109,7 @@ function _charts_system_generate($title, $sql, $callback = NULL) {
 
     $data[] = array(
       '#value'  => $result['count'],
-      '#label'  => $result['name'] .': '. $result['count']
+      '#label'  => $result['name'] . ': ' . $result['count']
     );
   }
 
@@ -132,7 +132,7 @@ function _charts_system_generate($title, $sql, $callback = NULL) {
  *   String. The HTML chart when all data is fine or a blank string
  */
 function _charts_system_node_activity() {
-  $now   = time();
+  $now   = REQUEST_TIME;
 
   $results = db_query('SELECT type, created
     FROM {node}
@@ -144,11 +144,17 @@ function _charts_system_node_activity() {
   $max    = array();
   $counts = array();
   $types  = array();
+  $type   = 0;
 
-  while ($result = db_fetch_array($results)) {
-    $day = ltrim(date('d', $result['created']), '0');
-    $types[$result['type']] = $type++;
-    $counts[$day][$result['type']]++;
+  foreach ($results as $result) {
+    $day = ltrim(date('d', $result->created), '0');
+    $types[$result->type] = $type++;
+    if (isset($counts[$day][$result->type])) {
+      $counts[$day][$result->type]++;
+    }
+    else {
+      $counts[$day][$result->type] = 1;
+    }
   }
 
   // Generate data and labels

charts_system/charts_system.info

 ; $Id$
-core            = "6.x"
+core            = "7.x"
 dependencies[]  = charts
 description     = "Use Charts for Drupal administration"
+files[]         = charts_system.inc
+files[]         = charts_system.hooks.inc
 name            = "Charts System"
 package         = "Charts"

charts_system/charts_system.module

 <?php
-// $Id$
-/**
- * @author Bruno Massa http://drupal.org/user/67164
- * @author TJ (based on his Chart module)
- * @file
- * Use Charts for Drupal administration
- */
-
-/**
- * Implementation of hook_menu().
- */
-function charts_system_menu() {
-  $items['admin/reports/charts'] = array(
-    'access arguments'  => array('access site reports'),
-    'file'              => 'charts_system.inc',
-    'page callback'     => '_charts_system_charts',
-    'page arguments'    => array('nodes'),
-    'title'             => 'Charts'
-  );
-  $items['admin/reports/charts/nodes'] = array(
-    'access arguments'  => array('access site reports'),
-    'file'              => 'charts_system.inc',
-    'page callback'     => '_charts_system_charts',
-    'page arguments'    => array('nodes'),
-    'title'             => 'Nodes',
-    'type'              => MENU_DEFAULT_LOCAL_TASK
-  );
-  $items['admin/reports/charts/users'] = array(
-    'access arguments'  => array('access site reports'),
-    'file'              => 'charts_system.inc',
-    'page callback'     => '_charts_system_charts',
-    'page arguments'    => array('users'),
-    'title'             => 'Users',
-    'type'              => MENU_LOCAL_TASK
-  );
-  $items['admin/reports/charts/watchdog'] = array(
-    'access arguments'  => array('access site reports'),
-    'file'              => 'charts_system.inc',
-    'page callback'     => '_charts_system_charts',
-    'page arguments'    => array('watchdog'),
-    'title'             => 'Watchdog',
-    'type'              => MENU_LOCAL_TASK
-  );
-
-  return $items;
-}

fusioncharts/fusioncharts.hooks.inc

+<?php
+// $Id$
+/**
+ * @author Bruno Massa http://drupal.org/user/67164
+ * @file
+ * Use FusionCharts on your site.
+ *
+ * @note only hooks are here.
+ */
+
+/**
+ * Implementation of hook_charts_info().
+ *
+ * Its a Charts module hook. It defines almost all aspects
+ * of a chart provider, like its name, what types of charts
+ * it can perform and what are the restrictions.
+ */
+function fusioncharts_charts_info() {
+  return array(
+    'fusioncharts' => array(
+      'file'    => drupal_get_path('module', 'fusioncharts') . '/fusioncharts.inc',
+      'name'    => t('FusionCharts'),
+      'render'  => '_fusioncharts_charts_render',
+      'types'   => array('line2D', 'hbar2D', 'hbar3D', 'vbar2D', 'vbar3D', 'pie2D', 'pie3D'),
+    ),
+  );
+}
+
+/**
+ * Implementation of hook_chart_types().
+ */
+function fusioncharts_chart_types() {
+  return array(
+    'hbar3D'    => t('Horizontal Bar 3D'),
+    'vbar3D'    => t('Vertical Bar 3D'),
+  );
+}

fusioncharts/fusioncharts.inc

@@ -101,7 +101,7 @@ function _fusioncharts_charts_render(&$data) {
     return t('This type is not possible using %chartplugin',
       array('%chartplugin' => 'FusionCharts'));
   }
-  $file = file_create_url('fusioncharts') .'/'. $options[$data['#type']];
+  $file = file_create_url('fusioncharts') . '/' . $options[$data['#type']];
 
   // Convert the chat SIZE into the FusionCharts way.
   // Since its a requirement to build the chart on Google, if the value
@@ -129,7 +129,7 @@ function _fusioncharts_charts_render(&$data) {
     return $message;
   }
 
-  $chart =  '&dataXML='. str_replace('"', "'", format_xml_elements(array($chart)));
+  $chart =  '&dataXML=' . str_replace('"', "'", format_xml_elements(array($chart)));
 
   // Its the HTML tag to include the chart
   return <<<FUSIONCHARTS

fusioncharts/fusioncharts.info

 ; $Id$
-core            = "6.x"
+core            = "7.x"
 dependencies[]  = charts
 description     = "Use FusionCharts on your site."
+files[]         = fusioncharts.inc
+files[]         = fusioncharts.hooks.inc
+files[]         = fusioncharts.install
 name            = "FusionCharts"
 package         = "Charts"

fusioncharts/fusioncharts.install

@@ -10,8 +10,8 @@
  * Implementation of hook_requirements().
  */
 function fusioncharts_requirements($phase) {
-  $path = file_create_path() .'/fusioncharts';
-  if (!file_exists($path .'/MSLine.swf')) {
+  $path = file_create_path() . '/fusioncharts';
+  if (!file_exists($path . '/MSLine.swf')) {
     $requirements['charts']['title']        = t('FusionCharts');
     $requirements['charts']['value']        = t('FusionCharts flash files not installed');
     $requirements['charts']['severity']     = REQUIREMENT_ERROR;

fusioncharts/fusioncharts.module

 <?php
-// $Id$
-/**
- * @author Bruno Massa http://drupal.org/user/67164
- * @file
- * Use FusionCharts on your site.
- *
- * @note only hooks are here.
- */
-
-/**
- * Immplementation of hook_charts_info().
- *
- * Its a Charts module hook. It defines almost all aspects
- * of a chart provider, like its name, what types of charts
- * it can perform and what are the restrictions.
- */
-function fusioncharts_charts_info() {
-  return array(
-    'fusioncharts' => array(
-      'file'    => drupal_get_path('module', 'fusioncharts') .'/fusioncharts.inc',
-      'name'    => t('FusionCharts'),
-      'render'  => '_fusioncharts_charts_render',
-      'types'   => array('line2D', 'hbar2D', 'hbar3D', 'vbar2D', 'vbar3D', 'pie2D', 'pie3D'),
-    ),
-  );
-}
-
-/**
- * Immplementation of hook_chart_types().
- */
-function fusioncharts_chart_types() {
-  return array(
-    'hbar3D'    => t('Horizontal Bar 3D'),
-    'vbar3D'    => t('Vertical Bar 3D'),
-  );
-}

google_charts/google_charts.hooks.inc

+<?php
+// $Id$
+/**
+ * @author Bruno Massa http://drupal.org/user/67164
+ * @file
+ * Use Google Charts on your site.
+ *
+ * @note only hooks are here.
+ */
+
+/**
+ * Implementation of hook_charts_info().
+ *
+ * Its a Charts module hook. It defines almost all aspects
+ * of a chart provider, like its name, what types of charts
+ * it can perform and what are the restrictions.
+ */
+function google_charts_charts_info() {
+  return array(
+    'google' => array(
+      'file'    => drupal_get_path('module', 'google_charts') . '/google_charts.inc',
+      'name'    => t('Google Chart'),
+      'render'  => '_google_charts_render',
+      'types'   => array('line2D', 'hbar2D', 'vbar2D', 'pie2D', 'pie3D', 'venn', 'scatter'),
+    ),
+  );
+}
+
+/**
+ * Implementation of hook_chart_types().
+ */
+function google_charts_chart_types() {
+  return array(
+    'venn'    => t('Venn'),
+    'scatter' => t('Scatter Plot'),
+  );
+}

google_charts/google_charts.inc

@@ -42,7 +42,7 @@ function _google_charts_chart(&$chart, &$data) {
     $chart[] = 'cht=pc';
   }
   else {
-    $chart[] = 'cht='. $options['typecode'];
+    $chart[] = 'cht=' . $options['typecode'];
   }
 
   // Convert the chat SIZE into the Google Chart way.
@@ -51,17 +51,17 @@ function _google_charts_chart(&$chart, &$data) {
   if (empty($data['#width']) or empty($data['#height'])) {
     return t('Height and Width are required');
   }
-  $chart[] = 'chs='. $data['#width'] .'x'. $data['#height'];
+  $chart[] = 'chs=' . $data['#width'] . 'x' . $data['#height'];
 
   // Add Title and Description to the chart
   if (!empty($data['#title'])) {
-    $chart[] = 'chtt='. $data['#title'];
+    $chart[] = 'chtt=' . $data['#title'];
   }
 
   // Chart background color. Since the default color
   // is white (#ffffff), only different colors are considered
   if (!empty($data['#color']['background']) and $data['#color']['background'] != '#ffffff') {
-    $chart[] = 'chf=bg,s,'. substr($data['#color']['background'], 1);
+    $chart[] = 'chf=bg,s,' . substr($data['#color']['background'], 1);
   }
 
   return;
@@ -117,7 +117,7 @@ function _google_charts_render(&$data) {
   }
 
   // If its all ok, build the HTML img tag
-  return '<img src="http://chart.apis.google.com/chart?'. implode('&amp;', $chart) .'" />';
+  return '<img src="http://chart.apis.google.com/chart?' . implode('&amp;', $chart) . '" />';
 }
 
 /**
@@ -165,10 +165,10 @@ function _google_charts_series(&$chart, &$data) {
       // Get the highlight points
       if (!empty($svalue['#highlight'])
           or ($data['#type'] == 'scatter' and ($series % 2 == 0))) {
-        $highlight[] = 't'. $svalue['#label'] .','.
-          (empty($svalue['#color']) ? substr($data[$series]['#color'], 1) : substr($svalue['#color'], 1)) .','.
-          $series .','.
-          $value .','.
+        $highlight[] = 't' . $svalue['#label'] . ',' .
+          (empty($svalue['#color']) ? substr($data[$series]['#color'], 1) : substr($svalue['#color'], 1)) . ',' .
+          $series . ',' .
+          $value . ',' .
           (empty($svalue['#size']) ? 10 : $svalue['#size']);
       }
 
@@ -199,27 +199,27 @@ function _google_charts_series(&$chart, &$data) {
   }
 
    // Insert data
-  $chart[] = 'chd=s:'. $chart_data;
+  $chart[] = 'chd=s:' . $chart_data;
 
   // Insert series color
   if (!empty($colors)) {
-    $chart[] = 'chco='. implode(',', $colors);
+    $chart[] = 'chco=' . implode(',', $colors);
   }
 
   // Insert values labels
   if (!empty($value_labels)) {
-    $chart[] = 'chl='. implode('|', $value_labels);
+    $chart[] = 'chl=' . implode('|', $value_labels);
   }
 
 
   // Insert multiple series tag
   if ($options['legend'] and !empty($legends)) {
-    $chart[] = 'chdl='. implode('|', $legends);
+    $chart[] = 'chdl=' . implode('|', $legends);
   }
 
   // Insert values labels
   if (!empty($highlight)) {
-    $chart[] = 'chm='. implode('|', $highlight);
+    $chart[] = 'chm=' . implode('|', $highlight);
   }
 
   return;

google_charts/google_charts.info

 ; $Id$
-core            = "6.x"
+core            = "7.x"
 dependencies[]  = charts
 description     = "Use Google Charts on your site."
+files[]         = google_charts.inc
+files[]         = google_charts.hooks.inc
 name            = "Google"
 package         = "Charts"

google_charts/google_charts.module

 <?php
-// $Id$
-/**
- * @author Bruno Massa http://drupal.org/user/67164
- * @file
- * Use Google Charts on your site.
- *
- * @note only hooks are here.
- */
-
-/**
- * Immplementation of hook_charts_info().
- *
- * Its a Charts module hook. It defines almost all aspects
- * of a chart provider, like its name, what types of charts
- * it can perform and what are the restrictions.
- */
-function google_charts_charts_info() {
-  return array(
-    'google' => array(
-      'file'    => drupal_get_path('module', 'google_charts') .'/google_charts.inc',
-      'name'    => t('Google Chart'),
-      'render'  => '_google_charts_render',
-      'types'   => array('line2D', 'hbar2D', 'vbar2D', 'pie2D', 'pie3D', 'venn', 'scatter'),
-    ),
-  );
-}
-
-/**
- * Immplementation of hook_chart_types().
- */
-function google_charts_chart_types() {
-  return array(
-    'venn'    => t('Venn'),
-    'scatter' => t('Scatter Plot'),
-  );
-}

openflashchart/openflashchart.hooks.inc

+<?php
+// $Id$
+/**
+ * @author Bruno Massa http://drupal.org/user/67164
+ * @file
+ * Use Open Flash Chart on your site.
+ *
+ * @note only hooks are here.
+ */
+
+/**
+ * Implementation of hook_charts_info().
+ *
+ * Its a Charts module hook. It defines almost all aspects
+ * of a chart provider, like its name, what types of charts
+ * it can perform and what are the restrictions.
+ */
+function openflashchart_charts_info() {
+  return array(
+    'openflashchart' => array(
+      'file'    => drupal_get_path('module', 'openflashchart') . '/openflashchart.inc',
+      'name'    => t('Open Flash Chart'),
+      'render'  => '_openflashchart_charts_render',
+      'types'   => array('line2D', 'vbar2D', 'vbar3D', 'pie2D'),
+    ),
+  );
+}