tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-04-03 Dario Rodriguez <dario.rodriguez@artica.es> 

* include/functions_menu.php: Deleted extension icon on menus.

	* extensions/extension_uploader.php: Fixed wrong link to menu for this
	extension.

	* operation/menu.php,
	godmode/menu.php: Fixed duplicated extension links on menus.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5883 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2012-04-03 13:26:22 +00:00
parent 72b629ae44
commit 8608d4ad03
5 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2012-04-03 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_menu.php: Deleted extension icon on menus.
* extensions/extension_uploader.php: Fixed wrong link to menu for this
extension.
* operation/menu.php,
godmode/menu.php: Fixed duplicated extension links on menus.
2012-04-03 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql

2
pandora_console/extensions/extension_uploader.php
View File

@ -75,6 +75,6 @@ function extension_uploader_extensions() {
echo "</form>";
}
extensions_add_godmode_menu_option(__('Extension uploader'), 'AM', 'gextensions');
extensions_add_godmode_menu_option(__('Extension uploader'), 'AM');
extensions_add_godmode_function('extension_uploader_extensions');
?>

15
pandora_console/godmode/menu.php
View File

@ -245,11 +245,20 @@ if (check_acl ($config['id_user'], 0, "PM")) {
$sub = array ();
foreach ($config['extensions'] as $extension) {
$extmenu = $extension['godmode_menu'];
if ($extension['godmode_menu'] == '' || ! check_acl ($config['id_user'], 0, $extmenu['acl'])) {
//If no godmode_menu is a operation extension
if ($extension['godmode_menu'] == '') {
continue;
}
//Check if was displayed inside other menu
//Check the ACL for this user
$extmenu = $extension['godmode_menu'];
if ($extension['godmode_menu']["fatherId"] != ''
|| ! check_acl ($config['id_user'], 0, $extmenu['acl'])
|| $extension["godmode_menu"]["sec2"] == "") {
continue;
}
$sub[$extmenu["sec2"]]["text"] = $extmenu["name"];
$sub[$extmenu["sec2"]]["refr"] = 0;

4
pandora_console/include/functions_menu.php
View File

@ -218,8 +218,8 @@ function menu_print_menu (&$menu) {
else {
$imageIcon = $imageIconDefault;
}
$submenu_output .= '<div style="background: url('.$imageIcon.') no-repeat; width: 16px; height: 16px; float: left; margin: 5px 0px 0px 3px;">&nbsp;</div>';
//Delete extension Icon before the was a style with background: url('.$imageIcon.') no-repeat;
$submenu_output .= '<div style="width: 16px; height: 16px; float: left; margin: 5px 0px 0px 3px;">&nbsp;</div>';
}

7
pandora_console/operation/menu.php
View File

@ -344,9 +344,16 @@ if (check_acl ($config['id_user'], 0, "AR")) {
$sub["operation/agentes/exportdata"]["refr"] = 0;
foreach ($config["extensions"] as $extension) {
//If no operation_menu is a godmode extension
if ($extension["operation_menu"] == '') {
continue;
}
//Check if was displayed inside other menu
if ($extension["operation_menu"]["fatherId"] != '' || $extension["operation_menu"]["sec2"] == "") {
continue;
}
$extension_menu = $extension["operation_menu"];
$sub[$extension_menu["sec2"]]["text"] = $extension_menu["name"];
$sub[$extension_menu["sec2"]]["refr"] = 0;