summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backend.php6
-rw-r--r--config.php-dist3
-rw-r--r--prefs.php2
3 files changed, 9 insertions, 2 deletions
diff --git a/backend.php b/backend.php
index fd2659996..93199e43e 100644
--- a/backend.php
+++ b/backend.php
@@ -272,7 +272,7 @@
print "</li></ul>";
}
- if (get_pref($link, 'ENABLE_LABELS')) {
+ if (GLOBAL_ENABLE_LABELS && get_pref($link, 'ENABLE_LABELS')) {
$result = db_query($link, "SELECT id,sql_exp,description FROM
ttrss_labels WHERE owner_uid = '$owner_uid' ORDER by description");
@@ -2203,6 +2203,10 @@
if ($op == "pref-labels") {
+ if (!GLOBAL_ENABLE_LABELS) {
+ return;
+ }
+
$subop = $_GET["subop"];
if ($subop == "test") {
diff --git a/config.php-dist b/config.php-dist
index 0686b9312..851beaeb0 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -45,4 +45,7 @@
// makes UI more responsive, but eats server memory.
// If you experience weird feedlist refresh bugs, disable this option.
+ define('GLOBAL_ENABLE_LABELS', true);
+ // Labels are a security risk, so this option can globally disable them for all users.
+
?>
diff --git a/prefs.php b/prefs.php
index 4be862d1e..8c0d29c31 100644
--- a/prefs.php
+++ b/prefs.php
@@ -83,7 +83,7 @@
onclick="selectTab('feedConfig')">
<input id="filterConfigTab" class="prefsTab" type="submit" value="Content Filtering"
onclick="selectTab('filterConfig')">
- <? if (get_pref($link, 'ENABLE_LABELS')) { ?>
+ <? if (GLOBAL_ENABLE_LABELS && get_pref($link, 'ENABLE_LABELS')) { ?>
<input id="labelConfigTab" class="prefsTab" type="submit" value="Label Editor"
onclick="selectTab('labelConfig')">
<? } ?>