Ticket #209: 0000209-email_mime.diff

wp-admin/users.php

@@ -95 +95 @@
         $message  = 'New user registration on your blog ' . get_settings('blogname') . ":\r\n\r\n";
         $message .= "Login: $user_login\r\n\r\nE-mail: $user_email";
 
-        @mail(get_settings('admin_email'), '[' . get_settings('blogname') . '] New User Registration', $message);
+        @mail_encoded(get_settings('admin_email'), '[' . get_settings('blogname') . '] New User Registration', $message);
         header('Location: users.php');
 break;
 

wp-includes/functions.php

@@ -982 +982 @@
         $notify_message .= get_permalink($comment->comment_post_ID) . '#comments';
 
         if ('' == $comment->comment_author_email || '' == $comment->comment_author) {
-                $from = "From: \"$blogname\" <wordpress@" . $_SERVER['SERVER_NAME'] . '>';
+                $from = "\"$blogname\" <wordpress@" . $_SERVER['SERVER_NAME'] . '>';
         } else {
-                $from = 'From: "' . $comment->comment_author . "\" <$comment->comment_author_email>";
+                $from = '"' . $comment->comment_author . "\" <$comment->comment_author_email>";
         }
 
-        $message_headers = "MIME-Version: 1.0\r\n"
-                . "$from\r\n"
-                . "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\r\n";
-
-        @mail($user->user_email, $subject, $notify_message, $message_headers);
+        @mail_encoded($user->user_email, $subject, $notify_message, $from);
    
     return true;
 }
@@ -1025 +1021 @@
 
     $subject = '[' . get_settings('blogname') . '] Please approve: "' .$post->post_title.'"';
     $admin_email = get_settings("admin_email");
-    $from  = "From: $admin_email";
-
-    $message_headers = "MIME-Version: 1.0\r\n"
-        . "$from\r\n"
-        . "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\r\n";
 
-    @mail($admin_email, $subject, $notify_message, $message_headers);
+    @mail_encoded($admin_email, $subject, $notify_message, $admin_email);
     
     return true;
 }
@@ -1580 +1571 @@
         endif;
 }
 
+function mail_encoded($to, $subject, $message, $from=''){
+
+        $charset = get_settings('blog_charset');
+ 
+        # prepare headers
+
+        $message_headers = "MIME-Version: 1.0\r\n";
+        if ($from){
+                $message_headers .= "From: $from\r\n";
+        }
+        $message_headers .= "Content-Type: text/plain; charset=\"$charset\"\r\n";
+
+
+        # escape subject
+
+        $subject = preg_replace('/([^a-z ])/ie', 'sprintf("=%02x",ord(StripSlashes("\\1")))', $subject);
+        $subject = str_replace(' ', '_', $subject);
+        $subject = "=?$charset?Q?$subject?=";
+
+
+        @mail($to, $subject, $message, $message_headers);
+}
+
 function wp_head() {
         do_action('wp_head', '');
 }

wp-login.php

@@ -216 +216 @@
         $message .= "Password: $user_pass\r\n";
         $message .= 'Login at: ' . get_settings('siteurl') . '/wp-login.php';
 
-        $m = mail($user_email, '[' . get_settings('blogname') . "] Your weblog's login/password", $message);
+        $m = mail_encoded($user_email, '[' . get_settings('blogname') . "] Your weblog's login/password", $message);
 
         if ($m == false) {
                  echo '<p>' . __('The e-mail could not be sent.') . "<br />\n";
@@ -226 +226 @@
                 echo '<p>' .  sprintf(__("The e-mail was sent successfully to %s's e-mail address."), $user_login) . '<br />';
         echo  "<a href='wp-login.php' title='" . __('Check your e-mail first, of course') . "'>" . __('Click here to login!') . '</a></p>';
                 // send a copy of password change notification to the admin
-                mail(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Change'), get_settings('blogname')), sprintf(__('Password Lost and Changed for user: %s'), $user_login));
+                mail_encoded(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Change'), get_settings('blogname')), sprintf(__('Password Lost and Changed for user: %s'), $user_login));
                 die();
         }