From 6615cc366c7d58b2f3291a76d6c299a114155899 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 18 Jan 2011 16:47:52 +0300 Subject: [PATCH] properly handle redirecting back to requested page after logging in (closes #302) --- backend.php | 14 ++------------ functions.php | 7 ++++++- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/backend.php b/backend.php index 962453c4b..c7bd61808 100644 --- a/backend.php +++ b/backend.php @@ -82,18 +82,8 @@ if ($op == "rpc" || $op == "viewfeed" || $op == "view") { print_error_xml(6); die; } else { - print " - -

Error: Not logged in.

- - - "; + header("Location: tt-rss.php?return=" . + urlencode($_SERVER['REQUEST_URI'])); } exit; } diff --git a/functions.php b/functions.php index 64269aada..0bbefd581 100644 --- a/functions.php +++ b/functions.php @@ -1985,7 +1985,12 @@ } } - header("Location: " . $_SERVER["REQUEST_URI"]); + if ($_REQUEST['return']) { + header("Location: " . $_REQUEST['return']); + } else { + header("Location: " . $_SERVER["REQUEST_URI"]); + } + exit; return;