diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/colors.php | 5 | ||||
| -rw-r--r-- | include/functions.php | 2 | ||||
| -rw-r--r-- | include/sessions.php | 161 |
3 files changed, 15 insertions, 153 deletions
diff --git a/include/colors.php b/include/colors.php index 64e24f8f1..35b84b9de 100644 --- a/include/colors.php +++ b/include/colors.php @@ -156,10 +156,7 @@ function _resolve_htmlcolor(string $color): string { $color = strtolower($color); - if (isset($htmlcolors[$color])) - return $htmlcolors[$color]; - else - return $color; + return $htmlcolors[$color] ?? $color; } /** diff --git a/include/functions.php b/include/functions.php index 2d3dd6d1e..c32924743 100644 --- a/include/functions.php +++ b/include/functions.php @@ -352,7 +352,7 @@ } /** Convert values accepted by tt-rss as true/false to PHP booleans - * @see https://tt-rss.org/wiki/ApiReference#boolean-values + * @see https://tt-rss.org/ApiReference/#boolean-values * @param null|string $s null values are considered false * @return bool */ diff --git a/include/sessions.php b/include/sessions.php index abc99176f..586eab7d5 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -1,155 +1,20 @@ <?php - namespace Sessions; +namespace Sessions; - use UserHelper; +require_once 'autoload.php'; +require_once 'errorhandler.php'; - require_once "autoload.php"; - require_once "errorhandler.php"; - require_once "lib/gettext/gettext.inc.php"; +$sessions = new \Sessions; +$sessions->configure(); +$sessions->extend_session(); - $session_expire = min(2147483647 - time() - 1, max(\Config::get(\Config::SESSION_COOKIE_LIFETIME), 86400)); - $session_name = \Config::get(\Config::SESSION_NAME); +if (\Config::get_schema_version() >= 0) { + session_set_save_handler($sessions); - if (\Config::is_server_https()) { - ini_set("session.cookie_secure", "true"); - } - - ini_set("session.gc_probability", "75"); - ini_set("session.name", $session_name); - ini_set("session.use_only_cookies", "true"); - ini_set("session.gc_maxlifetime", $session_expire); - ini_set("session.cookie_lifetime", "0"); - - // prolong PHP session cookie - if (isset($_COOKIE[$session_name])) - setcookie($session_name, - $_COOKIE[$session_name], - time() + $session_expire, - ini_get("session.cookie_path"), - ini_get("session.cookie_domain"), - ini_get("session.cookie_secure"), - ini_get("session.cookie_httponly")); - - function validate_session(): bool { - if (\Config::get(\Config::SINGLE_USER_MODE)) return true; - - $pdo = \Db::pdo(); - - if (!empty($_SESSION["uid"])) { - $user = \ORM::for_table('ttrss_users')->find_one($_SESSION["uid"]); - - if ($user) { - if ($user->pwd_hash != $_SESSION["pwd_hash"]) { - $_SESSION["login_error_msg"] = __("Session failed to validate (password changed)"); - return false; - } - - if ($user->access_level == UserHelper::ACCESS_LEVEL_DISABLED) { - $_SESSION["login_error_msg"] = __("Session failed to validate (account is disabled)"); - return false; - } - - // default to true because there might not be any hooks and this is our last check - $hook_result = true; - - \PluginHost::getInstance()->chain_hooks_callback(\PluginHost::HOOK_VALIDATE_SESSION, - function ($result) use (&$hook_result) { - $hook_result = $result; - - if (!$result) { - return true; - } - }); - - return $hook_result; - - } else { - $_SESSION["login_error_msg"] = __("Session failed to validate (user not found)"); - return false; - } - } - - return true; - } - - function ttrss_open(string $savePath, string $sessionName): bool { - return true; - } - - function ttrss_read(string $id): string { - global $session_expire; - - $sth = \Db::pdo()->prepare("SELECT data FROM ttrss_sessions WHERE id=?"); - $sth->execute([$id]); - - if ($row = $sth->fetch()) { - return base64_decode($row["data"]); - - } else { - $expire = time() + $session_expire; - - $sth = \Db::pdo()->prepare("INSERT INTO ttrss_sessions (id, data, expire) - VALUES (?, '', ?)"); - $sth->execute([$id, $expire]); - - return ""; - - } - - } - - function ttrss_write(string $id, string $data): bool { - global $session_expire; - - $data = base64_encode($data); - $expire = time() + $session_expire; - - $sth = \Db::pdo()->prepare("SELECT id FROM ttrss_sessions WHERE id=?"); - $sth->execute([$id]); - - if ($sth->fetch()) { - $sth = \Db::pdo()->prepare("UPDATE ttrss_sessions SET data=?, expire=? WHERE id=?"); - $sth->execute([$data, $expire, $id]); - } else { - $sth = \Db::pdo()->prepare("INSERT INTO ttrss_sessions (id, data, expire) - VALUES (?, ?, ?)"); - $sth->execute([$id, $data, $expire]); - } - - return true; - } - - function ttrss_close(): bool { - return true; - } - - function ttrss_destroy(string $id): bool { - $sth = \Db::pdo()->prepare("DELETE FROM ttrss_sessions WHERE id = ?"); - $sth->execute([$id]); - - return true; - } - - function ttrss_gc(int $lifetime): bool { - \Db::pdo()->query("DELETE FROM ttrss_sessions WHERE expire < " . time()); - - return true; - } - - if (\Config::get_schema_version() >= 0) { - session_set_save_handler('\Sessions\ttrss_open', - '\Sessions\ttrss_close', '\Sessions\ttrss_read', - '\Sessions\ttrss_write', '\Sessions\ttrss_destroy', - '\Sessions\ttrss_gc'); // @phpstan-ignore-line - // PHPStan complains about '\Sessions\ttrss_gc' if its $lifetime param isn't marked as string, - // but the docs say it's an int. If it is actually a string it'll get coerced to an int. - - register_shutdown_function('session_write_close'); - - if (!defined('NO_SESSION_AUTOSTART')) { - if (isset($_COOKIE[session_name()])) { - if (session_status() != PHP_SESSION_ACTIVE) - session_start(); - } + if (!defined('NO_SESSION_AUTOSTART')) { + if (isset($_COOKIE[session_name()])) { + if (session_status() != PHP_SESSION_ACTIVE) + session_start(); } } +} |