From 09c99eb97d8e6ddd528a31966c7a03dd511281fb Mon Sep 17 00:00:00 2001
From: myvesta <38690722+myvesta@users.noreply.github.com>
Date: Sat, 29 Sep 2018 01:28:15 +0200
Subject: [PATCH] improved secure login

---
 web/inc/secure_login.php | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/web/inc/secure_login.php b/web/inc/secure_login.php
index 9860912b..4b2944d7 100644
--- a/web/inc/secure_login.php
+++ b/web/inc/secure_login.php
@@ -1,12 +1,19 @@
 <?php
-if (!defined('NO_AUTH_REQUIRED2')) {
-    if (file_exists('/usr/local/vesta/web/inc/login_url.php')) {
-        require_once('/usr/local/vesta/web/inc/login_url.php');
-        if (isset($_GET[$login_url])) {
-            setcookie($login_url, '1', time() + 31536000, '/', $_SERVER['HTTP_HOST'], true);
-            header ("Location: /login/");
-            exit;
+$login_url_skip=0;
+if ($_SERVER['SCRIPT_FILENAME']=='/usr/local/vesta/web/reset/mail/index.php') $login_url_skip=1;
+if ($_SERVER['SCRIPT_FILENAME']=='/usr/local/vesta/web//reset/mail/index.php') $login_url_skip=1;
+
+if ($login_url_skip==0) {
+    if (!isset($login_url_loaded)) {
+        $login_url_loaded=1;
+        if (file_exists('/usr/local/vesta/web/inc/login_url.php')) {
+            require_once('/usr/local/vesta/web/inc/login_url.php');
+            if (isset($_GET[$login_url])) {
+                setcookie($login_url, '1', time() + 31536000, '/', $_SERVER['HTTP_HOST'], true);
+                header ("Location: /login/");
+                exit;
+            }
+            if (!isset($_COOKIE[$login_url])) exit;
         }
-        if (!isset($_COOKIE[$login_url])) exit;
     }
 }