From 9fc60317eecba785b66011f04b9a5150296f2df6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 5 Dec 2014 14:17:02 +0100
Subject: First draft for listing and manipulate extensions

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 43 +++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 app/Controllers/extensionController.php

(limited to 'app/Controllers/extensionController.php')

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
new file mode 100644
index 000000000..504be56d3
--- /dev/null
+++ b/app/Controllers/extensionController.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * The controller to manage extensions.
+ */
+class FreshRSS_extension_Controller extends Minz_ActionController {
+	/**
+	 * This action is called before every other action in that class. It is
+	 * the common boiler plate for every action. It is triggered by the
+	 * underlying framework.
+	 */
+	public function firstAction() {
+		if (!FreshRSS_Auth::hasAccess()) {
+			Minz_Error::error(403);
+		}
+	}
+
+	/**
+	 * This action lists all the extensions available to the current user.
+	 */
+	public function indexAction() {
+		Minz_View::prependTitle(_t('admin.extensions.title') . ' · ');
+		$this->view->extension_list = Minz_ExtensionManager::list_extensions();
+	}
+
+	public function configureAction() {
+		if (Minz_Request::param('ajax')) {
+			$this->view->_useLayout(false);
+		}
+	}
+
+	public function enableAction() {
+		
+	}
+
+	public function disableAction() {
+		
+	}
+
+	public function removeAction() {
+		
+	}
+}
-- 
cgit v1.2.3


From 2e4682ebd451f8dd291e11141553add9164cbbef Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 6 Dec 2014 16:17:11 +0100
Subject: Add enable / disable extension features

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 72 ++++++++++++++++++++++++++++++++-
 app/Models/Configuration.php            | 12 ++++++
 lib/Minz/ExtensionManager.php           | 18 +++++++--
 3 files changed, 97 insertions(+), 5 deletions(-)

(limited to 'app/Controllers/extensionController.php')

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 504be56d3..415f489a6 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -29,12 +29,80 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 		}
 	}
 
+	/**
+	 * This action enables a disabled extension for the current user.
+	 *
+	 * System extensions can only be enabled by an administrator.
+	 *
+	 * Parameter is:
+	 * - e: the extension name (urlencoded).
+	 */
 	public function enableAction() {
-		
+		$url_redirect = array('c' => 'extension', 'a' => 'index');
+
+		if (Minz_Request::isPost()) {
+			$ext_name = urldecode(Minz_Request::param('e'));
+			$ext = Minz_ExtensionManager::find_extension($ext_name);
+
+			if (is_null($ext)) {
+				Minz_Request::bad('feedback.extension.not_found', $url_redirect);
+			}
+
+			if ($ext->is_enabled()) {
+				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);
+			}
+
+			$ext->install();
+
+			FreshRSS_Context::$conf->addExtension($ext_name);
+			FreshRSS_Context::$conf->save();
+
+			Minz_Request::good('feedback.extension.enabled', $url_redirect);
+		}
+
+		Minz_Request::forward($url_redirect, true);
 	}
 
+	/**
+	 * This action disables an enabled extension for the current user.
+	 *
+	 * System extensions can only be disabled by an administrator.
+	 *
+	 * Parameter is:
+	 * - e: the extension name (urlencoded).
+	 */
 	public function disableAction() {
-		
+		$url_redirect = array('c' => 'extension', 'a' => 'index');
+
+		if (Minz_Request::isPost()) {
+			$ext_name = urldecode(Minz_Request::param('e'));
+			$ext = Minz_ExtensionManager::find_extension($ext_name);
+
+			if (is_null($ext)) {
+				Minz_Request::bad('feedback.extension.not_found', $url_redirect);
+			}
+
+			if (!$ext->is_enabled()) {
+				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);
+			}
+
+			$ext->uninstall();
+
+			FreshRSS_Context::$conf->removeExtension($ext_name);
+			FreshRSS_Context::$conf->save();
+
+			Minz_Request::good('feedback.extension.disabled', $url_redirect);
+		}
+
+		Minz_Request::forward($url_redirect, true);
 	}
 
 	public function removeAction() {
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 13ce43990..83a00d4bb 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -350,4 +350,16 @@ class FreshRSS_Configuration {
 		}
 		$this->data['extensions_enabled'] = $value;
 	}
+	public function removeExtension($ext_name) {
+		$this->data['extensions_enabled'] = array_diff(
+			$this->data['extensions_enabled'],
+			array($ext_name)
+		);
+	}
+	public function addExtension($ext_name) {
+		$found = array_search($ext_name, $this->data['extensions_enabled']) !== false;
+		if (!$found) {
+			$this->data['extensions_enabled'][] = $ext_name;
+		}
+	}
 }
diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php
index 6c32ccf19..46e421bac 100644
--- a/lib/Minz/ExtensionManager.php
+++ b/lib/Minz/ExtensionManager.php
@@ -160,10 +160,8 @@ class Minz_ExtensionManager {
 		}
 	}
 
-
-
 	/**
-	 * Returns a list of extensions.
+	 * Return a list of extensions.
 	 *
 	 * @param $only_enabled if true returns only the enabled extensions (false by default).
 	 * @return an array of extensions.
@@ -175,4 +173,18 @@ class Minz_ExtensionManager {
 			return self::$ext_list;
 		}
 	}
+
+	/**
+	 * Return an extension by its name.
+	 *
+	 * @param $ext_name the name of the extension.
+	 * @return the corresponding extension or null if it doesn't exist.
+	 */
+	public static function find_extension($ext_name) {
+		if (!isset(self::$ext_list[$ext_name])) {
+			return null;
+		}
+
+		return self::$ext_list[$ext_name];
+	}
 }
-- 
cgit v1.2.3


From 4c888590e6f0fd89fc1dccebb5e815883eeaa54c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 6 Dec 2014 16:39:10 +0100
Subject: 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
---
 app/Controllers/extensionController.php | 42 ++++++++++++++++++++++-----------
 app/FreshRSS.php                        |  8 ++++---
 app/views/extension/index.phtml         |  4 ++++
 lib/Minz/Configuration.php              | 19 +++++++++++++--
 4 files changed, 54 insertions(+), 19 deletions(-)

(limited to 'app/Controllers/extensionController.php')

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>
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 4d3ab0964..4a3221ef5 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -165,6 +165,19 @@ class Minz_Configuration {
 		self::$unsafe_autologin_enabled = (bool)$value;
 	}
 
