From 9e654f7e5777458941e93b4bfa6de2a11d4374f9 Mon Sep 17 00:00:00 2001
From: Chris Case <kahotep@bunda.dreamhost.com>
Date: Thu, 17 Feb 2011 13:41:56 -0800
Subject: [PATCH] removed localized multipart email templates, now the
 multipart settings are configured directly in the code

---
 mod/dfrn_notify.php           | 30 +++++++++++++++---------------
 view/de/mail_received_eml.tpl | 13 -------------
 view/en/mail_received_eml.tpl | 14 --------------
 view/fr/mail_received_eml.tpl | 13 -------------
 view/it/mail_received_eml.tpl | 13 -------------
 5 files changed, 15 insertions(+), 68 deletions(-)
 delete mode 100644 view/de/mail_received_eml.tpl
 delete mode 100644 view/en/mail_received_eml.tpl
 delete mode 100644 view/fr/mail_received_eml.tpl
 delete mode 100644 view/it/mail_received_eml.tpl

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 040263b0ca..9397cfaf92 100644
--- 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
index 6ddd586fc7..0000000000
--- 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
index 99eb14391c..0000000000
--- 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
index 6ddd586fc7..0000000000
--- 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
index 538d28e1ec..0000000000
--- 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--
-- 
2.39.5