another attempt to enforce session ID regeneration on login

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 7cce7d71b061d24f5bf1f93093b9b5173456e354..de9c9684a00336db2b37d1b8d4ddf967e8f01c5f 100755 (executable)
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -503,7 +503,9 @@ class Handler_Public extends Handler {
                                // start an empty session to deliver login error message
                                @session_start();
 
-                               $_SESSION["login_error_msg"] = __("Incorrect username or password");
+                               if (!isset($_SESSION["login_error_msg"]))
+                                       $_SESSION["login_error_msg"] = __("Incorrect username or password");
+
                                user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
                        }
 

diff --git a/include/functions.php b/include/functions.php
index a04a393ec3382c4fd852080e756f3cbc3e2d5e61..5588590a85c2ab8a99268af9db4d20fef498d308 100755 (executable)
--- a/include/functions.php
+++ b/include/functions.php
@@ -714,9 +714,11 @@
 
                        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);