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

2008-06-19 Sancho Lerena <slerena@gmail.com>

Browse Source 
* Fixed some typos.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@890 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2008-06-19 16:01:54 +00:00
parent 0b4adbafe8
commit 0da63bcaac
6 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/ChangeLog
View File

@ -1,5 +1,7 @@
2008-06-19 Sancho Lerena <slerena@gmail.com> 2008-06-19 Sancho Lerena <slerena@gmail.com>
* Fixed some typos.
* Fixed bad conflict resolution commit in functions_db.php * Fixed bad conflict resolution commit in functions_db.php
* include/functions_reporting.php * include/functions_reporting.php

3
pandora_console/general/logon_ok.php
View File

@ -100,6 +100,9 @@
} else } else
$global_health = 100; $global_health = 100;
if ($global_health < 0)
$global_health;
echo "<table class='databox' celldpadding=4 cellspacing=4 width=250>"; echo "<table class='databox' celldpadding=4 cellspacing=4 width=250>";
//echo "<h2>".$lang_label["tactical_indicator"]."</h2>"; //echo "<h2>".$lang_label["tactical_indicator"]."</h2>";
//echo "<img src='reporting/fgraph.php?tipo=odo_tactic&value1=$global_health&value2=$data_health&value3=$monitor_health'>"; //echo "<img src='reporting/fgraph.php?tipo=odo_tactic&value1=$global_health&value2=$data_health&value3=$monitor_health'>";

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

@ -93,7 +93,7 @@ if (give_acl($id_user, 0, "AW")!=1) {
// Update configuration // Update configuration
if (isset($_POST["disk_conf"])) { if (isset($_POST["disk_conf"])) {
save_config(str_replace("\r\n", "\n", stripslashes($_POST["disk_conf"]))); save_config(str_replace("\r\n", "\n", $_POST["disk_conf"]));
echo "<h3 class='suc'>" . $lang_label["update_agent_ok"] . "</h3>"; echo "<h3 class='suc'>" . $lang_label["update_agent_ok"] . "</h3>";
} }

2
pandora_console/include/functions_db.php
View File

@ -1110,7 +1110,7 @@ function give_agent_address_from_list ($id_agent){
* @return The agent if of the given module. * @return The agent if of the given module.
*/ */
function give_agent_id_from_module_id ($id_agent_module) { function give_agent_id_from_module_id ($id_agent_module) {
return (int) get_db_value ('id_agente', 'tagent_modulo', 'id_agente_modulo', $id_agent_module); return (int) get_db_value ('id_agente', 'tagente_modulo', 'id_agente_modulo', $id_agent_module);
} }
/** /**

3
pandora_console/operation/agentes/estado_agente.php
View File

@ -328,6 +328,9 @@ if (comprueba_login() == 0) {
$ultima = strtotime($ultimo_contacto); $ultima = strtotime($ultimo_contacto);
$ahora = strtotime("now"); $ahora = strtotime("now");
$diferencia = $ahora - $ultima; $diferencia = $ahora - $ultima;
if ( $diferencia > ($biginterval*2))
echo "<font color='#ff0000'>";
echo human_time_comparation($ultimo_contacto); echo human_time_comparation($ultimo_contacto);
/* /*
if ($biginterval > 0){ if ($biginterval > 0){

5
pandora_console/operation/agentes/tactical.php
View File

@ -63,7 +63,10 @@
$global_health = format_numeric ((($data_health * $data_checks) + ($monitor_health * $monitor_checks)) / $total_checks); $global_health = format_numeric ((($data_health * $data_checks) + ($monitor_health * $monitor_checks)) / $total_checks);
} else } else
$global_health = 100; $global_health = 100;
if ($global_health < 0)
$global_health;
// Monitor checks // Monitor checks
// ~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~
echo "<table width=770 border=0>"; echo "<table width=770 border=0>";