summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-08-22 16:01:03 +0200
committerLukas Reschke <lukas@owncloud.com>2014-08-22 16:01:03 +0200
commitdd871098c5f598326a1bc03f8b7bed0d2184e798 (patch)
tree737b281187a6c6be3e4fc3ab458cfc9ec2ba4ec8
parent88c3a4a31ae09b4822cff6d6965f0c39becb5b97 (diff)
downloadnextcloud-server-dd871098c5f598326a1bc03f8b7bed0d2184e798.tar.gz
nextcloud-server-dd871098c5f598326a1bc03f8b7bed0d2184e798.zip
Redirect user after clicking on link
Use DI
-rw-r--r--settings/ajax/setsecurity.php6
-rw-r--r--settings/js/admin.js4
2 files changed, 6 insertions, 4 deletions
diff --git a/settings/ajax/setsecurity.php b/settings/ajax/setsecurity.php
index 3cb1d05ee63..f1f737a4943 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 b09704f87b7..56dc1b98716 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'));
});
}
});