Changeset 27594 for extensions/Piwecard/include/piwecard.class.php

Timestamp:

Mar 7, 2014, 3:22:34 PM (10 years ago)

Author:

plg

Message:

compatibility 2.6

File:

• extensions/Piwecard/include/piwecard.class.php (modified) (2 diffs)

extensions/Piwecard/include/piwecard.class.php

@@ -467 +467 @@
                 }
         }
+
+  /**
+   * Encodes a string using Q form if required (RFC2045)
+   * mail headers MUST contain only US-ASCII characters
+   *
+   * This function was in Piwigo core include/functions_mail.inc.php, but
+   * was removed from version 2.6.
+   */
+  function encode_mime_header($str)
+  {
+    $x = preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
+    if ($x==0)
+    {
+      return $str;
+    }
+    // Replace every high ascii, control =, ? and _ characters
+    $str = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
+                        "'='.sprintf('%02X', ord('\\1'))", $str);
+    
+    // Replace every spaces to _ (more readable than =20)
+    $str = str_replace(" ", "_", $str);
+    
+    global $lang_info;
+    return '=?'.get_pwg_charset().'?Q?'.$str.'?=';
+  }
         
         /**
@@ -478 +503 @@
                 
                 $from = '"'.$email_infos['from_name'].'" <'.$email_infos['from_email'].'>';
-                $subject = encode_mime_header(trim(preg_replace('#[\n\r]+#s', '', $email_infos['subject'])));
+                $subject = $this->encode_mime_header(trim(preg_replace('#[\n\r]+#s', '', $email_infos['subject'])));
                 $boundary = '_----------='.md5(uniqid(mt_rand()));