Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii

LimeSurvey · Jul 11, 2012 · 03c4b3d · 03c4b3d
2 parents 9c6f9aa + 31c5458
commit 03c4b3d
Show file tree

Hide file tree

Showing 26 changed files with 849 additions and 1,054 deletions.
diff --git a/application/config/config-defaults.php b/application/config/config-defaults.php
@@ -474,11 +474,11 @@
 $config['restrictToLanguages'] = '';
 
 /**
-* This parameter enables/disables the XML-RPC interface
-* Set 1 to enable and 0 to disable
-* @var integer
+* This parameter enables/disables the RPC interface
+* Set to 'json' (for JSON-RPC) )or 'xml' (for XML-RPC) to enable and 'off' to disable
+* @var string
 */
-$config['enableXMLRPCInterface'] = 0;
+$config['RPCInterface'] = 'off';
 
 
 /**

diff --git a/application/controllers/admin/globalsettings.php b/application/controllers/admin/globalsettings.php
@@ -163,7 +163,7 @@ private function _saveSettings()
         setGlobalSetting('googletranslateapikey',$_POST['googletranslateapikey']);
         setGlobalSetting('force_ssl', $_POST['force_ssl']);
         setGlobalSetting('surveyPreview_require_Auth', $_POST['surveyPreview_require_Auth']);
-        setGlobalSetting('enableXMLRPCInterface', $_POST['enableXMLRPCInterface']);
+        setGlobalSetting('RPCInterface', $_POST['RPCInterface']);
         $savetime = trim(strip_tags((float)$_POST['timeadjust']) . ' hours'); //makes sure it is a number, at least 0
         if ((substr($savetime, 0, 1) != '-') && (substr($savetime, 0, 1) != '+')) {
             $savetime = '+' . $savetime;