Fixed Terminal NTPserver .... syslogserver default to inherited

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3410 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index 3e16aabb1e611ca76cf78ae7800c29758a2d0f36..812b4f90f8ea6dd9a1d13e6f56c6ca9c5ce5d072 100644 (file)
--- a/plugins/admin/systems/class_terminalGeneric.inc
+++ b/plugins/admin/systems/class_terminalGeneric.inc
@@ -12,6 +12,7 @@ class termgeneric extends plugin
   var $gotoTerminalPath= "";
   var $gotoSwapServer= "";
   var $gotoSyslogServer= "";
+  var $gotoSyslogServers = array();
   var $gotoNtpServer= array();
   var $gotoNtpServers= array();
   var $gotoSndModule= "";
@@ -71,7 +72,7 @@ class termgeneric extends plugin
     }
 
     /* Set inherit checkbox state */
-    if(in_array("default",$this->gotoNtpServer)){
+    if((in_array("default",$this->gotoNtpServer)) || (count($this->gotoNtpServer)==0)){
       $this->inheritTimeServer = true;
       $this->gotoNtpServer=array();
     }
@@ -96,6 +97,16 @@ class termgeneric extends plugin
       $this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
     }
 
+    /* Create an array of all Syslog servers */
+    $tmp = $this->config->data['SERVERS']['SYSLOG'];
+    foreach($tmp as $server){
+      $visible = $server;
+      if($server == "default") {
+        $visible = "["._("inherited")."]";
+      }
+      $this->gotoSyslogServers[$server] = $visible;
+    }
+
     $this->orig_dn= $this->dn;
   }
 
@@ -237,7 +248,10 @@ class termgeneric extends plugin
     }
   
     $smarty->assign("nfsservers",     $tmp2);
-    $smarty->assign("syslogservers",  $this->config->data['SERVERS']['SYSLOG']);
+
+    
+
+    $smarty->assign("syslogservers",  $this->gotoSyslogServers);
     $smarty->assign("ntpservers",     $this->gotoNtpServers);
 
     /* Variables */
@@ -385,7 +399,7 @@ class termgeneric extends plugin
     }
 
     if($this->inheritTimeServer){
-      $this->attrs['gotoNtpServer'] = "default";
+      $this->attrs['gotoNtpServer'] = array();
     }else{  
       /* Set ntpServers */
       $this->attrs['gotoNtpServer'] = array();

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index 4ac24ca17a653a9e5a9f02a691abbb2747011a03..37fdfc923bd08d1fe1b30a84dc60ef8a37f73a46 100644 (file)
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -10,6 +10,7 @@ class workgeneric extends plugin
   /* Generic terminal attributes */
   var $gotoMode= "locked";
   var $gotoSyslogServer= "";
+  var $gotoSyslogServers= array();
   var $gotoNtpServer= array();
   var $gotoNtpServers= array();
   var $gotoSndModule= "";
@@ -101,6 +102,16 @@ class workgeneric extends plugin
       $this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
     }
 
+    /* Create an array of all Syslog servers */
+    $tmp = $this->config->data['SERVERS']['SYSLOG'];
+    foreach($tmp as $server){
+      $visible = $server;
+      if($server == "default") {
+        $visible = "["._("inherited")."]";
+      }
+      $this->gotoSyslogServers[$server] = $visible;
+    }
+
     /* Save 'dn' for later referal */
     $this->orig_dn= $this->dn;
   }
@@ -200,7 +211,7 @@ class workgeneric extends plugin
     /* Arrays */
     $smarty->assign("modes", $this->modes);
     $smarty->assign("nfsservers", $this->config->data['SERVERS']['NFS']);
-    $smarty->assign("syslogservers", $this->config->data['SERVERS']['SYSLOG']);
+    $smarty->assign("syslogservers", $this->gotoSyslogServers);
     $smarty->assign("ntpservers", $this->config->data['SERVERS']['NTP']);
 
     /* Variables */

diff --git a/plugins/admin/systems/terminal.tpl b/plugins/admin/systems/terminal.tpl
index 607c5907c077f31a83ac13e9f3a201d91ab63422..8485c986231cbdbbb534cb7ed8da5c1164866032 100644 (file)
--- a/plugins/admin/systems/terminal.tpl
+++ b/plugins/admin/systems/terminal.tpl
@@ -37,7 +37,7 @@
      <td><LABEL for="gotoSyslogServer">{t}Syslog server{/t}</LABEL></td>
      <td>
       <select name="gotoSyslogServer" id="gotoSyslogServer" title="{t}Choose server to use for logging{/t}" {$gotoSyslogServerACL}>
-       {html_options values=$syslogservers output=$syslogservers selected=$gotoSyslogServer_select}
+       {html_options options=$syslogservers selected=$gotoSyslogServer_select}
       </select>
      </td>
     </tr>

diff --git a/plugins/admin/systems/workstation.tpl b/plugins/admin/systems/workstation.tpl
index 1a47d67d7b68910d6e4dfd00d796807b102ffd7b..a320b0dd2464944ae44b2e5d36fcb7429e13645b 100644 (file)
--- a/plugins/admin/systems/workstation.tpl
+++ b/plugins/admin/systems/workstation.tpl
@@ -43,7 +43,7 @@
      <td><LABEL for="gotoSyslogServer">{t}Syslog server{/t}</LABEL></td>
      <td>
       <select id="gotoSyslogServer" name="gotoSyslogServer" title="{t}Choose server to use for logging{/t}" {$gotoSyslogServerACL}>
-       {html_options values=$syslogservers output=$syslogservers selected=$gotoSyslogServer_select}
+       {html_options options=$syslogservers selected=$gotoSyslogServer_select}
       </select>
      </td>
     </tr>