adjust systemtags app

apps/systemtags/admin.php

@@ -1,23 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
- *
- * @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/>.
- *
- */
-
-$template = new \OCP\Template('systemtags', 'admin');
-return $template->fetchPage();

apps/systemtags/appinfo/app.php

@@ -78,9 +78,6 @@ $mapperListener = function(MapperEvent $event) use ($activityManager) {
 $eventDispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
 $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
 
-$app = new \OCA\SystemTags\AppInfo\Application();
-$app->registerAdminPage();
-
 $l = \OC::$server->getL10N('systemtags');
 
 \OCA\Files\App::getNavigationManager()->add(

apps/systemtags/appinfo/info.xml

@@ -7,7 +7,7 @@
 	<licence>AGPL</licence>
 	<author>Vincent Petry, Joas Schilling</author>
 	<default_enable/>
-	<version>1.1.0</version>
+	<version>1.1.1</version>
 	<dependencies>
 		<owncloud min-version="9.2" max-version="9.2" />
 	</dependencies>
@@ -15,4 +15,7 @@
 	<types>
 		<logging/>
 	</types>
+	<settings>
+		<admin>OCA\SystemTags\Settings\Admin</admin>
+	</settings>
 </info>

apps/systemtags/lib/AppInfo/Application.php

@@ -1,37 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
- *
- * @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\SystemTags\AppInfo;
-
-use OCP\AppFramework\App;
-
-class Application extends App {
-	public function __construct() {
-		parent::__construct('systemtags');
-	}
-
-	/**
-	 * Register admin settings
-	 */
-	public function registerAdminPage() {
-		\OCP\App::registerAdmin($this->getContainer()->getAppName(), 'admin');
-	}
-}

apps/systemtags/lib/Settings/Admin.php

@@ -0,0 +1,64 @@
+<?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\SystemTags\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() {
+		return new TemplateResponse('systemtags', 'admin', [], '');
+	}
+
+	/**
+	 * @return string the section ID, e.g. 'sharing'
+	 */
+	public function getSection() {
+		return 'collaboration';
+	}
+
+	/**
+	 * @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;
+	}
+
+}

lib/private/Settings/Manager.php

@@ -254,7 +254,7 @@ class Manager implements IManager {
 		$sections = [
 			 0 => [new Section('server',        $this->l->t('Server Settings'), 0)],
 			 5 => [new Section('sharing',       $this->l->t('Sharing'), 0)],
-			//15 => [new Section('collaboration', $this->l->t('Collaboration'), 0)],
+			15 => [new Section('collaboration', $this->l->t('Collaboration'), 0)],
 			45 => [new Section('encryption',    $this->l->t('Encryption'), 0)],
 			90 => [new Section('logging',       $this->l->t('Logging'), 0)],
 			98 => [new Section('additional',    $this->l->t('Additional Settings'), 0)],