11 files changed, 56 insertions, 41 deletions

diff --git a/application/container/ContainerBuilder.php b/application/container/ContainerBuilder.php
index 85126246..72a85710 100644
--- a/application/container/ContainerBuilder.php
+++ b/application/container/ContainerBuilder.php
@@ -38,19 +38,17 @@ class ContainerBuilder
     /** @var LoginManager */
     protected $login;
 
-    /** @var string */
-    protected $webPath;
+    /** @var string|null */
+    protected $basePath = null;
 
     public function __construct(
         ConfigManager $conf,
         SessionManager $session,
-        LoginManager $login,
-        string $webPath
+        LoginManager $login
     ) {
         $this->conf = $conf;
         $this->session = $session;
         $this->login = $login;
-        $this->webPath = $webPath;
     }
 
     public function build(): ShaarliContainer
@@ -60,7 +58,7 @@ class ContainerBuilder
         $container['conf'] = $this->conf;
         $container['sessionManager'] = $this->session;
         $container['loginManager'] = $this->login;
-        $container['webPath'] = $this->webPath;
+        $container['basePath'] = $this->basePath;
 
         $container['plugins'] = function (ShaarliContainer $container): PluginManager {
             return new PluginManager($container->conf);
diff --git a/application/container/ShaarliContainer.php b/application/container/ShaarliContainer.php
index a95393cd..4b97aae2 100644
--- a/application/container/ShaarliContainer.php
+++ b/application/container/ShaarliContainer.php
@@ -21,21 +21,20 @@ 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 BookmarkServiceInterface $bookmarkService
  * @property ConfigManager            $conf
- * @property SessionManager           $sessionManager
- * @property LoginManager             $loginManager
- * @property string                   $webPath
+ * @property mixed[]                  $environment     $_SERVER automatically injected by Slim
+ * @property FeedBuilder              $feedBuilder
+ * @property FormatterFactory         $formatterFactory
  * @property History                  $history
- * @property BookmarkServiceInterface $bookmarkService
+ * @property HttpAccess               $httpAccess
+ * @property LoginManager             $loginManager
  * @property PageBuilder              $pageBuilder
- * @property PluginManager            $pluginManager
- * @property FormatterFactory         $formatterFactory
  * @property PageCacheManager         $pageCacheManager
- * @property FeedBuilder              $feedBuilder
+ * @property PluginManager            $pluginManager
+ * @property SessionManager           $sessionManager
  * @property Thumbnailer              $thumbnailer
- * @property HttpAccess               $httpAccess
  */
 class ShaarliContainer extends Container
 {
diff --git a/application/front/ShaarliMiddleware.php b/application/front/ShaarliMiddleware.php
index 47aa61bb..7ad610c7 100644
--- a/application/front/ShaarliMiddleware.php
+++ b/application/front/ShaarliMiddleware.php
@@ -38,9 +38,9 @@ class ShaarliMiddleware
      */
     public function __invoke(Request $request, Response $response, callable $next)
     {
-        try {
-            $this->container->basePath = rtrim($request->getUri()->getBasePath(), '/');
+        $this->container->basePath = rtrim($request->getUri()->getBasePath(), '/');
 
+        try {
             $response = $next($request, $response);
         } catch (ShaarliFrontException $e) {
             $this->container->pageBuilder->assign('message', $e->getMessage());
@@ -54,7 +54,7 @@ class ShaarliMiddleware
             $response = $response->withStatus($e->getCode());
             $response = $response->write($this->container->pageBuilder->render('error'));
         } catch (UnauthorizedException $e) {
-            return $response->withRedirect($request->getUri()->getBasePath() . '/login');
+            return $response->withRedirect($this->container->basePath . '/login');
         }
 
         return $response;
diff --git a/application/front/controller/admin/ConfigureController.php b/application/front/controller/admin/ConfigureController.php
index 5a482d8e..44971c43 100644
--- a/application/front/controller/admin/ConfigureController.php
+++ b/application/front/controller/admin/ConfigureController.php
@@ -19,7 +19,7 @@ use Throwable;
 class ConfigureController extends ShaarliAdminController
 {
     /**
-     * GET /configure - Displays the configuration page
+     * GET /admin/configure - Displays the configuration page
      */
     public function index(Request $request, Response $response): Response
     {
@@ -56,7 +56,7 @@ class ConfigureController extends ShaarliAdminController
     }
 
     /**
-     * POST /configure - Update Shaarli's configuration
+     * POST /admin/configure - Update Shaarli's configuration
      */
     public function save(Request $request, Response $response): Response
     {
@@ -115,6 +115,6 @@ class ConfigureController extends ShaarliAdminController
 
         $this->saveSuccessMessage(t('Configuration was saved.'));
 
-        return $response->withRedirect('./configure');
+        return $this->redirect($response, '/admin/configure');
     }
 }
diff --git a/application/front/controller/admin/LogoutController.php b/application/front/controller/admin/LogoutController.php
index 41e81984..c5984814 100644
--- a/application/front/controller/admin/LogoutController.php
+++ b/application/front/controller/admin/LogoutController.php
@@ -22,8 +22,8 @@ class LogoutController extends ShaarliAdminController
         $this->container->sessionManager->logout();
 
         // TODO: switch to a simple Cookie manager allowing to check the session, and create mocks.
-        setcookie(LoginManager::$STAY_SIGNED_IN_COOKIE, 'false', 0, $this->container->webPath);
+        setcookie(LoginManager::$STAY_SIGNED_IN_COOKIE, 'false', 0, $this->container->basePath . '/');
 
-        return $response->withRedirect('./');
+        return $this->redirect($response, '/');
     }
 }
diff --git a/application/front/controller/admin/ManageTagController.php b/application/front/controller/admin/ManageTagController.php
index e015e613..7dab288a 100644
--- a/application/front/controller/admin/ManageTagController.php
+++ b/application/front/controller/admin/ManageTagController.php
@@ -16,7 +16,7 @@ use Slim\Http\Response;
 class ManageTagController extends ShaarliAdminController
 {
     /**
-     * GET /manage-tags - Displays the manage tags page
+     * GET /admin/tags - Displays the manage tags page
      */
     public function index(Request $request, Response $response): Response
     {
@@ -32,7 +32,7 @@ class ManageTagController extends ShaarliAdminController
     }
 
     /**
-     * POST /manage-tags - Update or delete provided tag
+     * POST /admin/tags - Update or delete provided tag
      */
     public function save(Request $request, Response $response): Response
     {
@@ -46,7 +46,7 @@ class ManageTagController extends ShaarliAdminController
         if (0 === strlen($fromTag) || false === $isDelete && 0 === strlen($toTag)) {
             $this->saveWarningMessage(t('Invalid tags provided.'));
 
-            return $response->withRedirect('./manage-tags');
+            return $this->redirect($response, '/admin/tags');
         }
 
         // TODO: move this to bookmark service
@@ -80,8 +80,8 @@ class ManageTagController extends ShaarliAdminController
 
         $this->saveSuccessMessage($alert);
 
-        $redirect = true === $isDelete ? './manage-tags' : './?searchtags='. urlencode($toTag);
+        $redirect = true === $isDelete ? '/admin/tags' : '/?searchtags='. urlencode($toTag);
 
-        return $response->withRedirect($redirect);
+        return $this->redirect($response, $redirect);
     }
 }
diff --git a/application/front/controller/admin/PasswordController.php b/application/front/controller/admin/PasswordController.php
index 6e8f0bcb..bcce01a6 100644
--- a/application/front/controller/admin/PasswordController.php
+++ b/application/front/controller/admin/PasswordController.php
@@ -29,7 +29,7 @@ class PasswordController extends ShaarliAdminController
     }
 
     /**
-     * GET /password - Displays the change password template
+     * GET /admin/password - Displays the change password template
      */
     public function index(Request $request, Response $response): Response
     {
@@ -37,7 +37,7 @@ class PasswordController extends ShaarliAdminController
     }
 
     /**
-     * POST /password - Change admin password - existing and new passwords need to be provided.
+     * POST /admin/password - Change admin password - existing and new passwords need to be provided.
      */
     public function change(Request $request, Response $response): Response
     {
diff --git a/application/front/controller/admin/PostBookmarkController.php b/application/front/controller/admin/PostBookmarkController.php
index dbe570e2..f3ee5dea 100644
--- a/application/front/controller/admin/PostBookmarkController.php
+++ b/application/front/controller/admin/PostBookmarkController.php
@@ -19,7 +19,7 @@ use Slim\Http\Response;
 class PostBookmarkController extends ShaarliAdminController
 {
     /**
-     * GET /add-shaare - Displays the form used to create a new bookmark from an URL
+     * GET /admin/add-shaare - Displays the form used to create a new bookmark from an URL
      */
     public function addShaare(Request $request, Response $response): Response
     {
@@ -32,7 +32,7 @@ class PostBookmarkController extends ShaarliAdminController
     }
 
     /**
-     * GET /shaare - Displays the bookmark form for creation.
+     * GET /admin/shaare - Displays the bookmark form for creation.
      *               Note that if the URL is found in existing bookmarks, then it will be in edit mode.
      */
     public function displayCreateForm(Request $request, Response $response): Response
@@ -93,7 +93,7 @@ class PostBookmarkController extends ShaarliAdminController
     }
 
     /**
-     * GET /shaare-{id} - Displays the bookmark form in edition mode.
+     * GET /admin/shaare/{id} - Displays the bookmark form in edition mode.
      */
     public function displayEditForm(Request $request, Response $response, array $args): Response
     {
@@ -106,7 +106,7 @@ class PostBookmarkController extends ShaarliAdminController
         } catch (BookmarkNotFoundException $e) {
             $this->saveErrorMessage(t('Bookmark not found'));
 
-            return $response->withRedirect('./');
+            return $this->redirect($response, '/');
         }
 
         $formatter = $this->container->formatterFactory->getFormatter('raw');
@@ -116,7 +116,7 @@ class PostBookmarkController extends ShaarliAdminController
     }
 
     /**
-     * POST /shaare
+     * POST /admin/shaare
      */
     public function save(Request $request, Response $response): Response
     {
@@ -170,11 +170,14 @@ class PostBookmarkController extends ShaarliAdminController
         );
     }
 
