daemon: less gentle child unstucking

[tt-rss.git] / sessions.php

diff --git a/sessions.php b/sessions.php
index 5b4da3a890fda3664cda441cc7c7228b037e1e74..2ad5a57fca012dcba98d9617f668244c714d3147 100644 (file)
--- a/sessions.php
+++ b/sessions.php
@@ -1,16 +1,18 @@
-<?
+<?php
        // Original from http://www.daniweb.com/code/snippet43.html
 
        require_once "config.php";
        require_once "db.php";
 
        $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", "ttrss_sid");
+       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) {
+       function ttrss_open ($s, $n) {
        
                global $session_connection;
                
@@ -19,17 +21,11 @@
                return true;
        }
 
-       function read ($id){
+       function ttrss_read ($id){
        
                global $session_connection,$session_read;                                        
 
-               $ip_address = $_SERVER["REMOTE_ADDR"];
-
-               if (SESSION_CHECK_ADDRESS) {
-                       $address_check_qpart = " AND ip_address = '$ip_address'";
-               }
-
-               $query = "SELECT data FROM ttrss_sessions WHERE id='$id' $address_check_qpart";
+               $query = "SELECT data FROM ttrss_sessions WHERE id='$id'";
 
                $res = db_query($session_connection, $query);
                
@@ -42,7 +38,7 @@
                }
        }
 
-       function write ($id, $data) {
+       function ttrss_write ($id, $data) {
  
                if (! $data) { 
                        return false; 
@@ -54,25 +50,19 @@
                
                $data = db_escape_string(base64_encode($data), $session_connection);
                
-               $ip_address = $_SERVER["REMOTE_ADDR"];
-
-               if (SESSION_CHECK_ADDRESS) {
-                       $address_check_qpart = " AND ip_address = '$ip_address'";
-               }
-               
                if ($session_read) {
                        $query = "UPDATE ttrss_sessions SET data='$data', 
-                                       expire='$expire' WHERE id='$id' $address_check_qpart"; 
+                                       expire='$expire' WHERE id='$id'"; 
                } else {
-                       $query = "INSERT INTO ttrss_sessions (id, data, expire, ip_address)
-                                       VALUES ('$id', '$data', '$expire', '$ip_address')";
+                       $query = "INSERT INTO ttrss_sessions (id, data, expire)
+                                       VALUES ('$id', '$data', '$expire')";
                }
                
                db_query($session_connection, $query);
                return true;
        }
 
-       function close () {
+       function ttrss_close () {
        
                global $session_connection;
                
@@ -81,24 +71,18 @@
                return true;
        }
 
-       function destroy ($id) {
+       function ttrss_destroy ($id) {
        
                global $session_connection;
 
-               $ip_address = $_SERVER["REMOTE_ADDR"];
-
-               if (SESSION_CHECK_ADDRESS) {
-                       $address_check_qpart = " AND ip_address = '$ip_address'";
-               }
-
-               $query = "DELETE FROM ttrss_sessions WHERE id = '$id' $address_check_qpart";
+               $query = "DELETE FROM ttrss_sessions WHERE id = '$id'";
                
                db_query($session_connection, $query);
                
                return true;
        }
 
-       function gc ($expire) {
+       function ttrss_gc ($expire) {
        
                global $session_connection;
                
@@ -107,11 +91,13 @@
                db_query($session_connection, $query);
        }
 
-//     session_set_cookie_params(SESSION_COOKIE_LIFETIME);
-
        if (DATABASE_BACKED_SESSIONS) {
-               session_set_save_handler("open", "close", "read", "write", "destroy", "gc");
+               session_set_save_handler("ttrss_open", 
+                       "ttrss_close", "ttrss_read", "ttrss_write", 
+                       "ttrss_destroy", "ttrss_gc");
        }
-       
+
+       session_set_cookie_params(SESSION_COOKIE_LIFETIME);
+
        session_start();
 ?>