From 84d47d8e9d67baac39513765081cf971a7faba25 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Tue, 25 Jun 2013 13:30:13 +0000 Subject: [PATCH] 2013-06-25 Miguel de Dios * godmode/menu.php: fixed the default value for refresh in the extensions. Fixes: #2310 * include/functions_extensions.php: cleaned source code style. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8402 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ pandora_console/godmode/menu.php | 3 ++- pandora_console/include/functions_extensions.php | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 92ef38d431..3ddea77d0f 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2013-06-25 Miguel de Dios + + * godmode/menu.php: fixed the default value for refresh in the + extensions. + + Fixes: #2310 + + * include/functions_extensions.php: cleaned source code style. + 2013-06-25 Miguel de Dios * operation/users/user_edit.php: fixed the "home page" for user, diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 01432cb4d2..c314780da4 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -49,6 +49,7 @@ if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, $menu_godmode["gagente"]["sub"] = $sub; } + } if (check_acl ($config['id_user'], 0, "AW")) { @@ -276,7 +277,7 @@ if (check_acl ($config['id_user'], 0, "PM")) { $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["refr"] = $config['refr']; } else { - $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["refr"] = 60; + $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["refr"] = 0; } } $menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["icon"] = $extmenu['icon']; diff --git a/pandora_console/include/functions_extensions.php b/pandora_console/include/functions_extensions.php index cd03bb246b..45e7be3889 100644 --- a/pandora_console/include/functions_extensions.php +++ b/pandora_console/include/functions_extensions.php @@ -336,7 +336,7 @@ function extensions_add_godmode_menu_option ($name, $acl, $fatherId = null, $ico $option_menu['acl'] = $acl; $option_menu['name'] = $name; $extension = &$config['extensions'][$extension_file]; - $option_menu['sec2'] = $extension['dir'].'/'.mb_substr ($extension_file, 0, -4); + $option_menu['sec2'] = $extension['dir'] . '/' . mb_substr ($extension_file, 0, -4); $option_menu['fatherId'] = $fatherId; $option_menu['icon'] = $icon; $option_menu['version'] = $version;