gunnar: server/php-kolab/Kolab_Filter ChangeLog, 1.29.2.5, 1.29.2.6 Kolab_Filter.spec, 1.19.2.8, 1.19.2.9 issue3521.patch, 1.1.2.1, 1.1.2.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv31587/php-kolab/Kolab_Filter

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Filter.spec issue3521.patch 
Log Message:
 kolab/issue3521 (kolabmailboxfilter does not accept mail for user+extension at example.com)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.5
retrieving revision 1.29.2.6
diff -u -d -r1.29.2.5 -r1.29.2.6
--- ChangeLog	29 Apr 2009 16:06:21 -0000	1.29.2.5
+++ ChangeLog	4 May 2009 20:43:39 -0000	1.29.2.6
@@ -1,3 +1,8 @@
+2009-05-04  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Filter.spec: kolab/issue3521 (kolabmailboxfilter does not
+	accept mail for user+extension at example.com)
+
 2009-04-29  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Filter.spec: kolab/issue3568 (umlauts broken in

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.8
retrieving revision 1.19.2.9
diff -u -d -r1.19.2.8 -r1.19.2.9
--- Kolab_Filter.spec	29 Apr 2009 16:06:21 -0000	1.19.2.8
+++ Kolab_Filter.spec	4 May 2009 20:43:39 -0000	1.19.2.9
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
 %define         V_version 0.1.4
-%define         V_release 20090429
+%define         V_release 20090504
 
 # Package Information
 Name:	   %{V_package}

Index: issue3521.patch
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Attic/issue3521.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- issue3521.patch	1 Apr 2009 16:24:42 -0000	1.1.2.1
+++ issue3521.patch	4 May 2009 20:43:39 -0000	1.1.2.2
@@ -32,3 +32,28 @@
          }
  
          foreach (array_keys($hosts) as $imap_host) {
+--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Incoming.php.orig	2009-04-01 15:47:53.000000000 +0000
++++ a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Incoming.php	2009-04-01 15:48:40.000000000 +0000
+@@ -132,13 +132,20 @@
+             require_once 'Horde/Kolab/Resource.php';
+             $newrecips = array();
+             foreach ($this->_recipients as $recip) {
++                if (strpos($recip, '+')) {
++                    list($local, $rest)  = explode('+', $recip, 2);
++                    list($rest, $domain) = explode('@', $recip, 2);
++                    $resource = $local . '@' . $domain;
++                } else {
++                    $resource = $recip;
++                }
+                 Horde::logMessage(sprintf("Calling resmgr_filter(%s, %s, %s, %s)",
+                                           $this->_fqhostname, $this->_sender,
+-                                          $recip, $this->_tmpfile), __FILE__, __LINE__,
++                                          $resource, $this->_tmpfile), __FILE__, __LINE__,
+                                   PEAR_LOG_DEBUG);
+                 $r = &new Kolab_Resource();
+                 $rc = $r->handleMessage($this->_fqhostname, $this->_sender,
+-                                        $recip, $this->_tmpfile);
++                                        $resource, $this->_tmpfile);
+                 if (is_a($rc, 'PEAR_Error')) {
+                     return $rc;
+                 } else if ($rc === true) {