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

2012-06-20 Vanessa Gil <vanessa.gil@artica.es> 

* godmode/agentes/module_manager.php
	  operation/agentes/estado_agente.php
	  operation/agentes/status_monitor: Changed interval format.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6618 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-06-20 10:56:40 +00:00
parent c091275af2
commit bcc468c356
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-06-20 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/module_manager.php
operation/agentes/estado_agente.php
operation/agentes/status_monitor: Changed interval format.
2012-06-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_agents.php

4
pandora_console/godmode/agentes/module_manager.php
View File

@ -529,10 +529,10 @@ foreach ($modules as $module) {
// Module interval
if ($module['module_interval']) {
$data[4] = $module['module_interval'];
$data[4] = human_time_description_raw($module['module_interval']);
}
else {
$data[4] = $agent_interval;
$data[4] = human_time_description_raw($agent_interval);
}
$data[5] = ui_print_truncate_text($module['descripcion'], 'description', false);

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

@ -487,7 +487,7 @@ foreach ($agents as $agent) {
// } else {
// $data[2] = $agent["intervalo"];
// }
$data[3] = $agent["intervalo"];
$data[3] = human_time_description_raw($agent["intervalo"]);
$data[4] = ui_print_group_icon ($agent["id_grupo"], true);

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

@ -584,7 +584,7 @@ foreach ($result as $row) {
$data[3] .= ui_print_help_tip ($row["extended_info"], true, '/images/comments.png');
}
$data[4] = ($row['module_interval'] == 0) ? $row['agent_interval'] : $row['module_interval'];
$data[4] = ($row['module_interval'] == 0) ? human_time_description_raw($row['agent_interval']) : human_time_description_raw($row['module_interval']);
if($row['utimestamp'] == 0 && (($row['module_type'] < 21 || $row['module_type'] > 23) && $row['module_type'] != 100)){
$data[5] = ui_print_status_image(STATUS_MODULE_NO_DATA, __('NOT INIT'), true);