1 files changed, 52 insertions, 36 deletions
diff --git a/actions/plugins/usersettings/save.php b/actions/plugins/usersettings/save.php
index b34c80828..f6b8ab0b6 100644
--- a/actions/plugins/usersettings/save.php
+++ b/actions/plugins/usersettings/save.php
@@ -1,42 +1,58 @@
 <?php
-	/**
-	 * Elgg plugin user settings save action.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.org/
-	 */
-
-	$params = get_input('params');
-	$plugin = get_input('plugin');
-
-	gatekeeper();
-	action_gatekeeper();
-	
-	$result = false;
-	
-	foreach ($params as $k => $v)
-	{
+/**
+ * Saves user-specific plugin settings.
+ *
+ * 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_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);
+}
+
+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;
+
+if (elgg_action_exists("$plugin_id/usersettings/save")) {
+	action("$plugin_id/usersettings/save");
+} else {
+	foreach ($params as $k => $v) {
 		// Save
-		$result = set_plugin_usersetting($k, $v, $_SESSION['user']->guid, $plugin);
-		
+		$result = $plugin->setUserSetting($k, $v, $user->guid);
+
 		// Error?
-		if (!$result)
-		{
-			register_error(sprintf(elgg_echo('plugins:usersettings:save:fail'), $plugin));
-			
-			forward($_SERVER['HTTP_REFERER']);
-			
-			exit;
+		if (!$result) {
+			register_error(elgg_echo('plugins:usersettings:save:fail', array($plugin_name)));
+			forward(REFERER);
 		}
 	}
+}
 
-	// An event to tell any interested plugins of the change is settings
-	//trigger_elgg_event('plugin_usersettings_save', $plugin, find_plugin_settings($plugin)); // replaced by plugin:usersetting event
-	
-	system_message(sprintf(elgg_echo('plugins:usersettings:save:ok'), $plugin));
-	forward($_SERVER['HTTP_REFERER']);
-?>
-\ No newline at end of file
+system_message(elgg_echo('plugins:usersettings:save:ok', array($plugin_name)));
+forward(REFERER);