clarify PLUGINS description, improve plugin CLI list

diff --git a/config.php-dist b/config.php-dist
index 52afdea1d4bbafd8020d19fd5901211fc729eef7..e6c917c31f72eb09136b3dfbb8e9706a50cc4099 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -172,9 +172,11 @@
        // after login, or content encoding errors, disable it.
 
        define('PLUGINS', 'note');
-       // Comma-separated list of plugins to load for all users. System plugins have to be specified
-       // here, user plugins may be loaded per-user using Preferences/Plugins.
-
+       // Comma-separated list of plugins to load automatically for all users. 
+       // System plugins have to be specified here.
+       // Users may enable other user plugins from Preferences/Plugins but may not
+       // disable plugins specified in this list.
+       
        define('FEEDBACK_URL', '');
        // Displays an URL for users to provide feedback or comments regarding
        // this instance of tt-rss. Can lead to a forum, contact email, etc.

diff --git a/update.php b/update.php
index 2e06565a42773bd6efa4442f079c43a64cb7e54b..0a18a00d9733b36b9ff22e68f2d8f968602363ba 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -261,12 +261,23 @@
        if (in_array("-list-plugins", $op)) {
                $tmppluginhost = new PluginHost($link);
                $tmppluginhost->load_all($tmppluginhost::KIND_ALL);
+               $enabled = array_map("trim", explode(",", PLUGINS));
+
+               echo "List of all available plugins:\n";
+
                foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
                        $about = $plugin->about();
 
-                       printf("%-60s - v%.2f (by %s)\n%s\n\n",
-                               $name, $about[0], $about[2], $about[1]);
+                       $status = $about[3] ? "system" : "user";
+
+                       if (in_array($name, $enabled)) $name .= "*";
+
+                       printf("%-50s %-10s v%.2f (by %s)\n%s\n\n",
+                               $name, $status, $about[0], $about[2], $about[1]);
                }
+
+               echo "Plugins marked by * are currently enabled for all users.\n";
+
        }
 
        $pluginhost->run_commands($op);