Revert commit 13946

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13947 594d385d-05f5-0310-b6e9-bd551577e9d8

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 b163d1b0552aff03fe479d7fa38caf4b1677b736..575626165251341721be9b18f95388cc4bf8fef2 100644 (file)
--- a/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc
+++ b/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc
@@ -431,9 +431,11 @@ class DaemonEvent
     foreach($this->attributes as $attr){
       $ret[$attr] = $this->$attr;
     }
-
-    $ret['timestamp'] = $this->_timestamp_to_event($this->timestamp);
-
+    if($this->mode == SCHEDULED_EVENT){
+      $ret['timestamp'] = $this->_timestamp_to_event($this->timestamp);
+    }elseif(isset($ret['timestamp'])){
+      unset($ret['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 e2599414b2f862d6741603323a87eb4e6fd3b159..13bf90dd827c484585dadc17538ad52f442278a6 100644 (file)
--- 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","timestamp");
+  var $attributes = array("from","user","group","message","subject");
 
   public function __construct($config,$data = array())
   {