diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index 99b11ba7efa0612b9913dd9b1166f92958774826..86aa8966e1f5b0aee580440b29a899694c0d97c0 100644 (file)
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;
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 {
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 {
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 {
/* Fill templating stuff */
$smarty= get_smarty();
$smarty->assign("cn", $this->cn);
+ $smarty->assign("staticAddress", "");
$smarty->assign("bases", $this->config->idepartments);
}
/* 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']);