another attempt to enforce session ID regeneration on login

[tt-rss.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index f5837e51c000285a44072ddf750751391de0c193..5588590a85c2ab8a99268af9db4d20fef498d308 100755 (executable)
--- a/include/functions.php
+++ b/include/functions.php
@@ -700,22 +700,25 @@
 
                if (!SINGLE_USER_MODE) {
                        $user_id = false;
+                       $auth_module = false;
 
                        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_AUTH_USER) as $plugin) {
 
                                $user_id = (int) $plugin->authenticate($login, $password);
 
                                if ($user_id) {
-                                       $_SESSION["auth_module"] = strtolower(get_class($plugin));
+                                       $auth_module = strtolower(get_class($plugin));
                                        break;
                                }
                        }
 
                        if ($user_id && !$check_only) {
 
+                               /* if a session is started here there's a stale login cookie we need to clean */
+
                                if (session_status() != PHP_SESSION_NONE) {
-                                       session_destroy();
-                                       session_commit();
+                                       $_SESSION["login_error_msg"] = __("Stale session cookie found, try logging in again");
+                                       return false;
                                }
 
                                session_regenerate_id(true);
@@ -723,6 +726,7 @@
 
                                $_SESSION["uid"] = $user_id;
                                $_SESSION["version"] = VERSION_STATIC;
+                               $_SESSION["auth_module"] = $auth_module;
 
                                $pdo = DB::pdo();
                                $sth = $pdo->prepare("SELECT login,access_level,pwd_hash FROM ttrss_users