Fixed saving of gotoNtpServer

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

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index 1bb728ace0b1a5424797a3e3a3dd42612fd0c88f..4ac24ca17a653a9e5a9f02a691abbb2747011a03 100644 (file)
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -75,17 +75,17 @@ class workgeneric 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();
     }
 
     /* Create available ntp options */
-    $this->gotoNtpServers = $this->config->data['SERVERS']['NTP'];
-    foreach($this->gotoNtpServers as $key => $server){
-      if($server == "default"){
-        unset($this->gotoNtpServers[$key]);
-      }
+    $tmp = $this->config->data['SERVERS']['NTP'];
+    $this->gotoNtpServers = array();
+    foreach($tmp as $key => $server){
+      if($server == "default") continue;
+      $this->gotoNtpServers[$server] = $server;
     }
 
     $this->modes["active"]= _("Activated");
@@ -342,7 +342,7 @@ class workgeneric extends plugin
 
     /* Update ntp server settings */
     if($this->inheritTimeServer){
-      $this->attrs['gotoNtpServer'] = "default";
+      $this->attrs['gotoNtpServer'] = array();
     }else{
       /* Set ntpServers */
       $this->attrs['gotoNtpServer'] = array();

diff --git a/plugins/admin/systems/workstation.tpl b/plugins/admin/systems/workstation.tpl
index 4a1ac0e695ce64f799e3a107ef7a09463fa1cf18..1a47d67d7b68910d6e4dfd00d796807b102ffd7b 100644 (file)
--- a/plugins/admin/systems/workstation.tpl
+++ b/plugins/admin/systems/workstation.tpl
@@ -69,7 +69,7 @@
       </select>
      <br>
       <select name="gotoNtpServers" id="gotoNtpServers" {$gotoNtpServerACL} {if $inheritTimeServer} disabled {/if} >
-       {html_options output=$gotoNtpServers values=$gotoNtpServers}
+       {html_options options=$gotoNtpServers}
       </select>
         <input type="submit" name="addNtpServer" value="{t}Add{/t}"     id="addNtpServer" {$gotoNtpServerACL}
          {if $inheritTimeServer} disabled {/if}>