From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 15 Feb 2008 09:18:10 +0000 (+0000)
Subject: Removed bootmode from terminal template
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=19cdb36876011a727352a850e45b87bc326734e4;p=gosa.git

Removed bootmode from terminal template


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8923 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc
index 009918129..fdff198df 100644
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc
@@ -7,7 +7,6 @@ class termstartup extends plugin
   var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
 
   /* Generic terminal attributes */
-  var $bootmode= "G";
   var $goLdapServerList= array();
   var $gotoBootKernel= "default";
   var $gotoKernelParameters= "";
@@ -58,16 +57,6 @@ class termstartup extends plugin
       $this->$val= array_unique($this->$val);
     }
 
-    /* Parse Kernel Parameters to decide what boot mode is enabled */
-    if (preg_match("/ splash=silent/", $this->gotoKernelParameters)){
-      $this->bootmode= "G";
-    } elseif (preg_match("/ debug/", $this->gotoKernelParameters)){
-      $this->bootmode= "D";
-    } elseif ($this->gotoKernelParameters == "") {
-      $this->bootmode= "G";
-    } else {
-      $this->bootmode= "T";
-    }
     if (preg_match("/ o /", $this->gotoKernelParameters)){
       $this->customParameters= preg_replace ("/^.* o /", "", $this->gotoKernelParameters);
     } else {
@@ -328,23 +317,6 @@ class termstartup extends plugin
       $smarty->assign($val, $this->$val);
     }
 
-    /* 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 */
     return($smarty->fetch (get_template_path('terminalStartup.tpl', TRUE,dirname(__FILE__))));
   }
@@ -370,11 +342,6 @@ class termstartup extends plugin
         $this->gotoLdap_inherit = FALSE;
       }
 
-      /* Save group radio buttons */
-      if ($this->acl_is_writeable("bootmode") && isset($_POST["bootmode"])){
-        $this->bootmode= $_POST["bootmode"];
-      }
-
       /* Save kernel parameters */
       if ($this->acl_is_writeable("gotoKernelParameters") && isset($_POST["customParameters"])){
         $this->customParameters= $_POST["customParameters"];
@@ -423,14 +390,6 @@ class termstartup extends plugin
       ",ro,hard,nolock,fg,rsize=8192 ".
       "ip=::::::dhcp ldap=".base64_encode($this->gotoLdapServer);
 
-    switch ($this->bootmode){
-      case "D":
-        $this->gotoKernelParameters.= " debug";
-      break;
-      case "G":
-        $this->gotoKernelParameters.= " splash=silent";
-      break;
-    }
     if ($this->customParameters != ""){
       $this->gotoKernelParameters.= " o ".$this->customParameters;
     }
@@ -531,7 +490,7 @@ class termstartup extends plugin
 
     $source_o = new termstartup ($this->config, $source['dn']);
 
-    foreach(array("gotoModules", "gotoKernelParameters","gotoShares","customParameters","bootmode","gotoTerminalPath","gotoShares","goLdapServerList","gotoBootKernel","gotoLdapServer","gotoBootKernels") as $attr){
+    foreach(array("gotoModules", "gotoKernelParameters","gotoShares","customParameters","gotoTerminalPath","gotoShares","goLdapServerList","gotoBootKernel","gotoLdapServer","gotoBootKernels") as $attr){
       $this->$attr = $source_o->$attr;
     }
   }