external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Be friendly to newly registered users

Browse source 
Use "Welcome to the Arch User Repository" instead of "AUR Password
Reset" as subject for the initial password reset email.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-05-22 15:32:52 +02:00
parent d062634ce2
commit 02e7df7631
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
web/html/passreset.php
View file

@ -41,11 +41,12 @@ if (isset($_GET['resetkey'], $_POST['email'], $_POST['password'], $_POST['confir
if (empty($email)) { if (empty($email)) {
$error = __('Missing a required field.'); $error = __('Missing a required field.');
} else { } else {
$subject = 'AUR Password Reset';
$body = __('A password reset request was submitted for the account '. $body = __('A password reset request was submitted for the account '.
'associated with your e-mail address. If you wish to reset '. 'associated with your e-mail address. If you wish to reset '.
'your password follow the link below, otherwise ignore '. 'your password follow the link below, otherwise ignore '.
'this message and nothing will happen.'). 'this message and nothing will happen.').
send_resetkey($email, $body); send_resetkey($email, $subject, $body);
header('Location: ' . get_uri('/passreset/') . '?step=confirm'); header('Location: ' . get_uri('/passreset/') . '?step=confirm');
exit(); exit();

8
web/lib/acctfuncs.inc.php
View file

@ -221,6 +221,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
"<strong>", htmlspecialchars($U,ENT_QUOTES), "</strong>"); "<strong>", htmlspecialchars($U,ENT_QUOTES), "</strong>");
print "<p>\n"; print "<p>\n";
if ($send_resetkey) { if ($send_resetkey) {
$subject = 'Welcome to the Arch User Repository';
$body = __('Welcome to %s! In order ' . $body = __('Welcome to %s! In order ' .
'to set an initial password ' . 'to set an initial password ' .
'for your new account, ' . 'for your new account, ' .
@ -230,7 +231,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
'pasting it into your ' . 'pasting it into your ' .
'browser.', 'browser.',
$AUR_LOCATION); $AUR_LOCATION);
send_resetkey($email, $body); send_resetkey($email, $subject, $body);
print __("A password reset key has been sent to your e-mail address."); print __("A password reset key has been sent to your e-mail address.");
} else { } else {
print __("Click on the Login link above to use your account."); print __("Click on the Login link above to use your account.");
@ -632,11 +633,12 @@ function create_resetkey($resetkey, $uid) {
* Send a reset key to a specific e-mail address * Send a reset key to a specific e-mail address
* *
* @param string $email E-mail address of the user resetting their password * @param string $email E-mail address of the user resetting their password
* @param string $subject Subject of the email
* @param string $body Body of the email * @param string $body Body of the email
* *
* @return void * @return void
*/ */
function send_resetkey($email, $body) { function send_resetkey($email, $subject, $body) {
global $AUR_LOCATION; global $AUR_LOCATION;
$uid = uid_from_email($email); $uid = uid_from_email($email);
@ -658,7 +660,7 @@ function send_resetkey($email, $body) {
"From: aur-notify@archlinux.org\r\n" . "From: aur-notify@archlinux.org\r\n" .
"X-Mailer: PHP\r\n" . "X-Mailer: PHP\r\n" .
"X-MimeOLE: Produced By AUR"; "X-MimeOLE: Produced By AUR";
@mail($email, 'AUR Password Reset', $body, $headers); @mail($email, $subject, $body, $headers);
} }
} }