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

2012-09-27 Sergio Martin <sergio.martin@artica.es> 

* include/functions_menu.php
	index.php
	operation/menu.php
	godmode/agentes/modificar_agente.php
	godmode/menu.php: Fixed some pages to ACL Enterprise
	and the full screen pages loading menu structure when is not
	shown
	Merged from 4.0.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7005 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-09-27 13:02:16 +00:00
parent ebe020bf61
commit 892dc813fb
6 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/ChangeLog
View File

@ -1,3 +1,14 @@
2012-09-27 Sergio Martin <sergio.martin@artica.es>
* include/functions_menu.php
index.php
operation/menu.php
godmode/agentes/modificar_agente.php
godmode/menu.php: Fixed some pages to ACL Enterprise
and the full screen pages loading menu structure when is not
shown
Merged from 4.0.x
2012-09-26 Sergio Martin <sergio.martin@artica.es>
* include/functions_menu.php

2
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -68,7 +68,7 @@ if (!empty($agent_to_delete)) {
$tab = 'view';
/* Setup tab */
$viewtab['text'] = '<a href="index.php?sec=gagente&sec2=operation/agentes/estado_agente">'
$viewtab['text'] = '<a href="index.php?sec=estado&sec2=operation/agentes/estado_agente">'
. html_print_image ("images/zoom.png", true, array ("title" =>__('View')))
. '</a>';

4
pandora_console/godmode/menu.php
View File

@ -295,5 +295,7 @@ if (check_acl ($config['id_user'], 0, "PM")) {
}
}
menu_print_menu ($menu_godmode);
if(!$config['pure']) {
menu_print_menu ($menu_godmode);
}
?>

6
pandora_console/include/functions_menu.php
View File

@ -377,6 +377,12 @@ function menu_add_extras(&$menu) {
$menu_extra['galertas']['sub']['godmode/alerts/configure_alert_compound']['text'] = __('Manage compound alerts');
$menu_extra['galertas']['sub']['enterprise/godmode/alerts/alert_events']['text'] = __('Manage event alerts');
$menu_extra['gservers']['sub']['enterprise/godmode/servers/manage_export_form']['text'] = __('Manage export targets');
$menu_extra['estado']['sub']['enterprise/godmode/services/manage_services']['text'] = __('Manage services');
$menu_extra['estado']['sub']['godmode/snmpconsole/snmp_alert']['text'] = __('SNMP alerts');
$menu_extra['estado']['sub']['godmode/snmpconsole/snmp_filters']['text'] = __('SNMP filters');
$menu_extra['estado']['sub']['enterprise/godmode/snmpconsole/snmp_trap_editor']['text'] = __('SNMP trap editor');
$menu_extra['estado']['sub']['godmode/snmpconsole/snmp_trap_generator']['text'] = __('SNMP trap generator');
$menu_extra['workspace']['sub']['operation/incidents/incident_detail']['text'] = __('Manage incident');
// Duplicate extensions as sec=extension to check it from url
foreach ($menu as $k => $m) {

4
pandora_console/index.php
View File

@ -407,9 +407,11 @@ if ($config["pure"] == 0) {
}
else {
echo '<div id="main_pure">';
// Require menu only to build structure to use it in ACLs
require ("operation/menu.php");
require ("godmode/menu.php");
}
// http://es2.php.net/manual/en/ref.session.php#64525
// Session locking concurrency speedup!
session_write_close ();

4
pandora_console/operation/menu.php
View File

@ -397,5 +397,7 @@ if (check_acl ($config['id_user'], 0, "AR")) {
// Save operation menu array to use in operation/extensions.php view
$operation_menu_array = $menu_operation;
menu_print_menu ($menu_operation, true);
if(!$config['pure']) {
menu_print_menu ($menu_operation, true);
}
?>