Updated setup to use xmlentities

[gosa.git] / gosa-core / include / class_gosaSupportDaemon.inc

diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc
index 8270f9ffc2fb7abf841ae56f0b5d6a8e04139834..b6eff67e502b5a1766dfa5d08a4a963bbf652796 100644 (file)
--- a/gosa-core/include/class_gosaSupportDaemon.inc
+++ b/gosa-core/include/class_gosaSupportDaemon.inc
@@ -76,7 +76,7 @@ class gosaSupportDaemon
       }else{
         $this->set_error($this->o_sock->get_error());
         $this->disconnect();
-        new log("debug","gosaSupportDaemon::connect()", "Could not connect to server.", array(),$this->get_error());
+        new log("debug","gosaSupportDaemon::connect()", "Cannot connect to si-server", array(),$this->get_error());
       }
     }else{
       $this->set_error(msgPool::cmdnotfound("GOSA_SI",_("GOsa support daemon")));
@@ -139,30 +139,33 @@ class gosaSupportDaemon
     $this->reset_error();
     $ret = array();
 
+    /* Check Parameter */
     if(!is_array($attrs) || !count($attrs)){
       trigger_error("Second parameter must be an array. With at least one attribute name.");
       return($ret);
     }
- 
-    $attr = "<select>package</select>";
+
+    /* Create list of attributes to fetch */
+    $attr = ""; 
     foreach($attrs as $at){
-#      $attr.= "<select>".trim($at)."</select>";
+      $attr.= $at.", ";
     }
- 
+
+    /* Create Daemon query */
     if(empty($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><limit>10</limit></xml>";
+        "<select> ".trim($attr,", ")." </select>".
+        "<where><clause><phrase><distribution>".$release."</distribution></phrase></clause></where>
+        </xml>";
     }else{
-      $xml_msg = 
-        "<xml><header>gosa_query_packages_list</header><target>GOSA</target><source>GOSA</source>".
-        $attr.
-          "<where><clause>".
-            "<connector>AND</connector>".
-            "<phrase><distribution>".$release."</distribution></phrase>".
-            "<phrase><package>".$package."</package></phrase>".
-          "</clause></where>".
-        "<limit>10</limit></xml>";
+         $xml_msg = "<xml><header>gosa_query_packages_list</header><target>GOSA</target><source>GOSA</source>".
+        "<select> ".trim($attr,", ")." </select>".
+        "<where><clause>
+            <connector>AND</connector>
+            <phrase><distribution>".$release."</distribution></phrase>
+            <phrase><package>".$package."</package></phrase>
+            </clause></where>
+        </xml>";
     }
 
     if($this->connect()){