X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_gosaSupportDaemon.inc;h=a61e1ea1ba4a240e668c3394397731595206a098;hb=0ed9b1739e716b327ca773724ebcfec83eb2904b;hp=3295c27381050d54ad7b954ceab0b9900c09c111;hpb=da1b35b1343f11e46bed8f993c57d1f779e0d1f2;p=gosa.git

diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc
index 3295c2738..a61e1ea1b 100644
--- 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,10 +52,18 @@ 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;
+    if(!isset($config) || !$config){
+      $config = session::global_get('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 +78,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 +87,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. 
    */
@@ -1054,10 +1068,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'])) {
@@ -1123,6 +1146,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 
@@ -1186,7 +1212,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);
     }
@@ -1491,7 +1517,7 @@ class gosaSupportDaemon
    */
   public function krb5_get_policy($server,$name)
   {
-    $res = array();  
+    $ret = array();  
 
     /* Check if the given name is a valid request value 
      */
@@ -1752,6 +1778,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 +1789,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;