X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_gosaSupportDaemon.inc;h=bcb62fd9ecc4f906d09a716608d43a2e75deb082;hb=9540255fc994b107abc71468c306d408e290d7bb;hp=90005169ae154e59a32420d38fb540a514b7f505;hpb=a5f39987da8949d0e2df1edd2a800cf7b3440f6a;p=gosa.git
diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc
index 90005169a..bcb62fd9e 100644
--- a/gosa-core/include/class_gosaSupportDaemon.inc
+++ b/gosa-core/include/class_gosaSupportDaemon.inc
@@ -56,6 +56,9 @@ class gosaSupportDaemon
{
#FIXME: bad idea about referencing global variables from within classes
global $config;
+ if(!isset($config) || !$config){
+ $config = session::global_get('config');
+ }
// Detect timeout
if($timeout == null){
@@ -842,15 +845,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.= "$sub_name";
- $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 +938,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.= "$sub_name";
- $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>";
@@ -1060,6 +1049,7 @@ class gosaSupportDaemon
}
@DEBUG(DEBUG_SI, $line, "".$class."::".$function."" , $file, "".htmlentities($data)."", $info="");
+ $start = microtime(1);
/*******
Start sending data
@@ -1072,6 +1062,7 @@ class gosaSupportDaemon
/* Check if something went wrong while reading */
if($this->o_sock->is_error()){
$this->set_error($this->o_sock->get_error());
+ @DEBUG(DEBUG_SI, $line, "".$class."::".$function."" , $file, sprintf('%.7f', microtime(1) - $start) , "FAILED Duration:");
return($ret);
}
@@ -1079,10 +1070,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'])) {
@@ -1103,6 +1103,8 @@ class gosaSupportDaemon
array($data=>$data),"Fire & forget, not result.! ".$this->get_error());
}
}
+
+ @DEBUG(DEBUG_SI, $line, "".$class."::".$function."" , $file, sprintf('%.7f', microtime(1) - $start) , "Duration:");
return($ret);
}
@@ -1148,6 +1150,9 @@ class gosaSupportDaemon
function clean_queue_from_mac($mac)
{
global $config;
+ if(!isset($config) || !$config){
+ $config = session::global_get('config');
+ }
/* First of all we have to check which jobs are startet
* for $mac
@@ -1176,7 +1181,7 @@ class gosaSupportDaemon
$tmp->add_targets(array($mac));
$tmp->set_type(TRIGGERED_EVENT);
if(!$this->append($tmp)){
- msg_dialog::display(_("Error"), sprintf(_("Cannot send abort event for entry %s!"),$entry['ID']) , ERROR_DIALOG);
+ msg_dialog::display(_("Error"), sprintf(_("Cannot send abort event for entry %s!"), bold($entry['ID'])) , ERROR_DIALOG);
new log("debug","DaemonEvent ", "gosaSupportDaemon::clean_queue_from_mac()", array($mac => $mac),
"FAILED, could not send 'DaemonEvent_faireboot' for entry ID (".$entry['ID'].") - ".$this->get_error());
}else{
@@ -1196,7 +1201,7 @@ class gosaSupportDaemon
* Failed or waiting events, can be removed without any trouble.
*/
if(!$this->remove_entries(array($entry['ID']))){
- msg_dialog::display(_("Error"), sprintf(_("Cannot remove entry %s!"),$entry['ID']) , ERROR_DIALOG);
+ msg_dialog::display(_("Error"), sprintf(_("Cannot remove entry %s!"), bold($entry['ID'])) , ERROR_DIALOG);
}
;break;
}