+	public function removeExtension($ext_name) {
+		self::$extensions_enabled = array_diff(
+			self::$extensions_enabled,
+			array($ext_name)
+		);
+	}
+	public function addExtension($ext_name) {
+		$found = array_search($ext_name, self::$extensions_enabled) !== false;
+		if (!$found) {
+			self::$extensions_enabled[] = $ext_name;
+		}
+	}
+
 	/**
 	 * Initialise les variables de configuration
 	 * @exception Minz_FileNotExistException si le CONF_PATH_NAME n'existe pas
@@ -197,6 +210,7 @@ class Minz_Configuration {
 			),
 			'limits' => self::$limits,
 			'db' => self::$db,
+			'extensions_enabled' => self::$extensions_enabled,
 		);
 		@rename(DATA_PATH . self::CONF_PATH_NAME, DATA_PATH . self::CONF_PATH_NAME . '.bak.php');
 		$result = file_put_contents(DATA_PATH . self::CONF_PATH_NAME, "<?php\n return " . var_export($ini_array, true) . ';');
@@ -344,8 +358,9 @@ class Minz_Configuration {
 		}
 
 		// Extensions
-		if (isset($ini_array['extensions']) && is_array($ini_array['extensions'])) {
-			self::$extensions_enabled = $ini_array['extensions'];
+		if (isset($ini_array['extensions_enabled']) &&
+				is_array($ini_array['extensions_enabled'])) {
+			self::$extensions_enabled = $ini_array['extensions_enabled'];
 		}
 
 		// Base de données
-- 
cgit v1.2.3


From 9d66462c1d7e901cebb9c0b43e4203607045fdf3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 6 Dec 2014 16:48:13 +0100
Subject: Fix typo (extensions)

- change feedback.extension into feedback.extensions
- disable button is pushed by default

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 20 ++++++++++----------
 app/views/extension/index.phtml         |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'app/Controllers/extensionController.php')

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index e348d9f31..543398b05 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -45,11 +45,11 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 			$ext = Minz_ExtensionManager::find_extension($ext_name);
 
 			if (is_null($ext)) {
-				Minz_Request::bad('feedback.extension.not_found', $url_redirect);
+				Minz_Request::bad('feedback.extensions.not_found', $url_redirect);
 			}
 
 			if ($ext->is_enabled()) {
-				Minz_Request::bad('feedback.extension.already_enabled', $url_redirect);
+				Minz_Request::bad('feedback.extensions.already_enabled', $url_redirect);
 			}
 
 			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
@@ -58,16 +58,16 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				Minz_Configuration::addExtension($ext_name);
 				Minz_Configuration::writeFile();
 
-				Minz_Request::good('feedback.extension.enabled', $url_redirect);
+				Minz_Request::good('feedback.extensions.enabled', $url_redirect);
 			} elseif ($ext->getType() === 'user') {
 				$ext->install();
 
 				FreshRSS_Context::$conf->addExtension($ext_name);
 				FreshRSS_Context::$conf->save();
 
-				Minz_Request::good('feedback.extension.enabled', $url_redirect);
+				Minz_Request::good('feedback.extensions.enabled', $url_redirect);
 			} else {
-				Minz_Request::bad('feedback.extension.no_access', $url_redirect);
+				Minz_Request::bad('feedback.extensions.no_access', $url_redirect);
 			}
 		}
 
@@ -90,11 +90,11 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 			$ext = Minz_ExtensionManager::find_extension($ext_name);
 
 			if (is_null($ext)) {
-				Minz_Request::bad('feedback.extension.not_found', $url_redirect);
+				Minz_Request::bad('feedback.extensions.not_found', $url_redirect);
 			}
 
 			if (!$ext->is_enabled()) {
-				Minz_Request::bad('feedback.extension.not_enabled', $url_redirect);
+				Minz_Request::bad('feedback.extensions.not_enabled', $url_redirect);
 			}
 
 			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
@@ -103,16 +103,16 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				Minz_Configuration::removeExtension($ext_name);
 				Minz_Configuration::writeFile();
 
-				Minz_Request::good('feedback.extension.disabled', $url_redirect);
+				Minz_Request::good('feedback.extensions.disabled', $url_redirect);
 			} elseif ($ext->getType() === 'user') {
 				$ext->uninstall();
 
 				FreshRSS_Context::$conf->removeExtension($ext_name);
 				FreshRSS_Context::$conf->save();
 
-				Minz_Request::good('feedback.extension.disabled', $url_redirect);
+				Minz_Request::good('feedback.extensions.disabled', $url_redirect);
 			} else {
-				Minz_Request::bad('feedback.extension.no_access', $url_redirect);
+				Minz_Request::bad('feedback.extensions.no_access', $url_redirect);
 			}
 		}
 
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index 0be03d7b5..142ee4bc2 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -15,7 +15,7 @@
 			<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>
 				<?php if ($ext->is_enabled()) { ?>
-				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.disable'); ?></button>
+				<button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.disable'); ?></button>
 				<?php } else { ?>
 				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.enable'); ?></button>
 				<?php } ?>
-- 
cgit v1.2.3


From 2da7c05fa6768b95a5cd0bd1c8f9934bbff05a03 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 6 Dec 2014 17:15:20 +0100
Subject: Update i18n (extensions)

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 30 ++++++++++++++++++++----------
 app/i18n/en/admin.php                   |  5 +++++
 app/i18n/en/feedback.php                |  8 ++++++++
 app/i18n/en/gen.php                     |  7 +++++++
 app/i18n/fr/admin.php                   |  5 +++++
 app/i18n/fr/feedback.php                |  8 ++++++++
 app/i18n/fr/gen.php                     |  7 +++++++
 app/views/extension/index.phtml         |  8 ++++----
 8 files changed, 64 insertions(+), 14 deletions(-)

(limited to 'app/Controllers/extensionController.php')

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 543398b05..35b001094 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -45,11 +45,13 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 			$ext = Minz_ExtensionManager::find_extension($ext_name);
 
 			if (is_null($ext)) {
-				Minz_Request::bad('feedback.extensions.not_found', $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
+				                  $url_redirect);
 			}
 
 			if ($ext->is_enabled()) {
-				Minz_Request::bad('feedback.extensions.already_enabled', $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.already_enabled', $ext_name),
+				                  $url_redirect);
 			}
 
 			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
@@ -58,16 +60,19 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				Minz_Configuration::addExtension($ext_name);
 				Minz_Configuration::writeFile();
 
-				Minz_Request::good('feedback.extensions.enabled', $url_redirect);
+				Minz_Request::good(_t('feedback.extensions.enabled', $ext_name),
+				                  $url_redirect);
 			} elseif ($ext->getType() === 'user') {
 				$ext->install();
 
 				FreshRSS_Context::$conf->addExtension($ext_name);
 				FreshRSS_Context::$conf->save();
 
-				Minz_Request::good('feedback.extensions.enabled', $url_redirect);
+				Minz_Request::good(_t('feedback.extensions.enabled', $ext_name),
+				                  $url_redirect);
 			} else {
-				Minz_Request::bad('feedback.extensions.no_access', $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.no_access', $ext_name),
+				                  $url_redirect);
 			}
 		}
 
@@ -90,11 +95,13 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 			$ext = Minz_ExtensionManager::find_extension($ext_name);
 
 			if (is_null($ext)) {
-				Minz_Request::bad('feedback.extensions.not_found', $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
+				                  $url_redirect);
 			}
 
 			if (!$ext->is_enabled()) {
-				Minz_Request::bad('feedback.extensions.not_enabled', $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.not_enabled', $ext_name),
+				                  $url_redirect);
 			}
 
 			if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
@@ -103,16 +110,19 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				Minz_Configuration::removeExtension($ext_name);
 				Minz_Configuration::writeFile();
 
-				Minz_Request::good('feedback.extensions.disabled', $url_redirect);
+				Minz_Request::good(_t('feedback.extensions.disabled', $ext_name),
+				                  $url_redirect);
 			} elseif ($ext->getType() === 'user') {
 				$ext->uninstall();
 
 				FreshRSS_Context::$conf->removeExtension($ext_name);
 				FreshRSS_Context::$conf->save();
 
-				Minz_Request::good('feedback.extensions.disabled', $url_redirect);
+				Minz_Request::good(_t('feedback.extensions.disabled', $ext_name),
+				                  $url_redirect);
 			} else {
-				Minz_Request::bad('feedback.extensions.no_access', $url_redirect);
+				Minz_Request::bad(_t('feedback.extensions.no_access', $ext_name),
+				                  $url_redirect);
 			}
 		}
 
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 74f01ae06..d73775d96 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -86,6 +86,11 @@ return array(
 			'ok' => 'You have ZIP extension.',
 		),
 	),
+	'extensions' => array(
+		'empty_list' => 'There is no installed extension',
+		'system' => 'System extension (you have no rights on it)',
+		'title' => 'Extensions',
+	),
 	'users' => array(
 		'articles_and_size' => '%s articles (%s)',
 	),
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index b3866f1dc..df1dc5725 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -1,6 +1,14 @@
 <?php
 
 return array(
+	'extensions' => array(
+		'already_enabled' => '%s is already enabled',
+		'disabled' => '%s is now disabled',
+		'enabled' => '%s is now enabled',
+		'no_access' => 'You have no access on %s',
+		'not_enabled' => '%s is not enabled yet',
+		'not_found' => '%s does not exist',
+	),
 	'login' => array(
 		'error' => 'Login is invalid',
 		'success' => 'You are connected',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 9e06357bc..ba5f0c86d 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -190,10 +190,17 @@ return array(
 	'freshrss_installation' => 'Installation · FreshRSS',
 	'fri' => 'Fri',
 	'g+' => 'Google+',
+	'actions' => array(
+		'disable' => 'Disable',
+		'enable' => 'Enable',
+		'manage' => 'Manage',
+		'remove' => 'Remove',
+	),
 	'menu' => array(
 		'admin' => 'Administration',
 		'authentication' => 'Authentication',
 		'check_install' => 'Installation checking',
+		'extensions' => 'Extensions',
 		'user_management' => 'Manage users',
 		'user_profile' => 'Profile',
 	),
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index ad1fae6c0..e46a5a7b0 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -86,6 +86,11 @@ return array(
 			'ok' => 'Vous disposez de l\'extension ZIP.',
 		),
 	),
+	'extensions' => array(
+		'empty_list' => 'Il n’y a aucune extension installée.',
+		'system' => 'Extension système (vous n’avez aucun droit dessus)',
+		'title' => 'Extensions',
+	),
 	'users' => array(
 		'articles_and_size' => '%s articles (%s)',
 	),
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index f4bb7cccf..7d3ab9db7 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -1,6 +1,14 @@
 <?php
 
 return array(
+	'extensions' => array(
+		'already_enabled' => '%s est déjà activée',
+		'disabled' => '%s est désormais désactivée',
+		'enabled' => '%s est désormais activée',
+		'no_access' => 'Vous n’avez aucun accès sur %s',
+		'not_enabled' => '%s n’est pas encore activée',
+		'not_found' => '%s n’existe pas',
+	),
 	'login' => array(
 		'error' => 'L’identifiant est invalide !',
 		'success' => 'Vous êtes désormais connecté',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 0b2395bd0..44d8fb837 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -191,10 +191,17 @@ return array(
 	'freshrss_installation' => 'Installation · FreshRSS',
 	'fri' => 'ven.',
 	'g+' => 'Google+',
+	'actions' => array(
+		'disable' => 'Désactiver',
+		'enable' => 'Activer',
+		'manage' => 'Gérer',
+		'remove' => 'Supprimer',
+	),
 	'menu' => array(
 		'admin' => 'Administration',
 		'authentication' => 'Authentification',
 		'check_install' => 'Vérification de l’installation',
+		'extensions' => 'Extensions',
 		'user_management' => 'Gestion des utilisateurs',
 		'user_profile' => 'Profil',
 	),
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index 142ee4bc2..d34a84452 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -13,14 +13,14 @@
 			<?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>
+				<a class="btn open-slider" href="<?php echo _url('extension', 'configure', 'e', $name_encoded); ?>"><?php echo _i('configure'); ?> <?php echo _t('gen.actions.manage'); ?></a>
 				<?php if ($ext->is_enabled()) { ?>
-				<button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.disable'); ?></button>
+				<button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('gen.actions.disable'); ?></button>
 				<?php } else { ?>
-				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.enable'); ?></button>
+				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('gen.actions.enable'); ?></button>
 				<?php } ?>
 				<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
-				<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>
+				<button class="btn btn-attention confirm" form="form-extension" formaction="<?php echo _url('extension', 'remove', 'e', $name_encoded); ?>"><?php echo _t('gen.actions.remove'); ?></button>
 				<?php } ?>
 			</div>
 			<?php } else { ?>
-- 
cgit v1.2.3


From bc81979a6b25554c4832d5ccb41b427023096463 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 6 Dec 2014 17:25:01 +0100
Subject: Add default behaviour for configure / remove ext

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php |  7 ++++++-
 app/views/extension/configure.phtml     | 12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 app/views/extension/configure.phtml

(limited to 'app/Controllers/extensionController.php')

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 35b001094..a1e39af37 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -130,6 +130,11 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 	}
 
 	public function removeAction() {
-		
+		if (!FreshRSS_Auth::hasAccess('admin')) {
+			Minz_Error::error(403);
+		}
+
+		$url_redirect = array('c' => 'extension', 'a' => 'index');
+		Minz_Request::bad('not implemented yet!', $url_redirect);
 	}
 }
diff --git a/app/views/extension/configure.phtml b/app/views/extension/configure.phtml
new file mode 100644
index 000000000..a79e9baac
--- /dev/null
+++ b/app/views/extension/configure.phtml
@@ -0,0 +1,12 @@
+<?php
+
+if (!Minz_Request::param('ajax')) {
+	$this->partial('aside_configure');
+}
+
+?>
+
+<div class="post">
+	<h1>Extension name</h1>
+	Not implemented yet!
+</div>
\ No newline at end of file
-- 
cgit v1.2.3


From c6dfec3ad351ee3b828c6a2c0a273bad5d9ac0df Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 8 Dec 2014 12:01:47 +0100
Subject: Add behaviour to configure action (extensions)

- Put extension configure view in dir_ext/configure.phtml
- Handle POST action in Extension->handleConfigureAction() method

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 16 ++++++++++++++++
 app/views/extension/configure.phtml     | 17 ++++++++++++++---
 lib/Minz/Extension.php                  | 21 +++++++++++++++++++++
 3 files changed, 51 insertions(+), 3 deletions(-)

(limited to 'app/Controllers/extensionController.php')

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index a1e39af37..73b8070cb 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -27,6 +27,22 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 		if (Minz_Request::param('ajax')) {
 			$this->view->_useLayout(false);
 		}
+
+		$ext_name = urldecode(Minz_Request::param('e'));
+		$ext = Minz_ExtensionManager::find_extension($ext_name);
+
+		if (is_null($ext)) {
+			Minz_Error::error(404);
+		}
+		if ($ext->getType() === 'system' && !FreshRSS_Auth::hasAccess('admin')) {
+			Minz_Error::error(403);
+		}
+
+		$this->view->extension = $ext;
+
+		if (Minz_Request::isPost()) {
+			$this->view->extension->handleConfigureAction();
+		}
 	}
 
 	/**
diff --git a/app/views/extension/configure.phtml b/app/views/extension/configure.phtml
index a79e9baac..295080d5e 100644
--- a/app/views/extension/configure.phtml
+++ b/app/views/extension/configure.phtml
@@ -7,6 +7,17 @@ if (!Minz_Request::param('ajax')) {
 ?>
 
 <div class="post">
-	<h1>Extension name</h1>
-	Not implemented yet!
-</div>
\ No newline at end of file
+	<h1><?php echo $this->extension->getName(); ?> (<?php echo $this->extension->getVersion(); ?>) — <?php echo $this->extension->getType(); ?></h1>
+
+	<p class="alert alert-warn"><?php echo $this->extension->getDescription(); ?> — <?php echo _t('gen.by'), ' ', $this->extension->getAuthor(); ?></p>
+
+	<h2><?php echo _t('gen.actions.manage'); ?></h2>
+	<?php
+		$configure_view = $this->extension->getConfigureView();
+		if ($configure_view !== false) {
+			echo $configure_view;
+		} else {
+	?>
+	<p class="alert alert-warn"><?php echo _t('admin.extensions.no_configure_view'); ?></p>
+	<?php } ?>
+</div>
diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index c93ba2520..1d706ed80 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -86,6 +86,27 @@ class Minz_Extension {
 		return $this->is_enabled;
 	}
 
+	/**
+	 * Return the content of the configure view for the current extension.
+	 *
+	 * @return the html content from ext_dir/configure.phtml, false if it does
+	 *         not exist.
+	 */
+	public function getConfigureView() {
+		$filename = $this->path . '/configure.phtml';
+		if (!file_exists($filename)) {
+			return false;
+		}
+		return @file_get_contents($filename);
+	}
+
+	/**
+	 * Handle the configure POST action.
+	 *
+	 * It must be redefined by child classes.
+	 */
+	public function handleConfigureAction() {}
+
 	/**
 	 * Getters and setters.
 	 */
