Changeset 1361 for trunk/include/functions_mail.inc.php

Timestamp:

Jun 18, 2006, 12:56:35 AM (18 years ago)

Author:

rub

Message:

Issue ID 0000407: accents are not allowed in mail headers

File:

• trunk/include/functions_mail.inc.php (modified) (3 diffs)

trunk/include/functions_mail.inc.php

@@ -79 +79 @@
 function format_email($name, $email)
 {
+  $cvt7b_name = str_translate_to_ascii7bits($name);
+
   if (strpos($email, '<') === false)
   {
-    return $name.' <'.$email.'>';
+    return $cvt7b_name.' <'.$email.'>';
   }
   else
   {
-    return $name.$email;
+    return $cvt7b_name.$email;
   }
 }
@@ -95 +97 @@
 {
   global $conf, $conf_mail;
+
+  $cvt7b_subject = str_translate_to_ascii7bits($subject);
 
   if (!isset($conf_mail))
@@ -127 +131 @@
     $options = '-f '.$from;
     
-    return mail($to, $subject, $content, $headers, $options);
+    return mail($to, $cvt7b_subject, $content, $headers, $options);
   }
   else
   {
-    return mail($to, $subject, $content, $headers);
+    return mail($to, $cvt7b_subject, $content, $headers);
   }
 }