gunnar: server/php-kolab/Kolab_Filter issue3521.patch,NONE,1.1.2.1
cvs at kolab.org
cvs at kolab.org
Wed Apr 1 18:24:44 CEST 2009
Author: gunnar
Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv20479/php-kolab/Kolab_Filter
Added Files:
Tag: kolab_2_2_branch
issue3521.patch
Log Message:
Actual patch was missing from the last commit ( kolab/issue3521 (kolabmailboxfilter does not accept mail for user+extension at example.com)).
--- NEW FILE: issue3521.patch ---
--- 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
@@ -200,30 +200,7 @@
$hosts = array();
foreach ($this->_recipients as $recipient) {
- $dn = $server->uidForIdOrMail($recipient);
- if (is_a($dn, 'PEAR_Error')) {
- return $dn;
- }
- if (!$dn) {
- Horde::logMessage(sprintf('User %s does not exist!', $recipient),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
- }
- $user = $server->fetch($dn, KOLAB_OBJECT_USER);
- if (is_a($user, 'PEAR_Error')) {
- $user->code = OUT_LOG | EX_NOUSER;
- return $user;
- }
- $imapserver = $user->get(KOLAB_ATTR_IMAPHOST);
- if (is_a($imapserver, 'PEAR_Error')) {
- $imapserver->code = OUT_LOG | EX_NOUSER;
- return $imapserver;
- }
- if (!empty($imapserver)) {
- $uhost = $imapserver;
- } else {
- $uhost = $host;
- }
- $hosts[$uhost][] = $recipient;
+ $hosts[$host][] = $recipient;
}
foreach (array_keys($hosts) as $imap_host) {
More information about the commits
mailing list