? chart-306978-1.patch
Index: chart.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/chart/chart.info,v
retrieving revision 1.2
diff -u -p -r1.2 chart.info
--- chart.info	7 Mar 2008 15:29:35 -0000	1.2
+++ chart.info	11 Sep 2008 14:09:06 -0000
@@ -1,3 +1,4 @@
 name = Chart API
 description = Chart generation API.
-package = Charting
\ No newline at end of file
+package = Charting
+core = 6.x
Index: chart.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/chart/chart.module,v
retrieving revision 1.9
diff -u -p -r1.9 chart.module
--- chart.module	24 Apr 2008 16:10:31 -0000	1.9
+++ chart.module	11 Sep 2008 14:09:07 -0000
@@ -78,18 +78,15 @@ function chart_init() {
 /**
 * Implementation of hook_menu().
 */  
-function chart_menu($may_cache) {
+function chart_menu() {
   $items = array();
   
-  if ($may_cache){                
-    $items[] = array(
-        'path' => 'admin/settings/chart',
-        'title' => t('Charts'),
-        'callback' => 'drupal_get_form',
-        'callback arguments' => array('chart_settings'),
-        'access' => user_access('administer chart'),
-      );  
-  }
+  $items['admin/settings/chart'] = array(
+    'title' => 'Charts',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('chart_settings'),
+    'access arguments' => array('administer chart'),
+  );  
             
   return $items;
 }
@@ -329,14 +326,14 @@ function chart_settings() {   
 /**
 * Implementation of hook_validate();
 */
-function chart_settings_validate($form_id, $form_values, $form){  
-  if (!empty($form_values['chart_global_bg']) && !preg_match('/[a-fA-F0-9]{6}/is', $form_values['chart_global_bg'])){
+function chart_settings_validate($form, &$form_state) {  
+  if (!empty($form_state['values']['chart_global_bg']) && !preg_match('/[a-fA-F0-9]{6}/is', $form_state['values']['chart_global_bg'])){
     form_set_error('chart_global_bg', t('Invalid color. Formatted as RRGGBB with no pound sign.'));  
   }
-  if (!empty($form_values['chart_max_width']) && !is_numeric($form_values['chart_max_width'])){
+  if (!empty($form_state['values']['chart_max_width']) && !is_numeric($form_state['values']['chart_max_width'])){
     form_set_error('chart_max_width', t('Width must be an integer.'));
   }     
-  if (!empty($form_values['chart_max_height']) && !is_numeric($form_values['chart_max_height'])){
+  if (!empty($form_state['values']['chart_max_height']) && !is_numeric($form_state['values']['chart_max_height'])){
     form_set_error('chart_max_height', t('Height must be an integer.'));  
   }  
 }
Index: contrib/system_charts/system_charts.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/chart/contrib/system_charts/system_charts.info,v
retrieving revision 1.2
diff -u -p -r1.2 system_charts.info
--- contrib/system_charts/system_charts.info	7 Mar 2008 15:29:35 -0000	1.2
+++ contrib/system_charts/system_charts.info	11 Sep 2008 14:09:07 -0000
@@ -1,4 +1,5 @@
 name = Drupal System Charting
 description = Charting for various core modules.
 package = Charting
-dependencies = chart
\ No newline at end of file
+dependencies[] = chart
+core = 6.x
Index: contrib/system_charts/system_charts.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/chart/contrib/system_charts/system_charts.module,v
retrieving revision 1.7
diff -u -p -r1.7 system_charts.module
--- contrib/system_charts/system_charts.module	24 Apr 2008 16:04:23 -0000	1.7
+++ contrib/system_charts/system_charts.module	11 Sep 2008 14:09:07 -0000
@@ -23,29 +23,25 @@ function system_charts_perm(){
 /**
 * Implementation of hook_menu().
 */  
-function system_charts_menu($may_cache){
+function system_charts_menu() {
   $items = array();
   
-  if ($may_cache){
-    $items[] = array(
-        'path' => 'admin/logs/charts',
-        'title' => t('System Charts'),
-        'callback' => 'system_charts',
-        'access' => user_access('access system charts'),
+    $items['admin/reports/charts'] = array(
+        'title' => 'System Charts',
+        'page callback' => 'system_charts',
+        'access callback' => array('access system charts'),
       ); 
 
     $pages = system_charts_get_page_info();   
     foreach($pages AS $type => $page){
-      $items[] = array(
-          'path' => 'admin/logs/charts/' . $type,
+      $items['admin/reports/charts/'. $type] = array(
           'title' => $page['#title'],
-          'callback' => 'system_charts',
-          'callback arguments' => array($type),
-          'access' => user_access('access system charts'),
+          'page callback' => 'system_charts',
+          'page arguments' => array($type),
+          'access callback' => array('access system charts'),
           'type' => $type == 'nodes' ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK,
         );   
     }
-  }      
   
   return $items;
 }