Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 13:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix email to new registerd users.

Browse source 
fix notification in case of error sending email.
This commit is contained in:
fabrixxm 2014-09-07 17:46:31 +02:00
parent 6db73c0b6d
commit 3ac5e4508b
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/Emailer.php
View file

@ -57,6 +57,7 @@ class Emailer {
);
logger("header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG);
logger("return value " . (($res)?"true":"false"), LOGGER_DEBUG);
return $res;
}
}
?>

3
include/enotify.php
View file

@ -595,7 +595,7 @@ function notification($params) {
// use the Emailer class to send the message
Emailer::send(array(
return Emailer::send(array(
'fromName' => $sender_name,
'fromEmail' => $sender_email,
'replyTo' => $sender_email,
@ -605,7 +605,6 @@ function notification($params) {
'textVersion' => $email_text_body,
'additionalMailHeader' => $datarray['headers'],
));
return True;
}
return False;

4
include/user.php
View file

@ -382,7 +382,7 @@ function send_register_open_eml($email, $sitename, $siteurl, $username, $passwor
The login details are as follows:
Site Location: %3$s
Login Name: %1$s
Password: %5$
Password: %5$s
You may change your password from your account "Settings" page after logging
in.
@ -407,7 +407,7 @@ function send_register_open_eml($email, $sitename, $siteurl, $username, $passwor
$preamble = sprintf($preamble, $username, $sitename);
$body = sprintf($body, $email, $sitename, $siteurl, $username, $password);
notification(array(
return notification(array(
'type' => "SYSTEM_EMAIL",
'to_email' => $email,
'subject'=> sprintf( t('Registration details for %s'), $sitename),

11
mod/register.php
View file

@ -81,20 +81,25 @@ function register_post(&$a) {
set_pconfig($user['uid'],'system','invites_remaining',$num_invites);
}
send_register_open_eml(
$res = send_register_open_eml(
$user['email'],
$a->config['sitename'],
$a->get_baseurl(),
$user['username'],
$result['password']);
if($res) {
info( t('Registration successful. Please check your email for further instructions.') . EOL ) ;
goaway(z_root());
}
else {
notice( t('Failed to send email message. Here is the message that failed.') . $email_tpl . EOL );
notice(
sprintf(
t('Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login.'),
$user['email'],
$result['password']
). EOL
);
}
}
elseif($a->config['register_policy'] == REGISTER_APPROVE) {