-- 
cgit v1.2.3


From 0543f96a97fa860fdec38d61b117e6b5addf94b6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 8 Dec 2014 13:22:11 +0100
Subject: Update comments for ExtensionController

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'app/Controllers/extensionController.php')

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 73b8070cb..cd56de9eb 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -23,6 +23,16 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 		$this->view->extension_list = Minz_ExtensionManager::list_extensions();
 	}
 
+	/**
+	 * This action handles configuration of a given extension.
+	 *
+	 * Only administrator can configure a system extension.
+	 *
+	 * Parameters are:
+	 * - e: the extension name (urlencoded)
+	 * - additional parameters which should be handle by the extension
+	 *   handleConfigureAction() method (POST request).
+	 */
 	public function configureAction() {
 		if (Minz_Request::param('ajax')) {
 			$this->view->_useLayout(false);
@@ -49,6 +59,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 	 * This action enables a disabled extension for the current user.
 	 *
 	 * System extensions can only be enabled by an administrator.
+	 * This action must be reached by a POST request.
 	 *
 	 * Parameter is:
 	 * - e: the extension name (urlencoded).
@@ -99,6 +110,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 	 * This action disables an enabled extension for the current user.
 	 *
 	 * System extensions can only be disabled by an administrator.
+	 * This action must be reached by a POST request.
 	 *
 	 * Parameter is:
 	 * - e: the extension name (urlencoded).
@@ -145,6 +157,15 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 		Minz_Request::forward($url_redirect, true);
 	}
 
+	/**
+	 * This action handles deletion of an extension.
+	 *
+	 * Only administrator can remove an extension.
+	 * This action must be reached by a POST request.
+	 *
+	 * Parameter is:
+	 * -e: extension name (urlencoded)
+	 */
 	public function removeAction() {
 		if (!FreshRSS_Auth::hasAccess('admin')) {
 			Minz_Error::error(403);
-- 
cgit v1.2.3


From 76358846abe2eba95668d66d3847cbdfe3f8bcdc Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 8 Dec 2014 13:36:08 +0100
Subject: Implement extension deletion

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 22 +++++++++++++++++++++-
 lib/lib_rss.php                         | 26 ++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

(limited to 'app/Controllers/extensionController.php')

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index cd56de9eb..adb3e1864 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -172,6 +172,26 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 		}
 
 		$url_redirect = array('c' => 'extension', 'a' => 'index');
-		Minz_Request::bad('not implemented yet!', $url_redirect);
+
+		if (Minz_Request::isPost()) {
+			$ext_name = urldecode(Minz_Request::param('e'));
+			$ext = Minz_ExtensionManager::find_extension($ext_name);
+
+			if (is_null($ext)) {
+				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
+				                  $url_redirect);
+			}
+
+			$res = recursive_unlink($ext->getPath());
+			if ($res) {
+				Minz_Request::good(_t('feedback.extensions.removed', $ext_name),
+				                  $url_redirect);
+			} else {
+				Minz_Request::bad(_t('feedback.extensions.cannot_delete', $ext_name),
+				                  $url_redirect);
+			}
+		}
+
+		Minz_Request::forward($url_redirect, true);
 	}
 }
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 8170c7fd9..e466bcb15 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -319,3 +319,29 @@ function check_install_database() {
 
 	return $status;
 }
