From a83ca340f0fdf878afee60cb4374cec52141f39c Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Mon, 22 Nov 2010 10:56:41 +0000 Subject: [PATCH] 2010-11-22 Miguel de Dios * godmode/extensions.php: fixed a lost javascript trace, and fixed when all extensions is disabled. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3611 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ pandora_console/godmode/extensions.php | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index faf141ee06..dc3950de8b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2010-11-22 Miguel de Dios + + * godmode/extensions.php: fixed a lost javascript trace, and fixed + when all extensions is disabled. + 2010-11-19 Sergio Martin * operation/agentes/estado_generalagente.php: Fixed the diff --git a/pandora_console/godmode/extensions.php b/pandora_console/godmode/extensions.php index 4f68c23908..a8766987a4 100644 --- a/pandora_console/godmode/extensions.php +++ b/pandora_console/godmode/extensions.php @@ -22,14 +22,17 @@ if (! give_acl ($config['id_user'], 0, "PM")) { exit; } -if (sizeof ($config['extensions']) == 0) { - echo '

'.__('There are no extensions defined').'

'; - return; -} - // Header print_page_header (__('Extensions'). " » ". __('Defined extensions'), "images/extensions.png", false, "", true, "" ); +if (sizeof ($config['extensions']) == 0) { + $extensions = getExtensionInfo(); + if (empty($extensions)) { + echo '

'.__('There are no extensions defined').'

'; + return; + } +} + $enterprise = (bool)get_parameter('enterprise', 0); $delete = get_parameter ("delete", ""); $enabled = get_parameter("enabled", ""); @@ -128,7 +131,6 @@ if ($disabled != '') { $(document).ready(function() { var href = location.href href = href.replace(/&enterprise=(0|1)&disabled=.*/g, ""); - console.log(href); location = href; } );