[php-blog-cvs] serendipity/include functions.inc.php,1.17,1.18

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4154

Modified Files:
	functions.inc.php 
Log Message:
- Encode subject and From name, if mbstring is installed
- Define Message-ID when sending a mail


Index: functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- functions.inc.php	2 Jan 2005 15:47:59 -0000	1.17
+++ functions.inc.php	6 Jan 2005 18:21:57 -0000	1.18
@@ -167,20 +167,23 @@
     /* Append signature to every mail */
     $message .= "\n" . sprintf(SIGNATURE, $serendipity['blogTitle']);
 
+
+    /* Check for mb_* function, and use it to encode headers etc. */
+    if ( function_exists('mb_encode_mimeheader') ) {
+        $subject = mb_encode_mimeheader($subject, LANG_CHARSET);
+        $fromName = mb_encode_mimeheader($fromName, LANG_CHARSET);
+    }
+
+
     /* Always add these headers */
     $headers[] = 'From: '. $fromName .' <'. $fromMail .'>';
     $headers[] = 'X-Mailer: Serendipity/'. $serendipity['version'];
     $headers[] = 'X-Engine: PHP/'. phpversion();
+    $headers[] = 'Message-ID: <'. md5(microtime() . uniqid(time())) .'@'. $_SERVER['HTTP_HOST'] .'>';
     $headers[] = 'MIME-Version: 1.0';
     $headers[] = 'Content-Type: text/plain; charset="' . LANG_CHARSET .'"';
 
-    if ( function_exists('mb_send_mail') ) {
-        $funcSend = 'mb_send_mail';
-    } else {
-        $funcSend = 'mail';
-    }
-
-    return $funcSend($to, $subject, $message, implode("\n", $headers));
+    return mail($to, $subject, $message, implode("\n", $headers));
 }
 
 function serendipity_makeFilename($str) {