From 07ba4da6349a768033d4ac56fecec06169cd75b9 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 4 Jan 2013 15:47:29 -0800 Subject: [PATCH] email header encoding everywhere --- boot.php | 5 +++-- include/items.php | 6 +++--- include/user.php | 1 + mod/dfrn_confirm.php | 7 ++++--- mod/invite.php | 4 +++- mod/lostpass.php | 11 +++++++---- mod/register.php | 10 ++++++---- mod/regmod.php | 6 ++++-- 8 files changed, 31 insertions(+), 19 deletions(-) diff --git a/boot.php b/boot.php index 380dfb0ce..a0febceeb 100644 --- a/boot.php +++ b/boot.php @@ -847,9 +847,10 @@ if(! function_exists('check_config')) { '$error' => sprintf( t('Update %s failed. See error logs.'), $x) )); $subject=sprintf(t('Update Error at %s'), $a->get_baseurl()); - + require_once('include/email.php'); + $subject = email_header_encode($subject,'UTF-8'); mail($a->config['admin_email'], $subject, $email_msg, - 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' ); //try the logger diff --git a/include/items.php b/include/items.php index 7eb090136..b465c444e 100755 --- a/include/items.php +++ b/include/items.php @@ -5,7 +5,7 @@ require_once('include/oembed.php'); require_once('include/salmon.php'); require_once('include/crypto.php'); require_once('include/Photo.php'); - +require_once('include/email.php'); function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) { @@ -3370,9 +3370,9 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) { '$sitename' => $a->config['sitename'] )); $res = mail($r[0]['email'], - (($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'], + email_header_encode((($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'],'UTF-8'), $email, - 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' ); diff --git a/include/user.php b/include/user.php index 282bbdbba..6f4ab3021 100644 --- a/include/user.php +++ b/include/user.php @@ -7,6 +7,7 @@ require_once('include/text.php'); require_once('include/pgettext.php'); require_once('include/datetime.php'); + function create_user($arr) { // Required: { username, nickname, email } or { openid_url } diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index f02119807..769036c5e 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -746,10 +746,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) { '$dfrn_url' => $r[0]['url'], '$uid' => $newuid ) ); - - $res = mail($r[0]['email'], sprintf( t("Connection accepted at %s") , $a->config['sitename']), + require_once('include/email.php'); + + $res = mail($r[0]['email'], email_header_encode( sprintf( t("Connection accepted at %s") , $a->config['sitename']),'UTF-8'), $email_tpl, - 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' ); diff --git a/mod/invite.php b/mod/invite.php index 2dbf93c59..384161c6d 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -7,6 +7,8 @@ * */ +require_once('include/email.php'); + function invite_post(&$a) { if(! local_user()) { @@ -56,7 +58,7 @@ function invite_post(&$a) { else $nmessage = $message; - $res = mail($recip, sprintf( t('Please join us on Friendica'), $a->config['sitename']), + $res = mail($recip, email_header_encode( t('Please join us on Friendica'),'UTF-8'), $nmessage, "From: " . $a->user['email'] . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" diff --git a/mod/lostpass.php b/mod/lostpass.php index 57e6d6965..cc31efd97 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -1,5 +1,6 @@ $a->get_baseurl() . '/lostpass?verify=' . $new_password )); - $res = mail($email, sprintf( t('Password reset requested at %s'),$a->config['sitename']), + $res = mail($email, email_header_encode(sprintf( t('Password reset requested at %s'),$a->config['sitename']),'UTF-8'), $email_tpl, - 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' ); @@ -103,8 +104,10 @@ function lostpass_content(&$a) { '$new_password' => $new_password, '$uid' => $newuid )); - $res = mail($email,"Your password has changed at {$a->config['sitename']}",$email_tpl, - 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + $subject = sprintf( t('Your password has been changed at %s'), $a->config['sitename']); + + $res = mail($email, email_header_encode( $subject, 'UTF-8'), $email_tpl, + 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' ); diff --git a/mod/register.php b/mod/register.php index f4c657087..3532f92e8 100644 --- a/mod/register.php +++ b/mod/register.php @@ -1,5 +1,7 @@ $result['password'], '$uid' => $user['uid'] )); - $res = mail($user['email'], sprintf(t('Registration details for %s'), $a->config['sitename']), + $res = mail($user['email'], email_header_encode( sprintf( t('Registration details for %s'), $a->config['sitename']),'UTF-8'), $email_tpl, - 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' ); @@ -140,9 +142,9 @@ function register_post(&$a) { '$hash' => $hash )); - $res = mail($a->config['admin_email'], sprintf(t('Registration request at %s'), $a->config['sitename']), + $res = mail($a->config['admin_email'], email_header_encode( sprintf(t('Registration request at %s'), $a->config['sitename']),'UTF-8'), $email_tpl, - 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' ); diff --git a/mod/regmod.php b/mod/regmod.php index 21f41eb01..5ed764200 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -1,5 +1,7 @@ $user[0]['uid'] )); - $res = mail($user[0]['email'], sprintf(t('Registration details for %s'), $a->config['sitename']), + $res = mail($user[0]['email'], email_header_encode( sprintf(t('Registration details for %s'), $a->config['sitename']), 'UTF-8'), $email_tpl, - 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' );