From 4780638b9ec230c1964a070fda4be49b0140fb1f Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 19 Oct 2010 15:57:07 +0000 Subject: [PATCH] 2010-10-19 Sergio Martin * include/functions_visual_map.php include/ajax/visual_console_builder.ajax.php godmode/reporting/visual_console_builder.php: Added the html support in the label type items of the visual consoles for pending task 3063404 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3425 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ .../godmode/reporting/visual_console_builder.php | 1 - .../include/ajax/visual_console_builder.ajax.php | 1 + pandora_console/include/functions_visual_map.php | 4 +--- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 771709fc0b..3e9cf88f2b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2010-10-19 Sergio Martin + + * include/functions_visual_map.php + include/ajax/visual_console_builder.ajax.php + godmode/reporting/visual_console_builder.php: Added the html support + in the label type items of the visual consoles for pending + task 3063404 + 2010-10-19 Miguel de Dios * include/functions_db.php: added hook for "user translation" in function diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php index 009b32245d..1b230fb4cd 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.php +++ b/pandora_console/godmode/reporting/visual_console_builder.php @@ -117,7 +117,6 @@ switch ($activeTab) { foreach ($idsElements as $idElement) { $id = $idElement['id']; $values = array(); - //$values['label'] = get_parameter('label_' . $id, ''); $values['label'] = get_parameter('label_' . $id, ''); $values['image'] = get_parameter('image_' . $id, ''); $values['width'] = get_parameter('width_' . $id, 0); diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php index 745127f4c6..c5ac341682 100644 --- a/pandora_console/include/ajax/visual_console_builder.ajax.php +++ b/pandora_console/include/ajax/visual_console_builder.ajax.php @@ -200,6 +200,7 @@ switch ($action) { $elementFields['height_module_graph'] = $elementFields['height']; break; } + $elementFields['label'] = safe_output($elementFields['label']); echo json_encode($elementFields); break; } diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index d30640821d..0adbfd9107 100644 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -406,7 +406,7 @@ function print_pandora_visual_map ($id_layout, $show_links = true, $draw_lines = if ($layout_datas !== false) { foreach ($layout_datas as $layout_data) { - + $layout_data['label'] = safe_output($layout_data['label']); // **************************************************************** // Get parent status (Could be an agent, module, map, others doesnt have parent info) // **************************************************************** @@ -878,8 +878,6 @@ function get_layout_status ($id_layout = 0, $depth = 0) { $id_layout = (int) $id_layout; - $sql = sprintf ('SELECT id_agente_modulo, parent_item, id_layout_linked, id_agent - FROM `tlayout_data` WHERE `id_layout` = %d', $id_layout); $result = get_db_all_rows_filter ('tlayout_data', array ('id_layout' => $id_layout), array ('id_agente_modulo', 'parent_item', 'id_layout_linked', 'id_agent', 'type')); if ($result === false)