bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Review Changes

Browse source 
renamed some functions and adjusted corresponding calls.
This commit is contained in:
Adam Magness 2017-12-01 21:05:06 -05:00
commit 9a4e741d1a
9 changed files with 34 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/invite.php
View file

@ -75,7 +75,7 @@ function invite_post(App $a) {
$nmessage = $message;
}
$res = mail($recip, Email::emailHeaderEncode(t('Please join us on Friendica'),'UTF-8'),
$res = mail($recip, Email::encodeHeader(t('Please join us on Friendica'),'UTF-8'),
$nmessage,
"From: " . $a->user['email'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"

4
mod/item.php
View file

@ -1032,9 +1032,9 @@ function item_post(App $a) {
$disclaimer .= sprintf( t('You may visit them online at %s'), System::baseUrl() . '/profile/' . $a->user['nickname']) . EOL;
$disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL;
if (!$datarray['title']=='') {
$subject = Email::emailHeaderEncode($datarray['title'], 'UTF-8');
$subject = Email::encodeHeader($datarray['title'], 'UTF-8');
} else {
$subject = Email::emailHeaderEncode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'), $a->user['username']), 'UTF-8');
$subject = Email::encodeHeader('[Friendica]' . ' ' . sprintf( t('%s posted an update.'), $a->user['username']), 'UTF-8');
}
$link = '<a href="' . System::baseUrl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
$html = prepare_body($datarray);

2
mod/settings.php
View file

@ -265,7 +265,7 @@ function settings_post(App $a) {
if (strlen($eacct['server'])) {
$dcrpass = '';
openssl_private_decrypt(hex2bin($eacct['pass']), $dcrpass, $a->user['prvkey']);
$mbox = Email::emailConnect($mb, $mail_user, $dcrpass);
$mbox = Email::connect($mb, $mail_user, $dcrpass);
unset($dcrpass);
if (!$mbox) {
$failed = true;