Merge pull request #72 from nextcloud/enhancent/settings-security-section

List U2F settings in security section

4 files changed, 53 insertions, 19 deletions

diff --git a/appinfo/app.php b/appinfo/app.php
deleted file mode 100644
index baa7afb..0000000
--- a/appinfo/app.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-
-/**
- * Nextcloud - U2F 2FA
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @copyright Christoph Wurst 2016
- */
-
-OC_App::registerPersonal('twofactor_u2f', 'settings/personal');
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 023d7b7..ca1fe50 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,4 +33,7 @@
 			<provider>OCA\TwoFactorU2F\Activity\Provider</provider>
 		</providers>
 	</activity>
+	<settings>
+		<personal>OCA\TwoFactorU2F\Settings\Personal</personal>
+	</settings>
 </info>
diff --git a/lib/Settings/Personal.php b/lib/Settings/Personal.php
new file mode 100644
index 0000000..a1ecd6c
--- /dev/null
+++ b/lib/Settings/Personal.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * Two-factor U2F
+ *
+ * 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/>
+ *
+ */
+
+namespace OCA\TwoFactorU2F\Settings;
+
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\Settings\ISettings;
+
+class Personal implements ISettings {
+
+	/**
+	 * @return TemplateResponse
+	 */
+	public function getForm() {
+		return new TemplateResponse('twofactor_u2f', 'personal');
+	}
+
+	/**
+	 * @return string the section ID
+	 */
+	public function getSection() {
+		return 'security';
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getPriority() {
+		return 40;
+	}
+
+}
diff --git a/settings/personal.php b/settings/personal.php
deleted file mode 100644
index 4ccf86b..0000000
--- a/settings/personal.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$tmpl = new \OCP\Template('twofactor_u2f', 'personal');
-
-return $tmpl->fetchPage();