X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_terminalStartup.inc;h=cba2b395433bc77f11cea64347025aef3e68333f;hb=e1bf22f058266d04da312a6a12cc26fcda9bd930;hp=589f89a7832aa69f718edcf7f2c78f34c08e3f85;hpb=d1a1f67066cf07616d37a1b3cd983082d0028f2f;p=gosa.git

diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 589f89a78..cba2b3954 100644
--- a/plugins/admin/systems/class_terminalStartup.inc
+++ b/plugins/admin/systems/class_terminalStartup.inc
@@ -8,13 +8,13 @@ class termstartup extends plugin
 
   /* Generic terminal attributes */
   var $bootmode= "G";
-  var $goLdapServerList= array("default");
+  var $goLdapServerList= array();
   var $gotoBootKernel= "";
   var $gotoKernelParameters= "";
   var $gotoLdapServer= "";
   var $gotoModules= array();
   var $gotoTerminalPath= "";
-  var $gotoBootKernels= array("default");
+  var $gotoBootKernels= array();
 
   /* Share */
   var $gotoShares         = array();// Currently Share Option
@@ -36,6 +36,8 @@ class termstartup extends plugin
   {
     plugin::plugin ($config, $dn);
 
+    $this->gotoBootKernels = array("default"=>"["._("inherited")."]");
+
     /* Get arrays */
     foreach (array("gotoModules") as $val){
       if (isset($this->attrs["$val"]["count"])){
@@ -94,14 +96,43 @@ class termstartup extends plugin
         $fh= popen($command, "r");
         while (!feof($fh)) {
           $buffer= fgets($fh, 256);
-          $this->gotoBootKernels[]= $buffer;
+          if(!empty($buffer)){
+            $this->gotoBootKernels[]= $buffer;
+          }
         }
         pclose($fh);
-        sort($this->gotoBootKernels);
       }
 
     }
+    $tmp = $this->config->data['SERVERS']['LDAP'];  
+    foreach($tmp as $server){
+      $visible = $server;
+      if($server == "default"){
+        $visible = "["._("inherited")."]";
+      }
+      $this->goLdapServerList[$server] = $visible;
+    }
+
+     /* Load hardware list */
+    $ldap= $this->config->get_ldap_link();
+    $ldap->cd($this->config->current['BASE']);
+    $ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".$this->dn."))");
+    if ($ldap->count() == 1){
+      $map= array("gotoLdapServer");
+      $attrs= $ldap->fetch();
+
+      foreach ($map as $name){
+        if (!isset($attrs[$name][0])){
+          continue;
+        }
 
+        switch ($name){
+          case 'gotoLdapServer':
+            $this->goLdapServerList= array_merge(array('default' => _("inherited").' ['.$attrs[$name][0].']' ), $this->goLdapServerList);
+            break;
+        }
+      }
+    }
   }
 
   function execute()
@@ -173,9 +204,6 @@ class termstartup extends plugin
     $smarty->assign("gotoShares",$this->printOutAssignedShares());
     $smarty->assign("gotoShareKeys",array_flip($this->printOutAssignedShares()));
 
-    /* Arrays */
-    $tmp = $this->config->data['SERVERS']['LDAP'];
-
     /* Create divSelectBox for ldap server selection
      */
     $SelectBoxLdapServer = new divSelectBox("LdapServer");
@@ -185,7 +213,7 @@ class termstartup extends plugin
      *  or given entry is no longer available ...
      */
     $found = false;
-    foreach($tmp as $server){
+    foreach($this->goLdapServerList as $server => $name){
       if($this->gotoLdapServer==$server){
         $found = true;
       }
@@ -193,7 +221,7 @@ class termstartup extends plugin
     
     /* Add Entries
      */
-    foreach($tmp as $server){
+    foreach($this->goLdapServerList as $server => $visible){
       $use ="";
       if(($this->gotoLdapServer == $server) || ($found == false)) {
         $found = true;
@@ -202,9 +230,9 @@ class termstartup extends plugin
 
       $SelectBoxLdapServer->AddEntry(
           array(
-            array("string"=>$server),
             array("string"=>"<input type='radio' name='gotoLdapServer' value='".$server."' ".$use.">",
-                  "attach"=>"style='border-right:0px;'")
+                  "attach"=>"style='border-left:0px;'"),
+            array("string"=>$visible)
             ));
     }
 
@@ -334,8 +362,10 @@ class termstartup extends plugin
     }
 
     /* Strip out 'default' values */
-    if ($this->attrs['gotoLdapServer'] == "default"){
-      unset ($this->attrs['gotoLdapServer']);
+    foreach(array("gotoBootKernel","gotoLdapServer") as $value){
+      if (!isset($this->attrs[$value]) || $this->attrs[$value] == "default"){
+        $this->attrs[$value] = array();
+      } 
     }
 
      /* prepare share settings */
@@ -353,7 +383,7 @@ class termstartup extends plugin
     $this->cleanup();
     $ldap->modify ($this->attrs); 
 
-    show_ldap_error($ldap->get_error(), _("Saving terminal startup settings failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Saving of system terminal/startup with dn '%s' failed."),$this->dn));
     $this->handle_post_events("modify");
   }