[mms] Added the 'noquote' option to Horde_Mail_Rfc822_Object#writeAdd…

…ress().
horde · Jul 28, 2014 · f414b7e · f414b7e
1 parent ab5018e
commit f414b7e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/framework/Mail/doc/Horde/Mail/UPGRADING b/framework/Mail/doc/Horde/Mail/UPGRADING
@@ -11,6 +11,16 @@
 This lists the API changes between releases of the package.
 
 
+Upgrading to 2.4
+================
+
+  - Horde_Mail_Rfc822_Object
+
+    - writeAddress()
+
+      Added the 'noquote' option.
+
+
 Upgrading to 2.3
 ================
 

diff --git a/framework/Mail/lib/Horde/Mail/Rfc822/Address.php b/framework/Mail/lib/Horde/Mail/Rfc822/Address.php
@@ -168,7 +168,9 @@ protected function _writeAddress($opts)
             if (!empty($opts['encode'])) {
                 $personal = Horde_Mime::encode($this->personal, $opts['encode']);
             }
-            $personal = $rfc822->encode($personal, 'personal');
+            if (empty($opts['noquote'])) {
+                $personal = $rfc822->encode($personal, 'personal');
+            }
         }
 
         return (strlen($personal) && ($personal != $address))

diff --git a/framework/Mail/lib/Horde/Mail/Rfc822/Group.php b/framework/Mail/lib/Horde/Mail/Rfc822/Group.php
@@ -109,11 +109,13 @@ protected function _writeAddress($opts)
         if (!empty($opts['encode'])) {
             $groupname = Horde_Mime::encode($groupname, $opts['encode']);
         }
+        if (empty($opts['noquote'])) {
+            $groupname = $rfc822->encode($groupname, 'personal');
+        }
 
         $rfc822 = new Horde_Mail_Rfc822();
 
-        return $rfc822->encode($groupname, 'personal') . ':' .
-            (strlen($addr) ? (' ' . $addr) : '') . ';';
+        return $groupname . ':' . (strlen($addr) ? (' ' . $addr) : '') . ';';
     }
 
     /**

diff --git a/framework/Mail/lib/Horde/Mail/Rfc822/Object.php b/framework/Mail/lib/Horde/Mail/Rfc822/Object.php
@@ -46,6 +46,9 @@ public function __toString()
      *          (Punycode/RFC 3490).
      *          Requires the idn or intl PHP module.
      *          DEFAULT: false
+     *   - noquote: (boolean) If true, don't quote personal part. [@since
+     *              2.4.0]
+     *              DEFAULT: false
      *
      * @return string  The correctly escaped/quoted address.
      */

diff --git a/framework/Mail/package.xml b/framework/Mail/package.xml
@@ -12,16 +12,16 @@
  </lead>
  <date>2014-05-21</date>
  <version>
-  <release>2.3.1</release>
-  <api>2.3.0</api>
+  <release>2.4.0</release>
+  <api>2.4.0</api>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
  <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
  <notes>
-* 
+* [mms] Added the &apos;noquote&apos; option to Horde_Mail_Rfc822_Object#writeAddress().
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -602,15 +602,15 @@
   </release>
   <release>
    <version>
-    <release>2.3.1</release>
-    <api>2.3.0</api></version>
+    <release>2.4.0</release>
+    <api>2.4.0</api></version>
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
    <date>2014-05-21</date>
    <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
    <notes>
-* 
+* [mms] Added the &apos;noquote&apos; option to Horde_Mail_Rfc822_Object#writeAddress().
    </notes>
   </release>
  </changelog>