+
+/**
+ * Remove a directory recursively.
+ *
+ * From http://php.net/rmdir#110489
+ *
+ * @param $dir the directory to remove
+ */
+function recursive_unlink($dir) {
+	if (!is_dir($dir)) {
+		return true;
+	}
+
+	$files = array_diff(scandir($dir), array('.', '..'));
+	foreach ($files as $filename) {
+		$filename = $dir . '/' . $filename;
+		if (is_dir($filename)) {
+			@chmod($filename, 0777);
+			recursive_unlink($filename);
+		} else {
+			unlink($filename);
+		}
+	}
+
+	return rmdir($dir);
+}
-- 
cgit v1.2.3


From 5bd7997d41d052420e2a4c164a4f60fe982760e2 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 8 Jan 2015 14:30:05 +0100
Subject: Call handleConfigureAction() even for GET requests

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/Controllers/extensionController.php | 5 +----
 lib/Minz/Extension.php                  | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'app/Controllers/extensionController.php')

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 3eedcd949..e013bb369 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -49,10 +49,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 		}
 
 		$this->view->extension = $ext;
-
-		if (Minz_Request::isPost()) {
-			$this->view->extension->handleConfigureAction();
-		}
+		$this->view->extension->handleConfigureAction();
 	}
 
 	/**
diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index a24c718c3..b3991c129 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -104,7 +104,7 @@ class Minz_Extension {
 	}
 
 	/**
-	 * Handle the configure POST action.
+	 * Handle the configure action.
 	 *
 	 * It must be redefined by child classes.
 	 */
