Class file relocations

[friendica.git] / mod / lostpass.php

diff --git a/mod/lostpass.php b/mod/lostpass.php
index 0c4bb1a8335ffc38a9cce9a08a86df5bcc99b799..1a30effd4eba82e3b7fdc9d819bd76fe7b965112 100644 (file)
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -1,24 +1,27 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
 require_once('include/email.php');
 require_once('include/enotify.php');
 require_once('include/text.php');
 
-if(! function_exists('lostpass_post')) {
-function lostpass_post(&$a) {
+function lostpass_post(App $a) {
 
        $loginame = notags(trim($_POST['login-name']));
        if(! $loginame)
-               goaway(z_root());
+               goaway(System::baseUrl());
 
        $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)) {
+       if (! DBM::is_result($r)) {
                notice( t('No valid account found.') . EOL);
-               goaway(z_root());
+               goaway(System::baseUrl());
        }
 
        $uid = $r[0]['uid'];
@@ -37,8 +40,7 @@ function lostpass_post(&$a) {
 
 
        $sitename = $a->config['sitename'];
-       $siteurl = $a->get_baseurl();
-       $resetlink = $a->get_baseurl() . '/lostpass?verify=' . $new_password;
+       $resetlink = System::baseUrl() . '/lostpass?verify=' . $new_password;
 
        $preamble = deindent(t('
                Dear %1$s,
@@ -65,21 +67,21 @@ function lostpass_post(&$a) {
                Login Name:     %3$s'));
 
        $preamble = sprintf($preamble, $username, $sitename);
-       $body = sprintf($body, $resetlink, $siteurl, $email);
+       $body = sprintf($body, $resetlink, System::baseUrl(), $email);
 
        notification(array(
-               'type' => "SYSTEM_EMAIL",
+               'type' => SYSTEM_EMAIL,
                'to_email' => $email,
                'subject'=> sprintf( t('Password reset requested at %s'),$sitename),
                'preamble'=> $preamble,
                'body' => $body));
 
-       goaway(z_root());
-}
+       goaway(System::baseUrl());
+
 }
 
-if(! function_exists('lostpass_content')) {
-function lostpass_content(&$a) {
+
+function lostpass_content(App $a) {
 
 
        if(x($_GET,'verify')) {
@@ -89,7 +91,7 @@ function lostpass_content(&$a) {
                $r = q("SELECT * FROM `user` WHERE `pwdreset` = '%s' LIMIT 1",
                        dbesc($hash)
                );
-               if(! count($r)) {
+               if (! DBM::is_result($r)) {
                        $o =  t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.");
                        return $o;
                }
@@ -104,24 +106,25 @@ function lostpass_content(&$a) {
                        dbesc($new_password_encoded),
                        intval($uid)
                );
-               if($r) {
+
+               /// @TODO Is DBM::is_result() okay here?
+               if ($r) {
                        $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>.',
+                               '$lbl5' => '<a href="' . System::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()
+                               '$baseurl' => System::baseUrl()
 
                        ));
                                info("Your password has been reset." . EOL);
 
 
                        $sitename = $a->config['sitename'];
-                       $siteurl = $a->get_baseurl();
                        // $username, $email, $new_password
                        $preamble = deindent(t('
                                Dear %1$s,
@@ -140,10 +143,10 @@ function lostpass_content(&$a) {
                        '));
 
                        $preamble = sprintf($preamble, $username);
-                       $body = sprintf($body, $siteurl, $email, $new_password);
+                       $body = sprintf($body, System::baseUrl(), $email, $new_password);
 
                        notification(array(
-                               'type' => "SYSTEM_EMAIL",
+                               'type' => SYSTEM_EMAIL,
                                'to_email' => $email,
                                'subject'=> sprintf( t('Your password has been changed at %s'),$sitename),
                                'preamble'=> $preamble,
@@ -165,5 +168,5 @@ function lostpass_content(&$a) {
 
                return $o;
        }
-}
+
 }