[Pkg-owncloud-commits] [owncloud] 14/22: Redirect user after clicking on link Use DI

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit dac8dead074fa58739d7c0b3b0a800f9ae32367a
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Fri Aug 22 16:01:03 2014 +0200

    Redirect user after clicking on link
    Use DI
---
 settings/ajax/setsecurity.php | 6 +++---
 settings/js/admin.js          | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/settings/ajax/setsecurity.php b/settings/ajax/setsecurity.php
index 3cb1d05..f1f737a 100644
--- a/settings/ajax/setsecurity.php
+++ b/settings/ajax/setsecurity.php
@@ -9,13 +9,13 @@ OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
 if(isset($_POST['enforceHTTPS'])) {
-	OC_Config::setValue( 'forcessl', filter_var($_POST['enforceHTTPS'], FILTER_VALIDATE_BOOLEAN));
+	 \OC::$server->getConfig()->setSystemValue('forcessl', filter_var($_POST['enforceHTTPS'], FILTER_VALIDATE_BOOLEAN));
 }
 
 if(isset($_POST['trustedDomain'])) {
-	$trustedDomains = OC_Config::getValue('trusted_domains');
+	$trustedDomains = \OC::$server->getConfig()->getSystemValue('trusted_domains');
 	$trustedDomains[] = $_POST['trustedDomain'];
-	OC_Config::setValue('trusted_domains', $trustedDomains);
+	\OC::$server->getConfig()->setSystemValue('trusted_domains', $trustedDomains);
 }
 
 echo 'true';
diff --git a/settings/js/admin.js b/settings/js/admin.js
index b09704f..56dc1b9 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -48,7 +48,9 @@ $(document).ready(function(){
 					$.ajax({
 						type: 'POST',
 						url: OC.generateUrl('settings/ajax/setsecurity.php'),
-						data: { trustedDomain: params.trustDomain}
+						data: { trustedDomain: params.trustDomain }
+					}).done(function() {
+						window.location.replace(OC.generateUrl('settings/admin'));
 					});
 				}
 			});

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git