php-blog-cvs

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7753/serendipity_event_mailer

Modified Files:
	serendipity_event_mailer.php 
Log Message:
use new function serendipity_sendMail (right, Tom?)


Index: serendipity_event_mailer.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer/serendipity_event_mailer.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_event_mailer.php	22 Dec 2004 11:32:45 -0000	1.9
+++ serendipity_event_mailer.php	29 Dec 2004 10:09:43 -0000	1.10
@@ -91,22 +91,20 @@
                 case 'backend_publish':
                     $mail = array(
                       'to'      => $this->get_config('mailto'),
-                      'subject' => '[' . $serendipity['blogTitle'] . '] ' . $eventData['title'],
+                      'subject' => $eventData['title'],
                       'body'    => $eventData['body'] . $eventData['extended'],
                       'from'    => $serendipity['blogTitle'] . ' - ' . $eventData['author'] . ' <' . $serendipity['serendipityEmail'] . '>'
                     );
 
                     if (serendipity_db_bool($this->get_config('striptags', false)) == true) {
-                       $mail['body'] = strip_tags($mail['body']) . $serendipity['signature'];
-                    } else {
-                        $mail['body'] .= $serendipity['signature'];
+                        $mail['body'] = strip_tags($mail['body']);
                     }
 
                     if (serendipity_db_bool($this->get_config('includelink', false)) == true) {
                        $mail['body'] = serendipity_archiveURL($eventData['id'], $eventData['title']) . "\n\n" . $mail['body'];
                     }
 
-                    mail($mail['to'], $mail['subject'], $mail['body'], "From: {$mail['from']}\r\n{$serendipity['mailheaders']}");
+                    serendipity_sendMail($mail['to'], $mail['subject'], $mail['body'], $mail['from']);
                     return true;
                     break;