friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

email header encoding everywhere

This commit is contained in:
friendica 2013-01-04 15:47:29 -08:00
parent a5755b59a8
commit 07ba4da634
8 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boot.php
View File

@ -847,9 +847,10 @@ if(! function_exists('check_config')) {
'$error' => sprintf( t('Update %s failed. See error logs.'), $x) '$error' => sprintf( t('Update %s failed. See error logs.'), $x)
)); ));
$subject=sprintf(t('Update Error at %s'), $a->get_baseurl()); $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, 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-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' ); . 'Content-transfer-encoding: 8bit' );
//try the logger //try the logger

6
include/items.php
View File

@ -5,7 +5,7 @@ require_once('include/oembed.php');
require_once('include/salmon.php'); require_once('include/salmon.php');
require_once('include/crypto.php'); require_once('include/crypto.php');
require_once('include/Photo.php'); require_once('include/Photo.php');
require_once('include/email.php');
function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) { 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'] '$sitename' => $a->config['sitename']
)); ));
$res = mail($r[0]['email'], $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, $email,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' ); . 'Content-transfer-encoding: 8bit' );

1
include/user.php
View File

@ -7,6 +7,7 @@ require_once('include/text.php');
require_once('include/pgettext.php'); require_once('include/pgettext.php');
require_once('include/datetime.php'); require_once('include/datetime.php');
function create_user($arr) { function create_user($arr) {
// Required: { username, nickname, email } or { openid_url } // Required: { username, nickname, email } or { openid_url }

7
mod/dfrn_confirm.php
View File

@ -746,10 +746,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
'$dfrn_url' => $r[0]['url'], '$dfrn_url' => $r[0]['url'],
'$uid' => $newuid ) '$uid' => $newuid )
); );
require_once('include/email.php');
$res = mail($r[0]['email'], sprintf( t("Connection accepted at %s") , $a->config['sitename']),
$res = mail($r[0]['email'], email_header_encode( sprintf( t("Connection accepted at %s") , $a->config['sitename']),'UTF-8'),
$email_tpl, $email_tpl,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' ); . 'Content-transfer-encoding: 8bit' );

4
mod/invite.php
View File

@ -7,6 +7,8 @@
* *
*/ */
require_once('include/email.php');
function invite_post(&$a) { function invite_post(&$a) {
if(! local_user()) { if(! local_user()) {
@ -56,7 +58,7 @@ function invite_post(&$a) {
else else
$nmessage = $message; $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, $nmessage,
"From: " . $a->user['email'] . "\n" "From: " . $a->user['email'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n"

11
mod/lostpass.php
View File

@ -1,5 +1,6 @@
<?php <?php
require_once('include/email.php');
function lostpass_post(&$a) { function lostpass_post(&$a) {
@ -40,9 +41,9 @@ function lostpass_post(&$a) {
'$reset_link' => $a->get_baseurl() . '/lostpass?verify=' . $new_password '$reset_link' => $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, $email_tpl,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' ); . 'Content-transfer-encoding: 8bit' );
@ -103,8 +104,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, $subject = sprintf( t('Your password has been changed at %s'), $a->config['sitename']);
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
$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-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' ); . 'Content-transfer-encoding: 8bit' );

10
mod/register.php
View File

@ -1,5 +1,7 @@
<?php <?php
require_once('include/email.php');
if(! function_exists('register_post')) { if(! function_exists('register_post')) {
function register_post(&$a) { function register_post(&$a) {
@ -86,9 +88,9 @@ function register_post(&$a) {
'$password' => $result['password'], '$password' => $result['password'],
'$uid' => $user['uid'] )); '$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, $email_tpl,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' ); . 'Content-transfer-encoding: 8bit' );
@ -140,9 +142,9 @@ function register_post(&$a) {
'$hash' => $hash '$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, $email_tpl,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' ); . 'Content-transfer-encoding: 8bit' );

6
mod/regmod.php
View File

@ -1,5 +1,7 @@
<?php <?php
require_once('include/email.php');
function user_allow($hash) { function user_allow($hash) {
$a = get_app(); $a = get_app();
@ -49,9 +51,9 @@ function user_allow($hash) {
'$uid' => $user[0]['uid'] '$uid' => $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, $email_tpl,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' ); . 'Content-transfer-encoding: 8bit' );