option GLOBAL_ENABLE_LABELS restricts labels globally

diff --git a/backend.php b/backend.php
index fd265999602b1ae5820a4a904f8dfc0698c276d2..93199e43e2118eff2936e3ba07d1aece00c39d79 100644 (file)
--- 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 0686b93127f09cd5863e850a06aff34ec57e0318..851beaeb0c2b182e13cd04e3946e859d68eb8e94 100644 (file)
--- 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 4be862d1eb77bfde2ef5b92cdf64bd245e49b26b..8c0d29c31bdf00850aa4da977110f94fd020dfca 100644 (file)
--- 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')">
                <? } ?>