login system fixes (3)

[tt-rss.git] / sessions.php

diff --git a/sessions.php b/sessions.php
index dddab50128e88bb06908144cbea85e26da5191d5..e1356262807bf3d8c7cc586956934948055b314f 100644 (file)
--- a/sessions.php
+++ b/sessions.php
@@ -1,12 +1,16 @@
-<?
+<?php
        // Original from http://www.daniweb.com/code/snippet43.html
 
        require_once "config.php";
        require_once "db.php";
 
-       $session_expire = 600;
+       $session_expire = SESSION_EXPIRE_TIME; //seconds
+       $session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME;
 
        ini_set("session.gc_probability", 50);
+       ini_set("session.name", $session_name);
+       ini_set("session.use_only_cookies", true);
+       ini_set("session.gc_maxlifetime", SESSION_EXPIRE_TIME);
 
        function open ($s, $n) {
        
@@ -21,7 +25,7 @@
        
                global $session_connection,$session_read;                                        
 
-               $query = "SELECT data FROM ttrss_sessions WHERE id='$id'";
+               $query = "SELECT data FROM ttrss_sessions WHERE id='$id' $address_check_qpart";
 
                $res = db_query($session_connection, $query);
                
@@ -48,7 +52,7 @@
                
                if ($session_read) {
                        $query = "UPDATE ttrss_sessions SET data='$data', 
-                                       expire='$expire' WHERE id='$id'"; 
+                                       expire='$expire' WHERE id='$id' $address_check_qpart"; 
                } else {
                        $query = "INSERT INTO ttrss_sessions (id, data, expire)
                                        VALUES ('$id', '$data', '$expire')";
@@ -70,8 +74,8 @@
        function destroy ($id) {
        
                global $session_connection;
-               
-               $query = "DELETE FROM ttrss_sessions WHERE id = '$id'";
+
+               $query = "DELETE FROM ttrss_sessions WHERE id = '$id' $address_check_qpart";
                
                db_query($session_connection, $query);
                
@@ -87,6 +91,11 @@
                db_query($session_connection, $query);
        }
 
-       session_set_save_handler ("open", "close", "read", "write", "destroy", "gc");
+       if (DATABASE_BACKED_SESSIONS) {
+               session_set_save_handler("open", "close", "read", "write", "destroy", "gc");
+       }
+
+//     session_set_cookie_params(SESSION_COOKIE_LIFETIME_REMEMBER);
+
        session_start();
 ?>