Nextcloud prevent confusion by using /run/ instead of /app/ in routes #…

…96
RainLoop · Oct 12, 2022 · 2a274f0 · 2a274f0
1 parent a9a5fbb
commit 2a274f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/integrations/nextcloud/snappymail/appinfo/routes.php b/integrations/nextcloud/snappymail/appinfo/routes.php
@@ -9,12 +9,12 @@
 		],
 		[
 			'name' => 'page#appGet',
-			'url' => '/app/',
+			'url' => '/run/',
 			'verb' => 'GET'
 		],
 		[
 			'name' => 'page#appPost',
-			'url' => '/app/',
+			'url' => '/run/',
 			'verb' => 'POST'
 		],
 		[

diff --git a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -86,14 +86,7 @@ public static function startApp(bool $api = false)
 	 */
 	public static function getAppUrl()
 	{
-		$sRequestUri = \OC::$server->getURLGenerator()->linkToRoute('snappymail.page.appGet');
-		if ($sRequestUri) {
-			return $sRequestUri;
-		}
-		$sRequestUri = empty($_SERVER['REQUEST_URI']) ? '': \trim($_SERVER['REQUEST_URI']);
-		$sRequestUri = \preg_replace('/index.php\/.+$/', 'index.php/', $sRequestUri);
-		$sRequestUri = $sRequestUri.'apps/snappymail/app/';
-		return '/'.\ltrim($sRequestUri, '/\\');
+		return \OC::$server->getURLGenerator()->linkToRoute('snappymail.page.appGet');
 	}
 
 	/**