From 818b3193ffabec57501e3bdfa997206e3c0671ef Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 13 Jun 2020 11:22:14 +0200
Subject: Explicitly define base and asset path in templates

With the new routes, all pages are not all at the same folder level anymore
(e.g. /shaare and /shaare/123), so we can't just use './' everywhere.
The most consistent way to handle this is to prefix all path with the proper variable,
and handle the actual path in controllers.
---
 application/container/ShaarliContainer.php                |  1 +
 application/front/ShaarliMiddleware.php                   |  2 ++
 .../front/controller/visitor/ShaarliVisitorController.php | 15 ++++++++++++++-
 application/render/PageBuilder.php                        |  4 ++++
 4 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'application')

diff --git a/application/container/ShaarliContainer.php b/application/container/ShaarliContainer.php
index fec398d0..a95393cd 100644
--- a/application/container/ShaarliContainer.php
+++ b/application/container/ShaarliContainer.php
@@ -22,6 +22,7 @@ use Slim\Container;
  * Extension of Slim container to document the injected objects.
  *
  * @property mixed[]                  $environment     $_SERVER automatically injected by Slim
+ * @property string                   $basePath        Shaarli's instance base path (e.g. `/shaarli/`)
  * @property ConfigManager            $conf
  * @property SessionManager           $sessionManager
  * @property LoginManager             $loginManager
diff --git a/application/front/ShaarliMiddleware.php b/application/front/ShaarliMiddleware.php
index f8992e0b..47aa61bb 100644
--- a/application/front/ShaarliMiddleware.php
+++ b/application/front/ShaarliMiddleware.php
@@ -39,6 +39,8 @@ class ShaarliMiddleware
     public function __invoke(Request $request, Response $response, callable $next)
     {
         try {
+            $this->container->basePath = rtrim($request->getUri()->getBasePath(), '/');
+
             $response = $next($request, $response);
         } catch (ShaarliFrontException $e) {
             $this->container->pageBuilder->assign('message', $e->getMessage());
diff --git a/application/front/controller/visitor/ShaarliVisitorController.php b/application/front/controller/visitor/ShaarliVisitorController.php
index 98423d90..b90b1e8f 100644
--- a/application/front/controller/visitor/ShaarliVisitorController.php
+++ b/application/front/controller/visitor/ShaarliVisitorController.php
@@ -60,6 +60,19 @@ abstract class ShaarliVisitorController
         $this->assignView('privateLinkcount', $this->container->bookmarkService->count(BookmarkFilter::$PRIVATE));
         $this->assignView('plugin_errors', $this->container->pluginManager->getErrors());
 
+        /*
+         * Define base path (if Shaarli is installed in a domain's subfolder, e.g. `/shaarli`)
+         * and the asset path (subfolder/tpl/default for default theme).
+         * These MUST be used to create an internal link or to include an asset in templates.
+         */
+        $this->assignView('base_path', $this->container->basePath);
+        $this->assignView(
+            'asset_path',
+            $this->container->basePath . '/' .
+            rtrim($this->container->conf->get('resource.raintpl_tpl', 'tpl'), '/') . '/' .
+            $this->container->conf->get('resource.theme', 'default')
+        );
+
         $this->executeDefaultHooks($template);
 
         return $this->container->pageBuilder->render($template);
@@ -105,7 +118,7 @@ abstract class ShaarliVisitorController
         array $clearParams = [],
         string $anchor = null
     ): Response {
-        $defaultPath = rtrim($request->getUri()->getBasePath(), '/') . '/';
+        $defaultPath = $this->container->basePath . '/';
         $referer = $this->container->environment['HTTP_REFERER'] ?? null;
 
         if (null !== $referer) {
diff --git a/application/render/PageBuilder.php b/application/render/PageBuilder.php
index d90ed58b..2779eb90 100644
--- a/application/render/PageBuilder.php
+++ b/application/render/PageBuilder.php
@@ -149,6 +149,10 @@ class PageBuilder
      */
     protected function finalize(): void
     {
+        //FIXME - DEV _ REMOVE ME
+        $this->assign('base_path', '/Shaarli');
+        $this->assign('asset_path', '/Shaarli/tpl/default');
+
         // TODO: use the SessionManager
         $messageKeys = [
             SessionManager::KEY_SUCCESS_MESSAGES,
-- 
cgit v1.2.3