From 6a7d3ba7ed2e458faf0ff3063ec287b001d72d9a Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 4 Jul 2014 11:49:54 +0000 Subject: [PATCH] 2014-07-04 Miguel de Dios * include/functions_config.php, include/functions_extensions.php: fixed the show old update manager and set the correct link in the header warning message to update manager. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10315 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/include/functions_config.php | 2 +- pandora_console/include/functions_extensions.php | 8 ++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 8fb6a523b2..d78e3beef5 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2014-07-04 Miguel de Dios + + * include/functions_config.php, include/functions_extensions.php: + fixed the show old update manager and set the correct link in the + header warning message to update manager. + 2014-06-30 Koichiro KIKUCHI * operation/agentes/estado_monitores.php, diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 314b33ac92..062996a969 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -1312,7 +1312,7 @@ function config_check () { $config["alert_cnt"]++; $_SESSION["alert_msg"] .= ui_print_info_message( array('title' => __("New update of Pandora Console"), - 'message' => __('There is a new update please go to menu Administration and into extensions go to Update Manager for more details.'), + 'message' => __('There is a new update please go to menu Administration and into extensions go to Update Manager for more details.'), 'no_close' => true, 'force_style' => 'color: #000000 !important'), '', true); } } diff --git a/pandora_console/include/functions_extensions.php b/pandora_console/include/functions_extensions.php index ccace76541..c8f6a419f8 100644 --- a/pandora_console/include/functions_extensions.php +++ b/pandora_console/include/functions_extensions.php @@ -99,11 +99,11 @@ function extensions_get_extensions ($enterprise = false) { $dir = ENTERPRISE_DIR.'/'.EXTENSIONS_DIR; if (file_exists ($dir)) - $handle = @opendir ($dir); + $handle = @opendir ($dir); if (empty ($handle)) return; - + $file = readdir ($handle); $extensions = array (); $ignores = array ('.', '..'); @@ -117,6 +117,10 @@ function extensions_get_extensions ($enterprise = false) { $file = readdir ($handle); continue; } + + if ($file == "update_manager.php") + continue; + $extension['file'] = $file; $extension['operation_menu'] = ''; $extension['godmode_menu'] = '';