From 168680976f9678e2769b77324e8a80527c16d287 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 2 Apr 2013 13:58:08 +0400 Subject: sessions: initialize connection on include, not in ttrss_open --- include/sessions.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/sessions.php b/include/sessions.php index dd1ca663d..4923a05b7 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -19,6 +19,10 @@ ini_set("session.use_only_cookies", true); ini_set("session.gc_maxlifetime", $session_expire); + global $session_connection; + + $session_connection = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); + function session_get_schema_version($link, $nocache = false) { global $schema_version; @@ -34,6 +38,7 @@ function validate_session($link) { if (SINGLE_USER_MODE) return true; + if (!$link) return false; $check_ip = $_SESSION['ip_address']; @@ -95,8 +100,6 @@ global $session_connection; - $session_connection = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - return true; } -- cgit v1.2.3 From c35b6d8e14fd930128cd70c7dc46bef9e1c39d9d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 2 Apr 2013 14:04:47 +0400 Subject: initialize session connection in ttrss_open but define session_connection in global context --- include/sessions.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/sessions.php b/include/sessions.php index 4923a05b7..539b81a06 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -21,8 +21,6 @@ global $session_connection; - $session_connection = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - function session_get_schema_version($link, $nocache = false) { global $schema_version; @@ -97,9 +95,10 @@ function ttrss_open ($s, $n) { - global $session_connection; + $session_connection = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); + return true; } -- cgit v1.2.3 From 8f2ad8e134e8d8110ec83ed4d14089549a63b5bb Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 2 Apr 2013 14:29:11 +0400 Subject: remove some old ?op syntax notation calls --- include/login_form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/login_form.php b/include/login_form.php index 4fc08261a..7ac7111c8 100644 --- a/include/login_form.php +++ b/include/login_form.php @@ -122,7 +122,7 @@ function init() { function fetchProfiles() { try { - var query = "?op=getProfiles&login=" + param_escape(document.forms["loginForm"].login.value); + var query = "op=getProfiles&login=" + param_escape(document.forms["loginForm"].login.value); if (query) { new Ajax.Request("public.php", { -- cgit v1.2.3