Default formatter: add a setting to disable auto-linkification

[github/shaarli/Shaarli.git] / application / front / controller / admin / ManageTagController.php

diff --git a/application/front/controller/admin/ManageTagController.php b/application/front/controller/admin/ManageTagController.php
index e015e613d8c60ca4a8a7c0a92e8e10d1e96230f5..2065c3e27cbdac21c43d68901c197aee05253805 100644 (file)
--- a/application/front/controller/admin/ManageTagController.php
+++ b/application/front/controller/admin/ManageTagController.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Shaarli\Front\Controller\Admin;
 
 use Shaarli\Bookmark\BookmarkFilter;
+use Shaarli\Render\TemplatePage;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
@@ -16,7 +17,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
     {
@@ -28,11 +29,11 @@ class ManageTagController extends ShaarliAdminController
             t('Manage tags') .' - '. $this->container->conf->get('general.title', 'Shaarli')
         );
 
-        return $response->write($this->render('changetag'));
+        return $response->write($this->render(TemplatePage::CHANGE_TAG));
     }
 
     /**
-     * POST /manage-tags - Update or delete provided tag
+     * POST /admin/tags - Update or delete provided tag
      */
     public function save(Request $request, Response $response): Response
     {
@@ -40,13 +41,13 @@ class ManageTagController extends ShaarliAdminController
 
         $isDelete = null !== $request->getParam('deletetag') && null === $request->getParam('renametag');
 
-        $fromTag = escape(trim($request->getParam('fromtag') ?? ''));
-        $toTag = escape(trim($request->getParam('totag') ?? ''));
+        $fromTag = trim($request->getParam('fromtag') ?? '');
+        $toTag = trim($request->getParam('totag') ?? '');
 
         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 +81,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);
     }
 }