revamped private message templates, added multipart messages with text and html versions, updated de, en, fr and it. Translated the french version of the private message template.

author: Chris Case <kahotep@bunda.dreamhost.com> 2011-02-14 03:59:54 -0800
committer: Chris Case <kahotep@bunda.dreamhost.com> 2011-02-14 03:59:54 -0800
commit: 5eebb373e5ac761ba0f2020a85fa6db7544f7229 (patch)
tree: 9779b029155a7b976259429bd7aa074714d62d67
parent: f98ba371cfdb0d0d47a5717aa60a5b703017cbe4 (diff)
download: volse-hubzilla-5eebb373e5ac761ba0f2020a85fa6db7544f7229.tar.gz
volse-hubzilla-5eebb373e5ac761ba0f2020a85fa6db7544f7229.tar.bz2
volse-hubzilla-5eebb373e5ac761ba0f2020a85fa6db7544f7229.zip
5 files changed, 178 insertions, 40 deletions
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 49276647a..ffd9020c5 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -181,8 +181,28 @@ function dfrn_notify_post(&$a) {
 			else
 				$body = qp($body);*/
 
-			$msg['body'] = str_replace(array("\\r\\n", "\\r", "\\n"), "<br />", $msg['body']);
-			$msg['body'] = html_entity_decode(strip_tags(bbcode($msg['body'])));			
+			//$msg['body'] = str_replace(array("\\r\\n", "\\r", "\\n"), "<br />", $msg['body']);
+			//$msg['body'] = html_entity_decode(strip_tags(bbcode($msg['body'])));	
+			$msg['mimeboundary']   =rand(0,9)."-"
+				.rand(10000000000,9999999999)."-"
+				.rand(10000000000,9999999999)."=:"
+				.rand(10000,99999);
+
+			$msg['notificationfromname']	= t('Administrator');
+			$msg['notificationfromemail']	= t('noreply') . '@' . $a->get_hostname();				
+			$msg['headers'] =
+				"From: {$msg['notificationfromname']} <{$msg['notificationfromemail']}>\n" . 
+				"Reply-To: {$msg['notificationfromemail']}\n" .
+				"MIME-Version: 1.0\n" .
+				"Content-Type: multipart/alternative; boundary=\"{$msg['mimeboundary']}\"";
+
+
+			$msg['textversion']
+				= html_entity_decode(strip_tags(bbcode(stripslashes($msg['body']))),ENT_QUOTES,'UTF-8');
+			//$TextMessage	= html_entity_decode(strip_tags(bbcode(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",$msg['body']))));	;
+			$msg['htmlversion']	
+				= str_replace(array("\\r\\n", "\\r", "\\n"), "<br />\n",html_entity_decode($msg['body']));
+								
 			$tpl = load_view_file('view/mail_received_eml.tpl');			
 			$email_tpl = replace_macros($tpl, array(
 				'$siteName'		=> $a->config['sitename'],
@@ -194,16 +214,22 @@ function dfrn_notify_post(&$a) {
 				'$senderName'	=> $importer['senderName'],
 				'$from'			=> $msg['from-name'],
 				'$title'		=> stripslashes($msg['title']),
-				'$body'			=> $msg['body'],
+				'$textversion'	=> $msg['textversion'],
+				'$htmlversion'	=> $msg['htmlversion'],
+				'$mimeboundary'	=> $msg['mimeboundary'],
 				'$hostname'		=> $a->get_hostname()
 			));
 			
+			logger("message headers: " . $msg['headers']);
+			logger("message body: " . $mail_tpl);
+			
+			
 			$res = mail($importer['email'], t('New mail received at ') . $a->config['sitename'],
-				$email_tpl, 
-					'From: ' . t('Administrator') . '@' . $a->get_hostname() . "\r\n"
+				$email_tpl, $msg['headers']
+			/*		'From: ' . t('Administrator') . '@' . $a->get_hostname() . "\r\n"
 					. 'MIME-Version: 1.0' . "\r\n"
-					. 'Content-type: text/html; charset=iso-8859-1' . "\r\n" 
-					. 'Content-transfer-encoding: 7-bit' . "\r\n"
+					. 'Content-type: text/html; charset=utf-8' . "\r\n" 
+					. 'Content-transfer-encoding: quoted-printable' . "\r\n" */
 			);
 		}
 		xml_status(0);
diff --git a/view/de/mail_received_eml.tpl b/view/de/mail_received_eml.tpl
index 466d31e79..174aa4f97 100644
--- a/view/de/mail_received_eml.tpl
+++ b/view/de/mail_received_eml.tpl
@@ -1,17 +1,47 @@
+--$mimeboundary
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
 
-Lieber $username,
-
-du hast eine neue private Nachricht von '$from' auf '$sitename' erhhalten.
------
+Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.
+	
 $title
------
-$body
------
+
+$textversion
+
 Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu
 beantworten.
 
 Viele Grüße,
-    $sitename Administrator
+$siteName Administrator
+
+--$mimeboundary
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: 8bit
+				
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>Friendika Nachricht</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+	<tbody>
+	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+
+	<tr><td style="padding-top:22px;" colspan="2">Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.</td></tr>
+
 
- 
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
+		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
+	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
+	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu beantworten.</td></tr>
+	<tr><td></td><td>Viele Grüße,</td></tr>
+	<tr><td></td><td>$siteName Administrator</td></tr>
+	</tbody>
+</table>
+</body>
+</html>
 
+--$mimeboundary--
+\ No newline at end of file
diff --git a/view/en/mail_received_eml.tpl b/view/en/mail_received_eml.tpl
index 510978582..68df07c3d 100644
--- a/view/en/mail_received_eml.tpl
+++ b/view/en/mail_received_eml.tpl
@@ -1,3 +1,22 @@
+--$mimeboundary
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+$from sent you a new private message at $siteName.
+	
+$title
+
+$textversion
+				
+Please login at $siteurl to read and reply to your private messages.
+
+Thank you,
+$siteName administrator
+
+--$mimeboundary
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: 8bit
+				
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
@@ -15,11 +34,14 @@
 	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
 		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
 	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
-	<tr><td style="padding-right:22px;">$body</td></tr>
+	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
 	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at $siteurl to read and reply to your private messages.</td></tr>
-	<tr><td style="padding-left:90px;" colspan="2">Thank you,</td></tr>
-	<tr><td style="padding-left:90px;" colspan="2">$siteName administrator</td></tr>
+	<tr><td></td><td>Thank You,</td></tr>
+	<tr><td></td><td>$siteName Administrator</td></tr>
 	</tbody>
 </table>
 </body>
-</html>
-\ No newline at end of file
+</html>
+
+--$mimeboundary--
+
diff --git a/view/fr/mail_received_eml.tpl b/view/fr/mail_received_eml.tpl
index 261aec4be..972d141c3 100644
--- a/view/fr/mail_received_eml.tpl
+++ b/view/fr/mail_received_eml.tpl
@@ -1,16 +1,46 @@
+--$mimeboundary
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
 
-Dear $username,
-
-	You've received a new private message at $sitename from '$from'.
------
+$from t'a envoy� un message � $siteName.
+	
 $title
------
-$body
------
-Please login at $siteurl to read and reply to your private messages.
 
-Thank you,
-	$sitename administrator
+$textversion
+
+Ouvrez une session svp � $siteurl pour lire et r�pondre � vos messages priv�s.
+
+Merci,
+$siteName Administrateur
+
+--$mimeboundary
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: 8bit
+				
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>Friendika Message</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+	<tbody>
+	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+
+	<tr><td style="padding-top:22px;" colspan="2">$from t'a envoy� un message � $siteName.</td></tr>
+
 
- 
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
+		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
+	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
+	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Ouvrez une session svp � $siteurl pour lire et r�pondre � vos messages priv�s.</td></tr>
+	<tr><td></td><td>Merci,</td></tr>
+	<tr><td></td><td>$siteName Administrateur</td></tr>
+	</tbody>
+</table>
+</body>
+</html>
 
+--$mimeboundary--
+\ No newline at end of file
diff --git a/view/it/mail_received_eml.tpl b/view/it/mail_received_eml.tpl
index 137614ca4..c51917a88 100644
--- a/view/it/mail_received_eml.tpl
+++ b/view/it/mail_received_eml.tpl
@@ -1,16 +1,46 @@
+--$mimeboundary
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
 
-Caro/a $username,
-
-    Hai ricevuto un nuovo messsaggio privato su $sitename da '$from'.
------
+Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.
+	
 $title
------
-$body
------
+
+$textversion
+				
 Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.
 
 Grazie,
-	L'amministratore di $sitename
+L'amministratore di $siteName
+
+--$mimeboundary
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: 8bit
+				
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>Friendika Messsaggio</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+	<tbody>
+	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+
+	<tr><td style="padding-top:22px;" colspan="2">Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.</td></tr>
+
 
- 
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
+		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
+	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
+	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.</td></tr>
+	<tr><td></td><td>Grazie,</td></tr>
+	<tr><td></td><td>L'amministratore di $siteName</td></tr>
+	</tbody>
+</table>
+</body>
+</html>
 
+--$mimeboundary--
+\ No newline at end of file
author	Chris Case <kahotep@bunda.dreamhost.com>	2011-02-14 03:59:54 -0800
committer	Chris Case <kahotep@bunda.dreamhost.com>	2011-02-14 03:59:54 -0800
commit	5eebb373e5ac761ba0f2020a85fa6db7544f7229 (patch)
tree	9779b029155a7b976259429bd7aa074714d62d67
parent	f98ba371cfdb0d0d47a5717aa60a5b703017cbe4 (diff)
download	volse-hubzilla-5eebb373e5ac761ba0f2020a85fa6db7544f7229.tar.gz volse-hubzilla-5eebb373e5ac761ba0f2020a85fa6db7544f7229.tar.bz2 volse-hubzilla-5eebb373e5ac761ba0f2020a85fa6db7544f7229.zip