X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_terminalGeneric.inc;h=86aa8966e1f5b0aee580440b29a899694c0d97c0;hb=6a798c99f3cd57b6e98610975ac80dcd7e094a90;hp=5d2b4395e282f44d89e300ea4ec3da989cba4385;hpb=39d0a234a02b9678799b80ea97ee53e8d4bfc6ff;p=gosa.git
diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index 5d2b4395e..86aa8966e 100644
--- a/plugins/admin/systems/class_terminalGeneric.inc
+++ b/plugins/admin/systems/class_terminalGeneric.inc
@@ -37,6 +37,7 @@ class termgeneric extends plugin
var $modes= array();
/* attribute list for save action */
+ var $ignore_account= TRUE;
var $attributes= array("gotoMode", "gotoTerminalPath", "macAddress",
"gotoSwapServer", "gotoSyslogServer", "gotoNtpServer",
"gotoFloppyEnable", "gotoCdromEnable", "cn", "gotoSndModule",
@@ -75,6 +76,9 @@ class termgeneric extends plugin
function execute()
{
+ /* Call parent execute */
+ plugin::execute();
+
/* Do we need to flip is_account state? */
if (isset($_POST['modify_state'])){
$this->is_account= !$this->is_account;
@@ -83,7 +87,7 @@ class termgeneric extends plugin
if (isset($_POST['action'])){
switch($_POST['saction']){
case 'wake':
- $cmd= $this->search($this->config->data['TABS'], "termgeneric", "WAKECMD");
+ $cmd= search_config($this->config->data['TABS'], "termgeneric", "WAKECMD");
if ($cmd == ""){
print_red(_("No WAKECMD definition found in your gosa.conf"));
} else {
@@ -95,7 +99,7 @@ class termgeneric extends plugin
break;
case 'reboot':
- $cmd= $this->search($this->config->data['TABS'], "termgeneric", "REBOOTCMD");
+ $cmd= search_config($this->config->data['TABS'], "termgeneric", "REBOOTCMD");
if ($cmd == ""){
print_red(_("No REBOOTCMD definition found in your gosa.conf"));
} else {
@@ -107,7 +111,7 @@ class termgeneric extends plugin
break;
case 'halt':
- $cmd= $this->search($this->config->data['TABS'], "termgeneric", "HALTCMD");
+ $cmd= search_config($this->config->data['TABS'], "termgeneric", "HALTCMD");
if ($cmd == ""){
print_red(_("No HALTCMD definition found in your gosa.conf"));
} else {
@@ -122,7 +126,7 @@ class termgeneric extends plugin
/* Do we represent a valid terminal? */
if (!$this->is_account && $this->parent == NULL){
- $display= "
".
+ $display= "
".
_("This 'dn' has no terminal features.")."";
return($display);
}
@@ -130,6 +134,7 @@ class termgeneric extends plugin
/* Fill templating stuff */
$smarty= get_smarty();
$smarty->assign("cn", $this->cn);
+ $smarty->assign("staticAddress", "");
$smarty->assign("bases", $this->config->idepartments);
@@ -145,7 +150,28 @@ class termgeneric extends plugin
}
/* Arrays */
$smarty->assign("modes", $this->modes);
- $smarty->assign("nfsservers", $this->config->data['SERVERS']['NFS']);
+
+ $tmp2 = array();
+ foreach($this->config->data['SERVERS']['NFS'] as $server){
+ if($server != "default"){
+ $tmp = split("\|",$server);
+ $tmp3= split(":",$tmp[0]);
+
+ $servername = $tmp3[0];
+ $nfsname = $tmp3[1];
+
+ $path ="";
+ if(isset($tmp[4])){
+ $path = $tmp[4];
+ }
+
+ $tmp2[$servername.":".$path]= $servername.":".$path;
+ }else{
+ $tmp2[$server]=$server;
+ }
+ }
+
+ $smarty->assign("nfsservers", $tmp2);
$smarty->assign("syslogservers", $this->config->data['SERVERS']['SYSLOG']);
$smarty->assign("ntpservers", $this->config->data['SERVERS']['NTP']);