Remove dependency to sambaversion

[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 90005169ae154e59a32420d38fb540a514b7f505..ab04844b46e360fc20483f39e03ff39cdba823ff 100644 (file)
--- a/gosa-core/include/class_gosaSupportDaemon.inc
+++ b/gosa-core/include/class_gosaSupportDaemon.inc
@@ -842,15 +842,8 @@ class gosaSupportDaemon
     foreach($data as $key => $value){
       $key = strtolower($key);
       if(is_array($value)){
-        if($key == "periodic"){
-          foreach($value as $sub_name => $sub_value){
-            $attr.= "<periodic>$sub_name</periodic>";
-            $attr.= "<$sub_name>$sub_value</$sub_name>";
-          }
-        }else{
-          foreach($value as $sub_value){
-            $attr.= "<$key>".strtolower($sub_value)."</$key>";
-          }
+        foreach($value as $sub_value){
+          $attr.= "<$key>".strtolower($sub_value)."</$key>\n";
         }
       }else{
         $attr.= "<$key>".strtolower($value)."</$key>\n";
@@ -942,15 +935,8 @@ class gosaSupportDaemon
     /* Prepare data */
     foreach ($data as $key => $value){
       if(is_array($value)){
-        if($key == "periodic"){
-          foreach($value as $sub_name => $sub_value){
-            $xml_message.= "<periodic>$sub_name</periodic>";
-            $xml_message.= "<$sub_name>$sub_value</$sub_name>";
-          }
-        }else{
-          foreach($value as $sub_value){
-            $xml_message.= "<$key>$sub_value</$key>";
-          }
+        foreach($value as $sub_value){
+          $xml_message.= "<$key>$sub_value</$key>";
         }
       }else{
         $xml_message.= "<$key>$value</$key>";
@@ -1079,10 +1065,19 @@ class gosaSupportDaemon
         if(isset($entries['XML']) && is_array($entries['XML'])){
           $ret = $entries;
           if($this->use_alternative_xml_parse_method) {
+
+            // --------- Seems broken, check for 'ERROR' but using 'ERROR_STRING'
             if(isset($entries['XML'][0]['ERROR'][0]['VALUE']) && $entries['XML'][0]['ERROR'][0]['VALUE'] == "1"){
               $this->set_error($entries['XML'][0]['ERROR_STRING'][0]['VALUE']);
               new log("debug","DaemonEvent (IDS) ", "gosaSupportDaemon::_send()", 
                   array($data=>$data),"FAILED ".$this->get_error());
+            // ---------
+      
+          
+            }elseif(isset($entries['XML'][0]['ERROR'][0]['VALUE'])){
+              $this->set_error($entries['XML'][0]['ERROR'][0]['VALUE']);
+              new log("debug","DaemonEvent (IDS) ", "gosaSupportDaemon::_send()", 
+                  array($data=>$data),"FAILED ".$this->get_error());
             }
           }else{
             if(isset($entries['XML']['ERROR_STRING'])) {