From c6716bb41aad008b6de9284d27e8fb2294963bbe Mon Sep 17 00:00:00 2001 From: esanchezm Date: Tue, 5 Aug 2008 10:47:40 +0000 Subject: [PATCH] 2008-08-05 Esteban Sanchez * include/functions_extensions.php: Added function to call login functions of the extensions. Functions renamed. * include/styles/pandora.css: Added style to notify bubble. * general/logon_ok.php: Added extensions login functions call. Style correction. * include/functions.php: Fixed array values cleanup on safe_input(). Documentation added to clean_output_breaks(). * index.php: Renamed functions fix. * operation/menu.php: Style correction. * ChangeLog: Added comment about commit #1000. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1001 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 23 +++++++++++++++++++ pandora_console/general/logon_ok.php | 7 ++++-- pandora_console/include/functions.php | 12 +++++----- .../include/functions_extensions.php | 17 +++++++++++--- pandora_console/include/styles/pandora.css | 12 ++++++---- pandora_console/index.php | 4 ++-- pandora_console/operation/menu.php | 21 ++++++++--------- 7 files changed, 67 insertions(+), 29 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index b69ae10cbe..2e6055f1cc 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,22 @@ +2008-08-05 Esteban Sanchez + + * include/functions_extensions.php: Added function to call login + functions of the extensions. Functions renamed. + + * include/styles/pandora.css: Added style to notify bubble. + + * general/logon_ok.php: Added extensions login functions call. Style + correction. + + * include/functions.php: Fixed array values cleanup on safe_input(). + Documentation added to clean_output_breaks(). + + * index.php: Renamed functions fix. + + * operation/menu.php: Style correction. + + * ChangeLog: Added comment about commit #1000. + 2008-08-04 Esteban Sanchez * index.php: Set id_user in config array when login. This fixes errors @@ -12,6 +31,10 @@ * godmode/extensions.php: It was showing main functions of extensions instead of godmode ones. + This commit is #1000. Congratulations to all the Pandora crew and + thanks all the Pandora users around the world. Pandora 2.0 is a bit + closer now. + 2008-08-04 Esteban Sánchez * extensions/hello.php: Fixed old function name. Activate the diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index dd4c057b09..4e9ef8d8a1 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -19,6 +19,9 @@ require ("include/functions_reporting.php"); +/* Call all extensions login function */ +extensions_call_login_function (); + echo "
"; $nick = $_SESSION['id_usuario']; echo "

" . lang_string ("welcome_title") . "

"; @@ -28,9 +31,9 @@ echo "

"; // Private messages pending to read ! -$sql=sprintf("SELECT COUNT(id_mensaje) AS count FROM tmensajes WHERE id_usuario_destino='%s' AND estado='FALSE';",$nick); +$sql = sprintf ("SELECT COUNT(id_mensaje) AS count FROM tmensajes WHERE id_usuario_destino='%s' AND estado='FALSE';",$nick); $resultado = get_db_sql ($sql); -if ($resultado != 0){ +if ($resultado != 0) { echo "