-- 
cgit v1.2.3


From 806b4de54ffd1dd682ec7b42a5be8343a464e5f0 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 14 Jan 2015 21:38:35 +0100
Subject: Add mechanism at (un)install of an extension

Test if the install or uninstall has been successfully performed.
If these methods return true, all is ok but if a string is returned,
the string must explain the problem. This problem is stored in log file.

A feedback is given to explain to check log file.

This commit fix a problem in the english translation of
feedback.sub.feed.internal_problem.
---
 app/Controllers/extensionController.php | 40 +++++++++++++++++++++------------
 app/i18n/en/feedback.php                | 12 +++++++---
 app/i18n/fr/feedback.php                | 10 +++++++--
 lib/Minz/Extension.php                  | 14 ++++++++++--
 4 files changed, 55 insertions(+), 21 deletions(-)

(limited to 'app/Controllers/extensionController.php')

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index e013bb369..692595a4c 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -88,15 +88,21 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				                  $url_redirect);
 			}
 
-			$ext->install();
+			$res = $ext->install();
 
-			$ext_list = $conf->extensions_enabled;
-			array_push_unique($ext_list, $ext_name);
-			$conf->extensions_enabled = $ext_list;
-			$conf->save();
+			if ($res === true) {
+				$ext_list = $conf->extensions_enabled;
+				array_push_unique($ext_list, $ext_name);
+				$conf->extensions_enabled = $ext_list;
+				$conf->save();
 
-			Minz_Request::good(_t('feedback.extensions.enabled', $ext_name),
-			                  $url_redirect);
+				Minz_Request::good(_t('feedback.extensions.enable.ok', $ext_name),
+				                   $url_redirect);
+			} else {
+				Minz_Log::warning('Can not enable extension ' . $ext_name . ': ' . $res);
+				Minz_Request::bad(_t('feedback.extensions.enable.ko', $ext_name, _url('index', 'logs')),
+				                  $url_redirect);
+			}
 		}
 
 		Minz_Request::forward($url_redirect, true);
@@ -138,15 +144,21 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				                  $url_redirect);
 			}
 
-			$ext->uninstall();
+			$res = $ext->uninstall();
 
