aboutsummaryrefslogtreecommitdiffhomepage
path: root/index.php
diff options
context:
space:
mode:
Diffstat (limited to 'index.php')
-rw-r--r--index.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/index.php b/index.php
index 6b02942f..1eaf70ce 100644
--- a/index.php
+++ b/index.php
@@ -495,9 +495,9 @@ if (isset($_POST['login']))
495 else 495 else
496 { 496 {
497 ban_loginFailed(); 497 ban_loginFailed();
498 $redir = ''; 498 $redir = '&username='. $_POST['login'];
499 if (isset($_GET['post'])) { 499 if (isset($_GET['post'])) {
500 $redir = '?post=' . urlencode($_GET['post']); 500 $redir .= '&post=' . urlencode($_GET['post']);
501 foreach (array('description', 'source', 'title') as $param) { 501 foreach (array('description', 'source', 'title') as $param) {
502 if (!empty($_GET[$param])) { 502 if (!empty($_GET[$param])) {
503 $redir .= '&' . $param . '=' . urlencode($_GET[$param]); 503 $redir .= '&' . $param . '=' . urlencode($_GET[$param]);
@@ -943,6 +943,9 @@ function renderPage()
943 if ($GLOBALS['config']['OPEN_SHAARLI']) { header('Location: ?'); exit; } // No need to login for open Shaarli 943 if ($GLOBALS['config']['OPEN_SHAARLI']) { header('Location: ?'); exit; } // No need to login for open Shaarli
944 $token=''; if (ban_canLogin()) $token=getToken(); // Do not waste token generation if not useful. 944 $token=''; if (ban_canLogin()) $token=getToken(); // Do not waste token generation if not useful.
945 $PAGE->assign('token',$token); 945 $PAGE->assign('token',$token);
946 if (isset($_GET['username'])) {
947 $PAGE->assign('username', escape($_GET['username']));
948 }
946 $PAGE->assign('returnurl',(isset($_SERVER['HTTP_REFERER']) ? escape($_SERVER['HTTP_REFERER']):'')); 949 $PAGE->assign('returnurl',(isset($_SERVER['HTTP_REFERER']) ? escape($_SERVER['HTTP_REFERER']):''));
947 $PAGE->renderPage('loginform'); 950 $PAGE->renderPage('loginform');
948 exit; 951 exit;