From e4107ac9520ca404d4ab49ef79ca74430e8fd772 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 22 Feb 2021 21:47:48 +0300 Subject: wip: initial for config object --- include/sessions.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include/sessions.php') diff --git a/include/sessions.php b/include/sessions.php index 5b372612b..d2fbc6a41 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -5,10 +5,11 @@ require_once "config.php"; require_once "autoload.php"; + require_once "functions.php"; require_once "errorhandler.php"; require_once "lib/gettext/gettext.inc.php"; - $session_expire = min(2147483647 - time() - 1, max(SESSION_COOKIE_LIFETIME, 86400)); + $session_expire = min(2147483647 - time() - 1, max(\Config::get(\Config::SESSION_COOKIE_LIFETIME), 86400)); $session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME; if (is_server_https()) { @@ -37,7 +38,7 @@ } function validate_session() { - if (SINGLE_USER_MODE) return true; + if (\Config::get(\Config::SINGLE_USER_MODE)) return true; if (isset($_SESSION["ref_schema_version"]) && $_SESSION["ref_schema_version"] != session_get_schema_version()) { $_SESSION["login_error_msg"] = @@ -144,7 +145,7 @@ return true; } - if (!SINGLE_USER_MODE /* && DB_TYPE == "pgsql" */) { + if (!\Config::get(\Config::SINGLE_USER_MODE)) { session_set_save_handler('\Sessions\ttrss_open', '\Sessions\ttrss_close', '\Sessions\ttrss_read', '\Sessions\ttrss_write', '\Sessions\ttrss_destroy', -- cgit v1.2.3 From 12bcf826e4f2672afbda85264a970fb4735d97f1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 22 Feb 2021 22:39:20 +0300 Subject: don't include config.php everywhere --- include/sessions.php | 1 - 1 file changed, 1 deletion(-) (limited to 'include/sessions.php') diff --git a/include/sessions.php b/include/sessions.php index d2fbc6a41..8b7de0ac7 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -3,7 +3,6 @@ // Original from http://www.daniweb.com/code/snippet43.html - require_once "config.php"; require_once "autoload.php"; require_once "functions.php"; require_once "errorhandler.php"; -- cgit v1.2.3