From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 11 Apr 2008 14:20:09 +0000 (+0000)
Subject: Updated package search
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=093493d86478e41b670f22c1f84ee0fb32fa5d28;p=gosa.git

Updated package search


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

diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc
index 9ceccc240..01c12fcde 100644
--- a/gosa-core/include/class_gosaSupportDaemon.inc
+++ b/gosa-core/include/class_gosaSupportDaemon.inc
@@ -154,15 +154,17 @@ class gosaSupportDaemon
     /* Create list of attributes to fetch */
     $pkgs = ""; 
     foreach($package as $pkg){
-      $pkgs .="<phrase>
+      $pkgs .="
+               <phrase>
                 <operator>like</operator>
                 <package>".$pkg."</package>
-               </phrase>";
+               </phrase>
+             ";
 
     }
 
     /* Create Daemon query */
-    if(empty($package)){
+    if(!count($package)){
       $xml_msg = "<xml><header>gosa_query_packages_list</header><target>GOSA</target><source>GOSA</source>".
         $attr.
         "<where><clause><phrase><distribution>".$release."</distribution></phrase></clause></where>
@@ -171,13 +173,13 @@ class gosaSupportDaemon
          $xml_msg = "<xml><header>gosa_query_packages_list</header><target>GOSA</target><source>GOSA</source>".
         $attr.
         "<where>
-            <connector>AND</connector>
             <clause>
-              <phrase><distribution>".$release."</distribution></phrase>
-            </clause>
-            <clause>
-             <connector>OR</connector>
-             $pkgs
+             <connector>AND</connector>
+             <phrase><distribution>".$release."</distribution></phrase>
+              <clause>
+              <connector>OR</connector>
+               ".$pkgs."
+             </clause>
             </clause>
          </where>
          <limit><from>0</from><to>100</to></limit>