--- swfcharts.module 2007-10-13 22:57:13.000000000 +0400 +++ new.php 2007-10-23 16:00:13.000000000 +0400 @@ -42,29 +42,23 @@ function swfcharts_perm() { /** * Implementation of hook_menu(). */ -function swfcharts_menu($may_cache) { - $items = array(); - - if ($may_cache) { - $items[] = array( - 'path' => 'admin/settings/swfcharts', - 'title' => t('SWF Charts'), - 'description' => t('Configure default settings for SWF Charts.'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('swfcharts_admin_settings'), - 'access' => user_access('administer swfcharts'), - 'type' => MENU_NORMAL_ITEM - ); - $items[] = array( - 'path' => 'swfcharts/generate_chart', - 'description' => t('Configure SWF Charts.'), - 'callback' => 'swfcharts_chart', - 'callback arguments' => array(), - 'access' => TRUE, - 'type' => MENU_CALLBACK - ); - } - return $items; +function swfcharts_menu(){ + $items = array(); + + $items['admin/settings/swfcharts'] = array( + 'title' => t('SWF Charts'), + 'description' => t('Configure default settings for SWF Charts.'), + 'page callback' => 'drupal_get_form', + 'page arguments' => array('swfcharts_admin_settings'), + 'access arguments' => array('administer swfcharts'), + 'type' => MENU_NORMAL_ITEM + ); + $items['swfcharts/generate_chart'] = array( + 'description' => t('Configure SWF Charts.'), + 'page callback' => 'swfcharts_chart', + 'type' => MENU_CALLBACK + ); + return $items; } /** @@ -143,8 +137,7 @@ function swfcharts_chart($data, $config $license = $config['license'] ? $config['license'] : variable_get('swfcharts_api_key', NULL); - $chart_source_string = $charts_swf_file . '?library_path=' . $charts_library_path - . '&xml_source=' . $xml_filename; + $chart_source_string = $charts_swf_file . '?library_path=' . $charts_library_path . '&xml_source=' . $xml_filename; if ($license != NULL) { $chart_source_string .= "&license=" . $license; } @@ -175,6 +168,14 @@ function swfcharts_chart($data, $config return theme('swf_chart', $output); } +function swfcharts_theme(){ + return array( + 'swf_chart' => array( + 'arguments' => array('output' => "") + ), + ); +} + /** * Description *