namespace Shaarli\Front\Controller\Admin;
use Shaarli\Bookmark\BookmarkFilter;
+use Shaarli\Render\TemplatePage;
use Slim\Http\Request;
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
{
$fromTag = $request->getParam('fromtag') ?? '';
$this->assignView('fromtag', escape($fromTag));
+ $separator = escape($this->container->conf->get('general.tags_separator', ' '));
+ if ($separator === ' ') {
+ $separator = ' ';
+ $this->assignView('tags_separator_desc', t('whitespace'));
+ }
+ $this->assignView('tags_separator', $separator);
$this->assignView(
'pagetitle',
- t('Manage tags') .' - '. $this->container->conf->get('general.title', 'Shaarli')
+ 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
{
$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
$this->saveSuccessMessage($alert);
- $redirect = true === $isDelete ? './manage-tags' : './?searchtags='. urlencode($toTag);
+ $redirect = true === $isDelete ? '/admin/tags' : '/?searchtags=' . urlencode($toTag);
+
+ return $this->redirect($response, $redirect);
+ }
+
+ /**
+ * POST /admin/tags/change-separator - Change tag separator
+ */
+ public function changeSeparator(Request $request, Response $response): Response
+ {
+ $this->checkToken($request);
+
+ $reservedCharacters = ['-', '.', '*'];
+ $newSeparator = $request->getParam('separator');
+ if ($newSeparator === null || mb_strlen($newSeparator) !== 1) {
+ $this->saveErrorMessage(t('Tags separator must be a single character.'));
+ } elseif (in_array($newSeparator, $reservedCharacters, true)) {
+ $reservedCharacters = implode(' ', array_map(function (string $character) {
+ return '<code>' . $character . '</code>';
+ }, $reservedCharacters));
+ $this->saveErrorMessage(
+ t('These characters are reserved and can\'t be used as tags separator: ') . $reservedCharacters
+ );
+ } else {
+ $this->container->conf->set('general.tags_separator', $newSeparator, true, true);
+
+ $this->saveSuccessMessage('Your tags separator setting has been updated!');
+ }
- return $response->withRedirect($redirect);
+ return $this->redirect($response, '/admin/tags');
}
}