Readded default:value to startup tabs

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

diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index d325b74781be91868baee2c6935406b918953f11..ccfaa3828c57eefd01e4a17e4418c8d2ed241c8d 100644 (file)
--- a/plugins/admin/systems/class_terminalStartup.inc
+++ b/plugins/admin/systems/class_terminalStartup.inc
@@ -97,15 +97,17 @@ class termstartup extends plugin
         while (!feof($fh)) {
           $buffer= trim(fgets($fh, 256));
           
-          $name=$value = $buffer;
-
-          if(preg_match("/:/",$buffer)){
-            $name = preg_replace("/:.*$/","",$buffer);
-            $value= preg_replace("/^.*:/","",$buffer);
-          }
-
           if(!empty($buffer)){
-            $this->gotoBootKernels[$name]= $value;
+          
+            $name=$value = $buffer;
+
+            if(preg_match("/:/",$buffer)){
+              $name = preg_replace("/:.*$/","",$buffer);
+              $value= preg_replace("/^.*:/","",$buffer);
+              $this->gotoBootKernels[$name]= $name.":".$value;
+            }else{
+              $this->gotoBootKernels[$name]= $value;
+            }
           }
         }
         pclose($fh);

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index a2761f271853024a2833d33c92880d2ee54e5ac4..6df7411c75390f6a503a06bb57e438d86d806400 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -312,17 +312,20 @@ class workstartup extends plugin
         $fh= popen($command, "r");
         while (!feof($fh)) {
           $buffer= trim(fgets($fh, 256));
-
-          $name= $value = $buffer;
-
-          if(preg_match("/:/",$buffer)){
-            $name  = preg_replace("/:.*$/","",$buffer);
-            $value = preg_replace("/^.*:/","",$buffer);
+          
+          if(!empty($buffer)){
+          
+            $name=$value = $buffer;
+
+            if(preg_match("/:/",$buffer)){
+              $name = preg_replace("/:.*$/","",$buffer);
+              $value= preg_replace("/^.*:/","",$buffer);
+              $this->gotoBootKernels[$name]= $name.":".$value;
+            }else{
+              $this->gotoBootKernels[$name]= $value;
+            }
           }
 
-          if ($buffer != ""){
-            $this->gotoBootKernels[$name]= $value;
-          }
         }
         pclose($fh);
       }