From 7349bad5a72695a91402db10597dcde61f179402 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Thu, 15 Apr 2010 21:55:12 +0200
Subject: [PATCH] MFB (kolab/issue3962 (Names of config variables for
 "untrusted" text missleading), kolab/issue3967 (UNTRUSTED vs.
 UNAUTHENTICATED, distinction considered harmful))

---
 .../lib/Horde/Kolab/Filter/Content.php             | 14 +++--------
 framework/Kolab_Filter/package.xml                 | 29 ++++++++++++++++++----
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php
index 8af155159..36aef80d9 100644
--- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php
+++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Content.php
@@ -385,18 +385,10 @@ class Horde_Kolab_Filter_Content extends Horde_Kolab_Filter_Base
             $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]);
diff --git a/framework/Kolab_Filter/package.xml b/framework/Kolab_Filter/package.xml
index c614abf65..710109046 100644
--- a/framework/Kolab_Filter/package.xml
+++ b/framework/Kolab_Filter/package.xml
@@ -43,11 +43,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
   * Fixed handling of whole day invitations.
   * Extended iTip reply delivery to support different transport mechanisms.
   * Splitted Free/Busy functionality in a separate driver class.
-  * kolab/issue973 (Rewritten from shown inconveniently in kontact)
-  * kolab/issue3594 (Mail containing NUL byte not delivered, Kolab
-    Filter does not report lmtp error)
-  * kolab/issue3965 (Always accept: invitations get lost when Calendar
-    folder ist not writable for the calendar user)
+  * kolab/issue3962 (Names of config variables for "untrusted" text missleading)
+  * kolab/issue3967 (UNTRUSTED vs. UNAUTHENTICATED, distinction considered
+    harmful)
+  * kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2)
  </notes>
  <contents>
   <dir name="/">
@@ -285,6 +284,26 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </phprelease>
  <changelog>
   <release>
+   <date>2010-01-11</date>
+   <version>
+    <release>0.1.8</release>
+    <api>0.1.0</api>
+   </version>
+   <stability>
+    <release>alpha</release>
+    <api>alpha</api>
+   </stability>
+   <license uri="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">LGPL</license>
+   <notes>
+    * Fix quoting when delivering to Dovecot.
+    * kolab/issue973 (Rewritten from shown inconveniently in kontact)
+    * kolab/issue3594 (Mail containing NUL byte not delivered, Kolab
+      Filter does not report lmtp error)
+    * kolab/issue3965 (Always accept: invitations get lost when Calendar
+      folder ist not writable for the calendar user)
+   </notes>
+  </release>
+  <release>
    <date>2009-11-16</date>
    <version>
     <release>0.1.7</release>
-- 
2.11.0