daemon: less gentle child unstucking

[tt-rss.git] / sessions.php

diff --git a/sessions.php b/sessions.php
index c2854e04a4d28295ea3a0ef2120c22a93914c51f..2ad5a57fca012dcba98d9617f668244c714d3147 100644 (file)
--- a/sessions.php
+++ b/sessions.php
@@ -12,7 +12,7 @@
        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;
                
@@ -21,11 +21,11 @@
                return true;
        }
 
-       function read ($id){
+       function ttrss_read ($id){
        
                global $session_connection,$session_read;                                        
 
-               $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);
                
@@ -38,7 +38,7 @@
                }
        }
 
-       function write ($id, $data) {
+       function ttrss_write ($id, $data) {
  
                if (! $data) { 
                        return false; 
@@ -52,7 +52,7 @@
                
                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)
                                        VALUES ('$id', '$data', '$expire')";
@@ -62,7 +62,7 @@
                return true;
        }
 
-       function close () {
+       function ttrss_close () {
        
                global $session_connection;
                
@@ -71,18 +71,18 @@
                return true;
        }
 
-       function destroy ($id) {
+       function ttrss_destroy ($id) {
        
                global $session_connection;
 
-               $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;
                
@@ -92,10 +92,12 @@
        }
 
        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_REMEMBER);
+       session_set_cookie_params(SESSION_COOKIE_LIFETIME);
 
        session_start();
 ?>