From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 27 Mar 2008 09:48:24 +0000 (+0000)
Subject: Updated package stuff.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=35670ca8e2622ca3632075f4050c2e8855f145d0;p=gosa.git

Updated package stuff.


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10021 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 6d60ba9f4..d76d2dd78 100644
--- a/gosa-plugins/fai/admin/fai/class_faiPackage.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiPackage.inc
@@ -255,14 +255,11 @@ class faiPackage extends plugin
 
     /* Configuration dialog open*/
     if((isset($_POST['Conpkg']))&&(isset($_POST['usedPackages']))&&(!empty($_POST['usedPackages'][0])) && $this->acl_is_writeable("FAIdebconfInfo")){
-      $path = CONFIG_DIR."/fai/".$this->FAIdebianRelease."/debconf.d";
       $pkg_config = array();
       $pkg = $_POST['usedPackages'][0];
-
       if(isset($this->ConfiguredPackages[$pkg])){
         $pkg_config = $this->ConfiguredPackages[$pkg];
       }
-
       $this->dialog = new faiPackageConfiguration($this->config, $this->dn,$pkg, $this->FAIdebianRelease , $pkg_config);
       $this->is_dialog =true;
     }
@@ -423,10 +420,10 @@ class faiPackage extends plugin
   function genPkgs()
   {
     $start = microtime(1);
-    if(1 | $this->buffer === NULL || !count($this->buffer)){
+    if($this->buffer === NULL || !count($this->buffer)){
       $this->buffer = array();
       $q = new gosaSupportDaemon();
-      $attrs = array("distribution", "package","version=''", "section", "description", "timestamp=''","template=''");
+      $attrs = array("distribution", "package","version", "section", "description", "timestamp","template=''");
       $ret = $q->FAI_get_packages($this->FAIdebianRelease,$attrs);
       if($q->is_error()){
         msg_dialog::display(_("Service infrastructure"),msgPool::siError($q->get_error()),ERROR_DIALOG);
@@ -437,8 +434,7 @@ class faiPackage extends plugin
       }
     }
     
-    printf("%0.6f",(microtime(1) - $start));
-    print_a($this->buffer);
+#    printf("%0.6f",(microtime(1) - $start));
     return $this->buffer;
   }