Fixing bug calling deprecated nextcloud API

pierre-alain-b · Oct 20, 2022 · 7136d5d · 7136d5d
1 parent f24115c
commit 7136d5d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/appinfo/app.php b/appinfo/app.php
@@ -10,6 +10,5 @@
 
 $app = new OCA\RainLoop\AppInfo\Application();
 $app->registerNavigation();
-$app->registerPersonalSettings();
 $app->getContainer()->query('RainLoopHelper')->registerHooks();
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
 	<id>rainloop</id>
-	<name>RainLoop</name>
-	<summary>RainLoop Webmail</summary>
-	<description>Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, "Additionnal settings" and you will see a "Rainloop webmail" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05).</description>
+	<name>RainLoop (deprecated, consider Snappymail)</name>
+	<summary>RainLoop Webmail (deprecated, consider Snappymail)</summary>
+	<description>Rainloop is not maintained anymore. Consider a switch to Snappymail which is an actively-maintained fork of Rainloop. After enabling in Nextcloud, go to Nextcloud admin panel, "Additionnal settings" and you will see a "Rainloop webmail" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05).</description>
 	<version>7.2.5</version>
 	<licence>agpl</licence>
 	<author>RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -79,9 +79,4 @@ public function registerNavigation() {
 		});
 	}
 
-	public function registerPersonalSettings() {
-		\OCP\App::registerPersonal('rainloop', 'templates/personal');
-	}
-
-}
-
+}
diff --git a/lib/Settings/PersonalSettings.php b/lib/Settings/PersonalSettings.php
@@ -3,8 +3,10 @@
 
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
+use OCP\Settings\ISettings;
 
-class PersonalSettings {
+class PersonalSettings implements ISettings
+{
 	private $config;
 
 	public function __construct(IConfig $config) {
@@ -28,5 +30,13 @@ public function getForm() {
 		return new TemplateResponse('rainloop', 'personal_settings', $parameters, '');
 	}
 
-}
+	public function getSection() {
+		return 'additional';
+	}
+
 
+	public function getPriority() {
+		return 50;
+	}
+
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,9 +79,4 @@ public function registerNavigation() { @@
     		});
     	}
-    	public function registerPersonalSettings() {
-    		\OCP\App::registerPersonal('rainloop', 'templates/personal');
-    	}
-    }
+    }