X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_gosaSupportDaemon.inc;h=7f21eed9245f1a63705786425590700df9426da2;hb=f43c362c3ff296dd9270bd48f2c7feecf34b7375;hp=3cf6e7da5c42712045ee2d28c0f1d3a3dfd7ecaa;hpb=c4b785ca317d70f4431b499a26d2159b91abfdd0;p=gosa.git

diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc
index 3cf6e7da5..7f21eed92 100644
--- a/gosa-core/include/class_gosaSupportDaemon.inc
+++ b/gosa-core/include/class_gosaSupportDaemon.inc
@@ -52,11 +52,16 @@ class gosaSupportDaemon
     @param boolean  Connect Directly connect to daemon socket.
     @param float    Timeout The timelimit for all socket actions.
    */
-  public function __construct($connect=TRUE,$timeout=10)
+  public function __construct($connect=TRUE,$timeout=null)
   {
     #FIXME: bad idea about referencing global variables from within classes
     global $config;
 
+    // Detect timeout 
+    if($timeout == null){
+      $timeout = $config->get_cfg_value("gosaSupportTimeout",15);
+    }
+
     /* This should only be the case if we call this from setup.
         __autoload() 
      */
@@ -930,8 +935,15 @@ class gosaSupportDaemon
     /* Prepare data */
     foreach ($data as $key => $value){
       if(is_array($value)){
-        foreach($value as $sub_value){
-          $xml_message.= "<$key>$sub_value</$key>";
+        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>";
+          }
         }
       }else{
         $xml_message.= "<$key>$value</$key>";
@@ -1192,7 +1204,7 @@ class gosaSupportDaemon
   {
     if (tests::is_mac($target)){
       /* Get communication object */
-      $d= new gosaSupportDaemon(TRUE,0.5);
+      $d= new gosaSupportDaemon(TRUE,2);
       $answer= $d->_send("<xml><header>gosa_ping</header><source>GOSA</source><target>$target</target></xml>", TRUE);
       return (count($answer) ? TRUE:FALSE);
     }