Merge pull request #10584 from owncloud/simple-wizard-trusted-domains

Add a trusted domain wizard

3 files changed, 7 insertions, 10 deletions

diff --git a/lib/base.php b/lib/base.php
index 759a4177031..499ef29f304 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -689,10 +689,9 @@ class OC {
 		) {
 			header('HTTP/1.1 400 Bad Request');
 			header('Status: 400 Bad Request');
-			OC_Template::printErrorPage(
-				$l->t('You are accessing the server from an untrusted domain.'),
-				$l->t('Please contact your administrator. If you are an administrator of this instance, configure the "trusted_domain" setting in config/config.php. An example configuration is provided in config/config.sample.php.')
-			);
+			$tmpl = new OCP\Template('core', 'untrustedDomain', 'guest');
+			$tmpl->assign('domain', $_SERVER['SERVER_NAME']);
+			$tmpl->printPage();
 			return;
 		}
 
diff --git a/lib/private/allconfig.php b/lib/private/allconfig.php
index de3ac973637..eb114546010 100644
--- a/lib/private/allconfig.php
+++ b/lib/private/allconfig.php
@@ -18,11 +18,10 @@ class AllConfig implements \OCP\IConfig {
 	 *
 	 * @param string $key the key of the value, under which will be saved
 	 * @param mixed $value the value that should be stored
-	 * @todo need a use case for this
 	 */
-// 	public function setSystemValue($key, $value) {
-// 		\OCP\Config::setSystemValue($key, $value);
-// 	}
+ 	public function setSystemValue($key, $value) {
+ 		\OCP\Config::setSystemValue($key, $value);
+	}
 
 	/**
 	 * Looks up a system wide defined value
diff --git a/lib/public/iconfig.php b/lib/public/iconfig.php
index 0ebbd9f5a71..d4a8cdc7381 100644
--- a/lib/public/iconfig.php
+++ b/lib/public/iconfig.php
@@ -39,9 +39,8 @@ interface IConfig {
 	 *
 	 * @param string $key the key of the value, under which will be saved
 	 * @param mixed $value the value that should be stored
-	 * @todo need a use case for this
 	 */
-// 	public function setSystemValue($key, $value);
+	public function setSystemValue($key, $value);
 
 	/**
 	 * Looks up a system wide defined value