Removed special handling gotoKernelParameters.

-Just a simple string now.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12973 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 df75154e034900df3b167ce59a30302166967872..c55ce9824b8192c538616c920504c26b44fc6bdb 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc
@@ -352,11 +352,6 @@ class termstartup extends plugin
       }else{
         $this->gotoLdap_inherit = FALSE;
       }
-
-      /* Save kernel parameters */
-      if ($this->acl_is_writeable("gotoKernelParameters") && isset($_POST["gotoKernelParameters"])){
-        $this->gotoKernelParameters= $_POST["gotoKernelParameters"];
-      }
     }
   }
 

diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
index 2419a7abe97aac3400d561db6de8e6f517a501db..134ec25561d0b5f88d1b6e97664acb83e7d54977 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
@@ -31,7 +31,6 @@ class workstartup extends plugin
   var $gotoAvailableShares= array();// Available Shares for this account
 
   /* Helper */
-  var $customParameters   = "";
   var $orig_dn            = "";
   var $ignore_account     = TRUE;
  
@@ -156,23 +155,6 @@ class workstartup extends plugin
       $this->$val= array_unique($this->$val);
     }
 
-    /* Parse Kernel Parameters to decide what boot mode is enabled */
-    #if (preg_match("/ splash/", $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 {
-    #  $this->customParameters= "";
-    #}
-    $this->customParameters= preg_replace ("/^o /", "", $this->gotoKernelParameters);
-
     /* Prepare Shares */
     if((isset($this->attrs['gotoShare']))&&(is_array($this->attrs['gotoShare']))){
       unset($this->attrs['gotoShare']['count']);
@@ -583,7 +565,7 @@ class workstartup extends plugin
     }
 
     /* Values */
-    foreach(array("gotoBootKernel", "customParameters", "gotoShare","FAIclasses","FAIclass","FAIdebianMirror","FAIrelease") as $val){
+    foreach(array("gotoBootKernel","gotoShare","FAIclasses","FAIclass","FAIdebianMirror","FAIrelease") as $val){
       $smarty->assign($val, $this->$val);
     }
 
@@ -709,6 +691,7 @@ class workstartup extends plugin
     }
 
     /* Show main page */
+    $smarty->assign("gotoKernelParameters",$this->gotoKernelParameters);
     return($smarty->fetch (get_template_path('workstationStartup.tpl', TRUE,dirname(__FILE__))));
   }
 
@@ -744,11 +727,6 @@ class workstartup extends plugin
       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"];
-      }
     }
   }
 
@@ -810,23 +788,6 @@ class workstartup extends plugin
       }
     }
 
-    /* Add semi automatic values */
-    $this->gotoKernelParameters= "";
-
-    switch ($this->bootmode){
-      case "D":
-        $this->gotoKernelParameters.= " debug";
-      break;
-      case "G":
-        $this->gotoKernelParameters.= " splash quiet";
-      break;
-    }
-    if ($this->customParameters != ""){
-                       # This should be enabled after boot-mode is available again
-      #$this->gotoKernelParameters.= " o ".$this->customParameters;
-      $this->gotoKernelParameters= $this->customParameters;
-    }
-
     plugin::save();
 
     unset( $this->attrs['FAIrelease'] );
@@ -1014,7 +975,7 @@ class workstartup extends plugin
     plugin::PrepareForCopyPaste($source);    
     $source_o = new workstartup ($this->config, $source['dn']);
     foreach(array("FAIclass","gotoModules", "gotoAutoFs", "gotoFilesystem",
-          "gotoKernelParameters","gotoShares","customParameters") as $attr){
+          "gotoKernelParameters","gotoShares") as $attr){
       $this->$attr = $source_o->$attr;
     }
   }

diff --git a/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl b/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl
index 92ae9dfe1b9f271da1869e4b1d8e4e18ebdf84db..a484dce7fdef5e2031754eaea2f2732475d05d2e 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl
@@ -17,11 +17,11 @@
     </tr>
        {/if}
     <tr>
-     <td><LABEL for="customParameters">{t}Custom options{/t}</LABEL></td>
+     <td><LABEL for="gotoKernelParameters">{t}Custom options{/t}</LABEL></td>
      <td>
 {render acl=$gotoKernelParametersACL}
-       <input name="customParameters" id="customParameters" size=25 maxlength=500
-                value="{$customParameters}" title="{t}Enter any parameters that should be passed to the kernel as append line during bootup{/t}">
+       <input name="gotoKernelParameters" id="gotoKernelParameters" size=25 maxlength=500
+                value="{$gotoKernelParameters}" title="{t}Enter any parameters that should be passed to the kernel as append line during bootup{/t}">
 {/render}
      </td>
     </tr>