]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0d85343)
changed message sending to use base64 encoding
authorChris Case <kahotep@bunda.dreamhost.com>
Wed, 16 Feb 2011 13:17:40 +0000 (05:17 -0800)
committerChris Case <kahotep@bunda.dreamhost.com>
Wed, 16 Feb 2011 13:17:40 +0000 (05:17 -0800)
12 files changed:
view/de/mail_received_eml.tpl patch | blob | history
view/de/mail_received_html_body_eml.tpl [new file with mode: 0644] patch | blob
view/de/mail_received_text_body_eml.tpl [new file with mode: 0644] patch | blob
view/en/mail_received_eml.tpl patch | blob | history
view/en/mail_received_html_body_eml.tpl [new file with mode: 0644] patch | blob
view/en/mail_received_text_body_eml.tpl [new file with mode: 0644] patch | blob
view/fr/mail_received_eml.tpl patch | blob | history
view/fr/mail_received_html_body_eml.tpl [new file with mode: 0644] patch | blob
view/fr/mail_received_text_body_eml.tpl [new file with mode: 0644] patch | blob
view/it/mail_received_eml.tpl patch | blob | history
view/it/mail_received_html_body_eml.tpl [new file with mode: 0644] patch | blob
view/it/mail_received_text_body_eml.tpl [new file with mode: 0644] patch | blob

diff --git a/view/de/mail_received_eml.tpl b/view/de/mail_received_eml.tpl
index bf9bb9ca92b842947d1437c0a0e2869fa6c0622c..890b71488f18b1433fa17a01893072d25a229149 100644 (file)
--- a/view/de/mail_received_eml.tpl
+++ b/view/de/mail_received_eml.tpl
@@ -1,47 +1,13 @@
 --$mimeboundary
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
 
-Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.
-       
-$title
-
-$textversion
-
-Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu
-beantworten.
-
-Viele Grüße,
-$siteName Administrator
+$textbody
 
 --$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=utf-8" />
-</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>
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
 
+$htmlbody
+                               
 --$mimeboundary--
\ No newline at end of file
diff --git a/view/de/mail_received_html_body_eml.tpl b/view/de/mail_received_html_body_eml.tpl
new file mode 100644 (file)
index 0000000..b2d914f
--- /dev/null
+++ b/view/de/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+<!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=utf-8" />
+</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>
diff --git a/view/de/mail_received_text_body_eml.tpl b/view/de/mail_received_text_body_eml.tpl
new file mode 100644 (file)
index 0000000..f5c90cf
--- /dev/null
+++ b/view/de/mail_received_text_body_eml.tpl
@@ -0,0 +1,11 @@
+Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.
+       
+$title
+
+$textversion
+
+Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu
+beantworten.
+
+Viele Gr\9f§e,
+$siteName Administrator
diff --git a/view/en/mail_received_eml.tpl b/view/en/mail_received_eml.tpl
index 8022800527f1085ff25b3e47d082b5d0aff24fd9..4ba0757cbd93ffdfa2d8257664f66f3756e32c4a 100644 (file)
--- a/view/en/mail_received_eml.tpl
+++ b/view/en/mail_received_eml.tpl
@@ -1,47 +1,14 @@
 --$mimeboundary
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
 
-$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
+$textbody
 
 --$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=utf-8" />
-</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 sent you a new private message at $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">Please login at $siteurl to read and reply to your private messages.</td></tr>
-       <tr><td></td><td>Thank You,</td></tr>
-       <tr><td></td><td>$siteName Administrator</td></tr>
-       </tbody>
-</table>
-</body>
-</html>
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
 
+$htmlbody
+                               
 --$mimeboundary--
 
