2 files changed, 65 insertions, 52 deletions

diff --git a/actions/plugins/settings/save.php b/actions/plugins/settings/save.php
index 1a8b2db3d..581a2f9ec 100644
--- a/actions/plugins/settings/save.php
+++ b/actions/plugins/settings/save.php
@@ -1,59 +1,43 @@
 <?php
 /**
- * Elgg plugin settings save action.
+ * Saves global plugin settings.
  *
- * @package Elgg
- * @subpackage Core
+ * This action can be overriden for a specific plugin by creating the
+ * <plugin_id>/settings/save action in that plugin.
+ *
+ * @uses array $_REQUEST['params']    A set of key/value pairs to save to the ElggPlugin entity
+ * @uses int   $_REQUEST['plugin_id'] The ID of the plugin
+ *
+ * @package Elgg.Core
+ * @subpackage Plugins.Settings
  */
 
 $params = get_input('params');
-$plugin = get_input('plugin');
-if (!$plugin_info = load_plugin_manifest($plugin)) {
-	register_error(sprintf(elgg_echo('plugins:settings:save:fail'), $plugin));
+$plugin_id = get_input('plugin_id');
+$plugin = elgg_get_plugin_from_id($plugin_id);
+
+if (!($plugin instanceof ElggPlugin)) {
+	register_error(elgg_echo('plugins:settings:save:fail', array($plugin_id)));
 	forward(REFERER);
 }
 
-$plugin_name = $plugin_info['name'];
-
-admin_gatekeeper();
+$plugin_name = $plugin->getManifest()->getName();
 
 $result = false;
 
-$options = array(
-	'plugin' => $plugin,
-	'manifest' => $plugin_info,
-	'settings' => $params
-);
-
 // allow a plugin to override the save action for their settings
-if (elgg_action_exist("settings/$plugin/save")) {
-	action("settings/$plugin/save");
+if (elgg_action_exists("$plugin_id/settings/save")) {
+	action("$plugin_id/settings/save");
 } else {
 	foreach ($params as $k => $v) {
-		if (!$result = set_plugin_setting($k, $v, $plugin)) {
-			register_error(sprintf(elgg_echo('plugins:settings:save:fail'), $plugin_name));
+		$result = $plugin->setSetting($k, $v);
+		if (!$result) {
+			register_error(elgg_echo('plugins:settings:save:fail', array($plugin_name)));
 			forward(REFERER);
 			exit;
 		}
 	}
 }
 
-system_message(sprintf(elgg_echo('plugins:settings:save:ok'), $plugin_name));
-forward(REFERER);
-//
-//$trigger = trigger_plugin_hook('plugin:save_settings', $plugin, $options, NULL);
-//if ($trigger === NULL) {
-//	foreach ($params as $k => $v) {
-//		if (!$result = set_plugin_setting($k, $v, $plugin)) {
-//			register_error(sprintf(elgg_echo('plugins:settings:save:fail'), $plugin_name));
-//			forward(REFERER);
-//			exit;
-//		}
-//	}
-//} elseif ($trigger === FALSE) {
-//	register_error(sprintf(elgg_echo('plugins:settings:save:fail'), $plugin_name));
-//	forward(REFERER);
-//}
-//
-//system_message(sprintf(elgg_echo('plugins:settings:save:ok'), $plugin_name));
-//forward(REFERER);
\ No newline at end of file
+system_message(elgg_echo('plugins:settings:save:ok', array($plugin_name)));
+forward(REFERER);
\ No newline at end of file
diff --git a/actions/plugins/usersettings/save.php b/actions/plugins/usersettings/save.php
index 27f549184..f6b8ab0b6 100644
--- a/actions/plugins/usersettings/save.php
+++ b/actions/plugins/usersettings/save.php
@@ -1,29 +1,58 @@
 <?php
 /**
- * Elgg plugin user settings save action.
+ * Saves user-specific plugin settings.
  *
- * @package Elgg
- * @subpackage Core
+ * This action can be overriden for a specific plugin by creating the
+ * <plugin_id>/usersettings/save action in that plugin.
+ *
+ * @uses array $_REQUEST['params']    A set of key/value pairs to save to the ElggPlugin entity
+ * @uses int   $_REQUEST['plugin_id'] The id of the plugin
+ * @uses int   $_REQUEST['user_guid'] The GUID of the user to save settings for.
+ *
+ * @package Elgg.Core
+ * @subpackage Plugins.Settings
  */
 
 $params = get_input('params');
-$plugin = get_input('plugin');
+$plugin_id = get_input('plugin_id');
+$user_guid = get_input('user_guid', elgg_get_logged_in_user_guid());
+$plugin = elgg_get_plugin_from_id($plugin_id);
+$user = get_entity($user_guid);
+
+if (!($plugin instanceof ElggPlugin)) {
+	register_error(elgg_echo('plugins:usersettings:save:fail', array($plugin_id)));
+	forward(REFERER);
+}
 
-gatekeeper();
+if (!($user instanceof ElggUser)) {
+	register_error(elgg_echo('plugins:usersettings:save:fail', array($plugin_id)));
+	forward(REFERER);
+}
+
+$plugin_name = $plugin->getManifest()->getName();
+
+// make sure we're admin or the user
+if (!$user->canEdit()) {
+	register_error(elgg_echo('plugins:usersettings:save:fail', array($plugin_name)));
+	forward(REFERER);
+}
 
 $result = false;
 
-foreach ($params as $k => $v) {
-	// Save
-	$result = set_plugin_usersetting($k, $v, get_loggedin_userid(), $plugin);
+if (elgg_action_exists("$plugin_id/usersettings/save")) {
+	action("$plugin_id/usersettings/save");
+} else {
+	foreach ($params as $k => $v) {
+		// Save
+		$result = $plugin->setUserSetting($k, $v, $user->guid);
 
-	// Error?
-	if (!$result) {
-		register_error(sprintf(elgg_echo('plugins:usersettings:save:fail'), $plugin));
-		forward(REFERER);
-		exit;
+		// Error?
+		if (!$result) {
+			register_error(elgg_echo('plugins:usersettings:save:fail', array($plugin_name)));
+			forward(REFERER);
+		}
 	}
 }
 
-system_message(sprintf(elgg_echo('plugins:usersettings:save:ok'), $plugin));
+system_message(elgg_echo('plugins:usersettings:save:ok', array($plugin_name)));
 forward(REFERER);