fix: password reset not working

src/classes/wishthis/Email.php

@@ -51,20 +51,7 @@ class Email
         $renderer = new \Qferrer\Mjml\Renderer\ApiRenderer($api);
 
         $html = $this->mjml;
-
+        $html = $renderer->render($this->mjml);
-        if ('127.0.0.1' === $_SERVER['REMOTE_ADDR']) {
-            /**
-             * Ignore SSL certificate errors
-             */
-            try {
-                $html = $renderer->render($this->mjml);
-            } catch (\Qferrer\Mjml\Exception\CurlException $th) {
-                error_log($th->getMessage());
-                error_log($this->mjml);
-            }
-        } else {
-            $html = $renderer->render($this->mjml);
-        }
 
         $to      = $this->to;
         $subject = $this->subject;

src/classes/wishthis/User.php

@@ -546,4 +546,9 @@ class User
     {
         $this->advertisements = $advertisements;
     }
+
+    public function getPasswordResetValidUntil(): int
+    {
+        return $this->password_reset_valid_until;
+    }
 }

src/pages/login.php

@@ -83,7 +83,7 @@ if (isset($_POST['reset'], $_POST['email'])) {
             'password-reset-link',
             $_SERVER['REQUEST_SCHEME'] . '://' .
             $_SERVER['HTTP_HOST'] .
-            Page::PAGE_REGISTER . '&password-reset=' . $user->email . '&token=' . $token
+            Page::PAGE_REGISTER . '&password-reset=' . $user->getEmail() . '&token=' . $token
         );
 
         $emailReset->send();

src/pages/register.php

@@ -71,8 +71,9 @@ if (isset($_POST['email'], $_POST['password']) && !empty($_POST['planet'])) {
              */
             $userQuery = $database
             ->query(
-                'SELECT * FROM `users`
+                'SELECT *
-                  WHERE `email`                = :user_email,
+                   FROM `users`
+                  WHERE `email`                = :user_email
                     AND `password_reset_token` = :user_password_reset_token',
                 array(
                     'user_email'                => $user_email,
@@ -83,14 +84,13 @@ if (isset($_POST['email'], $_POST['password']) && !empty($_POST['planet'])) {
             if (false !== $userQuery) {
                 $user = new User($userQuery->fetch());
 
-                if (time() > $user->password_reset_valid_until) {
+                echo \date('d.m.Y H:i') . ' <= ' . \date('d.m.Y H:i', $user->getPasswordResetValidUntil()) . '.';
+                if (time() <= $user->getPasswordResetValidUntil()) {
                     $database
                     ->query(
                         'UPDATE `users`
-                                SET `password`                   = :user_password,
+                            SET `password` = :user_password
-                                    `password_reset_token`       = NULL,
+                          WHERE `id`       = :user_id;',
-                                    `password_reset_valid_until` = NULL
-                              WHERE `id`                         = :user_id;',
                         array(
                             'user_password' => User::passwordToHash($_POST['password']),
                             'user_id'       => $user->getId(),