X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_terminalGeneric.inc;h=66500df3464b8721d69cf4b2b7e56a95d7551b39;hb=c30fdf675865a86365275ed6fb9f8a0cc06e41af;hp=598e4fbd458661620d032c2ceb3cde3c37e12922;hpb=458e1d6feba6965ea984d1a3b4b9f250b65468e3;p=gosa.git

diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index 598e4fbd4..66500df34 100644
--- a/plugins/admin/systems/class_terminalGeneric.inc
+++ b/plugins/admin/systems/class_terminalGeneric.inc
@@ -98,6 +98,11 @@ class termgeneric extends plugin
       $this->gotoNtpServer=array();
     }
 
+    /* You can't inherit the NTP service, if we are not member in an object group */
+    if(!$this->member_of_ogroup){
+      $this->inheritTimeServer = FALSE;
+    }
+
     /* Create available ntp options */
     $this->gotoNtpServers = $this->config->data['SERVERS']['NTP'];
     foreach($this->gotoNtpServers as $key => $server){
@@ -122,7 +127,7 @@ class termgeneric extends plugin
     $tmp = $this->config->data['SERVERS']['SYSLOG'];
     foreach($tmp as $server){
       $visible = $server;
-      if($server == "default") {
+      if($server == "default" && $this->member_of_ogroup) {
         $visible = "["._("inherited")."]";
       }
       $this->gotoSyslogServers[$server] = $visible;
@@ -294,7 +299,9 @@ class termgeneric extends plugin
       if($server != "default"){
         $tmp2[$server]= $server;
       }else{
-        $tmp2[$server]="["._("inherited")."]";
+        if($this->member_of_ogroup){
+          $tmp2[$server]="["._("inherited")."]";
+        }
       }
     }
   
@@ -369,7 +376,7 @@ class termgeneric extends plugin
     }
   
     if(isset($_POST['termgeneric_posted']) && chkacl($this->acl,"gotoNtpServer") == ""){
-      if(isset($_POST["inheritTimeServer"])){
+      if(isset($_POST["inheritTimeServer"]) && $this->member_of_ogroup){
         $this->inheritTimeServer = true;
       }else{
         $this->inheritTimeServer = false;
@@ -533,7 +540,7 @@ class termgeneric extends plugin
     /* Set workstation service attributes to inherited */
     if($this->member_of_ogroup && isset($this->parent->by_object['termservice'])){
       foreach(array("gotoXKbLayout","gotoXKbModel","gotoXKbVariant",
-            "gotoXResolution","gotoXColordepth","gotoXMouseType","gotoXMouseType") as $name){
+            "gotoXResolution","gotoXColordepth","gotoXMouseType","gotoXMouseport") as $name){
         $this->parent->by_object['termservice']->$name = "default";
       }
     }