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

2010-03-04 Sancho Lerena <slerena@artica.es> 

* install.php: Fixed a bad render in IE.

        * operation/agentes/estado_agente.php: Fixed general view of agents.
        When show agents without modules, never display it's date because was
        taking from the most recept module, instead of data from agent itself.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2475 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2010-03-04 20:02:29 +00:00
parent 3bf7f1594a
commit db044fda1c
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2010-03-04 Sancho Lerena <slerena@artica.es>
* install.php: Fixed a bad render in IE.
* operation/agentes/estado_agente.php: Fixed general view of agents.
When show agents without modules, never display it's date because was
taking from the most recept module, instead of data from agent itself.
:
2010-03-04 Pablo de la Concepción <pablo.concepcion@artica.es>
* godmode/gis_maps/configure_gis_map.php: Change help link.

4
pandora_console/install.php
View File

@ -267,11 +267,11 @@ function install_step1_licence() {
} else {
echo "<form method=post action='install.php?step=2'>";
echo "<textarea name='gpl2' cols=50 rows=20>";
echo "<textarea name='gpl2' cols=45 rows=15>";
echo file_get_contents ("COPYING");
echo "</textarea>";
echo "<p>";
echo "<input type=submit value='I understand and accept the licence terms'>";
echo "<input type=submit value='Yes, I accept licence terms'>";
}
echo "</div>";

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

@ -130,6 +130,7 @@ if (! empty ($agent_names)) {
array ('id_agente',
'id_grupo',
'id_os',
'ultimo_contacto',
'intervalo'));}
if (empty ($agents)) {
@ -218,9 +219,22 @@ foreach ($agents as $agent) {
$data[5] = $agent_info["status_img"];
$data[6] = $agent_info["alert_img"];
$data[7] = print_timestamp ($agent_info["last_contact"], true);
$last_time = strtotime ($agent["ultimo_contacto"]);
$now = time ();
$diferencia = $now - $last_time;
$time = print_timestamp ($last_time, true);
$style = '';
if ($diferencia > ($agent["intervalo"] * 2))
$data[7] = '<b><span style="color: #ff0000">'.$time.'</span></b>';
else
$data[7] = $time;
// This old code was returning "never" on agents without modules, BAD !!
// And does not print outdated agents in red. WRONG !!!!
// $data[7] = print_timestamp ($agent_info["last_contact"], true);
array_push ($table->data, $data);
}