Vier: Fading effects for tags, borders for links

[friendica.git] / mod / lostpass.php

diff --git a/mod/lostpass.php b/mod/lostpass.php
index 530619bc4f7fa484c29be5a5a6166fb57a5d9789..1751c2a7eacd555c1e4be88c3aaf1d8aa0d1870f 100644 (file)
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -1,30 +1,36 @@
 <?php
 
+require_once('include/email.php');
 
 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);
 
-       $r = q("UPDATE `user` SET `pwdreset` = '%s' WHERE `uid` = %d LIMIT 1",
+       $r = q("UPDATE `user` SET `pwdreset` = '%s' WHERE `uid` = %d",
                dbesc($new_password_encoded),
                intval($uid)
        );
        if($r)
-               notice( t('Password reset request issued. Check your email.') . EOL);
+               info( t('Password reset request issued. Check your email.') . EOL);
 
        $email_tpl = get_intltext_template("lostpass_eml.tpl");
        $email_tpl = replace_macros($email_tpl, array(
@@ -35,14 +41,14 @@ function lostpass_post(&$a) {
                        '$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,
-                       'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+                       'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
                        . 'Content-type: text/plain; charset=UTF-8' . "\n"
                        . 'Content-transfer-encoding: 8bit' );
 
 
-       goaway($a->get_baseurl());
+       goaway(z_root());
 }
 
 
@@ -58,7 +64,7 @@ function lostpass_content(&$a) {
                );
                if(! count($r)) {
                        notice( t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.") . EOL);
-                       goaway($a->get_baseurl());
+                       goaway(z_root());
                        return;
                }
                $uid = $r[0]['uid'];
@@ -68,7 +74,7 @@ function lostpass_content(&$a) {
                $new_password = autoname(6) . mt_rand(100,9999);
                $new_password_encoded = hash('whirlpool',$new_password);
 
-               $r = q("UPDATE `user` SET `password` = '%s', `pwdreset` = ''  WHERE `uid` = %d LIMIT 1",
+               $r = q("UPDATE `user` SET `password` = '%s', `pwdreset` = ''  WHERE `uid` = %d",
                        dbesc($new_password_encoded),
                        intval($uid)
                );
@@ -85,7 +91,7 @@ function lostpass_content(&$a) {
                                '$baseurl' => $a->get_baseurl()
 
                        ));
-                               notice("Your password has been reset." . EOL);
+                               info("Your password has been reset." . EOL);
 
 
 
@@ -98,8 +104,10 @@ function lostpass_content(&$a) {
                        '$new_password' => $new_password,
                        '$uid' => $newuid ));
 
-                       $res = mail($email,"Your password has changed at {$a->config['sitename']}",$email_tpl,
-                               'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+                       $subject = sprintf( t('Your password has been changed at %s'), $a->config['sitename']);
+
+                       $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-transfer-encoding: 8bit' );
 
@@ -120,4 +128,4 @@ function lostpass_content(&$a) {
                return $o;
        }
 
-}
\ No newline at end of file
+}