[php-blog-cvs] serendipity serendipity_functions.inc.php,1.139,1.140 serendipity_config.inc.php,1.23,1.24

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv28810

Modified Files:
	serendipity_functions.inc.php serendipity_config.inc.php 
Log Message:
Allow for easier handling of default mail headers.

We now send X-Powered-By and X-Engine.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- serendipity_functions.inc.php	19 Aug 2003 16:09:43 -0000	1.139
+++ serendipity_functions.inc.php	19 Aug 2003 16:15:44 -0000	1.140
@@ -903,7 +903,7 @@
                   $serendipity['baseURL'] .'unsubscribe/'. urlencode($subscriber['email']) .'/'. $entry_id
                 );
               
-        mail($subscriber['email'], $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} <$fromEmail>\r\n");
+        mail($subscriber['email'], $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} <$fromEmail>\r\n". $serendipity['mailheaders']);
     }
 }
 
@@ -947,7 +947,7 @@
               . "\n" . strip_tags($comment);
     }
 
-    return mail($to, $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} <$fromEmail>\r\n");
+    return mail($to, $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} <$fromEmail>\r\n". $serendipity['mailheaders']);
 }
 
 function serendipity_fetchReferences($id)

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_config.inc.php	16 Aug 2003 11:05:48 -0000	1.23
+++ serendipity_config.inc.php	19 Aug 2003 16:15:44 -0000	1.24
@@ -157,12 +157,9 @@
 /* Signature sent with all mails */
 $serendipity['signature'] = sprintf(SIGNATURE, $serendipity['blogTitle']);
 
-/**
- * Local Variables:
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: t
- * End:
- */
+/* Default mail headers */
+$serendipity['mailheaders'] = 'X-Powered-By: Serendipity v.'. $serendipity['version'] ."\r\n"
+                            . 'X-Engine: PHP v.'. phpversion() ."\r\n";
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>