upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Inject DbHandler ....

Browse source
This commit is contained in:
Thomas Müller 2015-12-17 17:01:24 +01:00
parent 6d223df2f4
commit 693617d8a5
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/federation/appinfo/register_command.php
View file

@ -1,6 +1,8 @@
<?php
$dbConnection = \OC::$server->getDatabaseConnection();
$l10n = \OC::$server->getL10N('federation');
$dbHandler = new \OCA\Federation\DbHandler($dbConnection, $l10n);
/** @var Symfony\Component\Console\Application $application */
$application->add(new \OCA\Federation\Command\SyncFederationAddressBooks($dbConnection));
$application->add(new \OCA\Federation\Command\SyncFederationAddressBooks($dbHandler));

15
apps/federation/command/syncfederationaddressbooks.php
View file

@ -16,22 +16,22 @@ use Symfony\Component\Console\Output\OutputInterface;
class SyncFederationAddressBooks extends Command {
/** @var \OCP\IDBConnection */
protected $dbConnection;
/** @var DbHandler */
protected $dbHandler;
/** @var SyncService */
private $syncService;
/**
* @param IUserManager $userManager
* @param IDBConnection $dbConnection
* @param IDBConnection $dbHandler
* @param IConfig $config
*/
function __construct(IDBConnection $dbConnection) {
function __construct(DbHandler $dbHandler) {
parent::__construct();
$this->syncService = \OC::$server->query('CardDAVSyncService');
$this->dbConnection = $dbConnection;
$this->dbHandler = $dbHandler;
}
protected function configure() {
@ -48,8 +48,7 @@ class SyncFederationAddressBooks extends Command {
$progress = new ProgressBar($output);
$progress->start();
$db = new DbHandler($this->dbConnection, null);
$trustedServers = $db->getAllServer();
$trustedServers = $this->dbHandler->getAllServer();
foreach ($trustedServers as $trustedServer) {
$progress->advance();
$url = $trustedServer['url'];
@ -66,7 +65,7 @@ class SyncFederationAddressBooks extends Command {
];
$newToken = $this->syncService->syncRemoteAddressBook($url, 'system', $sharedSecret, $syncToken, $targetPrincipal, $targetBookId, $targetBookProperties);
if ($newToken !== $syncToken) {
$db->setServerStatus($url, TrustedServers::STATUS_OK, $newToken);
$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_OK, $newToken);
}
}
$progress->finish();