diff --git a/view/en/mail_received_html_body_eml.tpl b/view/en/mail_received_html_body_eml.tpl
new file mode 100644 (file)
index 0000000..981aa46
--- /dev/null
+++ b/view/en/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+<!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=utf-8" />
+</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 sent you a new private message at $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">Please login at $siteurl to read and reply to your private messages.</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
diff --git a/view/en/mail_received_text_body_eml.tpl b/view/en/mail_received_text_body_eml.tpl
new file mode 100644 (file)
index 0000000..0238673
--- /dev/null
+++ b/view/en/mail_received_text_body_eml.tpl
@@ -0,0 +1,10 @@
+$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
diff --git a/view/fr/mail_received_eml.tpl b/view/fr/mail_received_eml.tpl
index f872a671369e7af137549468918e13fe9e9c1703..890b71488f18b1433fa17a01893072d25a229149 100644 (file)
--- a/view/fr/mail_received_eml.tpl
+++ b/view/fr/mail_received_eml.tpl
@@ -1,46 +1,13 @@
 --$mimeboundary
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
 
-$from t'a envoy\8e un message \88 $siteName.
-       
-$title
-
-$textversion
-
-Ouvrez une session svp \88 $siteurl pour lire et r\8epondre \88 vos messages priv\8es.
-
-Merci,
-$siteName Administrateur
+$textbody
 
 --$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=utf-8" />
-</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\8e un message \88 $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 \88 $siteurl pour lire et r\8epondre \88 vos messages priv\8es.</td></tr>
-       <tr><td></td><td>Merci,</td></tr>
-       <tr><td></td><td>$siteName Administrateur</td></tr>
-       </tbody>
-</table>
-</body>
-</html>
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
 
+$htmlbody
+                               
 --$mimeboundary--
\ No newline at end of file
diff --git a/view/fr/mail_received_html_body_eml.tpl b/view/fr/mail_received_html_body_eml.tpl
new file mode 100644 (file)
index 0000000..43584a4
--- /dev/null
+++ b/view/fr/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+<!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=utf-8" />
+</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>
diff --git a/view/fr/mail_received_text_body_eml.tpl b/view/fr/mail_received_text_body_eml.tpl
new file mode 100644 (file)
index 0000000..c877344
--- /dev/null
+++ b/view/fr/mail_received_text_body_eml.tpl
@@ -0,0 +1,10 @@
+$from t'a envoy\8e un message \88 $siteName.
+       
+$title
+
+$textversion
+
+Ouvrez une session svp \88 $siteurl pour lire et r\8epondre \88 vos messages priv\8es.
+
+Merci,
+$siteName Administrateur
diff --git a/view/it/mail_received_eml.tpl b/view/it/mail_received_eml.tpl
index 829c0fee59e1b460822f54af4d7ab02206e9e9d1..14b983cfebbbc76a14ebbf5d2c3d50ba0747c176 100644 (file)
--- a/view/it/mail_received_eml.tpl
+++ b/view/it/mail_received_eml.tpl
@@ -1,46 +1,13 @@
 --$mimeboundary
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
 
-Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.
-       
-$title
-
-$textversion
-                               
-Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.
-
-Grazie,
-L'amministratore di $siteName
+$textbody
 
 --$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=utf-8" />
-</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>
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
 
-       <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
+$htmlbody
+                               
+--$mimeboundary--
diff --git a/view/it/mail_received_html_body_eml.tpl b/view/it/mail_received_html_body_eml.tpl
new file mode 100644 (file)
index 0000000..a3c71ce
--- /dev/null
+++ b/view/it/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+<!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=utf-8" />
+</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>
diff --git a/view/it/mail_received_text_body_eml.tpl b/view/it/mail_received_text_body_eml.tpl
new file mode 100644 (file)
index 0000000..c7da953
--- /dev/null
+++ b/view/it/mail_received_text_body_eml.tpl
@@ -0,0 +1,10 @@
+Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.
+       
+$title
+
+$textversion
+                               
+Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.
+
+Grazie,
+L'amministratore di $siteName
Unnamed repository; edit this file 'description' to name the repository.