X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_gosaSupportDaemon.inc;h=7f21eed9245f1a63705786425590700df9426da2;hb=f43c362c3ff296dd9270bd48f2c7feecf34b7375;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..7f21eed92 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,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.= "$sub_name";
+ $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("GOSA$target", TRUE);
return (count($answer) ? TRUE:FALSE);
}
@@ -1491,7 +1509,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 +1770,9 @@ class gosaSupportDaemon
/* Get list of available log files
*/
+ if(!is_array($entry)){
+ $entry = array($entry);
+ }
foreach($entry as $log_date){
$xml_msg2 = "
gosa_show_log_files_by_date_and_mac
@@ -1760,7 +1781,7 @@ class gosaSupportDaemon
".$log_date."
".$mac."
";
-
+
$ret[$mac][$log_date] = array();
$res = $this->_send($xml_msg2,TRUE);
$ret[$mac][$log_date]['DATE_STR'] = $log_date;