tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-22 21:35:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

2012-07-04 Sergio Martin <sergio.martin@artica.es>

Browse Source 
* include/functions_menu.php
	operation/agentes/estado_monitores.php
	operation/snmpconsole/snmp_view.php
	operation/users/user_edit.php
	images/skin/skin_default/include/styles/pandora.css
	general/header.php: Fixes of missed "sec" changes in the new
	menus and a little hack of the classify of retrieved menus



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6734 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-07-04 10:47:04 +00:00
parent 5a4b64bc1b
commit 6fc5ad1b25
7 changed files with 22 additions and 9 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-07-04 Sergio Martin <sergio.martin@artica.es>
* include/functions_menu.php
operation/agentes/estado_monitores.php
operation/snmpconsole/snmp_view.php
operation/users/user_edit.php
images/skin/skin_default/include/styles/pandora.css
general/header.php: Fixes of missed "sec" changes in the new
menus and a little hack of the classify of retrieved menus
2012-07-03 Miguel de Dios <miguel.dedios@artica.es> 2012-07-03 Miguel de Dios <miguel.dedios@artica.es>
* ajax.php: added support for the enterprise, because some case * ajax.php: added support for the enterprise, because some case

2
pandora_console/general/header.php
View File

@ -49,7 +49,7 @@ config_check();
else else
html_print_image("images/user_green.png" , false, array("class" => 'bot', "alt" => 'user')); html_print_image("images/user_green.png" , false, array("class" => 'bot', "alt" => 'user'));
?> ?>
<a href="index.php?sec=usuarios&amp;sec2=operation/users/user_edit" class="white"> [<b><?php echo $config["id_user"];?></b>]</a> <a href="index.php?sec=workspace&amp;sec2=operation/users/user_edit" class="white"> [<b><?php echo $config["id_user"];?></b>]</a>
<?php <?php
if ($config["metaconsole"] == 0){ if ($config["metaconsole"] == 0){

2
pandora_console/images/skin/skin_default/include/styles/pandora.css
View File

@ -1667,7 +1667,7 @@ div.warn {
} }
/*#head a[href="index.php?sec=usuarios&sec2=operation/users/user_edit"] { /*#head a[href="index.php?sec=workspace&sec2=operation/users/user_edit"] {
display: block; display: block;
position: absolute; position: absolute;
top: 10px; top: 10px;

7
pandora_console/include/functions_menu.php
View File

@ -350,7 +350,11 @@ function menu_get_sec($with_categories = false) {
foreach($menu as $k => $v) { foreach($menu as $k => $v) {
if($with_categories) { if($with_categories) {
if(!$in_godmode && $k[0] == 'g') { if(!$in_godmode && $k[0] == 'g') {
$in_godmode = true; // Hack to dont confuse with gis activated because godmode
// sec starts with g (like gismaps)
if($k != 'gismaps') {
$in_godmode = true;
}
} }
if($in_godmode) { if($in_godmode) {
@ -389,7 +393,6 @@ function menu_get_sec_pages($sec,$menu_hash = false) {
else { else {
$menu = json_decode(base64_decode($menu_hash),true); $menu = json_decode(base64_decode($menu_hash),true);
} }
// Get the sec2 of the main section // Get the sec2 of the main section
$sec2_array[$menu[$sec]['sec2']] = $menu[$sec]['text']; $sec2_array[$menu[$sec]['sec2']] = $menu[$sec]['text'];

2
pandora_console/operation/agentes/estado_monitores.php
View File

@ -306,7 +306,7 @@ foreach ($modules as $module) {
$data[2] = servers_show_type ($module['id_modulo']) . '&nbsp;'; $data[2] = servers_show_type ($module['id_modulo']) . '&nbsp;';
if (check_acl ($config['id_user'], $id_grupo, "AW")) if (check_acl ($config['id_user'], $id_grupo, "AW"))
$data[2] .= '<a href="index.php?sec=estado&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'&amp;tab=module&amp;id_agent_module='.$module["id_agente_modulo"].'&amp;edit_module='.$module["id_modulo"].'">' . html_print_image("images/config.png", true, array("alt" => '0', "border" => "")) . '</a>'; $data[2] .= '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'&amp;tab=module&amp;id_agent_module='.$module["id_agente_modulo"].'&amp;edit_module='.$module["id_modulo"].'">' . html_print_image("images/config.png", true, array("alt" => '0', "border" => "")) . '</a>';
$data[3] = ui_print_string_substr ($module["nombre"], 30, true); $data[3] = ui_print_string_substr ($module["nombre"], 30, true);
if (!empty($module["extended_info"])) { if (!empty($module["extended_info"])) {

2
pandora_console/operation/snmpconsole/snmp_view.php
View File

@ -489,7 +489,7 @@ if ($traps !== false) {
//User //User
if (!empty ($trap["status"])) { if (!empty ($trap["status"])) {
$data[5] = '<a href="index.php?sec=usuarios&sec2=operation/users/user_edit&ver='.$trap["id_usuario"].'">'.substr ($trap["id_usuario"], 0, 8).'</a>'; $data[5] = '<a href="index.php?sec=workspace&sec2=operation/users/user_edit&ver='.$trap["id_usuario"].'">'.substr ($trap["id_usuario"], 0, 8).'</a>';
if (!empty($trap["id_usuario"])) if (!empty($trap["id_usuario"]))
$data[5] .= ui_print_help_tip(get_user_fullname($trap["id_usuario"]), true); $data[5] .= ui_print_help_tip(get_user_fullname($trap["id_usuario"]), true);
} }

6
pandora_console/operation/users/user_edit.php
View File

@ -147,10 +147,10 @@ if (isset ($_GET["modified"]) && !$view_mode) {
// Reload page to update skin // Reload page to update skin
/* if ($return){ /* if ($return){
header ('location:' . $config['homeurl'] . '/index.php?sec=usuarios&sec2=operation/users/user_edit&status=1'); header ('location:' . $config['homeurl'] . '/index.php?sec=workspace&sec2=operation/users/user_edit&status=1');
} }
else{ else{
header ('location:' . $config['homeurl'] . '/index.php?sec=usuarios&sec2=operation/users/user_edit&status=0'); header ('location:' . $config['homeurl'] . '/index.php?sec=workspace&sec2=operation/users/user_edit&status=0');
}*/ }*/
$user_info = $upd_info; $user_info = $upd_info;
@ -164,7 +164,7 @@ if ($status != -1){
} }
echo '<form name="user_mod" method="post" action="index.php?sec=usuarios&amp;sec2=operation/users/user_edit&amp;modified=1&amp;id='.$id.'">'; echo '<form name="user_mod" method="post" action="index.php?sec=workspace&amp;sec2=operation/users/user_edit&amp;modified=1&amp;id='.$id.'">';
echo '<table cellpadding="4" cellspacing="4" class="databox" width="98%">'; echo '<table cellpadding="4" cellspacing="4" class="databox" width="98%">';