diff options
| author | Andrew Dolgov <[email protected]> | 2021-02-23 08:34:37 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2021-02-23 08:34:37 +0300 |
| commit | 5229cc58b269bd04b2be7768107697063d95736e (patch) | |
| tree | 6520dfaf81ec8eb818c4b66f3f348024466c6e00 /include/sessions.php | |
| parent | 4ed91619ddefcaa2bf758361aaccf0844465228b (diff) | |
| parent | cae54dad564bc1372f0f6cc11101b6377caef9a9 (diff) | |
Merge branch 'wip-config-object'
Diffstat (limited to 'include/sessions.php')
| -rw-r--r-- | include/sessions.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sessions.php b/include/sessions.php index 5b372612b..8b7de0ac7 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -3,12 +3,12 @@ // 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"; 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 +37,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 +144,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', |