removed localized multipart email templates, now the multipart settings are configure...

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 040263b0ca8ecbb23273fe9ffd6fd31dc487e797..9397cfaf92b104447b5b1baf3a854bff726b0c6f 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -238,20 +238,20 @@ function dfrn_notify_post(&$a) {
                                '$mimeboundary' => $msg['mimeboundary'],                                // mime message divider
                                '$hostname'             => $a->get_hostname()                                   // name of this host
                        ));
-                       
-                       // load the template for private message notifications
-                       $tpl = load_view_file('view/mail_received_eml.tpl');
-                       
-                       // import the data into the template                    
-                       $email_tpl = replace_macros($tpl, array(
-                               '$email'                => $importer['email'],                                  // email address to send to
-                               '$from'                 => $msg['from-name'],                                   // name of the person sending the message
-                               '$title'                => stripslashes($msg['title']),                 // subject of the message
-                               '$mimeboundary' => $msg['mimeboundary'],                                // mime message divider
-                               '$hostname'             => $a->get_hostname(),                                  // name of this host
-                               '$htmlbody'             => chunk_split(base64_encode($email_html_body_tpl)),
-                               '$textbody'             => chunk_split(base64_encode($email_text_body_tpl))
-                       ));
+
+                       // assemble the final multipart message body with the text and html types included
+                       $textbody       =       chunk_split(base64_encode($email_text_body_tpl));
+                       $htmlbody       =       chunk_split(base64_encode($email_html_body_tpl));
+                       $multipart_message_body =
+                               "--" . $msg['mimeboundary'] . "\n" .                                    // plain text section
+                               "Content-Type: text/plain; charset=UTF-8\n" .
+                               "Content-Transfer-Encoding: base64\n\n" .
+                               $textbody . "\n" .
+                               "--" . $msg['mimeboundary'] . "\n" .                                    // text/html section
+                               "Content-Type: text/html; charset=UTF-8\n" .
+                               "Content-Transfer-Encoding: base64\n\n" .
+                               $htmlbody . "\n" .
+                               "--" . $msg['mimeboundary'] . "--\n";                                   // message ending
                        
                        logger("message headers: " . $msg['headers']);
                        logger("message body: " . $mail_tpl);
@@ -261,7 +261,7 @@ function dfrn_notify_post(&$a) {
                        $res = mail(
                                $importer['email'],                                                                     // send to address
                                t('New mail received at ') . $a->config['sitename'],    // subject
-                               $email_tpl,                                                                                     // message body
+                               $multipart_message_body,                                                                // message body
                                $msg['headers']                                                                                 // message headers
                        );
                }

diff --git a/view/de/mail_received_eml.tpl b/view/de/mail_received_eml.tpl
deleted file mode 100644 (file)
index 6ddd586..0000000
--- a/view/de/mail_received_eml.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
---$mimeboundary
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: base64
-
-$textbody
-
---$mimeboundary
-Content-Type: text/html; charset=UTF-8
-Content-Transfer-Encoding: base64
-
-$htmlbody
-                               
---$mimeboundary--
\ No newline at end of file

diff --git a/view/en/mail_received_eml.tpl b/view/en/mail_received_eml.tpl
deleted file mode 100644 (file)
index 99eb143..0000000
--- a/view/en/mail_received_eml.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
---$mimeboundary
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: base64
-
-$textbody
-
---$mimeboundary
-Content-Type: text/html; charset=UTF-8
-Content-Transfer-Encoding: base64
-
-$htmlbody
-                               
---$mimeboundary--
-

diff --git a/view/fr/mail_received_eml.tpl b/view/fr/mail_received_eml.tpl
deleted file mode 100644 (file)
index 6ddd586..0000000
--- a/view/fr/mail_received_eml.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
---$mimeboundary
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: base64
-
-$textbody
-
---$mimeboundary
-Content-Type: text/html; charset=UTF-8
-Content-Transfer-Encoding: base64
-
-$htmlbody
-                               
---$mimeboundary--
\ No newline at end of file

diff --git a/view/it/mail_received_eml.tpl b/view/it/mail_received_eml.tpl
deleted file mode 100644 (file)
index 538d28e..0000000
--- a/view/it/mail_received_eml.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
---$mimeboundary
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: base64
-
-$textbody
-
---$mimeboundary
-Content-Type: text/html; charset=UTF-8
-Content-Transfer-Encoding: base64
-
-$htmlbody
-                               
---$mimeboundary--