". lang_string ("new_message_bra") . ' ' .$row["count"] . ' ' diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index f2d1fde532..7fbe218a1b 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -46,7 +46,7 @@ function safe_input ($value) { if (is_numeric ($value)) return $value; if (is_array ($value)) { - $value = array_walk($value,'safe_input'); + array_walk (&$value,'safe_input'); return $value; } return htmlentities (utf8_decode ($value), ENT_QUOTES); @@ -86,15 +86,15 @@ function salida_limpia ($string) { } /** + * Replace all \n characters with
to show line breaks in HTML code. * + * @param string String to replace the characters * - * @param string - * - * @return + * @return The string with the characters replaced. */ function clean_output_breaks ($string){ - $myoutput = salida_limpia($string); - return preg_replace ('/\n/',"
", $myoutput); + $myoutput = salida_limpia ($string); + return preg_replace ('/\n/',"
", $myoutput); } /** diff --git a/pandora_console/include/functions_extensions.php b/pandora_console/include/functions_extensions.php index f50079cf5e..ec47f3cd05 100644 --- a/pandora_console/include/functions_extensions.php +++ b/pandora_console/include/functions_extensions.php @@ -2,7 +2,7 @@ $extension_file = ''; -function extension_main_function ($filename) { +function extension_call_main_function ($filename) { global $config; $extension = &$config['extensions'][$filename]; @@ -12,7 +12,7 @@ function extension_main_function ($filename) { } } -function extension_godmode_function ($filename) { +function extension_call_godmode_function ($filename) { global $config; $extension = &$config['extensions'][$filename]; @@ -22,6 +22,17 @@ function extension_godmode_function ($filename) { } } +function extensions_call_login_function () { + global $config; + + $params = array (); + foreach ($config['extensions'] as $extension) { + if ($extension['login_function'] == '') + continue; + call_user_func_array ($extension['login_function'], $params); + } +} + function is_extension ($page) { global $config; @@ -113,7 +124,7 @@ function add_extension_godmode_function ($function_name) { $extension['godmode_function'] = $function_name; } -function add_login_action_function ($function_name) { +function add_extension_login_function ($function_name) { global $config; global $extension_file; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index f5a2817d74..fe848db9ff 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -375,11 +375,6 @@ td.datos_jus, td.datos2_jus { border-bottom: 1px solid #708090; width: 100%; } -.suc { - color: #5a8629; - background: url(../../images/suc.png) no-repeat 1px; - padding: 4px 1px 6px 30px; -} .green { color: #5a8629; } @@ -754,3 +749,10 @@ a.big_data { text-decoration: none; font: bold 1em Arial, Sans-serif; color: #000; } + +.notify { + background-color: #f7ffa5; + text-align: center; + font-weight: bold; + padding: 8px; +} diff --git a/pandora_console/index.php b/pandora_console/index.php index 4366823f65..7e84d07878 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -241,9 +241,9 @@ if ($page != "") { require ($page); } else { if ($sec[0] == 'g') { - extension_godmode_function (basename ($page)); + extension_call_godmode_function (basename ($page)); } else { - extension_main_function (basename ($page)); + extension_call_main_function (basename ($page)); } } } else { diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 65c9697548..6bcf2d8ea1 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -230,7 +230,7 @@ if (give_acl ($config['id_user'], 0, "AR")) { } // SNMP console - if($sec2 == "operation/snmpconsole/snmp_view") { + if ($sec2 == "operation/snmpconsole/snmp_view") { $selected = ' menu-selected'; } else { $selected = ''; @@ -238,10 +238,10 @@ if (give_acl ($config['id_user'], 0, "AR")) { echo ''; - if ((give_acl($config['id_user'], 0, "AW")==1)){ + if (give_acl($config['id_user'], 0, "AW")) { // SNMP Console alert (submenu) - if ($sec == "snmpconsole"){ - if($sec2 == "operation/snmpconsole/snmp_alert") { + if ($sec == "snmpconsole") { + if ($sec2 == "operation/snmpconsole/snmp_alert") { echo "
"; } else { echo "
"; @@ -251,7 +251,7 @@ if (give_acl ($config['id_user'], 0, "AR")) { } // Messages - if($sec2 == "operation/messages/message" && !isset($_GET["nuevo_g"])) { + if($sec2 == "operation/messages/message" && !isset ($_GET["nuevo_g"])) { $selected = ' menu-selected'; } else { $selected = ''; @@ -260,8 +260,8 @@ if (give_acl ($config['id_user'], 0, "AR")) { echo '
'; // New message (submenu) - if ($sec == "messages"){ - if(isset($_GET["nuevo_g"])) { + if ($sec == "messages") { + if(isset ($_GET["nuevo_g"])) { echo "
"; } else { echo "
"; @@ -288,10 +288,9 @@ if (give_acl ($config['id_user'], 0, "AR")) { lang_string ("reporting").'
'; // Custom reporting - if ($sec == "reporting"){ - if ($sec2 == - "operation/reporting/custom_reporting" || $sec2 == - "operation/reporting/reporting_viewer") { + if ($sec == "reporting") { + if ($sec2 == "operation/reporting/custom_reporting" + || $sec2 == "operation/reporting/reporting_viewer") { echo "
"; } else { echo "
";