keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

removed localized multipart email templates, now the multipart settings are configured directly in the code

Browse source
This commit is contained in:
Chris Case 2011-02-17 13:41:56 -08:00
parent 5aa6bbbbc5
commit 9e654f7e57
5 changed files with 15 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
mod/dfrn_notify.php
View file

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

13
view/de/mail_received_eml.tpl
View file

@ -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--

14
view/en/mail_received_eml.tpl
View file

@ -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--

13
view/fr/mail_received_eml.tpl
View file

@ -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--

13
view/it/mail_received_eml.tpl
View file

@ -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--