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

2009-09-26 Raul Mateos <raulofpandora@gmail.com> 

* include/config_process.php: Update build after last changes.

	* operation/agentes/alerts_status.php, operation/agentes/sla_view.php: 
	Unify titles improving integrity of appearance.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1982 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2009-09-26 17:05:46 +00:00
parent f8efe4e917
commit a77bcf1ac1
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2009-09-26 Raul Mateos <raulofpandora@gmail.com>
* include/config_process.php: Update build after last changes.
* operation/agentes/alerts_status.php, operation/agentes/sla_view.php:
Unify titles improving integrity of appearance.
2009-09-25 Miguel de Dios <miguel.dedios@artica.es> 2009-09-25 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/pandora_modules.js: fix the js and add more entities * include/javascript/pandora_modules.js: fix the js and add more entities

2
pandora_console/include/config_process.php
View File

@ -22,7 +22,7 @@
/** /**
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC090914'; $build_version = 'PC090926';
$pandora_version = 'v3.0-dev'; $pandora_version = 'v3.0-dev';
$config['start_time'] = microtime (true); $config['start_time'] = microtime (true);

18
pandora_console/operation/agentes/alerts_status.php
View File

@ -72,6 +72,7 @@ if (isset ($_GET["id_agente"])) {
$alerts_simple = get_agent_alerts_simple ($id_agent, $filter); $alerts_simple = get_agent_alerts_simple ($id_agent, $filter);
$alerts_combined = get_agent_alerts_compound ($id_agent, $filter); $alerts_combined = get_agent_alerts_compound ($id_agent, $filter);
$print_agent = false; $print_agent = false;
$inside_main = 1;
} else { } else {
if (!give_acl ($config["id_user"], 0, "AR")) { if (!give_acl ($config["id_user"], 0, "AR")) {
audit_db ($config["id_user"], $config["remote_addr"], "ACL Violation","Trying to access alert view"); audit_db ($config["id_user"], $config["remote_addr"], "ACL Violation","Trying to access alert view");
@ -93,16 +94,27 @@ if (isset ($_GET["id_agente"])) {
} }
$print_agent = true; $print_agent = true;
$inside_main = 0;
} }
$tab = get_parameter_get ("tab"); $tab = get_parameter_get ("tab");
if ($tab != '') { if ($tab != '') {
$url = $url.'&tab='.$tab; $url = $url.'&tab='.$tab;
} }
echo "<h2>".__('Pandora agents')." &raquo; ".__('Alerts');
echo print_help_icon ('alert_validation', true); if ($inside_main == 1 && $tab != 'alert') {
echo "</h2>"; echo "<h3>";
echo __('Alerts');
echo "</h3>";
} else {
echo "<h2>";
echo __('Pandora agents'). " &raquo; ".__('Alerts');
echo print_help_icon ('alert_validation', true);
echo "</h2>";
}
echo '<form method="post" action="'.$url.'">'; echo '<form method="post" action="'.$url.'">';

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

@ -27,7 +27,7 @@ if (! give_acl ($config['id_user'], 0, "AR") && ! give_acl ($config['id_user'],
exit; exit;
} }
echo "<h2>".__('SLA view')."</h2>"; echo "<h2>".__('Pandora agents'). " &raquo; ".__('SLA view')."</h2>";
$id_agent = get_parameter ("id_agente", 0); $id_agent = get_parameter ("id_agente", 0);
$interval = get_agent_interval ($id_agent); $interval = get_agent_interval ($id_agent);
$modules = get_agent_modules ($id_agent, '*', $modules = get_agent_modules ($id_agent, '*',