Merge pull request #61 from pikzen/shaarli47

Prevents ?do=addlink from generating a 404 if the user is not logged in
Fixes https://github.com/sebsauvage/Shaarli/issues/141
Fixes https://github.com/shaarli/Shaarli/issues/47
This commit is contained in:
nodiscc 2014-11-21 18:42:10 +01:00
commit 9bd6089b57

View file

@ -1349,6 +1349,14 @@ function renderPage()
header('Location: ?do=login&post='.urlencode($_GET['post']).(!empty($_GET['title'])?'&title='.urlencode($_GET['title']):'').(!empty($_GET['description'])?'&description='.urlencode($_GET['description']):'').(!empty($_GET['source'])?'&source='.urlencode($_GET['source']):'')); // Redirect to login page, then back to post link. header('Location: ?do=login&post='.urlencode($_GET['post']).(!empty($_GET['title'])?'&title='.urlencode($_GET['title']):'').(!empty($_GET['description'])?'&description='.urlencode($_GET['description']):'').(!empty($_GET['source'])?'&source='.urlencode($_GET['source']):'')); // Redirect to login page, then back to post link.
exit; exit;
} }
// Same case as above except that user tried to access ?do=addlink without being logged in
// Note: passing empty parameters makes Shaarli generate default URLs and descriptions.
if (isset($_GET['do']) && $_GET['do'] === 'addlink') {
header('Location: ?do=login&post=');
exit;
}
$PAGE = new pageBuilder; $PAGE = new pageBuilder;
buildLinkList($PAGE,$LINKSDB); // Compute list of links to display buildLinkList($PAGE,$LINKSDB); // Compute list of links to display
$PAGE->renderPage('linklist'); $PAGE->renderPage('linklist');