From 9fbc42294e7667c5ef19cafa0d1fcfbc1c0f36a9 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sun, 26 Jul 2020 14:43:10 +0200
Subject: New basePath: fix officiel plugin paths and vintage template
---
.../visitor/ShaarliVisitorController.php | 33 ++++++++++++----------
1 file changed, 18 insertions(+), 15 deletions(-)
(limited to 'application/front/controller/visitor/ShaarliVisitorController.php')
diff --git a/application/front/controller/visitor/ShaarliVisitorController.php b/application/front/controller/visitor/ShaarliVisitorController.php
index b494a8e6..47057d97 100644
--- a/application/front/controller/visitor/ShaarliVisitorController.php
+++ b/application/front/controller/visitor/ShaarliVisitorController.php
@@ -60,22 +60,9 @@ 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);
+ return $this->container->pageBuilder->render($template, $this->container->basePath);
}
/**
@@ -97,13 +84,29 @@ abstract class ShaarliVisitorController
$pluginData,
[
'target' => $template,
- 'loggedin' => $this->container->loginManager->isLoggedIn()
+ 'loggedin' => $this->container->loginManager->isLoggedIn(),
+ 'basePath' => $this->container->basePath,
]
);
$this->assignView('plugins_' . $name, $pluginData);
}
}
+ protected function executePageHooks(string $hook, array &$data, string $template = null): void
+ {
+ $params = [
+ 'target' => $template,
+ 'loggedin' => $this->container->loginManager->isLoggedIn(),
+ 'basePath' => $this->container->basePath,
+ ];
+
+ $this->container->pluginManager->executeHooks(
+ $hook,
+ $data,
+ $params
+ );
+ }
+
/**
* Simple helper which prepend the base path to redirect path.
*
--
cgit v1.2.3