+    /**
+     * GET /admin/shaare/delete
+     */
     public function deleteBookmark(Request $request, Response $response): Response
     {
         $this->checkToken($request);
 
-        $ids = escape(trim($request->getParam('lf_linkdate')));
+        $ids = escape(trim($request->getParam('id')));
         if (strpos($ids, ' ') !== false) {
             // multiple, space-separated ids provided
             $ids = array_values(array_filter(preg_split('/\s+/', $ids), 'strlen'));
@@ -207,7 +210,7 @@ class PostBookmarkController extends ShaarliAdminController
         }
 
         // Don't redirect to where we were previously because the datastore has changed.
-        return $response->withRedirect('./');
+        return $this->redirect($response, '/');
     }
 
     protected function displayForm(array $link, bool $isNew, Request $request, Response $response): Response
diff --git a/application/front/controller/visitor/LoginController.php b/application/front/controller/visitor/LoginController.php
index 4de2f55d..0db1f463 100644
--- a/application/front/controller/visitor/LoginController.php
+++ b/application/front/controller/visitor/LoginController.php
@@ -23,7 +23,7 @@ class LoginController extends ShaarliVisitorController
         if ($this->container->loginManager->isLoggedIn()
             || $this->container->conf->get('security.open_shaarli', false)
         ) {
-            return $response->withRedirect('./');
+            return $this->redirect($response, '/');
         }
 
         $userCanLogin = $this->container->loginManager->canLogin($request->getServerParams());
