Display text input if there are no valid entries in select list

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

diff --git a/include/class_debconfTemplate.inc b/include/class_debconfTemplate.inc
index c9c4aa8ed864012c8694b8cabb98ff21f7de6342..001f562739a9529e61a4435a9e4fad6307f8bc63 100644 (file)
--- a/include/class_debconfTemplate.inc
+++ b/include/class_debconfTemplate.inc
@@ -286,35 +286,36 @@ class debconf
   {
     $post_name= $data['post_name'];
     if (preg_match('/\$\{/', $data['Choices'])){
-      $choices= array("Need to use some text...");
+      $result= $this->render_string($data);
     } else {
       $choices= "";
       foreach (split(", ", $data['Choices']) as $choice){
         $choices[]= $choice;
       }
-    }
 
-    $result="
-      <tr>
-      <td valign='top'>
-      <h2>".$data['Topic']."</h2>".$data['Description']."
-      </td>
-      <td valign='top'  style=\"white-space:nowrap; border-left: 1px solid rgb(160, 160, 160);\">
-        <input type='hidden' name='multi-".$post_name."' value='1'>
-      ";
-      
-    $defs = split(", ",$data['Default']);
-    foreach($choices as $value){
-      if(in_array($value,$defs)){
-        $result.="\n<input name='".$post_name."-multi-".$value."' type='checkbox' value='".htmlentities($value)."' checked>".$value."<br>";
-      }else{
-        $result.="\n<input name='".$post_name."-multi-".$value."' type='checkbox' value='".htmlentities($value)."'>".$value."<br>";
+
+      $result="
+        <tr>
+        <td valign='top'>
+        <h2>".$data['Topic']."</h2>".$data['Description']."
+        </td>
+        <td valign='top'  style=\"white-space:nowrap; border-left: 1px solid rgb(160, 160, 160);\">
+          <input type='hidden' name='multi-".$post_name."' value='1'>
+        ";
+        
+      $defs = split(", ",$data['Default']);
+      foreach($choices as $value){
+        if(in_array($value,$defs)){
+          $result.="\n<input name='".$post_name."-multi-".$value."' type='checkbox' value='".htmlentities($value)."' checked>".$value."<br>";
+        }else{
+          $result.="\n<input name='".$post_name."-multi-".$value."' type='checkbox' value='".htmlentities($value)."'>".$value."<br>";
+        }
       }
-    }
 
-  $result .=    "</td>
-      </tr>
-      ";
+    $result .=    "</td>
+        </tr>
+        ";
+    }    
 
     return ($result);
   }
@@ -388,8 +389,8 @@ class debconf
                   <td valign='top'>
                     <h2>".$data['Topic']."</h2>".$data['Description']."
                   </td>
-                  <td  style=\"white-space:nowrap; border-left: 1px solid rgb(160, 160, 160);\">
-                    <input type='text' name='".$data['post_name']."' value='".$data['Default']."'>
+                  <td  style=\"white-space:nowrap; border-left: 1px solid rgb(160, 160, 160);\" valign='top'>
+                    <input type='text' name='".$data['post_name']."' value='".$data['Default']."' style='width:300px;'>
                   </td>
                 </tr>
               ";