fix various issues reported by static analysis

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

diff --git a/include/sessions.php b/include/sessions.php
index 12925a511641396b7d7762ffc85f56402b614702..e955c70b26087cf7d7ca0bd413095c8121c23638 100644 (file)
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -23,7 +23,7 @@
        ini_set("session.gc_maxlifetime", $session_expire);
        ini_set("session.cookie_lifetime", min(0, SESSION_COOKIE_LIFETIME));
 
-       function session_get_schema_version($nocache = false) {
+       function session_get_schema_version() {
                global $schema_version;
 
                if (!$schema_version) {
@@ -39,41 +39,12 @@
        function validate_session() {
                if (SINGLE_USER_MODE) return true;
 
-               //if (VERSION_STATIC != $_SESSION["version"]) return false;
-
-               $check_ip = $_SESSION['ip_address'];
-
-               switch (SESSION_CHECK_ADDRESS) {
-               case 0:
-                       $check_ip = '';
-                       break;
-               case 1:
-                       $check_ip = substr($check_ip, 0, strrpos($check_ip, '.')+1);
-                       break;
-               case 2:
-                       $check_ip = substr($check_ip, 0, strrpos($check_ip, '.'));
-                       $check_ip = substr($check_ip, 0, strrpos($check_ip, '.')+1);
-                       break;
-               };
-
-               if ($check_ip && strpos($_SERVER['REMOTE_ADDR'], $check_ip) !== 0) {
-                       $_SESSION["login_error_msg"] =
-                               __("Session failed to validate (incorrect IP)");
-                       return false;
-               }
-
-               if ($_SESSION["ref_schema_version"] != session_get_schema_version(true)) {
+               if (isset($_SESSION["ref_schema_version"]) && $_SESSION["ref_schema_version"] != session_get_schema_version()) {
                        $_SESSION["login_error_msg"] =
                                __("Session failed to validate (schema version changed)");
                        return false;
                }
 
-               /* 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(
                                "SELECT pwd_hash FROM ttrss_users WHERE id = '".$_SESSION["uid"]."'");
@@ -101,7 +72,9 @@
                return true;
        }
 
-
+       /**
+        * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+        */
        function ttrss_open ($s, $n) {
                return true;
        }
@@ -146,8 +119,13 @@
                return true;
        }
 
+       /**
+        * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+        */
        function ttrss_gc ($expire) {
                Db::get()->query("DELETE FROM ttrss_sessions WHERE expire < " . time());
+
+               return true;
        }
 
        if (!SINGLE_USER_MODE /* && DB_TYPE == "pgsql" */) {