Fix route and js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

3 files changed, 11 insertions, 56 deletions

diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php
deleted file mode 100644
index 7c19c14b32e..00000000000
--- a/settings/ajax/setlanguage.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Christopher Schäpers <kondou@ts.unde.re>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-$l = \OC::$server->getL10N('settings');
-
-OC_JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-
-// Get data
-if( isset( $_POST['lang'] ) ) {
-	$languageCodes = \OC::$server->getL10NFactory()->findAvailableLanguages();
-	$lang = (string)$_POST['lang'];
-	if(array_search($lang, $languageCodes) or $lang === 'en') {
-		\OC::$server->getConfig()->setUserValue( OC_User::getUser(), 'core', 'lang', $lang );
-		OC_JSON::success(array("data" => array( "message" => $l->t("Language changed") )));
-	}else{
-		OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
-	}
-}else{
-	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
-}
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 3079cf27e06..aef67f719c0 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -272,13 +272,16 @@ $(document).ready(function () {
 		// Serialize the data
 		var post = $("#languageinput").serialize();
 		// Ajax foo
-		$.post('ajax/setlanguage.php', post, function (data) {
-			if (data.status === "success") {
-				location.reload();
-			}
-			else {
-				$('#passworderror').text(data.data.message);
+		$.ajax(
+			'ajax/setlanguage.php',
+			{
+				method: 'POST',
+				data: post
 			}
+		).done(function() {
+			location.reload();
+		}).fail(function(jqXHR) {
+			$('#passworderror').text(jqXHR.responseJSON.message);
 		});
 		return false;
 	});
diff --git a/settings/routes.php b/settings/routes.php
index 829474ce2bb..58a57606312 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -67,6 +67,7 @@ $application->registerRoutes($this, [
 		['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET'],
 		['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST'],
 		['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST'],
+		['name' => 'Personal#setLanguage', 'url' => '/settings/ajax/setlanguage.php', 'verb' => 'POST'],
 	]
 ]);
 
@@ -88,10 +89,7 @@ $this->create('settings_ajax_togglegroups', '/settings/ajax/togglegroups.php')
 $this->create('settings_ajax_togglesubadmins', '/settings/ajax/togglesubadmins.php')
 	->actionInclude('settings/ajax/togglesubadmins.php');
 $this->create('settings_ajax_changegorupname', '/settings/ajax/changegroupname.php')
-	->actionInclude('settings/ajax/changegroupname.php');	
-// personal
-$this->create('settings_ajax_setlanguage', '/settings/ajax/setlanguage.php')
-	->actionInclude('settings/ajax/setlanguage.php');
+	->actionInclude('settings/ajax/changegroupname.php');
 // apps
 $this->create('settings_ajax_enableapp', '/settings/ajax/enableapp.php')
 	->actionInclude('settings/ajax/enableapp.php');