Improve system/user types for extensions

- system extensions can only be managed by an administrator
- system extensions are loaded for all users (even if not logged)
- user extensions are loaded for logged users only
- system extensions loading is saved in global config.php file

See https://github.com/FreshRSS/FreshRSS/issues/252

3 files changed, 37 insertions, 17 deletions

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 415f489a6..e348d9f31 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -52,16 +52,23 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				Minz_Request::bad('feedback.extension.already_enabled', $url_redirect);
 			}
 
-			if ($ext->getType() === 'system' && !FreshRSS_Auth::hasAccess('admin')) {
-				Minz_Request::bad('feedback.extension.no_access', $url_redirect);
-			}
+			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
+				$ext->install();
+
+				Minz_Configuration::addExtension($ext_name);
+				Minz_Configuration::writeFile();
 
-			$ext->install();
+				Minz_Request::good('feedback.extension.enabled', $url_redirect);
+			} elseif ($ext->getType() === 'user') {
+				$ext->install();
 
-			FreshRSS_Context::$conf->addExtension($ext_name);
-			FreshRSS_Context::$conf->save();
+				FreshRSS_Context::$conf->addExtension($ext_name);
+				FreshRSS_Context::$conf->save();
 
-			Minz_Request::good('feedback.extension.enabled', $url_redirect);
+				Minz_Request::good('feedback.extension.enabled', $url_redirect);
+			} else {
+				Minz_Request::bad('feedback.extension.no_access', $url_redirect);
+			}
 		}
 
 		Minz_Request::forward($url_redirect, true);
@@ -90,16 +97,23 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				Minz_Request::bad('feedback.extension.not_enabled', $url_redirect);
 			}
 
-			if ($ext->getType() === 'system' && !FreshRSS_Auth::hasAccess('admin')) {
-				Minz_Request::bad('feedback.extension.no_access', $url_redirect);
-			}
+			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
+				$ext->uninstall();
+
+				Minz_Configuration::removeExtension($ext_name);
+				Minz_Configuration::writeFile();
 
-			$ext->uninstall();
+				Minz_Request::good('feedback.extension.disabled', $url_redirect);
+			} elseif ($ext->getType() === 'user') {
+				$ext->uninstall();
 
-			FreshRSS_Context::$conf->removeExtension($ext_name);
-			FreshRSS_Context::$conf->save();
+				FreshRSS_Context::$conf->removeExtension($ext_name);
+				FreshRSS_Context::$conf->save();
 
-			Minz_Request::good('feedback.extension.disabled', $url_redirect);
+				Minz_Request::good('feedback.extension.disabled', $url_redirect);
+			} else {
+				Minz_Request::bad('feedback.extension.no_access', $url_redirect);
+			}
 		}
 
 		Minz_Request::forward($url_redirect, true);
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index dc7d0b375..b91dfcc46 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -29,9 +29,11 @@ class FreshRSS extends Minz_FrontController {
 		// Load context and configuration.
 		FreshRSS_Context::init();
 
-		// Enable extensions for the current user.
-		$ext_list = FreshRSS_Context::$conf->extensions_enabled;
-		Minz_ExtensionManager::enable_by_list($ext_list);
+		// Enable extensions for the current (logged) user.
+		if (FreshRSS_Auth::hasAccess()) {
+			$ext_list = FreshRSS_Context::$conf->extensions_enabled;
+			Minz_ExtensionManager::enable_by_list($ext_list);
+		}
 
 		// Init i18n.
 		Minz_Session::_param('language', FreshRSS_Context::$conf->language);
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index c6b7c84a1..0be03d7b5 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -10,6 +10,7 @@
 	<?php foreach ($this->extension_list as $ext) { ?>
 	<ul class="horizontal-list">
 		<li class="item">
+			<?php if ($ext->getType() === 'user' || FreshRSS_Auth::hasAccess('admin')) { ?>
 			<?php $name_encoded = urlencode($ext->getName()); ?>
 			<div class="stick">
 				<a class="btn open-slider" href="<?php echo _url('extension', 'configure', 'e', $name_encoded); ?>"><?php echo _i('configure'); ?> <?php echo _t('admin.extensions.manage'); ?></a>
@@ -22,6 +23,9 @@
 				<button class="btn btn-attention confirm" form="form-extension" formaction="<?php echo _url('extension', 'remove', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.remove'); ?></button>
 				<?php } ?>
 			</div>
+			<?php } else { ?>
+			<?php echo _t('admin.extensions.system'); ?>
+			<?php } ?>
 		</li>
 		<li class="item"><?php echo $ext->getName(); ?></li>
 	</ul>