adapt federatedfilesharing

also drops IE8 switch

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

7 files changed, 190 insertions, 84 deletions

diff --git a/apps/federatedfilesharing/appinfo/app.php b/apps/federatedfilesharing/appinfo/app.php
index b6a145bcc2c..62265ff0644 100644
--- a/apps/federatedfilesharing/appinfo/app.php
+++ b/apps/federatedfilesharing/appinfo/app.php
@@ -26,8 +26,6 @@ use OCA\FederatedFileSharing\Notifier;
 $app = new \OCA\FederatedFileSharing\AppInfo\Application();
 $eventDispatcher = \OC::$server->getEventDispatcher();
 
-$app->registerSettings();
-
 $manager = \OC::$server->getNotificationManager();
 $manager->registerNotifier(function() {
 	return \OC::$server->query(Notifier::class);
diff --git a/apps/federatedfilesharing/appinfo/info.xml b/apps/federatedfilesharing/appinfo/info.xml
index aaacf3ec80e..ce2e2286be3 100644
--- a/apps/federatedfilesharing/appinfo/info.xml
+++ b/apps/federatedfilesharing/appinfo/info.xml
@@ -6,7 +6,7 @@
     <licence>AGPL</licence>
     <author>Bjoern Schiessle</author>
     <author>Roeland Jago Douma</author>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <namespace>FederatedFileSharing</namespace>
     <category>other</category>
     <dependencies>
@@ -14,5 +14,7 @@
     </dependencies>
     <settings>
         <admin>OCA\FederatedFileSharing\Settings\Admin</admin>
+        <personal>OCA\FederatedFileSharing\Settings\Personal</personal>
+        <personal-section>OCA\FederatedFileSharing\Settings\PersonalSection</personal-section>
     </settings>
 </info>
diff --git a/apps/federatedfilesharing/lib/AppInfo/Application.php b/apps/federatedfilesharing/lib/AppInfo/Application.php
index 346d3c4e292..a2e2f761862 100644
--- a/apps/federatedfilesharing/lib/AppInfo/Application.php
+++ b/apps/federatedfilesharing/lib/AppInfo/Application.php
@@ -70,13 +70,6 @@ class Application extends App {
 	}
 
 	/**
-	 * register personal and admin settings page
-	 */
-	public function registerSettings() {
-		\OCP\App::registerPersonal('federatedfilesharing', 'settings-personal');
-	}
-
-	/**
 	 * get instance of federated share provider
 	 *
 	 * @return FederatedShareProvider
diff --git a/apps/federatedfilesharing/lib/Settings/Personal.php b/apps/federatedfilesharing/lib/Settings/Personal.php
new file mode 100644
index 00000000000..854f5f13ab6
--- /dev/null
+++ b/apps/federatedfilesharing/lib/Settings/Personal.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 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\IL10N;
+use OCP\IURLGenerator;
+use OCP\IUserSession;
+use OCP\Settings\ISettings;
+
+class Personal implements ISettings {
+
+	/** @var FederatedShareProvider */
+	private $federatedShareProvider;
+	/** @var IUserSession */
+	private $userSession;
+	/** @var IL10N */
+	private $l;
+	/** @var IURLGenerator */
+	private $urlGenerator;
+	/** @var \OC_Defaults */
+	private $defaults;
+
+	public function __construct(
+		FederatedShareProvider $federatedShareProvider, #
+		IUserSession $userSession,
+		IL10N $l,
+		IURLGenerator $urlGenerator,
+		\OC_Defaults $defaults
+	) {
+		$this->federatedShareProvider = $federatedShareProvider;
+		$this->userSession = $userSession;
+		$this->l = $l;
+		$this->urlGenerator = $urlGenerator;
+		$this->defaults = $defaults;
+	}
+
+	/**
+	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+	 * @since 9.1
+	 */
+	public function getForm() {
+		$cloudID = $this->userSession->getUser()->getCloudId();
+		$url = 'https://nextcloud.com/federation#' . $cloudID;
+
+		$parameters = [
+			'outgoingServer2serverShareEnabled' => $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(),
+			'message_with_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID, see %s', [$url]),
+			'message_without_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID', [$cloudID]),
+			'logoPath' => $this->urlGenerator->imagePath('core', 'logo-icon.svg'),
+			'reference' => $url,
+			'cloudId' => $cloudID,
+			'color' => $this->defaults->getColorPrimary(),
+			'textColor' => "#ffffff",
+		];
+		return new TemplateResponse('federatedfilesharing', 'settings-personal', $parameters, '');
+	}
+
+	/**
+	 * @return string the section ID, e.g. 'sharing'
+	 * @since 9.1
+	 */
+	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
+	 * @since 9.1
+	 */
+	public function getPriority() {
+		return 40;
+	}
+}
diff --git a/apps/federatedfilesharing/lib/Settings/PersonalSection.php b/apps/federatedfilesharing/lib/Settings/PersonalSection.php
new file mode 100644
index 00000000000..e4e1bad7217
--- /dev/null
+++ b/apps/federatedfilesharing/lib/Settings/PersonalSection.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 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 OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\Settings\IIconSection;
+
+class PersonalSection implements IIconSection {
+	/** @var IURLGenerator */
+	private $urlGenerator;
+	/** @var IL10N */
+	private $l;
+
+	public function __construct(IURLGenerator $urlGenerator, IL10N $l) {
+		$this->urlGenerator = $urlGenerator;
+		$this->l = $l;
+	}
+
+	/**
+	 * returns the relative path to an 16*16 icon describing the section.
+	 * e.g. '/core/img/places/files.svg'
+	 *
+	 * @returns string
+	 * @since 12
+	 */
+	public function getIcon() {
+		return $this->urlGenerator->imagePath('core', 'actions/share.svg');
+	}
+
+	/**
+	 * returns the ID of the section. It is supposed to be a lower case string,
+	 * e.g. 'ldap'
+	 *
+	 * @returns string
+	 * @since 9.1
+	 */
+	public function getID() {
+		return 'sharing';
+	}
+
+	/**
+	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+	 * integration'. Use the L10N service to translate it.
+	 *
+	 * @return string
+	 * @since 9.1
+	 */
+	public function getName() {
+		return $this->l->t('Sharing');
+	}
+
+	/**
+	 * @return int whether the form should be rather on the top or bottom of
+	 * the settings navigation. The sections are arranged in ascending order of
+	 * the priority values. It is required to return a value between 0 and 99.
+	 *
+	 * E.g.: 70
+	 * @since 9.1
+	 */
+	public function getPriority() {
+		return 15;
+	}
+}
diff --git a/apps/federatedfilesharing/settings-personal.php b/apps/federatedfilesharing/settings-personal.php
deleted file mode 100644
index cd22cc17089..00000000000
--- a/apps/federatedfilesharing/settings-personal.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @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;
-
-\OC_Util::checkLoggedIn();
-
-$l = \OC::$server->getL10N('federatedfilesharing');
-
-$app = new Application();
-$federatedShareProvider = $app->getFederatedShareProvider();
-
-$isIE8 = false;
-preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
-if (count($matches) > 0 && $matches[1] <= 9) {
-	$isIE8 = true;
-}
-
-$cloudID = \OC::$server->getUserSession()->getUser()->getCloudId();
-$url = 'https://nextcloud.com/federation#' . $cloudID;
-$logoPath = \OC::$server->getURLGenerator()->imagePath('core', 'logo-icon.svg');
-/** @var \OCP\Defaults $theme */
-$theme = \OC::$server->query(\OCP\Defaults::class);
-$color = $theme->getColorPrimary();
-$textColor = "#ffffff";
-if(\OC::$server->getAppManager()->isEnabledForUser("theming")) {
-	$logoPath = $theme->getLogo();
-	try {
-		$util = \OC::$server->query("\OCA\Theming\Util");
-		if($util->invertTextColor($color)) {
-			$textColor = "#000000";
-		}
-	} catch (OCP\AppFramework\QueryException $e) {
-
-	}
-}
-
-
-$tmpl = new OCP\Template('federatedfilesharing', 'settings-personal');
-$tmpl->assign('outgoingServer2serverShareEnabled', $federatedShareProvider->isOutgoingServer2serverShareEnabled());
-$tmpl->assign('message_with_URL', $l->t('Share with me through my #Nextcloud Federated Cloud ID, see %s', [$url]));
-$tmpl->assign('message_without_URL', $l->t('Share with me through my #Nextcloud Federated Cloud ID', [$cloudID]));
-$tmpl->assign('logoPath', $logoPath);
-$tmpl->assign('reference', $url);
-$tmpl->assign('cloudId', $cloudID);
-$tmpl->assign('showShareIT', !$isIE8);
-$tmpl->assign('color', $color);
-$tmpl->assign('textColor', $textColor);
-
-return $tmpl->fetchPage();
diff --git a/apps/federatedfilesharing/templates/settings-personal.php b/apps/federatedfilesharing/templates/settings-personal.php
index 126daae27d0..c6be2a45f16 100644
--- a/apps/federatedfilesharing/templates/settings-personal.php
+++ b/apps/federatedfilesharing/templates/settings-personal.php
@@ -18,7 +18,6 @@ style('federatedfilesharing', 'settings-personal');
 
 		<br>
 
-		<?php if ($_['showShareIT']) {?>
 		<p>
 			<?php p($l->t('Share it so your friends can share files with you:')); ?><br>
 			<button class="social-facebook pop-up"
@@ -58,7 +57,6 @@ style('federatedfilesharing', 'settings-personal');
 <?php p($l->t('Share with me via Nextcloud')); ?></a></xmp>
 		</p>
 		</div>
-		<?php } ?>
 
 	</div>
 <?php endif; ?>