Updated faiPackage lists.

-Description is now base64 coded

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

diff --git a/gosa-plugins/fai/admin/fai/class_faiPackage.inc b/gosa-plugins/fai/admin/fai/class_faiPackage.inc
index f645529dbe574715bc0dbd0e4d0d1312481bc496..e2d801ac80fc4f9fac9d4540b2226b45a0d6b0e2 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiPackage.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiPackage.inc
@@ -341,15 +341,15 @@ class faiPackage extends plugin
         }
 
         /* Get Version */
-        $version = " ";
+        $version = " ";
         if(isset($this->list[$usedName]['VERSION'])){
           $version = $this->list[$usedName]['VERSION'];
         }
     
         /* Get description */
-        $description = " ";
+        $description = " ";
         if(isset($this->list[$usedName]['DESCRIPTION'])){
-          $description = $this->list[$usedName]['DESCRIPTION'];
+          $description = base64_decode($this->list[$usedName]['DESCRIPTION']);
         }
  
         if(!preg_match('/^freeze/', $this->FAIstate) && $this->acl_is_writeable("FAIpackage")){

diff --git a/gosa-plugins/fai/admin/fai/class_faiPackageEntry.inc b/gosa-plugins/fai/admin/fai/class_faiPackageEntry.inc
index 8c329402190c1f665d80ec402ca728dd9447adc4..46fc8b8aacc25a7701fb46539824a92543fcf064 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiPackageEntry.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiPackageEntry.inc
@@ -111,9 +111,10 @@ class faiPackageEntry extends plugin
       }else{
         $check = "";
       }
-
-      if(!isset($pkg['DESCRIPTION'])){
-        $pkg['DESCRIPTION'] = " ";
+  
+      $desc = " ";
+      if(isset($pkg['DESCRIPTION'])){
+        $desc = base64_decode($pkg['DESCRIPTION']);
       }
 
       $chkbox = "<input type='checkbox' value='1' name='use_".base64_encode($pkg['PACKAGE'])."' ".$check.">
@@ -123,7 +124,7 @@ class faiPackageEntry extends plugin
               "attach" => "style='width:180px;' title='".$pkg['PACKAGE']." (".$pkg['VERSION'].")'"),
             array("string"=>"<div style='width:238px; overflow:hidden;'>".htmlentities($pkg['VERSION'])."</div>",   
               "attach" => "style='width:240px' title='".$pkg['PACKAGE']." (".$pkg['VERSION'].")'"),
-            array("string"=>htmlentities($pkg['DESCRIPTION']), 
+            array("string"=>htmlentities($desc), 
               "attach" => "style='border-right:0px;text-align:left;'")));
     }