From: psc <psc@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 1 Oct 2010 08:44:03 +0000 (+0000)
Subject: Apply patch for #5508
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e32927528b8c692880df907c0eca337afd226f4b;p=gosa.git

Apply patch for #5508

When checking for messages to be delivered, honor delivery_time field
and skip the message if the delivery time has not been reached yet.

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

diff --git a/trunk/gosa-si/gosa-si-server b/trunk/gosa-si/gosa-si-server
index a2a49db1e..c95660b5c 100755
--- a/trunk/gosa-si/gosa-si-server
+++ b/trunk/gosa-si/gosa-si-server
@@ -1942,7 +1942,8 @@ sub watch_for_delivery_messages {
     my ($kernel, $heap) = @_[KERNEL, HEAP];
 
     # select outgoing messages
-    my $sql_statement = "SELECT * FROM $messaging_tn WHERE ( flag='p' AND direction='out' )";
+    my $timestamp= &get_time();
+    my $sql_statement = "SELECT * FROM $messaging_tn WHERE ( flag='p' AND direction='out' AND delivery_time<$timestamp)";
     #&daemon_log("0 DEBUG: $sql", 7);
     my $res = $messaging_db->exec_statement( $sql_statement );