X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_terminalInfo.inc;h=7c378d679a2a5e1eed114500247b4a3f5c7c8e5d;hb=df9cf42cba6b375e7f39681c151ad9d1b22501bb;hp=82d7c0a0f041abce6150db3d8eecc88ab20b09ae;hpb=e4b67d7e99f6e8a9b0763e5c230d0849074cd2e0;p=gosa.git
diff --git a/plugins/admin/systems/class_terminalInfo.inc b/plugins/admin/systems/class_terminalInfo.inc
index 82d7c0a0f..7c378d679 100644
--- a/plugins/admin/systems/class_terminalInfo.inc
+++ b/plugins/admin/systems/class_terminalInfo.inc
@@ -26,6 +26,7 @@ class terminfo extends plugin
var $cn= "";
/* attribute list for save action */
+ var $ignore_account= TRUE;
var $attributes= array("cn", "gotoMode", "gotoTerminalPath", "gotoFloppyEnable",
"gotoCdromEnable", "ghInventoryNumber",
"gotoSwapServer", "gotoSyslogServer", "gotoNtpServer",
@@ -72,6 +73,14 @@ class terminfo extends plugin
$smarty= get_smarty();
$display= "";
+ $smarty->assign("staticAddress", "");
+
+
+ /* Prevent undefined variable .... */
+ $smarty->assign("load", progressbar(0,100,15,true));
+ $smarty->assign("mem", progressbar(0,100,15,true));
+ $smarty->assign("swap", progressbar(0,100,15,true));
+
/* Check if terminal is online */
$query= "fping -q -r 1 -t 500 ".$this->cn;
exec ($query, $dummy, $retval);
@@ -91,7 +100,8 @@ class terminfo extends plugin
$MemTotal= @snmpget($host, $community, "UCD-SNMP-MIB::memory.memTotalReal.0");
$MemTotal= preg_replace('/^.*[=:] ([0-9.]+)$/', '\\1', $MemTotal);
if ($MemTotal != 0){
- $smarty->assign("mem", (int)(($MemTotal - $MemFree)*100/$MemTotal));
+ $smarty->assign("mem",progressbar( (int)(($MemTotal - $MemFree)*100/$MemTotal),100,15,true));
+ ;
}
$SwapFree= @snmpget($host, $community, "UCD-SNMP-MIB::memory.memAvailSwap.0");
$SwapFree= preg_replace('/^.*[=:] ([0-9.]+)$/', '\\1', $SwapFree);
@@ -99,7 +109,7 @@ class terminfo extends plugin
$SwapTotal= preg_replace('/^.*[=:] ([0-9.]+)$/', '\\1', $SwapTotal);
if ($SwapTotal != 0){
#$smarty->assign("swap", (int)(($SwapTotal - $SwapFree)*100/$SwapTotal));
- $smarty->assign("swap", 0);
+ $smarty->assign("swap", progressbar(0,100,15,true));
}
/* Get system uptime */
@@ -109,7 +119,8 @@ class terminfo extends plugin
/* Get system load */
$sysload= @snmpget($host, $community, "UCD-SNMP-MIB::laLoad.2");
$sysload= preg_replace('/^.*[=:] ([0-9.]+)$/', '\\1', $sysload);
- $smarty->assign("load", $sysload*100);
+
+ $smarty->assign("load", progressbar($sysload*100,100,15,true));
/* Get status for key processes */
$processes= @snmpwalk($host, $community, "UCD-SNMP-MIB::prNames");
@@ -127,10 +138,10 @@ class terminfo extends plugin
}
switch ($eflag){
case 0:
- $smarty->assign("$pname", "");
+ $smarty->assign("$pname", "
");
break;
case 1:
- $smarty->assign("$pname", "
");
+ $smarty->assign("$pname", "
");
break;
default:
$smarty->assign("$pname", _("not defined"));
@@ -152,7 +163,7 @@ class terminfo extends plugin
$device= preg_replace('/^STRING: */', '', $device);
$usage= @snmpget($host, $community, "UCD-SNMP-MIB::dskPercent.$n");
$usage= preg_replace('/^INTEGER: */', '', $usage);
- $partitions.= "