From 597432a5674e0a54d0f29bbeae9c62044f4f0537 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 29 Apr 2008 12:31:52 +0000 Subject: [PATCH] Updated faiPackage lists. -Description is now base64 coded git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10723 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/fai/admin/fai/class_faiPackage.inc | 6 +++--- gosa-plugins/fai/admin/fai/class_faiPackageEntry.inc | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gosa-plugins/fai/admin/fai/class_faiPackage.inc b/gosa-plugins/fai/admin/fai/class_faiPackage.inc index f645529db..e2d801ac8 100644 --- 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 8c3294021..46fc8b8aa 100644 --- 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 = " @@ -123,7 +124,7 @@ class faiPackageEntry extends plugin "attach" => "style='width:180px;' title='".$pkg['PACKAGE']." (".$pkg['VERSION'].")'"), array("string"=>"
".htmlentities($pkg['VERSION'])."
", "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;'"))); } -- 2.30.2