valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into master

This commit is contained in:
kdan 2021-05-12 04:43:04 +03:00
parent 2ccf0e50a2 f423874e05
commit 6c06a26649
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/config.php
View File

@ -484,7 +484,8 @@ class Config {
array_push($errors, "Data export cache is not writable (chmod -R 777 ".self::get(Config::CACHE_DIR)."/export)"); array_push($errors, "Data export cache is not writable (chmod -R 777 ".self::get(Config::CACHE_DIR)."/export)");
} }
if (self::get(Config::SINGLE_USER_MODE) && class_exists("PDO")) { // ttrss_users won't be there on initial startup (before migrations are done)
if (!Config::is_migration_needed() && self::get(Config::SINGLE_USER_MODE)) {
if (UserHelper::get_login_by_id(1) != "admin") { if (UserHelper::get_login_by_id(1) != "admin") {
array_push($errors, "SINGLE_USER_MODE is enabled but default admin account (ID: 1) is not found."); array_push($errors, "SINGLE_USER_MODE is enabled but default admin account (ID: 1) is not found.");
} }

2
classes/userhelper.php
View File

@ -75,7 +75,7 @@ class UserHelper {
$_SESSION["auth_module"] = false; $_SESSION["auth_module"] = false;
if (!$_SESSION["csrf_token"]) if (empty($_SESSION["csrf_token"]))
$_SESSION["csrf_token"] = bin2hex(get_random_bytes(16)); $_SESSION["csrf_token"] = bin2hex(get_random_bytes(16));
$_SESSION["ip_address"] = UserHelper::get_user_ip(); $_SESSION["ip_address"] = UserHelper::get_user_ip();

2
include/sessions.php
View File

@ -106,13 +106,11 @@
} }
if (\Config::get_schema_version() >= 0) { if (\Config::get_schema_version() >= 0) {
if (!\Config::get(\Config::SINGLE_USER_MODE)) {
session_set_save_handler('\Sessions\ttrss_open', session_set_save_handler('\Sessions\ttrss_open',
'\Sessions\ttrss_close', '\Sessions\ttrss_read', '\Sessions\ttrss_close', '\Sessions\ttrss_read',
'\Sessions\ttrss_write', '\Sessions\ttrss_destroy', '\Sessions\ttrss_write', '\Sessions\ttrss_destroy',
'\Sessions\ttrss_gc'); '\Sessions\ttrss_gc');
register_shutdown_function('session_write_close'); register_shutdown_function('session_write_close');
}
if (!defined('NO_SESSION_AUTOSTART')) { if (!defined('NO_SESSION_AUTOSTART')) {
if (isset($_COOKIE[session_name()])) { if (isset($_COOKIE[session_name()])) {