From b3cf5a302d25b06421a055f280ca4f654bd8e6a7 Mon Sep 17 00:00:00 2001
From: beck24 <beck24@gmail.com>
Date: Sun, 13 Oct 2013 00:03:11 -0700
Subject: Fixes #6177 - refuse to deactive plugins used as dependencies

---
 engine/lib/plugins.php | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'engine/lib/plugins.php')

diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index 74bce45fd..f0d89e92d 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -1104,6 +1104,39 @@ function plugins_test($hook, $type, $value, $params) {
 	return $value;
 }
 
+function plugins_deactivate_dependency_check($event, $type, $params) {
+    $plugin_id = $params['plugin_entity']->getManifest()->getPluginID();
+    $plugin_name = $params['plugin_entity']->getManifest()->getName();
+  
+    $active_plugins = elgg_get_plugins();
+
+	$dependents = array();
+    foreach ($active_plugins as $plugin) {
+		$manifest = $plugin->getManifest();
+		$requires = $manifest->getRequires();
+    
+		foreach ($requires as $required) {
+			if ($required['type'] == 'plugin' && $required['name'] == $plugin_id) {
+				// there are active dependents
+				$dependents[$manifest->getPluginID()] = $plugin;
+			}
+		}
+    }
+    
+    if ($dependents) {
+		$list = '<ul>';
+		// construct error message and prevent disabling
+		foreach ($dependents as $dependent) {
+			$list .= '<li>' . $dependent->getManifest()->getName() . '</li>';
+		}
+		$list .= '</ul>';
+		
+		register_error(elgg_echo('ElggPlugin:Dependencies:ActiveDependent', array($plugin_name, $list)));
+		
+		return false;
+    }
+}
+
 /**
  * Initialize the plugin system
  * Listens to system init and registers actions
@@ -1115,6 +1148,8 @@ function plugin_init() {
 	run_function_once("plugin_run_once");
 
 	elgg_register_plugin_hook_handler('unit_test', 'system', 'plugins_test');
+	
+	elgg_register_event_handler('deactivate', 'plugin', 'plugins_deactivate_dependency_check');
 
 	elgg_register_action("plugins/settings/save", '', 'admin');
 	elgg_register_action("plugins/usersettings/save");
-- 
cgit v1.2.3


From 634216f0978d037fb84ef8e68e4e4272752c22fb Mon Sep 17 00:00:00 2001
From: beck24 <beck24@gmail.com>
Date: Sun, 13 Oct 2013 00:19:46 -0700
Subject: whitespace fix

---
 engine/lib/plugins.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'engine/lib/plugins.php')

diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index f0d89e92d..e0aa705bb 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -1105,13 +1105,13 @@ function plugins_test($hook, $type, $value, $params) {
 }
 
 function plugins_deactivate_dependency_check($event, $type, $params) {
-    $plugin_id = $params['plugin_entity']->getManifest()->getPluginID();
-    $plugin_name = $params['plugin_entity']->getManifest()->getName();
-  
-    $active_plugins = elgg_get_plugins();
+	$plugin_id = $params['plugin_entity']->getManifest()->getPluginID();
+	$plugin_name = $params['plugin_entity']->getManifest()->getName();
+
+	$active_plugins = elgg_get_plugins();
 
 	$dependents = array();
-    foreach ($active_plugins as $plugin) {
+	foreach ($active_plugins as $plugin) {
 		$manifest = $plugin->getManifest();
 		$requires = $manifest->getRequires();
     
@@ -1121,9 +1121,9 @@ function plugins_deactivate_dependency_check($event, $type, $params) {
 				$dependents[$manifest->getPluginID()] = $plugin;
 			}
 		}
-    }
-    
-    if ($dependents) {
+	}
+
+	if ($dependents) {
 		$list = '<ul>';
 		// construct error message and prevent disabling
 		foreach ($dependents as $dependent) {
-- 
cgit v1.2.3


From 6da43b70ca0de807c0532adb0bba65405d3ffbc1 Mon Sep 17 00:00:00 2001
From: beck24 <beck24@gmail.com>
Date: Sun, 13 Oct 2013 21:51:02 -0700
Subject: move deactivate event registration to the user-triggered action

---
 actions/admin/plugins/deactivate.php | 3 +++
 engine/lib/plugins.php               | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'engine/lib/plugins.php')

diff --git a/actions/admin/plugins/deactivate.php b/actions/admin/plugins/deactivate.php
index 354f4717d..adb86dd7a 100644
--- a/actions/admin/plugins/deactivate.php
+++ b/actions/admin/plugins/deactivate.php
@@ -10,6 +10,9 @@
  * @package Elgg.Core
  * @subpackage Administration.Plugins
  */
