mail plugin: only mail unique articles

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

diff --git a/include/sessions.php b/include/sessions.php
index c4876489fa3165a486909a45158539cda583acce..66214afe76923af8779795222958f376854b2992 100644 (file)
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -39,7 +39,7 @@
        function validate_session() {
                if (SINGLE_USER_MODE) return true;
 
-               if (VERSION != $_SESSION["version"]) return false;
+               if (VERSION_STATIC != $_SESSION["version"]) return false;
 
                $check_ip = $_SESSION['ip_address'];
 
@@ -62,11 +62,17 @@
                        return false;
                }
 
-               if ($_SESSION["ref_schema_version"] != session_get_schema_version(true))
+               if ($_SESSION["ref_schema_version"] != session_get_schema_version(true)) {
+                       $_SESSION["login_error_msg"] =
+                               __("Session failed to validate (schema version changed)");
                        return false;
+               }
 
-               if (sha1($_SERVER['HTTP_USER_AGENT']) != $_SESSION["user_agent"])
+               if (sha1($_SERVER['HTTP_USER_AGENT']) != $_SESSION["user_agent"]) {
+                       $_SESSION["login_error_msg"] =
+                               __("Session failed to validate (user agent changed)");
                        return false;
+               }
 
                if ($_SESSION["uid"]) {
                        $result = Db::get()->query(
@@ -74,11 +80,19 @@
 
                        // user not found
                        if (Db::get()->num_rows($result) == 0) {
+
+                               $_SESSION["login_error_msg"] =
+                                       __("Session failed to validate (user not found)");
+
                                return false;
                        } else {
                                $pwd_hash = Db::get()->fetch_result($result, 0, "pwd_hash");
 
                                if ($pwd_hash != $_SESSION["pwd_hash"]) {
+
+                                       $_SESSION["login_error_msg"] =
+                                               __("Session failed to validate (password changed)");
+
                                        return false;
                                }
                        }