Just some more fixed notice

[friendica.git] / mod / lostpass.php

diff --git a/mod/lostpass.php b/mod/lostpass.php
index c39a38cca95fe002b7caf7fa03ba49faa6977a37..07c24f158016df4519234e0b5a10c29fe18efd05 100644 (file)
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -4,13 +4,15 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
+use Friendica\Database\dba;
 use Friendica\Database\DBM;
 use Friendica\Model\User;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'boot.php';
-require_once 'include/datetime.php';
 require_once 'include/enotify.php';
 require_once 'include/text.php';
 
@@ -32,14 +34,14 @@ function lostpass_post(App $a)
 
        $fields = [
                'pwdreset' => $pwdreset_token,
-               'pwdreset_time' => datetime_convert()
+               'pwdreset_time' => DateTimeFormat::utcNow()
        ];
        $result = dba::update('user', $fields, ['uid' => $user['uid']]);
        if ($result) {
                info(L10n::t('Password reset request issued. Check your email.') . EOL);
        }
 
-       $sitename = $a->config['sitename'];
+       $sitename = Config::get('config', 'sitename');
        $resetlink = System::baseUrl() . '/lostpass/' . $pwdreset_token;
 
        $preamble = deindent(L10n::t('
@@ -69,6 +71,7 @@ function lostpass_post(App $a)
        notification([
                'type'     => SYSTEM_EMAIL,
                'to_email' => $user['email'],
+               'uid'      => $user['uid'],
                'subject'  => L10n::t('Password reset requested at %s', $sitename),
                'preamble' => $preamble,
                'body'     => $body
@@ -91,7 +94,7 @@ function lostpass_content(App $a)
                }
 
                // Password reset requests expire in 60 minutes
-               if ($user['pwdreset_time'] < datetime_convert('UTC', 'UTC', 'now - 1 hour')) {
+               if ($user['pwdreset_time'] < DateTimeFormat::utc('now - 1 hour')) {
                        $fields = [
                                'pwdreset' => null,
                                'pwdreset_time' => null
@@ -125,6 +128,7 @@ function lostpass_form()
 function lostpass_generate_password($user)
 {
        $o = '';
+       $a = get_app();
 
        $new_password = User::generateNewPassword();
        $result = User::updatePassword($user['uid'], $new_password);
@@ -143,7 +147,7 @@ function lostpass_generate_password($user)
 
                info("Your password has been reset." . EOL);
 
-               $sitename = $a->config['sitename'];
+               $sitename = Config::get('config', 'sitename');
                $preamble = deindent(L10n::t('
                        Dear %1$s,
                                Your password has been changed as requested. Please retain this
@@ -163,6 +167,7 @@ function lostpass_generate_password($user)
                notification([
                        'type'     => SYSTEM_EMAIL,
                        'to_email' => $user['email'],
+                       'uid'      => $user['uid'],
                        'subject'  => L10n::t('Your password has been changed at %s', $sitename),
                        'preamble' => $preamble,
                        'body'     => $body