-			$ext_list = $conf->extensions_enabled;
-			array_remove($ext_list, $ext_name);
-			$conf->extensions_enabled = $ext_list;
-			$conf->save();
+			if ($res === true) {
+				$ext_list = $conf->extensions_enabled;
+				array_remove($ext_list, $ext_name);
+				$conf->extensions_enabled = $ext_list;
+				$conf->save();
 
-			Minz_Request::good(_t('feedback.extensions.disabled', $ext_name),
-			                  $url_redirect);
+				Minz_Request::good(_t('feedback.extensions.disable.ok', $ext_name),
+				                   $url_redirect);
+			} else {
+				Minz_Log::warning('Can not unable extension ' . $ext_name . ': ' . $res);
+				Minz_Request::bad(_t('feedback.extensions.disable.ko', $ext_name, _url('index', 'logs')),
+				                  $url_redirect);
+			}
 		}
 
 		Minz_Request::forward($url_redirect, true);
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index e9499ed46..19af81e5b 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -31,8 +31,14 @@ return array(
 	),
 	'extensions' => array(
 		'already_enabled' => '%s is already enabled',
-		'disabled' => '%s is now disabled',
-		'enabled' => '%s is now enabled',
+		'disable' => array(
+			'ko' => '%s cannot be disabled. <a href="%s">Check FressRSS logs</a> for details.',
+			'ok' => '%s is now disabled',
+		),
+		'enable' => array(
+			'ko' => '%s cannot be enabled. <a href="%s">Check FressRSS logs</a> for details.',
+			'ok' => '%s is now enabled',
+		),
 		'no_access' => 'You have no access on %s',
 		'not_enabled' => '%s is not enabled yet',
 		'not_found' => '%s does not exist',
@@ -67,7 +73,7 @@ return array(
 			'already_subscribed' => 'You have already subscribed to <em>%s</em>',
 			'deleted' => 'Feed has been deleted',
 			'error' => 'Feed cannot be updated',
-			'internal_problem_feed' => 'The RSS feed could not be added. <a href="%s">Check FressRSS logs</a> for details.',
+			'internal_problem' => 'The RSS feed could not be added. <a href="%s">Check FressRSS logs</a> for details.',
 			'invalid_url' => 'URL <em>%s</em> is invalid',
 			'marked_read' => 'Feeds have been marked as read',
 			'n_actualized' => '%d feeds have been updated',
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index c99314411..e2364a251 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -31,8 +31,14 @@ return array(
 	),
 	'extensions' => array(
 		'already_enabled' => '%s est déjà activée',
-		'disabled' => '%s est désormais désactivée',
-		'enabled' => '%s est désormais activée',
+		'disable' => array(
+			'ko' => '%s ne peut pas être désactivée. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails.',
+			'ok' => '%s est désormais désactivée',
+		),
+		'enable' => array(
+			'ko' => '%s ne peut pas être activée. <a href="%s">Consulter les logs de FreshRSS</a> pour plus de détails.',
+			'ok' => '%s est désormais activée',
+		),
 		'no_access' => 'Vous n’avez aucun accès sur %s',
 		'not_enabled' => '%s n’est pas encore activée',
 		'not_found' => '%s n’existe pas',
diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index b3991c129..ac7231e9c 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -51,16 +51,26 @@ class Minz_Extension {
 	 * Used when installing an extension (e.g. update the database scheme).
 	 *
 	 * It must be redefined by child classes.
+	 *
+	 * @return true if the extension has been installed or a string explaining
+	 *         the problem.
 	 */
-	public function install() {}
+	public function install() {
+		return true;
+	}
 
 	/**
 	 * Used when uninstalling an extension (e.g. revert the database scheme to
 	 * cancel changes from install).
 	 *
 	 * It must be redefined by child classes.
+	 *
+	 * @return true if the extension has been uninstalled or a string explaining
+	 *         the problem.
 	 */
-	public function uninstall() {}
+	public function uninstall() {
+		return true;
+	}
 
 	/**
 	 * Call at the initialization of the extension (i.e. when the extension is
-- 
cgit v1.2.3


From 89682886005f1e6b36e664f47b3b0862d62846e6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 14 Jan 2015 22:22:30 +0100
Subject: Fix extension API (coding style)

is_enabled() becomes isEnabled(). Sorry for this coding style mistake :s
---
 app/Controllers/extensionController.php | 4 ++--
 app/views/extension/index.phtml         | 2 +-
 lib/Minz/Extension.php                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/Controllers/extensionController.php')

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 692595a4c..5dd7eac89 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -73,7 +73,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				                  $url_redirect);
 			}
 
-			if ($ext->is_enabled()) {
+			if ($ext->isEnabled()) {
 				Minz_Request::bad(_t('feedback.extensions.already_enabled', $ext_name),
 				                  $url_redirect);
 			}
@@ -129,7 +129,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 				                  $url_redirect);
 			}
 
-			if (!$ext->is_enabled()) {
+			if (!$ext->isEnabled()) {
 				Minz_Request::bad(_t('feedback.extensions.not_enabled', $ext_name),
 				                  $url_redirect);
 			}
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index fd97c5e81..25b0eb9ee 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -14,7 +14,7 @@
 			<?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('gen.action.manage'); ?></a>
-				<?php if ($ext->is_enabled()) { ?>
+				<?php if ($ext->isEnabled()) { ?>
 				<button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('gen.action.disable'); ?></button>
 				<?php } else { ?>
 				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('gen.action.enable'); ?></button>
diff --git a/lib/Minz/Extension.php b/lib/Minz/Extension.php
index ac7231e9c..5069362b5 100644
--- a/lib/Minz/Extension.php
+++ b/lib/Minz/Extension.php
@@ -92,7 +92,7 @@ class Minz_Extension {
 	 *
 	 * @return true if extension is enabled, false else.
 	 */
-	public function is_enabled() {
+	public function isEnabled() {
 		return $this->is_enabled;
 	}
 
-- 
cgit v1.2.3


From 2f1116818d7d9a6ef413b2c06e9603ffceaf7867 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 14 Jan 2015 23:30:19 +0100
Subject: Fix extension interface

- Seperate user and system extensions on extension/index
- extension/configure shows index page with the slider opened
  if request is done with ajax
- Reorganize some extension view files
---
 app/Controllers/extensionController.php     | 13 ++++++-
 app/i18n/en/admin.php                       |  8 +++-
 app/i18n/fr/admin.php                       |  8 +++-
 app/views/extension/configure.phtml         | 22 +----------
 app/views/extension/index.phtml             | 57 ++++++++++++++++-------------
 app/views/helpers/extension/configure.phtml | 19 ++++++++++
 app/views/helpers/extension/details.phtml   | 21 +++++++++++
 7 files changed, 98 insertions(+), 50 deletions(-)
 create mode 100644 app/views/helpers/extension/configure.phtml
 create mode 100644 app/views/helpers/extension/details.phtml

(limited to 'app/Controllers/extensionController.php')

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 5dd7eac89..ec5eecadb 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -20,7 +20,15 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 	 */
 	public function indexAction() {
 		Minz_View::prependTitle(_t('admin.extensions.title') . ' · ');
-		$this->view->extension_list = Minz_ExtensionManager::list_extensions();
+		$this->view->extension_list = array(
+			'system' => array(),
+			'user' => array(),
+		);
+
+		$extensions = Minz_ExtensionManager::list_extensions();
+		foreach ($extensions as $ext) {
+			$this->view->extension_list[$ext->getType()][] = $ext;
+		}
 	}
 
 	/**
@@ -36,6 +44,9 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 	public function configureAction() {
 		if (Minz_Request::param('ajax')) {
 			$this->view->_useLayout(false);
+		} else {
+			$this->indexAction();
+			$this->view->change_view('extension', 'index');
 		}
 
 		$ext_name = urldecode(Minz_Request::param('e'));
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 3161683a8..947d0e6c7 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -103,10 +103,16 @@ return array(
 		),
 	),
 	'extensions' => array(
+		'disabled' => 'Disabled',
 		'empty_list' => 'There is no installed extension',
+		'enabled' => 'Enabled',
 		'no_configure_view' => 'This extension cannot be configured.',
-		'system' => 'System extension (you have no rights on it)',
+		'system' => array(
+			'_' => 'System extensions',
+			'no_rights' => 'System extension (you have no rights on it)',
+		),
 		'title' => 'Extensions',
+		'user' => 'User extensions',
 	),
 	'stats' => array(
 		'_' => 'Statistics',
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 3d69e4daf..980f1fccf 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -103,10 +103,16 @@ return array(
 		),
 	),
 	'extensions' => array(
+		'disabled' => 'Désactivée',
 		'empty_list' => 'Il n’y a aucune extension installée.',
+		'enabled' => 'Activée',
 		'no_configure_view' => 'Cette extension ne peut pas être configurée.',
-		'system' => 'Extension système (vous n’avez aucun droit dessus)',
+		'system' => array(
+			'_' => 'Extensions système',
+			'no_rights' => 'Extension système (vous n’avez aucun droit dessus)',
+		),
 		'title' => 'Extensions',
+		'user' => 'Extensions utilisateur',
 	),
 	'stats' => array(
 		'_' => 'Statistiques',
diff --git a/app/views/extension/configure.phtml b/app/views/extension/configure.phtml
index c03439a75..8933eeae5 100644
--- a/app/views/extension/configure.phtml
+++ b/app/views/extension/configure.phtml
@@ -1,23 +1,3 @@
 <?php
 
-if (!Minz_Request::param('ajax')) {
-	$this->partial('aside_configure');
-}
-
-?>
-
-<div class="post">
-	<h1><?php echo $this->extension->getName(); ?> (<?php echo $this->extension->getVersion(); ?>) — <?php echo $this->extension->getType(); ?></h1>
-
-	<p class="alert alert-warn"><?php echo $this->extension->getDescription(); ?> — <?php echo _t('gen.short.by_author', $this->extension->getAuthor()); ?></p>
-
-	<h2><?php echo _t('gen.action.manage'); ?></h2>
-	<?php
-		$configure_view = $this->extension->getConfigureView();
-		if ($configure_view !== false) {
-			echo $configure_view;
-		} else {
-	?>
-	<p class="alert alert-warn"><?php echo _t('admin.extensions.no_configure_view'); ?></p>
-	<?php } ?>
-</div>
+$this->renderHelper('extension/configure');
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index 25b0eb9ee..f2d05028f 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -5,35 +5,40 @@
 
 	<h1><?php echo _t('admin.extensions.title'); ?></h1>
 
-	<?php if (!empty($this->extension_list)) { ?>
 	<form id="form-extension" method="post" style="display: none"></form>
-	<?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('gen.action.manage'); ?></a>
-				<?php if ($ext->isEnabled()) { ?>
-				<button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('gen.action.disable'); ?></button>
-				<?php } else { ?>
-				<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('gen.action.enable'); ?></button>
-				<?php } ?>
-				<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
-				<button class="btn btn-attention confirm" form="form-extension" formaction="<?php echo _url('extension', 'remove', 'e', $name_encoded); ?>"><?php echo _t('gen.action.remove'); ?></button>
-				<?php } ?>
-			</div>
-			<?php } else { ?>
-			<?php echo _t('admin.extensions.system'); ?>
-			<?php } ?>
-		</li>
-		<li class="item"><?php echo $ext->getName(); ?></li>
-	</ul>
+	<?php if (!empty($this->extension_list['system'])) { ?>
+	<h2><?php echo _t('admin.extensions.system'); ?></h2>
+	<?php
+		foreach ($this->extension_list['system'] as $ext) {
+			$this->ext_details = $ext;
+			$this->renderHelper('extension/details');
+		}
+	?>
 	<?php } ?>
-	<?php } else { ?>
+
+	<?php if (!empty($this->extension_list['user'])) { ?>
+	<h2><?php echo _t('admin.extensions.user'); ?></h2>
+	<?php
+		foreach ($this->extension_list['user'] as $ext) {
+			$this->ext_details = $ext;
+			$this->renderHelper('extension/details');
+		}
+	?>
+	<?php
+		}
+
+		if (empty($this->extension_list['system']) && empty($this->extension_list['user'])) {
+	?>
 	<p class="alert alert-warn"><?php echo _t('admin.extensions.empty_list'); ?></p>
 	<?php } ?>
 </div>
 
-<a href="#" id="close-slider"></a>
-<div id="slider"></div>
+<?php $class = isset($this->extension) ? ' class="active"' : ''; ?>
+<a href="#" id="close-slider"<?php echo $class; ?>></a>
+<div id="slider"<?php echo $class; ?>>
+<?php
+	if (isset($this->extension)) {
+		$this->renderHelper('extension/configure');
+	}
+?>
+</div>
diff --git a/app/views/helpers/extension/configure.phtml b/app/views/helpers/extension/configure.phtml
new file mode 100644
index 000000000..95d968aba
--- /dev/null
+++ b/app/views/helpers/extension/configure.phtml
@@ -0,0 +1,19 @@
+<div class="post">
+	<h1>
+		<?php echo $this->extension->getName(); ?> (<?php echo $this->extension->getVersion(); ?>) —
+		<?php echo $this->extension->isEnabled() ? _t('admin.extensions.enabled')
+		                                         : _t('admin.extensions.disabled'); ?>
+	</h1>
+
+	<p class="alert alert-warn"><?php echo $this->extension->getDescription(); ?> — <?php echo _t('gen.short.by_author', $this->extension->getAuthor()); ?></p>
+
+	<h2><?php echo _t('gen.action.manage'); ?></h2>
+	<?php
+		$configure_view = $this->extension->getConfigureView();
+		if ($configure_view !== false) {
+			echo $configure_view;
+		} else {
+	?>
+	<p class="alert alert-warn"><?php echo _t('admin.extensions.no_configure_view'); ?></p>
+	<?php } ?>
+</div>
diff --git a/app/views/helpers/extension/details.phtml b/app/views/helpers/extension/details.phtml
new file mode 100644
index 000000000..acba4e816
--- /dev/null
+++ b/app/views/helpers/extension/details.phtml
@@ -0,0 +1,21 @@
+<ul class="horizontal-list">
+	<li class="item">
+		<?php if ($this->ext_details->getType() === 'user' || FreshRSS_Auth::hasAccess('admin')) { ?>
+		<?php $name_encoded = urlencode($this->ext_details->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('gen.action.manage'); ?></a>
+			<?php if ($this->ext_details->isEnabled()) { ?>
+			<button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('gen.action.disable'); ?></button>
+			<?php } else { ?>
+			<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('gen.action.enable'); ?></button>
+			<?php } ?>
+			<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
+			<button class="btn btn-attention confirm" form="form-extension" formaction="<?php echo _url('extension', 'remove', 'e', $name_encoded); ?>"><?php echo _t('gen.action.remove'); ?></button>
+			<?php } ?>
+		</div>
+		<?php } else { ?>
+		<?php echo _t('admin.extensions.system.no_rights'); ?>
+		<?php } ?>
+	</li>
+	<li class="item"><?php echo $this->ext_details->getName(); ?></li>
+</ul>
-- 
cgit v1.2.3


From 789d9fc6c8647fa100d80e3ef52727c813f35f16 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 14 Jan 2015 23:40:18 +0100
Subject: Fix coding style in extension manager

Yep, same as 8968288...
---
 app/Controllers/extensionController.php | 10 +++++-----
 app/FreshRSS.php                        |  2 +-
 lib/Minz/ExtensionManager.php           | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'app/Controllers/extensionController.php')

diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index ec5eecadb..b6d2d3fe4 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -25,7 +25,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 			'user' => array(),
 		);
 
-		$extensions = Minz_ExtensionManager::list_extensions();
+		$extensions = Minz_ExtensionManager::listExtensions();
 		foreach ($extensions as $ext) {
 			$this->view->extension_list[$ext->getType()][] = $ext;
 		}
@@ -50,7 +50,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 		}
 
 		$ext_name = urldecode(Minz_Request::param('e'));
-		$ext = Minz_ExtensionManager::find_extension($ext_name);
+		$ext = Minz_ExtensionManager::findExtension($ext_name);
 
 		if (is_null($ext)) {
 			Minz_Error::error(404);
@@ -77,7 +77,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 
 		if (Minz_Request::isPost()) {
 			$ext_name = urldecode(Minz_Request::param('e'));
-			$ext = Minz_ExtensionManager::find_extension($ext_name);
+			$ext = Minz_ExtensionManager::findExtension($ext_name);
 
 			if (is_null($ext)) {
 				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
@@ -133,7 +133,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 
 		if (Minz_Request::isPost()) {
 			$ext_name = urldecode(Minz_Request::param('e'));
-			$ext = Minz_ExtensionManager::find_extension($ext_name);
+			$ext = Minz_ExtensionManager::findExtension($ext_name);
 
 			if (is_null($ext)) {
 				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
@@ -193,7 +193,7 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
 
 		if (Minz_Request::isPost()) {
 			$ext_name = urldecode(Minz_Request::param('e'));
-			$ext = Minz_ExtensionManager::find_extension($ext_name);
+			$ext = Minz_ExtensionManager::findExtension($ext_name);
 
 			if (is_null($ext)) {
 				Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 785b10299..021687999 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -53,7 +53,7 @@ class FreshRSS extends Minz_FrontController {
 		// Enable extensions for the current (logged) user.
 		if (FreshRSS_Auth::hasAccess()) {
 			$ext_list = FreshRSS_Context::$user_conf->extensions_enabled;
-			Minz_ExtensionManager::enable_by_list($ext_list);
+			Minz_ExtensionManager::enableByList($ext_list);
 		}
 	}
 
diff --git a/lib/Minz/ExtensionManager.php b/lib/Minz/ExtensionManager.php
index 3df72abb7..8369e242a 100644
--- a/lib/Minz/ExtensionManager.php
+++ b/lib/Minz/ExtensionManager.php
@@ -52,7 +52,7 @@ class Minz_ExtensionManager {
 			}
 			$meta_raw_content = file_get_contents($metadata_filename);
 			$meta_json = json_decode($meta_raw_content, true);
-			if (!$meta_json || !self::is_valid_metadata($meta_json)) {
+			if (!$meta_json || !self::isValidMetadata($meta_json)) {
 				// metadata.json is not a json file? Invalid!
 				// or metadata.json is invalid (no required information), invalid!
 				Minz_Log::warning('`' . $metadata_filename . '` is not a valid metadata file');
@@ -81,7 +81,7 @@ class Minz_ExtensionManager {
 	 * @param $meta is an array of values.
 	 * @return true if the array is valid, false else.
 	 */
-	public static function is_valid_metadata($meta) {
+	public static function isValidMetadata($meta) {
 		$valid_chars = array('_');
 		return !(empty($meta['name']) ||
 		         empty($meta['entrypoint']) ||
@@ -168,7 +168,7 @@ class Minz_ExtensionManager {
 	 *
 	 * @param $ext_list the names of extensions we want to load.
 	 */
-	public static function enable_by_list($ext_list) {
+	public static function enableByList($ext_list) {
 		foreach ($ext_list as $ext_name) {
 			self::enable($ext_name);
 		}
@@ -180,7 +180,7 @@ class Minz_ExtensionManager {
 	 * @param $only_enabled if true returns only the enabled extensions (false by default).
 	 * @return an array of extensions.
 	 */
-	public static function list_extensions($only_enabled = false) {
+	public static function listExtensions($only_enabled = false) {
 		if ($only_enabled) {
 			return self::$ext_list_enabled;
 		} else {
@@ -194,7 +194,7 @@ class Minz_ExtensionManager {
 	 * @param $ext_name the name of the extension.
 	 * @return the corresponding extension or null if it doesn't exist.
 	 */
-	public static function find_extension($ext_name) {
+	public static function findExtension($ext_name) {
 		if (!isset(self::$ext_list[$ext_name])) {
 			return null;
 		}
-- 
cgit v1.2.3