fix ?rt= handling in login.php

19 years ago · 1f0d3e0765
parent ab9ecc041b
commit 1f0d3e0765
1 changed files with 5 additions and 9 deletions
--- a/login.php
+++ b/login.php
@ -18,6 +18,7 @@

 	$login = $_POST["login"];
 	$password = $_POST["password"];
+	$return_to = $_POST["rt"];

 	if ($_COOKIE["ttrss_sid"]) {
 		require_once "sessions.php";
@ -41,20 +42,14 @@
 		if (authenticate_user($link, $login, $password)) {
 			initialize_user_prefs($link, $_SESSION["uid"]); 
 			
-			if ($_SESSION["login_redirect"]) {
-				$redirect_to = $_SESSION["login_redirect"];
-			} else {
-				$redirect_to = "tt-rss.php";
+			if (!$return_to) {
+				$return_to = "tt-rss.php";
 			}
-			header("Location: $redirect_base/$redirect_to");
+			header("Location: $redirect_base/$return_to");
 			exit;
 		}
 	}

-	if ($_GET["rt"]) {
-		$_SESSION["login_redirect"] = $_GET["rt"];
-	}
-
 ?>
 <html>
 <head>
@ -90,6 +85,7 @@
 	</td></tr>
 	<tr><td colspan="2" align="center">
 		<input type="submit" class="button" value="Login">
+		<input type="hidden" name="rt" value="<?= $_GET['rt'] ?>">
 	</td></tr>
 	
 	</table>