Merge pull request #4705 from tobiasd/20180329-de

[friendica.git] / mod / lostpass.php

diff --git a/mod/lostpass.php b/mod/lostpass.php
index ec397b7a1684e981bbf48f71f5f744df0883be18..56ad7e30ef0e71225e73d6423a569d1b30568059 100644 (file)
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -8,12 +8,11 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 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';
-require_once 'include/pgettext.php';
 
 function lostpass_post(App $a)
 {
@@ -33,7 +32,7 @@ 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) {
@@ -92,7 +91,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
@@ -126,6 +125,7 @@ function lostpass_form()
 function lostpass_generate_password($user)
 {
        $o = '';
+       $a = get_app();
 
        $new_password = User::generateNewPassword();
        $result = User::updatePassword($user['uid'], $new_password);
@@ -148,8 +148,8 @@ function lostpass_generate_password($user)
                $preamble = deindent(L10n::t('
                        Dear %1$s,
                                Your password has been changed as requested. Please retain this
-                       information for your records (or change your password immediately to
-                       something that you will remember).
+                       information for your records ' . "\x28" . 'or change your password immediately to
+                       something that you will remember' . "\x29" . '.
                ', $user['username']));
                $body = deindent(L10n::t('
                        Your login details are as follows: