Add missing broken_rfc2231 and lang options to Horde_Mime_Headers#toA…

…rray()
horde · Nov 11, 2014 · 6ccbe58 · 6ccbe58
1 parent ddf32ac
commit 6ccbe58
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/framework/Mime/lib/Horde/Mime/Headers.php b/framework/Mime/lib/Horde/Mime/Headers.php
@@ -68,15 +68,24 @@ public function __clone()
      * Returns the headers in array format.
      *
      * @param array $opts  Optional parameters:
+     * <pre>
+     *   - broken_rfc2231: (boolean) Attempt to work around non-RFC
+     *                     2231-compliant MUAs by generating both a RFC
+     *                     2047-like parameter name and also the correct RFC
+     *                     2231 parameter
+     *                     DEFAULT: false
      *   - canonical: (boolean) Use canonical (RFC 822/2045) CRLF EOLs?
      *                DEFAULT: Uses "\n"
      *   - charset: (string) Encodes the headers using this charset. If empty,
      *              encodes using UTF-8.
      *              DEFAULT: No encoding.
      *   - defserver: (string) The default domain to append to mailboxes.
      *                DEFAULT: No default name.
+     *   - lang: (string) The language to use when encoding.
+     *           DEFAULT: None specified
      *   - nowrap: (integer) Don't wrap the headers.
      *             DEFAULT: Headers are wrapped.
+     * </pre>
      *
      * @return array  The headers in array format. Keys are header names, but
      *                case sensitivity cannot be guaranteed. Values are
@@ -93,23 +102,25 @@ public function toArray(array $opts = array())
         $ret = array();
 
         foreach ($this->_headers as $ob) {
-            $opts = array(
+            $sopts = array(
                 'charset' => $charset
             );
 
             if (($ob instanceof Horde_Mime_Headers_Addresses) ||
                 ($ob instanceof Horde_Mime_Headers_AddressesMulti)) {
-                $opts['defserver'] = empty($opts['defserver'])
-                    ? null
-                    : $opts['defserver'];
+                if (!empty($opts['defserver'])) {
+                    $sopts['defserver'] = $opts['defserver'];
+                }
             } elseif ($ob instanceof Horde_Mime_Headers_ContentParams) {
-                // TODO: 'broken_rfc2231'
-                // TODO: 'lang'
+                $sopts['broken_rfc2231'] = !empty($opts['broken_rfc2231']);
+                if (!empty($opts['lang'])) {
+                    $sopts['lang'] = $opts['lang'];
+                }
             }
 
             $tmp = array();
 
-            foreach ($ob->sendEncode(array_filter($opts)) as $val) {
+            foreach ($ob->sendEncode(array_filter($sopts)) as $val) {
                 if (empty($opts['nowrap'])) {
                     /* Remove any existing linebreaks and wrap the line. */
                     $htext = $ob->name . ': ';