wilde: server/php-kolab/Kolab_Filter issue973.patch, NONE, 1.1.2.1 ChangeLog, 1.29.2.13, 1.29.2.14 Kolab_Filter.spec, 1.19.2.16, 1.19.2.17 Makefile, 1.8.2.14, 1.8.2.15

[cvs at kolab.org]

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Filter.spec Makefile 
Added Files:
      Tag: kolab_2_2_branch
	issue973.patch 
Log Message:
Made configuration of untrusted messages more flexible. 
Fixes kolab/issue973 (Rewritten from shown inconveniently in kontact)

--- NEW FILE: issue973.patch ---
--- a/lib/Horde/Kolab/Filter/Content.php
+++ b/lib/Horde/Kolab/Filter/Content.php
@@ -403,7 +403,6 @@
                 $fmt = _("(UNTRUSTED, sender <%s> is not authenticated)");
             }
         }
-        $untrusted = sprintf($fmt, $sender);
 
         $adrs = imap_rfc822_parse_adrlist($fromhdr, $domains[0]);
 
@@ -433,15 +432,22 @@
                             /* Rewrite */
                             Horde::logMessage(sprintf("%s is not an allowed From address for unauthenticated users, rewriting.", 
                                                       $from), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+                            if (property_exists($adr, 'personal')) {
+                                $name = str_replace(array("\\", '"'), 
+                                                    array("\\\\",'\"'), 
+                                                    MIME::decode($adr->personal, 'utf-8'));
+                            } else {
+                                $name = '';
+                            }
+
+                            $untrusted = sprintf($fmt, $sender, $from, $name);
+
+                            // Is this test really correct?  Is $fromhdr a _decoded_ string?
+                            // If not comparing with the unencoded $untrusted is wrong.
+                            // sw - 20091125
                             if (strpos( $fromhdr, $untrusted )===false) {
-                                if (property_exists($adr, 'personal')) {
-                                    $name = str_replace(array("\\", '"'), 
-                                                        array("\\\\",'\"'), 
-                                                        MIME::decode($adr->personal, 'utf-8'));
-                                } else {
-                                    $name = '';
-                                }
-                                $new_from = '"' . MIME::encode($name . ' ' . $untrusted) . '"';
+                                $new_from = '"' . MIME::encode($untrusted) . '"';
                                 return  $new_from . ' <' . $from . '>';
                             } else {
                                 return true;

Diff finished.  Wed Nov 25 14:12:47 2009

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.13
retrieving revision 1.29.2.14
diff -u -d -r1.29.2.13 -r1.29.2.14
--- ChangeLog	24 Nov 2009 14:00:25 -0000	1.29.2.13
+++ ChangeLog	25 Nov 2009 13:42:20 -0000	1.29.2.14
@@ -1,3 +1,8 @@
+2009-11-25  Sascha Wilde  <wilde at intevation.de>
+
+	* Kolab_Filter.spec: kolab/issue973 (Rewritten from shown
+	inconveniently in kontact)
+
 2009-11-24  root  <Gunnar Wrobel <wrobel at pardus.de>>
 
 	* Kolab_Filter.spec: kolab/issue3594 (Mail containing NUL byte not

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.16
retrieving revision 1.19.2.17
diff -u -d -r1.19.2.16 -r1.19.2.17
--- Kolab_Filter.spec	24 Nov 2009 14:00:25 -0000	1.19.2.16
+++ Kolab_Filter.spec	25 Nov 2009 13:42:20 -0000	1.19.2.17
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
 %define         V_version 0.1.4
-%define         V_release 20091124
+%define         V_release 20091125
 
 # Package Information
 Name:	   %{V_package}
@@ -33,6 +33,7 @@
 Patch11:   issue3768.patch
 Patch12:   issue3464.patch
 Patch13:   issue3594.patch
+Patch14:   issue973.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -81,6 +82,7 @@
 	%patch -p1 -P 11
 	%patch -p1 -P 12
 	%patch -p1 -P 13
+	%patch -p1 -P 14
 	cp %{S:1} .
 %build
 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.14
retrieving revision 1.8.2.15
diff -u -d -r1.8.2.14 -r1.8.2.15
--- Makefile	24 Nov 2009 14:00:25 -0000	1.8.2.14
+++ Makefile	25 Nov 2009 13:42:20 -0000	1.8.2.15
@@ -6,7 +6,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3464.patch issue3521.patch issue3558.patch issue3568.patch issue3594.patch issue3610.patch issue3768.patch issue3868.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3464.patch issue3521.patch issue3558.patch issue3568.patch issue3594.patch issue3610.patch issue3768.patch issue3868.patch issue973.patch dovecotlda-quoting.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm