summaryrefslogtreecommitdiffstats
path: root/apps/federation/backgroundjob
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/backgroundjob
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/backgroundjob')
-rw-r--r--apps/federation/backgroundjob/getsharedsecret.php3
-rw-r--r--apps/federation/backgroundjob/requestsharedsecret.php3
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/federation/backgroundjob/getsharedsecret.php b/apps/federation/backgroundjob/getsharedsecret.php
index 665c6ec6cce..3e8597cd78b 100644
--- a/apps/federation/backgroundjob/getsharedsecret.php
+++ b/apps/federation/backgroundjob/getsharedsecret.php
@@ -85,7 +85,8 @@ class GetSharedSecret extends QueuedJob{
\OC::$server->getHTTPClientService(),
\OC::$server->getLogger(),
$this->jobList,
- \OC::$server->getSecureRandom()
+ \OC::$server->getSecureRandom(),
+ \OC::$server->getConfig()
);
}
}
diff --git a/apps/federation/backgroundjob/requestsharedsecret.php b/apps/federation/backgroundjob/requestsharedsecret.php
index b61026a4d66..b73b620b4b7 100644
--- a/apps/federation/backgroundjob/requestsharedsecret.php
+++ b/apps/federation/backgroundjob/requestsharedsecret.php
@@ -77,7 +77,8 @@ class RequestSharedSecret extends QueuedJob {
\OC::$server->getHTTPClientService(),
\OC::$server->getLogger(),
$this->jobList,
- \OC::$server->getSecureRandom()
+ \OC::$server->getSecureRandom(),
+ \OC::$server->getConfig()
);
}
}