Fix url generator for index.php frontend and linkToRoute

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
nextcloud · Dec 7, 2020 · 9d641d3 · 9d641d3
1 parent 342355d
commit 9d641d3
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php
@@ -80,7 +80,14 @@ public function __construct(IConfig $config,
 	 * Returns a url to the given route.
 	 */
 	public function linkToRoute(string $routeName, array $arguments = []): string {
-		return $this->router->generate($routeName, $arguments);
+		$frontControllerActive = $this->isFrontControllerActive();
+		$url = $this->router->generate($routeName, $arguments);
+
+		if (strpos($url, '/index.php/') !== false || $frontControllerActive) {
+			return $url;
+		}
+
+		return 'index.php/' . $url;
 	}
 
 	/**
@@ -121,7 +128,7 @@ public function linkToOCSRouteAbsolute(string $routeName, array $arguments = [])
 	 * Returns a url to the given app and file.
 	 */
 	public function linkTo(string $appName, string $file, array $args = []): string {
-		$frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
+		$frontControllerActive = $this->isFrontControllerActive();
 
 		if ($appName !== '') {
 			$app_path = \OC_App::getAppPath($appName);
@@ -271,4 +278,13 @@ public function linkToDocs(string $key): string {
 	public function getBaseUrl(): string {
 		return $this->request->getServerProtocol() . '://' . $this->request->getServerHost() . \OC::$WEBROOT;
 	}
+
+	/**
+	 * is index.php needed ?
+	 * @return bool
+	 */
+	protected function isFrontControllerActive() {
+		return $this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true
+			|| getenv('front_controller_active') === 'true';
+	}
 }