aboutsummaryrefslogtreecommitdiffstats
path: root/apps/federation/settings
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2015-11-18 15:07:41 +0100
committerBjörn Schießle <bjoern@schiessle.org>2015-11-19 18:07:25 +0100
commit2754afc0747950591b3ddca37248d363c6ab64f3 (patch)
tree9bae88b29416ec6d9e3f58abdf26e98e0b7d42e8 /apps/federation/settings
parent8f55b1a27d97f24751542b6dc44a89eb03387a75 (diff)
downloadnextcloud-server-2754afc0747950591b3ddca37248d363c6ab64f3.tar.gz
nextcloud-server-2754afc0747950591b3ddca37248d363c6ab64f3.zip
add option to auto add servers to the list of trusted servers once a federated share was created and accepted successfully
Diffstat (limited to 'apps/federation/settings')
-rw-r--r--apps/federation/settings/settings-admin.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/federation/settings/settings-admin.php b/apps/federation/settings/settings-admin.php
index c160b7ee825..76ae0c3b6e0 100644
--- a/apps/federation/settings/settings-admin.php
+++ b/apps/federation/settings/settings-admin.php
@@ -33,9 +33,11 @@ $trustedServers = new \OCA\Federation\TrustedServers(
\OC::$server->getHTTPClientService(),
\OC::$server->getLogger(),
\OC::$server->getJobList(),
- \OC::$server->getSecureRandom()
+ \OC::$server->getSecureRandom(),
+ \OC::$server->getConfig()
);
$template->assign('trustedServers', $trustedServers->getServers());
+$template->assign('autoAddServers', $trustedServers->getAutoAddServers());
return $template->fetchPage();