X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_gosaSupportDaemon.inc;h=05817d193f7d32b2c8cc65a523ee8e718c386ee6;hb=3654000069256d0fb3b4cbb31bd2bd5478f163f2;hp=0a782df027e2d30274561b831fd137096b59d619;hpb=5cfa61046f74bb94dfa5b66445b63e9b30554979;p=gosa.git
diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc
index 0a782df02..05817d193 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.
*/
@@ -215,7 +226,7 @@ class gosaSupportDaemon
$ret .= $msg." ";
}
}
- $ret = preg_replace("/ /"," ",$ret);
+ $ret = str_replace(" "," ",$ret);
return($ret);
}
@@ -1186,7 +1197,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("$target", TRUE);
return (count($answer) ? TRUE:FALSE);
}
@@ -1491,7 +1502,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 +1763,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 +1774,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;
@@ -1859,7 +1873,7 @@ class gosaSupportDaemon
There may be some Header lines like:
-----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.6 (GNU/Linux)
*/
- if(preg_match("/".normalizePreg("BEGIN PGP PUBLIC KEY BLOCK")."/",$key)){
+ if(preg_match("/BEGIN PGP PUBLIC KEY BLOCK/",$key)){
/* Remove header */
$key = preg_replace("/^.*\n\n/sim","",$key);