+ 
+ // prevent disabling plugins with active dependents
+ elgg_register_event_handler('deactivate', 'plugin', 'plugins_deactivate_dependency_check');
 
 $plugin_guids = get_input('plugin_guids');
 
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index e0aa705bb..1b7ad5db9 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -1148,8 +1148,6 @@ function plugin_init() {
 	run_function_once("plugin_run_once");
 
 	elgg_register_plugin_hook_handler('unit_test', 'system', 'plugins_test');
-	
-	elgg_register_event_handler('deactivate', 'plugin', 'plugins_deactivate_dependency_check');
 
 	elgg_register_action("plugins/settings/save", '', 'admin');
 	elgg_register_action("plugins/usersettings/save");
-- 
cgit v1.2.3


From db9153b12101da7836d6ef0d748fb11eee335d9b Mon Sep 17 00:00:00 2001
From: Matt Beckett <beck24@gmail.com>
Date: Wed, 23 Oct 2013 23:42:30 -0700
Subject: Revert "move deactivate event registration to the user-triggered
 action"

This reverts commit 6da43b70ca0de807c0532adb0bba65405d3ffbc1.
---
 actions/admin/plugins/deactivate.php | 3 ---
 engine/lib/plugins.php               | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'engine/lib/plugins.php')

diff --git a/actions/admin/plugins/deactivate.php b/actions/admin/plugins/deactivate.php
index adb86dd7a..354f4717d 100644
--- a/actions/admin/plugins/deactivate.php
+++ b/actions/admin/plugins/deactivate.php
@@ -10,9 +10,6 @@
  * @package Elgg.Core
  * @subpackage Administration.Plugins
  */
- 
- // prevent disabling plugins with active dependents
- elgg_register_event_handler('deactivate', 'plugin', 'plugins_deactivate_dependency_check');
 
 $plugin_guids = get_input('plugin_guids');
 
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index 1b7ad5db9..e0aa705bb 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -1148,6 +1148,8 @@ function plugin_init() {
 	run_function_once("plugin_run_once");
 
 	elgg_register_plugin_hook_handler('unit_test', 'system', 'plugins_test');
+	
+	elgg_register_event_handler('deactivate', 'plugin', 'plugins_deactivate_dependency_check');
 
 	elgg_register_action("plugins/settings/save", '', 'admin');
 	elgg_register_action("plugins/usersettings/save");
-- 
cgit v1.2.3


From 9762edd4305ab8e6523d2f8171a32688295f1c88 Mon Sep 17 00:00:00 2001
From: Matt Beckett <beck24@gmail.com>
Date: Wed, 23 Oct 2013 23:52:53 -0700
Subject: Added comments regarding deactivation due to error

---
 engine/lib/plugins.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engine/lib/plugins.php')

diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index e0aa705bb..c296346fc 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -1149,6 +1149,8 @@ function plugin_init() {
 
 	elgg_register_plugin_hook_handler('unit_test', 'system', 'plugins_test');
 	
+	// note - plugins are booted by the time this handler is registered
+	// deactivation due to error may have already occurred
 	elgg_register_event_handler('deactivate', 'plugin', 'plugins_deactivate_dependency_check');
 
 	elgg_register_action("plugins/settings/save", '', 'admin');
-- 
cgit v1.2.3


From 33260fd7a88e5e92fbee6ee0719ab4286e9ce221 Mon Sep 17 00:00:00 2001
From: Paweł Sroka <srokap@gmail.com>
Date: Sun, 27 Oct 2013 19:27:14 +0100
Subject: Refs #6117 - Added docs + changed plugins_deactivate_dependency_check
 to _plugins_deactivate_dependency_check

---
 engine/lib/plugins.php | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'engine/lib/plugins.php')

diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index c296346fc..d5d3db466 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -1104,7 +1104,17 @@ function plugins_test($hook, $type, $value, $params) {
 	return $value;
 }
 
-function plugins_deactivate_dependency_check($event, $type, $params) {
+/**
+ * Checks on deactivate plugin event if disabling it won't create unmet dependencies and blocks disable in such case.
+ *
+ * @param string $event  deactivate
+ * @param string $type   plugin
+ * @param array  $params Parameters array containing entry with ELggPlugin instance under 'plugin_entity' key
+ * @return bool  false to block plugin deactivation action
+ *
+ * @access private
+ */
+function _plugins_deactivate_dependency_check($event, $type, $params) {
 	$plugin_id = $params['plugin_entity']->getManifest()->getPluginID();
 	$plugin_name = $params['plugin_entity']->getManifest()->getName();
 
@@ -1114,7 +1124,7 @@ function plugins_deactivate_dependency_check($event, $type, $params) {
 	foreach ($active_plugins as $plugin) {
 		$manifest = $plugin->getManifest();
 		$requires = $manifest->getRequires();
-    
+
 		foreach ($requires as $required) {
 			if ($required['type'] == 'plugin' && $required['name'] == $plugin_id) {
 				// there are active dependents
@@ -1130,11 +1140,11 @@ function plugins_deactivate_dependency_check($event, $type, $params) {
 			$list .= '<li>' . $dependent->getManifest()->getName() . '</li>';
 		}
 		$list .= '</ul>';
-		
+
 		register_error(elgg_echo('ElggPlugin:Dependencies:ActiveDependent', array($plugin_name, $list)));
-		
+
 		return false;
-    }
+	}
 }
 
 /**
@@ -1151,7 +1161,7 @@ function plugin_init() {
 	
 	// note - plugins are booted by the time this handler is registered
 	// deactivation due to error may have already occurred
-	elgg_register_event_handler('deactivate', 'plugin', 'plugins_deactivate_dependency_check');
+	elgg_register_event_handler('deactivate', 'plugin', '_plugins_deactivate_dependency_check');
 
 	elgg_register_action("plugins/settings/save", '', 'admin');
 	elgg_register_action("plugins/usersettings/save");
-- 
cgit v1.2.3