diff options
author | Andrew Dolgov <[email protected]> | 2021-02-25 14:49:58 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2021-02-25 14:49:58 +0300 |
commit | c96172fa044d847fee237d966a6e75f8be5afa4d (patch) | |
tree | cdd79fdea548ab41b642fca12be7634ad8d25d2d /classes/pref | |
parent | 5aa05c90e1b979a2dd8985c10a541243e9415c39 (diff) |
use constants in get_pref()/set_pref()
Diffstat (limited to 'classes/pref')
-rwxr-xr-x | classes/pref/feeds.php | 24 | ||||
-rwxr-xr-x | classes/pref/filters.php | 2 | ||||
-rw-r--r-- | classes/pref/prefs.php | 18 |
3 files changed, 25 insertions, 19 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 086c52697..3b4afab26 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -122,7 +122,7 @@ class Pref_Feeds extends Handler_Protected { $root['param'] = 0; $root['type'] = 'category'; - $enable_cats = get_pref('ENABLE_FEED_CATS'); + $enable_cats = get_pref(Prefs::ENABLE_FEED_CATS); if (clean($_REQUEST['mode'] ?? 0) == 2) { @@ -171,7 +171,7 @@ class Pref_Feeds extends Handler_Protected { ttrss_labels2 WHERE owner_uid = ? ORDER by caption"); $sth->execute([$_SESSION['uid']]); - if (get_pref('ENABLE_FEED_CATS')) { + if (get_pref(Prefs::ENABLE_FEED_CATS)) { $cat = $this->feedlist_init_cat(-2); } else { $cat['items'] = array(); @@ -527,11 +527,11 @@ class Pref_Feeds extends Handler_Protected { $row["icon"] = Feeds::_get_icon($feed_id); $local_update_intervals = $update_intervals; - $local_update_intervals[0] .= sprintf(" (%s)", $update_intervals[get_pref("DEFAULT_UPDATE_INTERVAL")]); + $local_update_intervals[0] .= sprintf(" (%s)", $update_intervals[get_pref(Prefs::DEFAULT_UPDATE_INTERVAL)]); if (Config::get(Config::FORCE_ARTICLE_PURGE) == 0) { $local_purge_intervals = $purge_intervals; - $default_purge_interval = get_pref("PURGE_OLD_DAYS"); + $default_purge_interval = get_pref(Prefs::PURGE_OLD_DAYS); if ($default_purge_interval > 0) $local_purge_intervals[0] .= " " . T_nsprintf('(%d day)', '(%d days)', $default_purge_interval, $default_purge_interval); @@ -546,7 +546,7 @@ class Pref_Feeds extends Handler_Protected { print json_encode([ "feed" => $row, "cats" => [ - "enabled" => get_pref('ENABLE_FEED_CATS'), + "enabled" => get_pref(Prefs::ENABLE_FEED_CATS), "select" => \Controls\select_feeds_cats("cat_id", $row["cat_id"]), ], "plugin_data" => $plugin_data, @@ -557,7 +557,7 @@ class Pref_Feeds extends Handler_Protected { ], "lang" => [ "enabled" => Config::get(Config::DB_TYPE) == "pgsql", - "default" => get_pref('DEFAULT_SEARCH_LANGUAGE'), + "default" => get_pref(Prefs::DEFAULT_SEARCH_LANGUAGE), "all" => $this::get_ts_languages(), ] ]); @@ -576,10 +576,10 @@ class Pref_Feeds extends Handler_Protected { $feed_ids = clean($_REQUEST["ids"]); $local_update_intervals = $update_intervals; - $local_update_intervals[0] .= sprintf(" (%s)", $update_intervals[get_pref("DEFAULT_UPDATE_INTERVAL")]); + $local_update_intervals[0] .= sprintf(" (%s)", $update_intervals[get_pref(Prefs::DEFAULT_UPDATE_INTERVAL)]); $local_purge_intervals = $purge_intervals; - $default_purge_interval = get_pref("PURGE_OLD_DAYS"); + $default_purge_interval = get_pref(Prefs::PURGE_OLD_DAYS); if ($default_purge_interval > 0) $local_purge_intervals[0] .= " " . T_sprintf("(%d days)", $default_purge_interval); @@ -604,7 +604,7 @@ class Pref_Feeds extends Handler_Protected { <div dojoType="dijit.layout.TabContainer" style="height : 450px"> <div dojoType="dijit.layout.ContentPane" title="<?= __('General') ?>"> <section> - <?php if (get_pref('ENABLE_FEED_CATS')) { ?> + <?php if (get_pref(Prefs::ENABLE_FEED_CATS)) { ?> <fieldset> <label><?= __('Place in category:') ?></label> <?= \Controls\select_feeds_cats("cat_id", null, ['disabled' => '1']) ?> @@ -830,7 +830,7 @@ class Pref_Feeds extends Handler_Protected { break; case "cat_id": - if (get_pref('ENABLE_FEED_CATS')) { + if (get_pref(Prefs::ENABLE_FEED_CATS)) { if ($cat_id) { $qpart = "cat_id = " . $this->pdo->quote($cat_id); } else { @@ -946,7 +946,7 @@ class Pref_Feeds extends Handler_Protected { </div> </div> - <?php if (get_pref('ENABLE_FEED_CATS')) { ?> + <?php if (get_pref(Prefs::ENABLE_FEED_CATS)) { ?> <div dojoType="fox.form.DropDownButton"> <span><?= __('Categories') ?></span> <div dojoType="dijit.Menu" style="display: none"> @@ -1237,7 +1237,7 @@ class Pref_Feeds extends Handler_Protected { function batchSubscribe() { print json_encode([ - "enable_cats" => (int)get_pref('ENABLE_FEED_CATS'), + "enable_cats" => (int)get_pref(Prefs::ENABLE_FEED_CATS), "cat_select" => \Controls\select_feeds_cats("cat") ]); } diff --git a/classes/pref/filters.php b/classes/pref/filters.php index fda4a6513..a6ea9f982 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -848,7 +848,7 @@ class Pref_Filters extends Handler_Protected { } } - if (get_pref('ENABLE_FEED_CATS')) { + if (get_pref(Prefs::ENABLE_FEED_CATS)) { if (!$root_id) $root_id = null; diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 625c5b661..c12dd289b 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -106,9 +106,15 @@ class Pref_Prefs extends Handler_Protected { Prefs::USER_CSS_THEME => array(__("Theme")) ]; - $this->pref_blacklist = [Prefs::ALLOW_DUPLICATE_POSTS, Prefs::REVERSE_HEADLINES, - Prefs::SORT_HEADLINES_BY_FEED_DATE, Prefs::DEFAULT_ARTICLE_LIMIT, - Prefs::FEEDS_SORT_BY_UNREAD, Prefs::USER_STYLESHEET]; + // hidden in the main prefs UI + $this->pref_blacklist = [ + Prefs::ALLOW_DUPLICATE_POSTS, + Prefs::REVERSE_HEADLINES, + Prefs::SORT_HEADLINES_BY_FEED_DATE, + Prefs::DEFAULT_ARTICLE_LIMIT, + Prefs::FEEDS_SORT_BY_UNREAD, + Prefs::USER_STYLESHEET + ]; } function changepassword() { @@ -830,7 +836,7 @@ class Pref_Prefs extends Handler_Protected { private function index_plugins_user() { $system_enabled = array_map("trim", explode(",", (string)Config::get(Config::PLUGINS))); - $user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS"))); + $user_enabled = array_map("trim", explode(",", get_pref(Prefs::_ENABLED_PLUGINS))); $tmppluginhost = new PluginHost(); $tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true); @@ -1131,7 +1137,7 @@ class Pref_Prefs extends Handler_Protected { else $plugins = ""; - set_pref("_ENABLED_PLUGINS", $plugins); + set_pref(Prefs::_ENABLED_PLUGINS, $plugins); } function clearplugindata() { @@ -1141,7 +1147,7 @@ class Pref_Prefs extends Handler_Protected { } function customizeCSS() { - $value = get_pref("USER_STYLESHEET"); + $value = get_pref(Prefs::USER_STYLESHEET); $value = str_replace("<br/>", "\n", $value); print json_encode(["value" => $value]); |