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

2012-04-30 Vanessa Gil <vanessa.gil@artica.es> 

* godmode/servers/modificar_server.php: Changed values of columns 'load',
	'modules' and 'lag'.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6224 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-04-30 09:11:16 +00:00
parent 387c29606b
commit 22ecbe28c2
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-04-30 Vanessa Gil <vanessa.gil@artica.es>
* godmode/servers/modificar_server.php: Changed values of columns 'load',
'modules' and 'lag'.
2012-04-28 Junichi Satoh <junichi@rworks.jp> 2012-04-28 Junichi Satoh <junichi@rworks.jp>
* godmode/setup/setup.php: Fixed SQL error with PostgreSQL. * godmode/setup/setup.php: Fixed SQL error with PostgreSQL.

21
pandora_console/godmode/servers/modificar_server.php
View File

@ -137,12 +137,23 @@ else {
$data[2] = '<span style="white-space:nowrap;">'.$server["img"].'</span> ('.ucfirst($server["type"]).")"; $data[2] = '<span style="white-space:nowrap;">'.$server["img"].'</span> ('.ucfirst($server["type"]).")";
if ($server["master"] == 1) if ($server["master"] == 1)
$data[2] .= ui_print_help_tip (__("This is a master server"), true); $data[2] .= ui_print_help_tip (__("This is a master server"), true);
switch ($server['type']) {
case "snmp":
case "event":
$data[3] = 'N/A';
$data[4] = 'N/A';
$data[5] = 'N/A';
break;
default:
// Load
$data[3] =
progress_bar($server["load"], 60, 20, $server["lag_txt"], 0);
$data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"];
$data[5] = '<span style="white-space:nowrap;">'.$server["lag_txt"].'</span>';
break;
}
// Load
$data[3] =
progress_bar($server["load"], 60, 20, $server["lag_txt"], 0);
$data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"];
$data[5] = '<span style="white-space:nowrap;">'.$server["lag_txt"].'</span>';
$data[6] = $server['threads'].' : '.$server['queued_modules']; $data[6] = $server['threads'].' : '.$server['queued_modules'];
$data[7] = ui_print_timestamp ($server['keepalive'], true); $data[7] = ui_print_timestamp ($server['keepalive'], true);