* Fix inheritance of kernel cmdline

  + Drop unused bootmode code
  + Drop legacy "base64 ldap server on cmdline" code

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@16492 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
index eba1146bbf3617a2b4df9397bf74686dc25b96bd..58fc74ed2abb701be2b1b1a58d21a7d72ac0cb6c 100644 (file)
--- a/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
+++ b/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
@@ -7,7 +7,6 @@ class workstartup extends plugin
   var $gotoLdap_inherit   = FALSE;
 
   /* Generic terminal attributes */
-  var $bootmode             = "G";
   var $gotoBootKernel       = "default-inherited";
   var $gotoKernelParameters = "";
   var $gotoLdapServer       = "default-inherited";
@@ -670,23 +669,6 @@ class workstartup extends plugin
     }// END FAI output generation 
     $smarty->assign("FAIScriptlist",$div->DrawList()); 
 
-    /* Radio button group */
-    if (preg_match("/G/", $this->bootmode)) {
-      $smarty->assign("graphicalbootup", "checked");
-    } else {
-      $smarty->assign("graphicalbootup", "");
-    }
-    if (preg_match("/T/", $this->bootmode)) {
-      $smarty->assign("textbootup", "checked");
-    } else {
-      $smarty->assign("textbootup", "");
-    }
-    if (preg_match("/D/", $this->bootmode)) {
-      $smarty->assign("debugbootup", "checked");
-    } else {
-      $smarty->assign("debugbootup", "");
-    }
-
     /* Show main page */
     $smarty->assign("gotoKernelParameters",$this->gotoKernelParameters);
     return($smarty->fetch (get_template_path('workstationStartup.tpl', TRUE,dirname(__FILE__))));
@@ -736,11 +718,6 @@ class workstartup extends plugin
       }else{
         $this->gotoLdap_inherit = FALSE;
       }
-
-      /* Save group radio buttons */
-      if ($this->acl_is_writeable("bootmode") && isset($_POST["bootmode"])){
-        $this->bootmode= $_POST["bootmode"];
-      }
     }
   }
 
@@ -802,21 +779,6 @@ class workstartup extends plugin
       }
     }
 
-    if ($this->gotoKernelParameters == "") {
-      /* Add semi automatic values if empty */
-      // FIXME: LDAP Server may not be set here...
-      $this->gotoKernelParameters= "ldap=".base64_encode($this->gotoLdapServer);
-      
-      switch ($this->bootmode){
-        case "D":
-          $this->gotoKernelParameters.= " debug";
-        break;
-        case "G":
-          $this->gotoKernelParameters.= " splash=silent";
-        break;
-      }
-    }
-
     plugin::save();
 
     unset( $this->attrs['FAIrelease'] );