Updated printGeneric.

[gosa.git] / plugins / admin / systems / class_workstationStartup.inc

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 65ac31f0d6047d6d871bc9d45688e0a26704683b..0874a2814a86ac9bb92c3b4b9d9ad98d41428691 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -53,6 +53,8 @@ class workstartup extends plugin
   var $fai_activated      = FALSE;
   var $member_of_ogroup   = FALSE;
 
+  var $o_group_dn         = "";
+
   function workstartup ($config, $dn= NULL, $parent= NULL)
   {
     /* Cehck if FAI is activated, else do not save any FAI attributes */
@@ -69,8 +71,12 @@ class workstartup extends plugin
     if(!isset($this->parent->by_object['ogroup'])){
       $ldap = $this->config->get_ldap_link();
       $ldap->cd ($this->config->current['BASE']);
-      $ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".$this->dn."))",array("cn"));
-      $this->member_of_ogroup = $ldap->count() >= 1;
+      $ldap->search("(&(objectClass=gotoWorkstationTemplate)(member=".LDAP::prepare4filter($this->dn)."))",array("cn","dn"));
+      if($ldap->count()){
+        $this->member_of_ogroup = TRUE;
+        $attrs = $ldap->fetch();
+        $this->o_group_dn = $attrs['dn'];
+      }
     }
 
     /* Creating a list of valid Mirrors 
@@ -327,6 +333,8 @@ class workstartup extends plugin
         $map= array("gotoLdapServer","gotoBootKernel");
       }
 
+      $ldap = $this->config->get_ldap_link();
+      $ldap->cat($this->o_group_dn);
       $attrs= $ldap->fetch();
 
       foreach ($map as $name){
@@ -454,12 +462,20 @@ class workstartup extends plugin
         else select the first one ..
      */
     $tmp2 = $this->getFAIreleases();
+    if(!isset($tmp2[$this->FAIrelease]) || !$tmp2[$this->FAIrelease]['USE']){
+      foreach($tmp2 as $key => $data){
+        if($data['USE']){
+          $this->FAIrelease = $key;
+        }
+      }
+    }
     if(!in_array($this->FAIrelease, $tmp2)){  
-      $this->FAIrelease = key($tmp2);
+    #  $this->FAIrelease = key($tmp2);
     }
  
     /* Get all Packages for this server/release combination
      */
+
     if(!isset($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'][$this->FAIrelease]['PACKAGES'])){
       $pkgs = array();
       print_red(_("There are packages in your configuration, which can't be resolved with current server/release settings."));
@@ -515,7 +531,6 @@ class workstartup extends plugin
 
   function execute()
   {
-
        /* Call parent execute */
        plugin::execute();
 
@@ -854,10 +869,12 @@ class workstartup extends plugin
     /* Only add inherit option, if we are part in an object group 
      */
     if($this->member_of_ogroup)    {
-      $ret['inherited']="["._("inherited")."]";
+      $ret['inherited']['NAME']="["._("inherited")."]";
+      $ret['inherited']['USE'] = TRUE;
     }
 
-    $ret['auto']=_("automatic");
+    $ret['auto']['NAME']=_("automatic");
+    $ret['auto']['USE'] = TRUE;
     $secs  = array();
 
     /* Walk through all available servers 
@@ -866,15 +883,19 @@ class workstartup extends plugin
      */
     foreach($this->FAIServRepConfig as $mirror => $rest){
 
-      $use = false;
+      /* Automatically selection is available everytime */
+      if($mirror == "auto"){
+        continue;
+      }
 
+      $use = false;
       if(count($this->FAIclass) == 0){
         $use = true;
       }else{
         $tmp = $this->getFAIreleases();
-        foreach($tmp as $release){
-          if(isset($rest['RELEASE'][$release])){
-            $use =true;
+        foreach($tmp as $release => $data){
+          if(isset($rest['RELEASE'][$release]) && $release == $this->FAIrelease){
+            $use = $data['USE']; 
           }
         } 
       }
@@ -882,9 +903,8 @@ class workstartup extends plugin
       /* If current server, doesn't support this class
           remove it from list
        */
-      if($use){
-        $ret[$mirror] = $mirror;
-      }
+      $ret[$mirror]['NAME'] = $mirror;
+      $ret[$mirror]['USE'] = $use;
     }
     return($ret);
   }
@@ -893,13 +913,15 @@ class workstartup extends plugin
   {
     $ret = array();
 
-    if($this->FAIdebianMirror == "inherited") return(array());
+    if($this->FAIdebianMirror == "inherited") {
+      return(array());
+    }
 
     if(!isset($this->FAIServRepConfig[$this->FAIdebianMirror])){
       $this->FAIdebianMirror = "auto";
     }
 
-    $errorClasses = array();  
+    $errorClasses = array();
     if(isset($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'])) {
       foreach($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'] as $release => $sections){
         $use = true;
@@ -911,16 +933,16 @@ class workstartup extends plugin
               $errorClasses[$class] = $class;
             }else{
               if(isset($errorClasses[$class])){
-                unset($errorClasses[$class]); 
+                unset($errorClasses[$class]);
               }
             }
           }
         }
-        if($use){
-          $ret[$release]=$release;
-        }
+        $ret[$release]['NAME']=$release;
+        $ret[$release]['USE']=$use;
       }
-    } 
+    }
+
     if((count($ret) == 0 ) && ($this->FAIdebianMirror != "auto")){
 
       $eClasses = " ";
@@ -937,7 +959,7 @@ class workstartup extends plugin
       foreach($errorClasses as $class){
         $eClasses .= $class." ";
       }
-      
+
       $this->unresolved_classes = $errorClasses;
       $this->FAIdebianMirror = "auto";
       //$this->FAIclass= array();