Requrie new schema for gosaAccount

[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 5c183e763730eca41ea7481993ca301ac316fce7..7f21eed9245f1a63705786425590700df9426da2 100644 (file)
--- a/gosa-core/include/class_gosaSupportDaemon.inc
+++ b/gosa-core/include/class_gosaSupportDaemon.inc
@@ -31,8 +31,8 @@ class gosaSupportDaemon
   private $s_error      = "";
   private $b_error      = FALSE;
 
-  private $is_connected     = FALSE;
-
+  private $is_connected   = FALSE;
+  private $is_configured  = FALSE;
   protected $use_alternative_xml_parse_method = FALSE;
 
   public function get_host()
@@ -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() 
      */
@@ -70,7 +75,7 @@ class gosaSupportDaemon
         $this->i_port= preg_replace("/^.*@[^:]+:(.*)$/", "$1", $config->get_cfg_value("gosaSupportURI"));
         $this->s_encryption_key = preg_replace("/^(.*)@[^:]+:.*$/", "$1", $config->get_cfg_value("gosaSupportURI"));
       }
-
+      $this->is_configured = TRUE;
       $this->f_timeout = $timeout;
       if($connect){
         $this->connect();
@@ -79,6 +84,12 @@ class gosaSupportDaemon
   }
 
 
+  public function is_configured()
+  {
+    return($this->is_configured);
+  }
+
+
   /*! \brief  Establish daemon connection. 
     @return boolean Returns true if the connection was succesfully established. 
    */
@@ -924,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>";
@@ -1186,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);
     }
@@ -1752,6 +1770,9 @@ class gosaSupportDaemon
 
           /* Get list of available log files 
            */
+          if(!is_array($entry)){
+            $entry = array($entry);
+          }
           foreach($entry as $log_date){
             $xml_msg2 = "<xml> 
               <header>gosa_show_log_files_by_date_and_mac</header> 
@@ -1760,7 +1781,7 @@ class gosaSupportDaemon
               <date>".$log_date."</date> 
               <mac>".$mac."</mac> 
               </xml>";
-
+   
             $ret[$mac][$log_date] = array();
             $res = $this->_send($xml_msg2,TRUE);
             $ret[$mac][$log_date]['DATE_STR']  = $log_date;