SOURCES: eventum-bounce-notes.patch - update to r3386

[glen]

Author: glen                         Date: Fri Oct 12 20:48:57 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update to r3386

---- Files affected:
SOURCES:
   eventum-bounce-notes.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/eventum-bounce-notes.patch
diff -u SOURCES/eventum-bounce-notes.patch:1.5 SOURCES/eventum-bounce-notes.patch:1.6
--- SOURCES/eventum-bounce-notes.patch:1.5	Wed Apr  4 22:03:08 2007
+++ SOURCES/eventum-bounce-notes.patch	Fri Oct 12 22:48:51 2007
@@ -67,48 +67,48 @@
       * from a given mailbox.
       *
 @@ -536,10 +580,11 @@
-                     $res = Routing::getMatchingIssueIDs($addresses, 'email');
-                     if ($res != false) {
-                         $return = Routing::route_emails($message);
--                        if ($return == true) {
-+                        if ($return === true) {
-                             Support::deleteMessage($info, $mbox, $num);
-                             return;
-                         }
-+                        // TODO: handle errors?
+                 $res = Routing::getMatchingIssueIDs($addresses, 'email');
+                 if ($res != false) {
+                     $return = Routing::route_emails($message);
+-                    if ($return == true) {
++                    if ($return === true) {
+                         Support::deleteMessage($info, $mbox, $num);
                          return;
                      }
++                    // TODO: handle errors?
+                     return;
                  }
+             }
 @@ -547,10 +592,13 @@
-                     $res = Routing::getMatchingIssueIDs($addresses, 'note');
-                     if ($res != false) {
-                         $return = Routing::route_notes($message);
--                        if ($return == true) {
--                            Support::deleteMessage($info, $mbox, $num);
--                            return;
-+                        if ($return !== true) {
-+                            // in case of error, create bounce, but still
-+                            // delete email not to send bounce in next process :)
-+                            Support::bounceMessage($email, $return);
-                         }
-+
-+                        Support::deleteMessage($info, $mbox, $num);
-                         return;
+                 $res = Routing::getMatchingIssueIDs($addresses, 'note');
+                 if ($res != false) {
+                     $return = Routing::route_notes($message);
+-                    if ($return == true) {
+-                        Support::deleteMessage($info, $mbox, $num);
+-                        return;
++                    if ($return !== true) {
++                        // in case of error, create bounce, but still
++                        // delete email not to send bounce in next process :)
++                        Support::bounceMessage($email, $return);
                      }
++
++                    Support::deleteMessage($info, $mbox, $num);
+                     return;
                  }
+             }
 @@ -558,10 +606,11 @@
-                     $res = Routing::getMatchingIssueIDs($addresses, 'draft');
-                     if ($res != false) {
-                         $return = Routing::route_drafts($message);
--                        if ($return == true) {
-+                        if ($return === true) {
-                             Support::deleteMessage($info, $mbox, $num);
-                             return;
-                         }
-+                        // TODO: handle errors?
+                 $res = Routing::getMatchingIssueIDs($addresses, 'draft');
+                 if ($res != false) {
+                     $return = Routing::route_drafts($message);
+-                    if ($return == true) {
++                    if ($return === true) {
+                         Support::deleteMessage($info, $mbox, $num);
                          return;
                      }
++                    // TODO: handle errors?
+                     return;
                  }
+             }
 --- templates/notifications/bounced_email.tpl.text	(revision 0)
 +++ templates/notifications/bounced_email.tpl.text	(revision 0)
 @@ -0,0 +1,12 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/eventum-bounce-notes.patch?r1=1.5&r2=1.6&f=u