X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_debconfTemplate.inc;h=d781321ec8daba9f701e18fa561ff5738a966e41;hb=343367db13017701f67f4d3ed11eae1fbc25dfa2;hp=c9c4aa8ed864012c8694b8cabb98ff21f7de6342;hpb=7dddfc9610fd1372ce99ca3214df17e764f8f6ad;p=gosa.git

diff --git a/include/class_debconfTemplate.inc b/include/class_debconfTemplate.inc
index c9c4aa8ed..d781321ec 100644
--- a/include/class_debconfTemplate.inc
+++ b/include/class_debconfTemplate.inc
@@ -4,8 +4,8 @@ class debconf
 {
   var $package= "";
   var $language= "";
-  var $has_template= FALSE;
-  var $template_directory= "/var/lib/dpkg/info";
+  var $loaded_template= FALSE;
+  var $template_directory= "";
   var $template= array();
 
 
@@ -19,7 +19,6 @@ class debconf
   function set_package($package)
   {
     $this->package= $package;
-    return ($this->load());
   }
 
 
@@ -43,25 +42,30 @@ class debconf
 
   function load()
   {
-    /* Reject requests, if parameters are not set */
-    if ($this->package == "" || $this->template_directory == ""){
-      return (FALSE);
-    }
-
-    /* Try to load package based template file */
-    $filename= preg_replace("/\/+/", "/", $this->template_directory."/".$this->package.".templates");
-    if (is_file($filename) && is_readable($filename)){
+    if( TRUE === $this->has_template() ) {
+    
+      /* Try to load package based template file */
       $this->template= array();
 
       /* Read template array */
-      $post_name              = 0;
-      $langcode             = $this->language.".UTF-8";
-      $in_description       = FALSE;
-      $got_local_description= FALSE;
+      $post_name             = 0;
+      $langcode              = $this->language.".UTF-8";
+      $in_description        = FALSE;
+      $got_local_description = FALSE;
+
+      /* get filename */
+      $filename= preg_replace("/\/+/", "/", $this->template_directory."/".$this->package.".templates");
 
+      /* Check if file is readable */
+      if (!is_file($filename) || !is_readable($filename)){
+        return(FALSE);
+      }
+
+      /* Open file and read content line by line */
       $fh= fopen($filename, 'r');
 
-      while (!feof($fh)){
+      /* While the file handle is valid && there is still data to read -> parse configuration file */
+      while ($fh && !feof($fh)){
         $line= fgets($fh, 1024);
 
         /* Reset description flag */
@@ -144,7 +148,7 @@ class debconf
       }
 
       fclose($fh);
-      $this->has_template= TRUE;
+      $this->loaded_template= TRUE;
       
       $tmp= array();
       foreach($this->template as $post_name => $template){
@@ -156,14 +160,19 @@ class debconf
       return (TRUE);
     }
 
-    $this->has_template= FALSE;
+    $this->loaded_template= FALSE;
     return (FALSE);
   }
 
 
   function has_template()
   {
-    return ($this->has_template);
+    /* Reject requests, if parameters are not set */
+    if ($this->package == "" || $this->template_directory == ""){
+      return (FALSE);
+    }
+    $filename= preg_replace("/\/+/", "/", $this->template_directory."/".$this->package.".templates");
+    return (is_file($filename) && is_readable($filename));
   }
 
 
@@ -209,7 +218,7 @@ class debconf
   /* This funtion sets the defualt value */
   function SetDefault($var,$val)
   {
-    if($this->has_template){
+    if ($this->loaded_template) {
       foreach($this->template as $key => $tmp){
         if($tmp['Name'] == $var ){
           $this->template[$key]['Default'] = $val;
@@ -222,8 +231,8 @@ class debconf
   /* Display all possible options in html*/
   function get_dialog()
   {
-    if ($this->has_template){
-      $result= "<table>";
+    if ($this->loaded_template) {
+      $result= "<table summary=''>";
 
       foreach ($this->template as $post_name => $entry){
 
@@ -286,35 +295,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 +398,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>
               ";