adjust federation app
This commit is contained in:
parent
0c86f69626
commit
63efdb35df
|
@ -23,5 +23,4 @@
|
||||||
namespace OCA\Federation\AppInfo;
|
namespace OCA\Federation\AppInfo;
|
||||||
|
|
||||||
$app = new Application();
|
$app = new Application();
|
||||||
$app->registerSettings();
|
|
||||||
$app->registerHooks();
|
$app->registerHooks();
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<description>Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description>
|
<description>Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description>
|
||||||
<licence>AGPL</licence>
|
<licence>AGPL</licence>
|
||||||
<author>Bjoern Schiessle</author>
|
<author>Bjoern Schiessle</author>
|
||||||
<version>1.0.0</version>
|
<version>1.0.1</version>
|
||||||
<namespace>Federation</namespace>
|
<namespace>Federation</namespace>
|
||||||
<category>other</category>
|
<category>other</category>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -19,4 +19,8 @@
|
||||||
<background-jobs>
|
<background-jobs>
|
||||||
<job>OCA\Federation\SyncJob</job>
|
<job>OCA\Federation\SyncJob</job>
|
||||||
</background-jobs>
|
</background-jobs>
|
||||||
|
|
||||||
|
<settings>
|
||||||
|
<admin>OCA\Federation\Settings\Admin</admin>
|
||||||
|
</settings>
|
||||||
</info>
|
</info>
|
||||||
|
|
|
@ -51,13 +51,6 @@ class Application extends \OCP\AppFramework\App {
|
||||||
$this->registerMiddleware();
|
$this->registerMiddleware();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* register setting scripts
|
|
||||||
*/
|
|
||||||
public function registerSettings() {
|
|
||||||
App::registerAdmin('federation', 'settings/settings-admin');
|
|
||||||
}
|
|
||||||
|
|
||||||
private function registerService() {
|
private function registerService() {
|
||||||
$container = $this->getContainer();
|
$container = $this->getContainer();
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,69 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
|
||||||
|
*
|
||||||
|
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
|
||||||
|
*
|
||||||
|
* @license GNU AGPL version 3 or any later version
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCA\Federation\Settings;
|
||||||
|
|
||||||
|
use OCA\Federation\TrustedServers;
|
||||||
|
use OCP\AppFramework\Http\TemplateResponse;
|
||||||
|
use OCP\Settings\ISettings;
|
||||||
|
|
||||||
|
class Admin implements ISettings {
|
||||||
|
|
||||||
|
/** @var TrustedServers */
|
||||||
|
private $trustedServers;
|
||||||
|
|
||||||
|
public function __construct(TrustedServers $trustedServers) {
|
||||||
|
$this->trustedServers = $trustedServers;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return TemplateResponse
|
||||||
|
*/
|
||||||
|
public function getForm() {
|
||||||
|
$parameters = [
|
||||||
|
'trustedServers' => $this->trustedServers->getServers(),
|
||||||
|
'autoAddServers' => $this->trustedServers->getAutoAddServers(),
|
||||||
|
];
|
||||||
|
|
||||||
|
return new TemplateResponse('federation', 'settings-admin', $parameters, '');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return string the section ID, e.g. 'sharing'
|
||||||
|
*/
|
||||||
|
public function getSection() {
|
||||||
|
return 'sharing';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return int whether the form should be rather on the top or bottom of
|
||||||
|
* the admin section. The forms are arranged in ascending order of the
|
||||||
|
* priority values. It is required to return a value between 0 and 100.
|
||||||
|
*
|
||||||
|
* E.g.: 70
|
||||||
|
*/
|
||||||
|
public function getPriority() {
|
||||||
|
return 30;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -1,43 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
|
||||||
*
|
|
||||||
* @author Björn Schießle <bjoern@schiessle.org>
|
|
||||||
*
|
|
||||||
* @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/>
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
$template = new OCP\Template('federation', 'settings-admin');
|
|
||||||
|
|
||||||
$dbHandler = new \OCA\Federation\DbHandler(
|
|
||||||
\OC::$server->getDatabaseConnection(),
|
|
||||||
\OC::$server->getL10N('federation')
|
|
||||||
);
|
|
||||||
|
|
||||||
$trustedServers = new \OCA\Federation\TrustedServers(
|
|
||||||
$dbHandler,
|
|
||||||
\OC::$server->getHTTPClientService(),
|
|
||||||
\OC::$server->getLogger(),
|
|
||||||
\OC::$server->getJobList(),
|
|
||||||
\OC::$server->getSecureRandom(),
|
|
||||||
\OC::$server->getConfig(),
|
|
||||||
\OC::$server->getEventDispatcher()
|
|
||||||
);
|
|
||||||
|
|
||||||
$template->assign('trustedServers', $trustedServers->getServers());
|
|
||||||
$template->assign('autoAddServers', $trustedServers->getAutoAddServers());
|
|
||||||
|
|
||||||
return $template->fetchPage();
|
|
Loading…
Reference in New Issue