diff --git a/application/front/controller/visitor/ShaarliVisitorController.php b/application/front/controller/visitor/ShaarliVisitorController.php
index b90b1e8f..b494a8e6 100644
--- a/application/front/controller/visitor/ShaarliVisitorController.php
+++ b/application/front/controller/visitor/ShaarliVisitorController.php
@@ -105,6 +105,19 @@ abstract class ShaarliVisitorController
     }
 
     /**
+     * Simple helper which prepend the base path to redirect path.
+     *
+     * @param Response $response
+     * @param string $path Absolute path, e.g.: `/`, or `/admin/shaare/123` regardless of install directory
+     *
+     * @return Response updated
+     */
+    protected function redirect(Response $response, string $path): Response
+    {
+        return $response->withRedirect($this->container->basePath . $path);
+    }
+
+    /**
      * Generates a redirection to the previous page, based on the HTTP_REFERER.
      * It fails back to the home page.
      *
diff --git a/application/front/controller/visitor/TagController.php b/application/front/controller/visitor/TagController.php
index a0bc1d1b..c176f43f 100644
--- a/application/front/controller/visitor/TagController.php
+++ b/application/front/controller/visitor/TagController.php
@@ -11,6 +11,8 @@ use Slim\Http\Response;
  * Class TagController
  *
  * Slim controller handle tags.
+ *
+ * TODO: check redirections with new helper
  */
 class TagController extends ShaarliVisitorController
 {
@@ -27,10 +29,10 @@ class TagController extends ShaarliVisitorController
         // In case browser does not send HTTP_REFERER, we search a single tag
         if (null === $referer) {
             if (null !== $newTag) {
-                return $response->withRedirect('./?searchtags='. urlencode($newTag));
+                return $this->redirect($response, '/?searchtags='. urlencode($newTag));
             }
 
-            return $response->withRedirect('./');
+            return $this->redirect($response, '/');
         }
 
         $currentUrl = parse_url($referer);
@@ -81,7 +83,7 @@ class TagController extends ShaarliVisitorController
 
         // If the referrer is not provided, we can update the search, so we failback on the bookmark list
         if (empty($referer)) {
-            return $response->withRedirect('./');
+            return $this->redirect($response, '/');
         }
 
         $tagToRemove = $args['tag'] ?? null;