Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / mod / lostpass.php

diff --git a/mod/lostpass.php b/mod/lostpass.php
index 0b5dc1376bb7ca17dba16ecde71243c2926d1455..57e6d696537c24b3e5440d751b5e1fa6c4e6625a 100644 (file)
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -3,18 +3,23 @@
 
 function lostpass_post(&$a) {
 
-       $email = notags(trim($_POST['login-name']));
-       if(! $email)
-               goaway($a->get_baseurl());
+       $loginame = notags(trim($_POST['login-name']));
+       if(! $loginame)
+               goaway(z_root());
 
-       $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) LIMIT 1",
-               dbesc($email),
-               dbesc($email)
+       $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) AND `verified` = 1 AND `blocked` = 0 LIMIT 1",
+               dbesc($loginame),
+               dbesc($loginame)
        );
-       if(! count($r))
-               goaway($a->get_baseurl());
+
+       if(! count($r)) {
+               notice( t('No valid account found.') . EOL);
+               goaway(z_root());
+       }
+
        $uid = $r[0]['uid'];
        $username = $r[0]['username'];
+       $email = $r[0]['email'];
 
        $new_password = autoname(12) . mt_rand(100,9999);
        $new_password_encoded = hash('whirlpool',$new_password);
@@ -24,9 +29,9 @@ function lostpass_post(&$a) {
                intval($uid)
        );
        if($r)
-               notice("Password reset request issued. Check your email.");
+               info( t('Password reset request issued. Check your email.') . EOL);
 
-       $email_tpl = load_view_file("view/lostpass_eml.tpl");
+       $email_tpl = get_intltext_template("lostpass_eml.tpl");
        $email_tpl = replace_macros($email_tpl, array(
                        '$sitename' => $a->config['sitename'],
                        '$siteurl' =>  $a->get_baseurl(),
@@ -35,11 +40,14 @@ function lostpass_post(&$a) {
                        '$reset_link' => $a->get_baseurl() . '/lostpass?verify=' . $new_password
        ));
 
-       $res = mail($email,"Password reset requested at {$a->config['sitename']}",$email_tpl,"From: Administrator@{$_SERVER[SERVER_NAME]}");
+       $res = mail($email, sprintf( t('Password reset requested at %s'),$a->config['sitename']),
+                       $email_tpl,
+                       'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+                       . 'Content-type: text/plain; charset=UTF-8' . "\n"
+                       . 'Content-transfer-encoding: 8bit' );
 
-       
 
-       goaway($a->get_baseurl());
+       goaway(z_root());
 }
 
 
@@ -54,8 +62,8 @@ function lostpass_content(&$a) {
                        dbesc($hash)
                );
                if(! count($r)) {
-                       notice("Request could not be verified. (You may have previously submitted it.) Password reset failed." . EOL);
-                       goaway($a->get_baseurl());
+                       notice( t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.") . EOL);
+                       goaway(z_root());
                        return;
                }
                $uid = $r[0]['uid'];
@@ -70,16 +78,23 @@ function lostpass_content(&$a) {
                        intval($uid)
                );
                if($r) {
-                       $tpl = load_view_file('view/pwdreset.tpl');
+                       $tpl = get_markup_template('pwdreset.tpl');
                        $o .= replace_macros($tpl,array(
+                               '$lbl1' => t('Password Reset'),
+                               '$lbl2' => t('Your password has been reset as requested.'),
+                               '$lbl3' => t('Your new password is'),
+                               '$lbl4' => t('Save or copy your new password - and then'),
+                               '$lbl5' => '<a href="' . $a->get_baseurl() . '">' . t('click here to login') . '</a>.',
+                               '$lbl6' => t('Your password may be changed from the <em>Settings</em> page after successful login.'),
                                '$newpass' => $new_password,
                                '$baseurl' => $a->get_baseurl()
+
                        ));
-                               notice("Your password has been reset." . EOL);
+                               info("Your password has been reset." . EOL);
 
 
 
-                       $email_tpl = load_view_file("view/passchanged_eml.tpl");
+                       $email_tpl = get_intltext_template("passchanged_eml.tpl");
                        $email_tpl = replace_macros($email_tpl, array(
                        '$sitename' => $a->config['sitename'],
                        '$siteurl' =>  $a->get_baseurl(),
@@ -88,18 +103,26 @@ function lostpass_content(&$a) {
                        '$new_password' => $new_password,
                        '$uid' => $newuid ));
 
-                       $res = mail($email,"Your password has changed at {$a->config['sitename']}",$email_tpl,"From: Administrator@{$_SERVER[SERVER_NAME]}");
+                       $res = mail($email,"Your password has changed at {$a->config['sitename']}",$email_tpl,
+                               'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+                               . 'Content-type: text/plain; charset=UTF-8' . "\n"
+                               . 'Content-transfer-encoding: 8bit' );
 
                        return $o;
                }
        
        }
        else {
-               $tpl = load_view_file('view/lostpass.tpl');
+               $tpl = get_markup_template('lostpass.tpl');
 
-               $o .= $tpl;
+               $o .= replace_macros($tpl,array(
+                       '$title' => t('Forgot your Password?'),
+                       '$desc' => t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'),
+                       '$name' => t('Nickname or Email: '),
+                       '$submit' => t('Reset') 
+               ));
 
                return $o;
        }
 
-}
\ No newline at end of file
+}