refs matomo-org#4126 fix settings were not saved

sabl0r · Oct 22, 2013 · b969dc7 · b969dc7
1 parent 313ccf7
commit b969dc7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/core/Plugin/Settings.php b/core/Plugin/Settings.php
@@ -159,7 +159,8 @@ private function checkIsValidSetting($name)
         $setting = $this->getSetting($name);
 
         if (empty($setting)) {
-            throw new \Exception('This setting does not exist');
+            // TODO escape $name? or is it automatically escaped?
+            throw new \Exception(sprintf('The setting %s does not exist', $name));
         }
 
         if (!$setting['displayedForCurrentUser']) {

diff --git a/core/Settings/Manager.php b/core/Settings/Manager.php
@@ -30,10 +30,10 @@ public static function getAllPluginSettings()
     {
         if (empty(static::$settings)) {
 
-            $pluginSettings = array('Login' => 'Piwik\\Plugins\\Login\\Settings');
+            $pluginSettings = array();
             // TODO: document hook and think about better name
 
-            Piwik::postEvent('Plugin.addSettings', $pluginSettings);
+            Piwik::postEvent('Plugin.addSettings', array(&$pluginSettings));
 
             $settings = array();
             foreach ($pluginSettings as $pluginName => $pluginSetting) {

diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
@@ -110,13 +110,12 @@ public function setPluginSettings()
         Piwik::checkUserIsNotAnonymous();
         Json::sendHeaderJSON();
 
-        $updateSettings = Common::getRequestVar('settings', null, 'json');
+        $changedPluginSettings = Common::getRequestVar('settings', null, 'array');
         $pluginSettings = SettingsManager::getAllPluginSettings();
 
         try {
 
-            foreach ($updateSettings as $pluginName => $serializedSetting) {
-                $unserializedSettings = UrlHelper::getArrayFromQueryString($serializedSetting);
+            foreach ($changedPluginSettings as $pluginName => $changedPluginSetting) {
 
                 if (!array_key_exists($pluginName, $pluginSettings)) {
                     // this plugin is not using settings, skip it
@@ -125,8 +124,8 @@ public function setPluginSettings()
 
                 $pluginSetting = $pluginSettings[$pluginName];
 
-                foreach ($unserializedSettings as $key => $value) {
-                    $pluginSetting->setSettingValue($key, $value);
+                foreach ($changedPluginSetting as $changedSetting) {
+                    $pluginSetting->setSettingValue($changedSetting['name'], $changedSetting['value']);
                 }
             }
 

diff --git a/plugins/CoreAdminHome/javascripts/pluginSettings.js b/plugins/CoreAdminHome/javascripts/pluginSettings.js
@@ -22,7 +22,7 @@ $(document).ready(function () {
             module: 'CoreAdminHome',
             action: 'setPluginSettings'
         }, 'GET');
-        ajaxHandler.addParams({settings: JSON.stringify(getSettings())}, 'POST');
+        ajaxHandler.addParams({settings: getSettings()}, 'POST');
         ajaxHandler.redirectOnSuccess();
         ajaxHandler.setLoadingElement(getLoadingElement());
         ajaxHandler.setErrorElement(getErrorElement());
@@ -39,7 +39,7 @@ $(document).ready(function () {
             $pluginSection = $(pluginSection);
 
             var pluginName = $pluginSection.attr('data-pluginname');
-            var serialized = $('input, textarea, select', $pluginSection ).serialize();
+            var serialized = $('input, textarea, select', $pluginSection ).serializeArray();
 
             values[pluginName] = serialized;
         });