friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

set utf-8 on all emails

Browse source
This commit is contained in:
Friendika 2011-04-14 17:13:13 -07:00
parent c3b42fdbcb
commit de131c9e58
9 changed files with 57 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/items.php
View file

@ -1415,7 +1415,9 @@ function new_follower($importer,$contact,$datarray,$item) {
$res = mail($r[0]['email'], $res = mail($r[0]['email'],
t("You have a new follower at ") . $a->config['sitename'], t("You have a new follower at ") . $a->config['sitename'],
$email, $email,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] ); 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
} }
} }

6
mod/dfrn_confirm.php
View file

@ -651,7 +651,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
); );
$res = mail($r[0]['email'], sprintf( t("Connection accepted at %s") , $a->config['sitename']), $res = mail($r[0]['email'], sprintf( t("Connection accepted at %s") , $a->config['sitename']),
$email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] ); $email_tpl,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
if(!$res) { if(!$res) {
// pointless throwing an error here and confusing the person at the other end of the wire. // pointless throwing an error here and confusing the person at the other end of the wire.
} }

12
mod/dfrn_notify.php
View file

@ -401,7 +401,11 @@ function dfrn_notify_post(&$a) {
)); ));
$res = mail($importer['email'], sprintf(t('%s commented on an item at %s'), $from , $a->config['sitename']), $res = mail($importer['email'], sprintf(t('%s commented on an item at %s'), $from , $a->config['sitename']),
$email_tpl, "From: " . t('Administrator') . '@' . $a->get_hostname() ); $email_tpl,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
} }
} }
xml_status(0); xml_status(0);
@ -487,7 +491,11 @@ function dfrn_notify_post(&$a) {
)); ));
$res = mail($importer['email'], sprintf( t("%s commented on an item at %s") , $from ,$a->config['sitename']), $res = mail($importer['email'], sprintf( t("%s commented on an item at %s") , $from ,$a->config['sitename']),
$email_tpl, "From: ".t("Administrator") . "@". $a->get_hostname() ); $email_tpl,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
break; break;
} }
} }

5
mod/dfrn_request.php
View file

@ -544,7 +544,10 @@ function dfrn_request_content(&$a) {
$res = mail($r[0]['email'], $res = mail($r[0]['email'],
t("Introduction received at ") . $a->config['sitename'], t("Introduction received at ") . $a->config['sitename'],
$email, $email,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] ); 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
// This is a redundant notification - no point throwing errors if it fails. // This is a redundant notification - no point throwing errors if it fails.
} }
if($auto_confirm) { if($auto_confirm) {

6
mod/invite.php
View file

@ -30,7 +30,11 @@ function invite_post(&$a) {
} }
$res = mail($recip, sprintf(t('Please join my network on %s'), $a->config['sitename']), $res = mail($recip, sprintf(t('Please join my network on %s'), $a->config['sitename']),
$message, "From: " . $a->user['email']); $message,
"From: " . $a->user['email'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
if($res) { if($res) {
$total ++; $total ++;
} }

11
mod/item.php
View file

@ -472,7 +472,10 @@ function item_post(&$a) {
)); ));
$res = mail($user['email'], sprintf( t("%s commented on your item at %s") ,$from,$a->config['sitename']), $res = mail($user['email'], sprintf( t("%s commented on your item at %s") ,$from,$a->config['sitename']),
$email_tpl,"From: " . t("Administrator") . "@" . $a->get_hostname() ); $email_tpl,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
} }
} }
else { else {
@ -495,7 +498,11 @@ function item_post(&$a) {
)); ));
$res = mail($user['email'], sprintf( t("%s posted on your profile wall at %s") ,$from, $a->config['sitename']), $res = mail($user['email'], sprintf( t("%s posted on your profile wall at %s") ,$from, $a->config['sitename']),
$email_tpl,"From: " . t("Administrator") . "@" . $a->get_hostname() ); $email_tpl,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
} }
} }

11
mod/lostpass.php
View file

@ -36,7 +36,11 @@ function lostpass_post(&$a) {
)); ));
$res = mail($email, sprintf( t('Password reset requested at %s'),$a->config['sitename']), $res = mail($email, sprintf( t('Password reset requested at %s'),$a->config['sitename']),
$email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME]); $email_tpl,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
goaway($a->get_baseurl()); goaway($a->get_baseurl());
} }
@ -94,7 +98,10 @@ function lostpass_content(&$a) {
'$new_password' => $new_password, '$new_password' => $new_password,
'$uid' => $newuid )); '$uid' => $newuid ));
$res = mail($email,"Your password has changed at {$a->config['sitename']}",$email_tpl,"From: Administrator@{$_SERVER[SERVER_NAME]}"); $res = mail($email,"Your password has changed at {$a->config['sitename']}",$email_tpl,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
return $o; return $o;
} }

11
mod/register.php
View file

@ -329,7 +329,10 @@ function register_post(&$a) {
'$uid' => $newuid )); '$uid' => $newuid ));
$res = mail($email, sprintf(t('Registration details for %s'), $a->config['sitename']), $res = mail($email, sprintf(t('Registration details for %s'), $a->config['sitename']),
$email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME']); $email_tpl,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
if($res) { if($res) {
@ -366,8 +369,10 @@ function register_post(&$a) {
)); ));
$res = mail($a->config['admin_email'], sprintf(t('Registration request at %s'), $a->config['sitename']), $res = mail($a->config['admin_email'], sprintf(t('Registration request at %s'), $a->config['sitename']),
$email_tpl,'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME']); $email_tpl,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
if($res) { if($res) {
notice( t('Your registration is pending approval by the site owner.') . EOL ) ; notice( t('Your registration is pending approval by the site owner.') . EOL ) ;
goaway($a->get_baseurl()); goaway($a->get_baseurl());

5
mod/regmod.php
View file

@ -90,7 +90,10 @@ function regmod_content(&$a) {
)); ));
$res = mail($user[0]['email'], sprintf(t('Registration details for %s'), $a->config['sitename']), $res = mail($user[0]['email'], sprintf(t('Registration details for %s'), $a->config['sitename']),
$email_tpl,'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] ); $email_tpl,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
if($res) { if($res) {
notice( t('Account approved.') . EOL ); notice( t('Account approved.') . EOL );