diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc
index 33e841885166744e132c6135832db1e120faa727..7f21eed9245f1a63705786425590700df9426da2 100644 (file)
@param boolean Connect Directly connect to daemon socket.
@param float Timeout The timelimit for all socket actions.
*/
- public function __construct($connect=TRUE,$timeout=15)
+ 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()
*/
/* 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>";