diff options
| author | Andrew Dolgov <[email protected]> | 2021-11-10 20:44:51 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2021-11-10 20:44:51 +0300 |
| commit | 9e8d69739f21e5ac85977d57a2a6c961e318c26e (patch) | |
| tree | 0fc52f7be644b5f86e236cc7cb8f4dc4351da8f9 /classes/rpc.php | |
| parent | 7a52560e4e3b0652d32645b60ae13e4904f606bc (diff) | |
add two helper account access levels:
- read only - can't subscribe to more feeds, feed updates are skipped
- disabled - can't login
define used access levels as UserHelper constants and refactor code to
use them instead of hardcoded numbers
Diffstat (limited to 'classes/rpc.php')
| -rwxr-xr-x | classes/rpc.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/classes/rpc.php b/classes/rpc.php index b6c4a5fc9..0432ed2d3 100755 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -299,7 +299,8 @@ class RPC extends Handler_Protected { ttrss_feeds f, ttrss_users u LEFT JOIN ttrss_user_prefs2 p ON (p.owner_uid = u.id AND profile IS NULL AND pref_name = 'DEFAULT_UPDATE_INTERVAL') WHERE - f.owner_uid = u.id + f.owner_uid = u.id AND + u.access_level NOT IN (".sprintf("%d, %d", UserHelper::ACCESS_LEVEL_DISABLED, UserHelper::ACCESS_LEVEL_READONLY).") $owner_check_qpart $update_limit_qpart $updstart_thresh_qpart @@ -403,7 +404,7 @@ class RPC extends Handler_Protected { $git_timestamp = $version["timestamp"] ?? false; $git_commit = $version["commit"] ?? false; - if (Config::get(Config::CHECK_FOR_UPDATES) && $_SESSION["access_level"] >= 10 && $git_timestamp) { + if (Config::get(Config::CHECK_FOR_UPDATES) && $_SESSION["access_level"] >= UserHelper::ACCESS_LEVEL_ADMIN && $git_timestamp) { $content = @UrlHelper::fetch(["url" => "https://tt-rss.org/version.json"]); if ($content) { @@ -510,7 +511,7 @@ class RPC extends Handler_Protected { $data['cdm_expanded'] = get_pref(Prefs::CDM_EXPANDED); $data["labels"] = Labels::get_all($_SESSION["uid"]); - if (Config::get(Config::LOG_DESTINATION) == 'sql' && $_SESSION['access_level'] >= 10) { + if (Config::get(Config::LOG_DESTINATION) == 'sql' && $_SESSION['access_level'] >= UserHelper::ACCESS_LEVEL_ADMIN) { if (Config::get(Config::DB_TYPE) == 'pgsql') { $log_interval = "created_at > NOW() - interval '1 hour'"; } else { |