X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=f4c8b391a44aee1572b57df299421c723e682405;hb=ba43064ddb7771fc97df135a32f9b0d5e373dd36;hp=c3e0a5bf9c6a131bbcc2f631b7ecc8b235d76877;hpb=7b2ba6ef820335df682fbe3dcfaceef3a62cf4a5;p=github%2Fshaarli%2FShaarli.git
diff --git a/index.php b/index.php
index c3e0a5bf..f4c8b391 100644
--- a/index.php
+++ b/index.php
@@ -439,9 +439,7 @@ function renderPage($conf, $pluginManager, $bookmarkService, $history, $sessionM
// Display opensearch plugin (XML)
if ($targetPage == Router::$PAGE_OPENSEARCH) {
- header('Content-Type: application/xml; charset=utf-8');
- $PAGE->assign('serverurl', index_url($_SERVER));
- $PAGE->renderPage('opensearch');
+ header('Location: ./open-search');
exit;
}
@@ -453,91 +451,25 @@ function renderPage($conf, $pluginManager, $bookmarkService, $history, $sessionM
// -------- User clicks on a tag in result count: Remove the tag from the list of searched tags (searchtags=...)
if (isset($_GET['removetag'])) {
- // Get previous URL (http_referer) and remove the tag from the searchtags parameters in query.
- if (empty($_SERVER['HTTP_REFERER'])) {
- header('Location: ?');
- exit;
- }
-
- // In case browser does not send HTTP_REFERER
- parse_str(parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY), $params);
-
- // Prevent redirection loop
- if (isset($params['removetag'])) {
- unset($params['removetag']);
- }
-
- if (isset($params['searchtags'])) {
- $tags = explode(' ', $params['searchtags']);
- // Remove value from array $tags.
- $tags = array_diff($tags, array($_GET['removetag']));
- $params['searchtags'] = implode(' ', $tags);
-
- if (empty($params['searchtags'])) {
- unset($params['searchtags']);
- }
-
- // We also remove page (keeping the same page has no sense, since
- // the results are different)
- unset($params['page']);
- }
- header('Location: ?'.http_build_query($params));
+ header('Location: ./remove-tag/'. $_GET['removetag']);
exit;
}
// -------- User wants to change the number of bookmarks per page (linksperpage=...)
if (isset($_GET['linksperpage'])) {
- if (is_numeric($_GET['linksperpage'])) {
- $_SESSION['LINKS_PER_PAGE']=abs(intval($_GET['linksperpage']));
- }
-
- if (! empty($_SERVER['HTTP_REFERER'])) {
- $location = generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('linksperpage'));
- } else {
- $location = '?';
- }
- header('Location: '. $location);
+ header('Location: ./links-per-page?nb='. $_GET['linksperpage']);
exit;
}
// -------- User wants to see only private bookmarks (toggle)
if (isset($_GET['visibility'])) {
- if ($_GET['visibility'] === 'private') {
- // Visibility not set or not already private, set private, otherwise reset it
- if (empty($_SESSION['visibility']) || $_SESSION['visibility'] !== 'private') {
- // See only private bookmarks
- $_SESSION['visibility'] = 'private';
- } else {
- unset($_SESSION['visibility']);
- }
- } elseif ($_GET['visibility'] === 'public') {
- if (empty($_SESSION['visibility']) || $_SESSION['visibility'] !== 'public') {
- // See only public bookmarks
- $_SESSION['visibility'] = 'public';
- } else {
- unset($_SESSION['visibility']);
- }
- }
-
- if (! empty($_SERVER['HTTP_REFERER'])) {
- $location = generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('visibility'));
- } else {
- $location = '?';
- }
- header('Location: '. $location);
+ header('Location: ./visibility/'. $_GET['visibility']);
exit;
}
// -------- User wants to see only untagged bookmarks (toggle)
if (isset($_GET['untaggedonly'])) {
- $_SESSION['untaggedonly'] = empty($_SESSION['untaggedonly']);
-
- if (! empty($_SERVER['HTTP_REFERER'])) {
- $location = generateLocation($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'], array('untaggedonly'));
- } else {
- $location = '?';
- }
- header('Location: '. $location);
+ header('Location: ./untagged-only');
exit;
}
@@ -569,18 +501,7 @@ function renderPage($conf, $pluginManager, $bookmarkService, $history, $sessionM
// -------- Display the Tools menu if requested (import/export/bookmarklet...)
if ($targetPage == Router::$PAGE_TOOLS) {
- $data = [
- 'pageabsaddr' => index_url($_SERVER),
- 'sslenabled' => is_https($_SERVER),
- ];
- $pluginManager->executeHooks('render_tools', $data);
-
- foreach ($data as $key => $value) {
- $PAGE->assign($key, $value);
- }
-
- $PAGE->assign('pagetitle', t('Tools') .' - '. $conf->get('general.title', 'Shaarli'));
- $PAGE->renderPage('tools');
+ header('Location: ./tools');
exit;
}
@@ -625,10 +546,10 @@ function renderPage($conf, $pluginManager, $bookmarkService, $history, $sessionM
);
// TODO: do not handle exceptions/errors in JS.
- echo '';
+ echo '';
exit;
}
- echo '';
+ echo '';
exit;
} else {
// show the change password form.
@@ -1566,17 +1487,36 @@ $app->group('/api/v1', function () {
})->add('\Shaarli\Api\ApiMiddleware');
$app->group('', function () {
- $this->get('/login', '\Shaarli\Front\Controller\LoginController:index')->setName('login');
- $this->get('/logout', '\Shaarli\Front\Controller\LogoutController:index')->setName('logout');
- $this->get('/picture-wall', '\Shaarli\Front\Controller\PictureWallController:index')->setName('picwall');
- $this->get('/tag-cloud', '\Shaarli\Front\Controller\TagCloudController:cloud')->setName('tagcloud');
- $this->get('/tag-list', '\Shaarli\Front\Controller\TagCloudController:list')->setName('taglist');
- $this->get('/daily', '\Shaarli\Front\Controller\DailyController:index')->setName('daily');
- $this->get('/daily-rss', '\Shaarli\Front\Controller\DailyController:rss')->setName('dailyrss');
- $this->get('/feed-atom', '\Shaarli\Front\Controller\FeedController:atom')->setName('feedatom');
- $this->get('/feed-rss', '\Shaarli\Front\Controller\FeedController:rss')->setName('feedrss');
-
- $this->get('/add-tag/{newTag}', '\Shaarli\Front\Controller\TagController:addTag')->setName('add-tag');
+ /* -- PUBLIC --*/
+ $this->get('/login', '\Shaarli\Front\Controller\Visitor\LoginController:index')->setName('login');
+ $this->get('/picture-wall', '\Shaarli\Front\Controller\Visitor\PictureWallController:index')->setName('picwall');
+ $this->get('/tag-cloud', '\Shaarli\Front\Controller\Visitor\TagCloudController:cloud')->setName('tagcloud');
+ $this->get('/tag-list', '\Shaarli\Front\Controller\Visitor\TagCloudController:list')->setName('taglist');
+ $this->get('/daily', '\Shaarli\Front\Controller\Visitor\DailyController:index')->setName('daily');
+ $this->get('/daily-rss', '\Shaarli\Front\Controller\Visitor\DailyController:rss')->setName('dailyrss');
+ $this->get('/feed-atom', '\Shaarli\Front\Controller\Visitor\FeedController:atom')->setName('feedatom');
+ $this->get('/feed-rss', '\Shaarli\Front\Controller\Visitor\FeedController:rss')->setName('feedrss');
+ $this->get('/open-search', '\Shaarli\Front\Controller\Visitor\OpenSearchController:index')->setName('opensearch');
+
+ $this->get('/add-tag/{newTag}', '\Shaarli\Front\Controller\Visitor\TagController:addTag')->setName('add-tag');
+ $this->get('/remove-tag/{tag}', '\Shaarli\Front\Controller\Visitor\TagController:removeTag')->setName('remove-tag');
+
+ /* -- LOGGED IN -- */
+ $this->get('/logout', '\Shaarli\Front\Controller\Admin\LogoutController:index')->setName('logout');
+ $this->get('/tools', '\Shaarli\Front\Controller\Admin\ToolsController:index')->setName('tools');
+
+ $this
+ ->get('/links-per-page', '\Shaarli\Front\Controller\Admin\SessionFilterController:linksPerPage')
+ ->setName('filter-links-per-page')
+ ;
+ $this
+ ->get('/visibility/{visibility}', '\Shaarli\Front\Controller\Admin\SessionFilterController:visibility')
+ ->setName('visibility')
+ ;
+ $this
+ ->get('/untagged-only', '\Shaarli\Front\Controller\Admin\SessionFilterController:untaggedOnly')
+ ->setName('untagged-only')
+ ;
})->add('\Shaarli\Front\ShaarliMiddleware');
$response = $app->run(true);