From 4fac2f62ffd64b76ed881700aa3932f07a6b020b Mon Sep 17 00:00:00 2001 From: psc Date: Wed, 22 Jul 2009 11:28:18 +0000 Subject: [PATCH 1/1] - Add missing 'timestamp' in attributes list - Do not simply unset the timestamp, because that causes PHP errors when sending messages git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13946 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../goto/addons/goto/events/class_DaemonEvent.inc | 8 +++----- .../goto/addons/goto/events/class_DaemonEvent_notify.inc | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc b/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc index 575626165..b163d1b05 100644 --- a/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc +++ b/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc @@ -431,11 +431,9 @@ class DaemonEvent foreach($this->attributes as $attr){ $ret[$attr] = $this->$attr; } - if($this->mode == SCHEDULED_EVENT){ - $ret['timestamp'] = $this->_timestamp_to_event($this->timestamp); - }elseif(isset($ret['timestamp'])){ - unset($ret['timestamp']); - } + + $ret['timestamp'] = $this->_timestamp_to_event($this->timestamp); + return($ret); } diff --git a/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc b/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc index 13bf90dd8..e2599414b 100644 --- a/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc +++ b/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc @@ -31,7 +31,7 @@ class DaemonEvent_notify extends DaemonEvent var $subject = ""; var $from = ""; - var $attributes = array("from","user","group","message","subject"); + var $attributes = array("from","user","group","message","subject","timestamp"); public function __construct($config,$data = array()) { -- 2.30.2