From 50578199598c751f8da7241e4cf4c3ca2c34080c Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 27 Feb 2008 08:54:28 +0000 Subject: [PATCH] Updated deamon -List entries again git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9151 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/include/class_gosaSupportDaemon.inc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc index 7cf912d54..ac029ce9d 100644 --- a/gosa-core/include/class_gosaSupportDaemon.inc +++ b/gosa-core/include/class_gosaSupportDaemon.inc @@ -168,7 +168,7 @@ $xml_msg.= " if(isset($entries['XML']) && is_array($entries['XML'])){ /* Check if returned values represent a valid answer */ - if($entries['XML']['HEADER'] == "answer"){ + if(isset($entries['XML'])){ /* Unset header tags */ foreach(array("HEADER","SOURCE","TARGET") as $type){ @@ -579,7 +579,10 @@ $xml_msg.= " $str = trim($this->o_sock->read()); $entries = $this->xml_to_array($str); if(isset($entries['XML']) && is_array($entries['XML'])){ - $ret = $entries; + $ret = $entries; + if(isset($entries['XML']['ERROR_STRING'])) { + $this->set_error($entries['XML']['ERROR_STRING']); + } } } } @@ -601,14 +604,15 @@ $xml_msg.= " /* Multiple targets? */ if (!is_array($to)){ - $to_targets= array($to); + $to_targets= array($to); } else { - $to_targets= $to; + $to_targets= $to; } /* Build target strings */ - foreach($to_target as $to){ - $target.= "$to"; + $target =""; + foreach($to_targets as $to){ + $target.= "$to"; } return $d->_send("
$header
GOSA$target".$xml_message."
",$answer_expected); -- 2.30.2