From 0c7fa1a7a584f6aba65bbc1d5d598fe327962dd0 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Mon, 22 Nov 2010 13:43:54 +0000 Subject: [PATCH] 2010-11-22 Miguel de Dios * include/help/en/help_operation_visual_console.php, include/help/es/help_operation_visual_console.php: added first version of help file for the operation main page of Visual Console, these have a explain for the especial name for visual consoles. * operation/visual_console/index.php: added link to help in header. operation/menu.php: added filter to hide the "Visual Console items" in submenu that haven't first letter as "_", "," , "[" , "(". And fixed the show name with safe_input entities. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3612 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 13 +++++++++++++ .../help/en/help_operation_visual_console.php | 8 ++++++++ .../help/es/help_operation_visual_console.php | 9 +++++++++ pandora_console/operation/menu.php | 14 +++++++++++++- pandora_console/operation/visual_console/index.php | 2 +- 5 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 pandora_console/include/help/en/help_operation_visual_console.php create mode 100644 pandora_console/include/help/es/help_operation_visual_console.php diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index dc3950de8b..df2c38100f 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,16 @@ +2010-11-22 Miguel de Dios + + * include/help/en/help_operation_visual_console.php, + include/help/es/help_operation_visual_console.php: added first + version of help file for the operation main page of Visual Console, + these have a explain for the especial name for visual consoles. + + * operation/visual_console/index.php: added link to help in header. + + operation/menu.php: added filter to hide the "Visual Console items" + in submenu that haven't first letter as "_", "," , "[" , "(". And + fixed the show name with safe_input entities. + 2010-11-22 Miguel de Dios * godmode/extensions.php: fixed a lost javascript trace, and fixed diff --git a/pandora_console/include/help/en/help_operation_visual_console.php b/pandora_console/include/help/en/help_operation_visual_console.php new file mode 100644 index 0000000000..42b875ee89 --- /dev/null +++ b/pandora_console/include/help/en/help_operation_visual_console.php @@ -0,0 +1,8 @@ + +

Visual Console

+

The visual console items have the characters "_", "," , "[" , "(" for the first letter, +it is show in the left menu into "Visual Console" submenu.

diff --git a/pandora_console/include/help/es/help_operation_visual_console.php b/pandora_console/include/help/es/help_operation_visual_console.php new file mode 100644 index 0000000000..173653535e --- /dev/null +++ b/pandora_console/include/help/es/help_operation_visual_console.php @@ -0,0 +1,9 @@ + +

Visual Console

+

Los "mapas visuales" que tengan por primera letra del nombre los caracteres +"_", "," , "[" , "(", seran mostrados en el menu de la izquierda en el submenu +de la "Consola Visual".

diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index c39fb6b1e2..2f810f0d53 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -105,11 +105,23 @@ if (give_acl ($config['id_user'], 0, "AR")) { } $id = (int) get_parameter ('id', -1); + $firstLetterNameVisualToShow = array('_', ',', '[', '('); + foreach ($layouts as $layout) { if (! give_acl ($config["id_user"], $layout["id_group"], "AR")) { continue; } - $sub["operation/visual_console/render_view&id=".$layout["id"]]["text"] = mb_substr ($layout["name"], 0, 15); + $name = safe_output($layout['name']); + if (empty($name)) { + $firstLetter = ''; + } + else { + $firstLetter = $name[0]; + } + if (!in_array($firstLetter, $firstLetterNameVisualToShow)) { + continue; + } + $sub["operation/visual_console/render_view&id=".$layout["id"]]["text"] = mb_substr ($name, 0, 15); $sub["operation/visual_console/render_view&id=".$layout["id"]]["refr"] = 0; } diff --git a/pandora_console/operation/visual_console/index.php b/pandora_console/operation/visual_console/index.php index 702a629e6c..4ba0090cfc 100644 --- a/pandora_console/operation/visual_console/index.php +++ b/pandora_console/operation/visual_console/index.php @@ -19,7 +19,7 @@ check_login (); // Header -print_page_header (__("Visual console"), "images/monitor.png"); +print_page_header (__("Visual console"), "images/monitor.png", false, "operation_visual_console"); require_once ('include/functions_visual_map.php'); $layouts = get_user_layouts ();