More speed optimizations

[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 d6743a295005fd2072b8dba29c0dc0722fc92c2f..812a48982592ef4df973562f09cbee2308fc918d 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -1,4 +1,5 @@
 <?php
+
 class workstartup extends plugin
 {
   /* CLI vars */
@@ -9,7 +10,7 @@ class workstartup extends plugin
   /* Generic terminal attributes */
   var $bootmode             = "G";
   var $goLdapServerList     = array();
-  var $gotoBootKernel       = "";
+  var $gotoBootKernel       = "default-inherited";
   var $gotoKernelParameters = "";
   var $gotoLdapServer       = "default-inherited";
   var $gotoModules          = array();
@@ -50,9 +51,9 @@ class workstartup extends plugin
   /* Contains all possible server/release/class settings */
   var $FAIServRepConfig   = array();
 
-  function workstartup ($config, $dn= NULL)
+  function workstartup ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     /* Creating a list of valid Mirrors 
      * none will not be saved to ldap.
@@ -341,6 +342,11 @@ class workstartup extends plugin
       }
     }
 
+    /* Turn to default, if we've nothing to inherit */
+    if (!isset($this->gotoBootKernels['default-inherited']) && $this->gotoBootKernel == "default-inherited"){
+      $this->gotoBootKernel= "default";
+    }
+
     if(count($this->FAIclass)==0 && $this->FAIrelease == ""){
       $this->FAIdebianMirror = "inherited";
     }
@@ -819,8 +825,8 @@ class workstartup extends plugin
       $this->FAIdebianMirror = "auto";
     }
 
-    $errorClasses = "";  
-    if(is_array($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'])) {
+    $errorClasses = array();  
+    if(isset($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'])) {
       foreach($this->FAIServRepConfig[$this->FAIdebianMirror]['RELEASE'] as $release => $sections){
         $use = true;
 
@@ -1003,13 +1009,6 @@ class workstartup extends plugin
 
     /* Remove FAI objects if no FAI class is selected */ 
     if((count($this->FAIclass)==0) && (!isset($checkFAIstate['FAIstate']))){
-      $tmp = array();
-      foreach($this->attrs['objectClass'] as $class){
-        if($class != "FAIobject"){
-          $tmp[] = $class;
-        }
-      }
-      $this->attrs['objectClass']     = $tmp;
       $this->attrs['FAIclass']        = array();
       $this->attrs['FAIdebianMirror'] = array();
     }