Show a link to the docs instead of a button on the untrusted domain page

Before there was a button to "quickly" add the untrusted domain to the config. This button often didn't worked, because the generated URL was often untrusted as well. Thus removing it and providing proper docs seems to be the better approach to handle this rare case.

Also the log should not be spammed by messages for the untrusted domain accesses, because they are user related and not necessarily an administrative issue.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

3 files changed, 0 insertions, 98 deletions

diff --git a/settings/Controller/SecuritySettingsController.php b/settings/Controller/SecuritySettingsController.php
deleted file mode 100644
index bda86dff841..00000000000
--- a/settings/Controller/SecuritySettingsController.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @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/>
- *
- */
-
-namespace OC\Settings\Controller;
-
-use \OCP\AppFramework\Controller;
-use OCP\IRequest;
-use OCP\IConfig;
-
-/**
- * @package OC\Settings\Controller
- */
-class SecuritySettingsController extends Controller {
-	/** @var \OCP\IConfig */
-	private $config;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IConfig $config) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-	}
-
-	/**
-	 * @return array
-	 */
-	protected function returnSuccess() {
-		return array(
-			'status' => 'success'
-		);
-	}
-
-	/**
-	 * Add a new trusted domain
-	 * @param string $newTrustedDomain The newly to add trusted domain
-	 * @return array
-	 */
-	public function trustedDomains($newTrustedDomain) {
-		$trustedDomains = $this->config->getSystemValue('trusted_domains', []);
-		$trustedDomains[] = $newTrustedDomain;
-		$this->config->setSystemValue('trusted_domains', $trustedDomains);
-
-		return $this->returnSuccess();
-	}
-
-}
diff --git a/settings/js/admin.js b/settings/js/admin.js
index f637cb64592..650bc84930c 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -1,29 +1,4 @@
 $(document).ready(function(){
-	var params = OC.Util.History.parseUrlQuery();
-
-	// Hack to add a trusted domain
-	if (params.trustDomain) {
-		var potentialDomain = params.trustDomain;
-		potentialDomain = encodeURI(escapeHTML(potentialDomain));
-		potentialDomain = '<span class="trusted-domain-warning">' + potentialDomain + '</span>';
-
-		OC.dialogs.confirmHtml(t('settings', 'Are you really sure you want add {domain} as trusted domain?', {
-				domain: potentialDomain
-			}, undefined, {escape: false}),
-			t('settings', 'Add trusted domain'), function(answer) {
-				if(answer) {
-					$.ajax({
-						type: 'POST',
-						url: OC.generateUrl('settings/admin/security/trustedDomains'),
-						data: { newTrustedDomain: params.trustDomain }
-					}).done(function() {
-						window.location.replace(OC.generateUrl('settings/admin'));
-					});
-				}
-			});
-	}
-
-
 	$('#excludedGroups').each(function (index, element) {
 		OC.Settings.setupGroupsSelect($(element));
 		$(element).change(function(ev) {
diff --git a/settings/routes.php b/settings/routes.php
index df49f0af859..9a89d7353ef 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -50,7 +50,6 @@ $application->registerRoutes($this, [
 		['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'],
 		['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET'],
 		['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'],
-		['name' => 'SecuritySettings#trustedDomains', 'url' => '/settings/admin/security/trustedDomains', 'verb' => 'POST'],
 		['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST'],
 		['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT'],
 		['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT'],