gunnar: server/php-kolab/Kolab_Filter/patches/Kolab_Filter-0.1.8 issue3967.patch, NONE, 1.1 issue3983.patch, 1.1, 1.2

cvs at kolab.org cvs at kolab.org
Thu Apr 15 16:45:40 CEST 2010


Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/patches/Kolab_Filter-0.1.8
In directory doto:/tmp/cvs-serv2360/d/Kolab_Filter/patches/Kolab_Filter-0.1.8

Modified Files:
	issue3983.patch 
Added Files:
	issue3967.patch 
Log Message:
kolab/issue3967 (UNTRUSTED vs. UNAUTHENTICATED, distinction considered harmful), kolab/issue3962 (Names of config variables for untrusted text missleading)

--- NEW FILE: issue3967.patch ---
From: Gunnar Wrobel <wrobel at pardus.de>
Subject: [PATCH] issue3967.patch

kolab/issue3967 (UNTRUSTED vs. UNAUTHENTICATED, distinction considered harmful)

STATUS: MERGED

REF: http://issues.kolab.org/issue3967

Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>

--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php	15 Apr 2010 13:23:20 -0000	1.4.2.9
+++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php	15 Apr 2010 14:08:11 -0000
@@ -391,18 +391,10 @@
             $allowed_addrs = false;
         }
 
-        if ($sasluser) {
-            if (isset($conf['kolab']['filter']['untrusted_subject_insert'])) {
-                $fmt = $conf['kolab']['filter']['untrusted_subject_insert'];
-            } else {
-                $fmt = _("(UNTRUSTED, sender is <%s>)");
-            }
+        if (isset($conf['kolab']['filter']['unauthenticated_from_insert'])) {
+            $fmt = $conf['kolab']['filter']['unauthenticated_from_insert'];
         } else {
-            if (isset($conf['kolab']['filter']['unauthenticated_subject_insert'])) {
-                $fmt = $conf['kolab']['filter']['unauthenticated_subject_insert'];
-            } else {
-                $fmt = _("(UNTRUSTED, sender <%s> is not authenticated)");
-            }
+            $fmt = _("(UNTRUSTED, sender <%s> is not authenticated)");
         }
 
         $adrs = imap_rfc822_parse_adrlist($fromhdr, $domains[0]);

Index: issue3983.patch
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/patches/Kolab_Filter-0.1.8/issue3983.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- issue3983.patch	25 Mar 2010 16:28:18 -0000	1.1
+++ issue3983.patch	15 Apr 2010 14:45:38 -0000	1.2
@@ -3,7 +3,7 @@
 
 Fixes unit testing for PHP 5.3.* and inactivates some problematic tests.
 
-STATUS: UNMERGED
+STATUS: MERGED
 
 REF: http://issues.kolab.org/issue3983
 





More information about the commits mailing list