diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-04-17 21:21:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-17 21:21:37 +0200 |
| commit | b7d00ff5ef1a70b0331405d4bdf3dc38fd04924e (patch) | |
| tree | 62c0373782f6dd056d8964299a6a0051c4781c5c /lib | |
| parent | 748b51a22568b18eb22ec98f2641146e9023f0b4 (diff) | |
| parent | 0d5142be7080fba001d74609676e7e1ddd5b547f (diff) | |
| download | nextcloud-server-b7d00ff5ef1a70b0331405d4bdf3dc38fd04924e.tar.gz nextcloud-server-b7d00ff5ef1a70b0331405d4bdf3dc38fd04924e.zip | |
Merge pull request #9217 from nextcloud/show-link-trusted-domains
Show a link to the docs instead of a button on the untrusted domain page
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 4 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_classmap.php | 1 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_static.php | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/lib/base.php b/lib/base.php index fa2f5011f16..f3e2e734d0d 100644 --- a/lib/base.php +++ b/lib/base.php @@ -778,7 +778,7 @@ class OC { OC_Response::setStatus(\OC_Response::STATUS_BAD_REQUEST); header('Status: 400 Bad Request'); - \OC::$server->getLogger()->warning( + \OC::$server->getLogger()->info( 'Trusted domain error. "{remoteAddress}" tried to access using "{host}" as host.', [ 'app' => 'core', @@ -788,7 +788,7 @@ class OC { ); $tmpl = new OCP\Template('core', 'untrustedDomain', 'guest'); - $tmpl->assign('domain', $host); + $tmpl->assign('docUrl', \OC::$server->getURLGenerator()->linkToDocs('admin-trusted-domains')); $tmpl->printPage(); exit(); diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 99023096bcb..c24b1832ec6 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -898,7 +898,6 @@ return array( 'OC\\Settings\\Controller\\LogSettingsController' => $baseDir . '/settings/Controller/LogSettingsController.php', 'OC\\Settings\\Controller\\MailSettingsController' => $baseDir . '/settings/Controller/MailSettingsController.php', 'OC\\Settings\\Controller\\PersonalSettingsController' => $baseDir . '/settings/Controller/PersonalSettingsController.php', - 'OC\\Settings\\Controller\\SecuritySettingsController' => $baseDir . '/settings/Controller/SecuritySettingsController.php', 'OC\\Settings\\Controller\\UsersController' => $baseDir . '/settings/Controller/UsersController.php', 'OC\\Settings\\Hooks' => $baseDir . '/settings/Hooks.php', 'OC\\Settings\\Mailer\\NewUserMailHelper' => $baseDir . '/settings/Mailer/NewUserMailHelper.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 33533569e90..b4af81e36ce 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -928,7 +928,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Settings\\Controller\\LogSettingsController' => __DIR__ . '/../../..' . '/settings/Controller/LogSettingsController.php', 'OC\\Settings\\Controller\\MailSettingsController' => __DIR__ . '/../../..' . '/settings/Controller/MailSettingsController.php', 'OC\\Settings\\Controller\\PersonalSettingsController' => __DIR__ . '/../../..' . '/settings/Controller/PersonalSettingsController.php', - 'OC\\Settings\\Controller\\SecuritySettingsController' => __DIR__ . '/../../..' . '/settings/Controller/SecuritySettingsController.php', 'OC\\Settings\\Controller\\UsersController' => __DIR__ . '/../../..' . '/settings/Controller/UsersController.php', 'OC\\Settings\\Hooks' => __DIR__ . '/../../..' . '/settings/Hooks.php', 'OC\\Settings\\Mailer\\NewUserMailHelper' => __DIR__ . '/../../..' . '/settings/Mailer/NewUserMailHelper.php', |