X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_gosaSupportDaemon.inc;h=2c832a6e79dfb508812e38627a5a3d3acdfa40ac;hb=0998bc227b3037c4f3f79ef60aa34e3811b853a3;hp=3a7d09ce4365793cfab00b120f92e54893d34566;hpb=2a5dd0d7ed2ee3ff87b2ecb63739b16daa8074fa;p=gosa.git diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc index 3a7d09ce4..2c832a6e7 100644 --- a/gosa-core/include/class_gosaSupportDaemon.inc +++ b/gosa-core/include/class_gosaSupportDaemon.inc @@ -62,7 +62,7 @@ class gosaSupportDaemon // Detect timeout if($timeout == null){ - $timeout = $config->get_cfg_value("gosaSupportTimeout",15); + $timeout = $config->get_cfg_value("core","gosaSupportTimeout",15); } /* This should only be the case if we call this from setup. @@ -71,12 +71,12 @@ class gosaSupportDaemon if(!is_object($config)) { return; } # load from config, store statically - if ($config->get_cfg_value("gosaSupportURI") != ""){ + if ($config->get_cfg_value("core","gosaSupportURI") != ""){ if ($this->s_host == ""){ - $this->s_host= preg_replace("/^.*@([^:]+):.*$/", "$1", $config->get_cfg_value("gosaSupportURI")); - $this->i_port= preg_replace("/^.*@[^:]+:(.*)$/", "$1", $config->get_cfg_value("gosaSupportURI")); - $this->s_encryption_key = preg_replace("/^(.*)@[^:]+:.*$/", "$1", $config->get_cfg_value("gosaSupportURI")); + $this->s_host= preg_replace("/^.*@([^:]+):.*$/", "$1", $config->get_cfg_value("core","gosaSupportURI")); + $this->i_port= preg_replace("/^.*@[^:]+:(.*)$/", "$1", $config->get_cfg_value("core","gosaSupportURI")); + $this->s_encryption_key = preg_replace("/^(.*)@[^:]+:.*$/", "$1", $config->get_cfg_value("core","gosaSupportURI")); } $this->is_configured = TRUE; $this->f_timeout = $timeout; @@ -1181,7 +1181,7 @@ class gosaSupportDaemon $tmp->add_targets(array($mac)); $tmp->set_type(TRIGGERED_EVENT); if(!$this->append($tmp)){ - msg_dialog::display(_("Error"), sprintf(_("Cannot send abort event for entry %s!"),$entry['ID']) , ERROR_DIALOG); + msg_dialog::display(_("Error"), sprintf(_("Cannot send abort event for entry %s!"), bold($entry['ID'])) , ERROR_DIALOG); new log("debug","DaemonEvent ", "gosaSupportDaemon::clean_queue_from_mac()", array($mac => $mac), "FAILED, could not send 'DaemonEvent_faireboot' for entry ID (".$entry['ID'].") - ".$this->get_error()); }else{ @@ -1201,7 +1201,7 @@ class gosaSupportDaemon * Failed or waiting events, can be removed without any trouble. */ if(!$this->remove_entries(array($entry['ID']))){ - msg_dialog::display(_("Error"), sprintf(_("Cannot remove entry %s!"),$entry['ID']) , ERROR_DIALOG); + msg_dialog::display(_("Error"), sprintf(_("Cannot remove entry %s!"), bold($entry['ID'])) , ERROR_DIALOG); } ;break; }