diff --git a/pandora_console/include/ajax/graph.ajax.php b/pandora_console/include/ajax/graph.ajax.php index ed1651ee3c..3449cb5cab 100644 --- a/pandora_console/include/ajax/graph.ajax.php +++ b/pandora_console/include/ajax/graph.ajax.php @@ -22,7 +22,7 @@ $get_graphs = (bool)get_parameter('get_graphs_container'); if ($save_custom_graph) { $return = array(); - + $id_modules = (array)get_parameter('id_modules', array()); $name = get_parameter('name', ''); $description = get_parameter('description', ''); @@ -32,20 +32,19 @@ if ($save_custom_graph) { $events = get_parameter('events', 0); $period = get_parameter('period', 0); $fullscale = get_parameter('fullscale', 0); - + $result = (bool)custom_graphs_create($id_modules, $name, $description, $stacked, $width, $height, $events, $period, 0, 0, false, $fullscale); - - + $return['correct'] = $result; - + echo json_encode($return); return; } if ($print_custom_graph) { ob_clean(); - + $id_graph = (int) get_parameter('id_graph'); $height = (int) get_parameter('height', CHART_DEFAULT_HEIGHT); $width = (int) get_parameter('width', CHART_DEFAULT_WIDTH); @@ -76,43 +75,41 @@ if ($print_custom_graph) { if ($print_sparse_graph) { ob_clean(); - - $agent_module_id = (int) get_parameter('agent_module_id'); - $period = (int) get_parameter('period', SECONDS_5MINUTES); - $show_events = (bool) get_parameter('show_events'); - $width = (int) get_parameter('width', CHART_DEFAULT_WIDTH); - $height = (int) get_parameter('height', CHART_DEFAULT_HEIGHT); - $title = (string) get_parameter('title'); - $unit_name = (string) get_parameter('unit_name'); - $show_alerts = (bool) get_parameter('show_alerts'); - $avg_only = (int) get_parameter('avg_only'); - $pure = (bool) get_parameter('pure'); - $date = (int) get_parameter('date', time()); - $unit = (string) get_parameter('unit'); - $baseline = (int) get_parameter('baseline'); - $return_data = (int) get_parameter('return_data'); - $show_title = (bool) get_parameter('show_title', true); - $only_image = (bool) get_parameter('only_image'); - $homeurl = (string) get_parameter('homeurl'); - $ttl = (int) get_parameter('ttl', 1); - $projection = (bool) get_parameter('projection'); - $adapt_key = (string) get_parameter('adapt_key'); - $compare = (bool) get_parameter('compare'); - $show_unknown = (bool) get_parameter('show_unknown'); - $menu = (bool) get_parameter('menu', true); - $background_color = (string) get_parameter('background_color', 'white'); - $percentil = get_parameter('percentil', null); - $dashboard = (bool) get_parameter('dashboard'); - $vconsole = (bool) get_parameter('vconsole'); - $type_g = get_parameter('type_g', $config['type_module_charts']); - $fullscale = get_parameter('fullscale', 0); - - echo grafico_modulo_sparse($agent_module_id, $period, $show_events, - $width, $height , $title, $unit_name, $show_alerts, $avg_only, - $pure, $date, $unit, $baseline, $return_data, $show_title, - $only_image, $homeurl, $ttl, $projection, $adapt_key, $compare, - $show_unknown, $menu, $backgroundColor, $percentil, - $dashboard, $vconsole, $type_g, $fullscale); + $params =array( + 'agent_module_id' => (int)get_parameter('agent_module_id'), + 'period' => (int) get_parameter('period', SECONDS_5MINUTES), + 'show_events' => (bool) get_parameter('show_events'), + 'title' => (string) get_parameter('title'), + 'unit_name' => (string) get_parameter('unit_name'), + 'show_alerts' => (bool) get_parameter('show_alerts'), + 'avg_only' => (int) get_parameter('avg_only'), + 'pure' => (bool) get_parameter('pure'), + 'date' => (int) get_parameter('date', time()), + 'unit' => (string) get_parameter('unit'), + 'baseline' => (int) get_parameter('baseline'), + 'return_data' => (int) get_parameter('return_data'), + 'show_title' => (bool) get_parameter('show_title', true), + 'only_image' => (bool) get_parameter('only_image'), + 'homeurl' => (string) get_parameter('homeurl'), + 'ttl' => (int) get_parameter('ttl', 1), + 'projection' => (bool) get_parameter('projection'), + 'adapt_key' => (string) get_parameter('adapt_key'), + 'compare' => (bool) get_parameter('compare'), + 'show_unknown' => (bool) get_parameter('show_unknown'), + 'menu' => (bool) get_parameter('menu', true), + 'backgroundColor' => (string) get_parameter('background_color', 'white'), + 'percentil' => get_parameter('percentil', null), + 'dashboard' => (bool) get_parameter('dashboard'), + 'vconsole' => (bool) get_parameter('vconsole'), + 'type_graph' => get_parameter('type_g', $config['type_module_charts']), + 'fullscale' => get_parameter('fullscale', 0), + 'id_widget_dashboard' => false, + 'force_interval' => '', + 'time_interval' => 300, + 'array_data_create' => 0 + ); + + echo grafico_modulo_sparse($params); return; } @@ -124,7 +121,7 @@ if ($get_graphs){ if (!empty($result_items)){ $hash = get_parameter('hash',0); $period = get_parameter('time',0); - + $periods = array (); $periods[1] = __('none'); $periods[SECONDS_1HOUR] = __('1 hour'); @@ -137,7 +134,7 @@ if ($get_graphs){ $periods[SECONDS_1WEEK] = __('1 week'); $periods[SECONDS_15DAYS] = __('15 days'); $periods[SECONDS_1MONTH] = __('1 month'); - + $table = ''; $single_table = "