adjust federatedfilesharing

diff --git a/apps/federatedfilesharing/appinfo/info.xml b/apps/federatedfilesharing/appinfo/info.xml
index ff734c1356c6fdb4a17a07a08a36b09f021b2188..411716c5c3273c1eefcd6fa63bf93f67924d4da1 100644 (file)
--- a/apps/federatedfilesharing/appinfo/info.xml
+++ b/apps/federatedfilesharing/appinfo/info.xml
@@ -5,10 +5,13 @@
     <description>Provide federated file sharing across servers</description>
     <licence>AGPL</licence>
     <author>Bjoern Schiessle, Roeland Jago Douma</author>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <namespace>FederatedFileSharing</namespace>
     <category>other</category>
     <dependencies>
                <owncloud min-version="9.1" max-version="9.1" />
     </dependencies>
+    <settings>
+        <admin>OCA\FederatedFileSharing\Settings\Admin</admin>
+    </settings>
 </info>

diff --git a/apps/federatedfilesharing/lib/AppInfo/Application.php b/apps/federatedfilesharing/lib/AppInfo/Application.php
index b4ddc6cfe0455a0a74d53ecb1afe8f081d4ab11c..b767a322505b26aa8a63d69ef6f1099ee73956b1 100644 (file)
--- a/apps/federatedfilesharing/lib/AppInfo/Application.php
+++ b/apps/federatedfilesharing/lib/AppInfo/Application.php
@@ -40,7 +40,6 @@ class Application extends App {
         * register personal and admin settings page
         */
        public function registerSettings() {
-               \OCP\App::registerAdmin('federatedfilesharing', 'settings-admin');
                \OCP\App::registerPersonal('federatedfilesharing', 'settings-personal');
        }
 

diff --git a/apps/federatedfilesharing/lib/Settings/Admin.php b/apps/federatedfilesharing/lib/Settings/Admin.php
new file mode 100644 (file)
index 0000000..64619e3
--- /dev/null
+++ b/apps/federatedfilesharing/lib/Settings/Admin.php
@@ -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\FederatedFileSharing\Settings;
+
+use OCA\FederatedFileSharing\FederatedShareProvider;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\Settings\ISettings;
+
+class Admin implements ISettings {
+
+       /** @var FederatedShareProvider */
+       private $fedShareProvider;
+
+       public function __construct(FederatedShareProvider $fedShareProvider) {
+               $this->fedShareProvider = $fedShareProvider;
+       }
+
+       /**
+        * @return TemplateResponse
+        */
+       public function getForm() {
+               $parameters = [
+                       'outgoingServer2serverShareEnabled' => $this->fedShareProvider->isOutgoingServer2serverShareEnabled(),
+                       'incomingServer2serverShareEnabled' => $this->fedShareProvider->isIncomingServer2serverShareEnabled(),
+               ];
+
+               return new TemplateResponse('federatedfilesharing', '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 20;
+       }
+
+}

diff --git a/apps/federatedfilesharing/settings-admin.php b/apps/federatedfilesharing/settings-admin.php
deleted file mode 100644 (file)
index 5ccd223..0000000
--- a/apps/federatedfilesharing/settings-admin.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @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/>
- *
- */
-
-use OCA\FederatedFileSharing\AppInfo\Application;
-
-$app = new Application();
-$federatedShareProvider = $app->getFederatedShareProvider();
-
-$tmpl = new OCP\Template('federatedfilesharing', 'settings-admin');
-$tmpl->assign('outgoingServer2serverShareEnabled', $federatedShareProvider->isOutgoingServer2serverShareEnabled());
-$tmpl->assign('incomingServer2serverShareEnabled', $federatedShareProvider->isIncomingServer2serverShareEnabled());
-
-return $tmpl->fetchPage();

diff --git a/apps/federatedfilesharing/templates/settings-admin.php b/apps/federatedfilesharing/templates/settings-admin.php
index 5d2eb04c1706e6794ca83a1213edd1f0a31401d8..aa2f551e18d3f1190b5bae2e28041eab049dc952 100644 (file)
--- a/apps/federatedfilesharing/templates/settings-admin.php
+++ b/apps/federatedfilesharing/templates/settings-admin.php
@@ -4,7 +4,7 @@
 script('federatedfilesharing', 'settings-admin');
 ?>
 
-<div id="fileSharingSettings">
+<div id="fileSharingSettings" class="section">
        <h3><?php p($l->t('Federated Cloud Sharing'));?></h3>
        <a target="_blank" rel="noreferrer" class="icon-info svg"
                title="<?php p($l->t('Open documentation'));?>"