- class_DaemonEvent.inc: Do not simply reset timestamp, because

it causes PHP errors when sending messages
- class_DaemonEvent_notify.inc: Add missing timestamp to attributes
list
- gosa-si: Revert commit 13501 because the code actually needs id not
to be a primary key.

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13948 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 575626165251341721be9b18f95388cc4bf8fef2..b163d1b0552aff03fe479d7fa38caf4b1677b736 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,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 13bf90dd827c484585dadc17538ad52f442278a6..e2599414b2f862d6741603323a87eb4e6fd3b159 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");
+  var $attributes = array("from","user","group","message","subject","timestamp");
 
   public function __construct($config,$data = array())
   {

diff --git a/trunk/gosa-si/gosa-si-server b/trunk/gosa-si/gosa-si-server
index 7d43973982d1435c91096771e4b3be3de231ff9c..091402f963c0916a547b2f829aa5f39f9c54eb1d 100755 (executable)
--- a/trunk/gosa-si/gosa-si-server
+++ b/trunk/gosa-si/gosa-si-server
@@ -200,7 +200,7 @@ my $arch = "i386";
 # holds all messages which should be delivered to a user
 our $messaging_db;
 our $messaging_tn = "messaging"; 
-our @messaging_col_names = ("id INTEGER PRIMARY KEY", "subject TEXT", "message_from VARCHAR(255)", "message_to VARCHAR(255)", 
+our @messaging_col_names = ("id INTEGER", "subject TEXT", "message_from VARCHAR(255)", "message_to VARCHAR(255)", 
         "flag VARCHAR(255)", "direction VARCHAR(255)", "delivery_time VARCHAR(255)", "message TEXT", "timestamp VARCHAR(14)" );
 my $messaging_file_name;