baoshuo/S2OJ
baoshuo/S2OJ
1
1
Fork 0
mirror of https://github.com/renbaoshuo/S2OJ.git synced 2024-11-22 14:08:42 +00:00
Code Issues Actions Packages Releases Activity

fix(login): return url

Browse Source
This commit is contained in:
Baoshuo Ren 2023-02-01 20:03:02 +08:00
parent f2f4ae9b4e
commit d6fdff6588
Signed by: baoshuo
GPG Key ID: 00CB9680AB29F51A
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/controllers/login.php
View File

@ -135,7 +135,7 @@ if (isset($_POST['login'])) {
$('#help-username, #help-passwor, #help-captcha').html(''); $('#help-username, #help-passwor, #help-captcha').html('');
if (msg == 'ok') { if (msg == 'ok') {
var prevUrl = document.referrer; var prevUrl = new URLSearchParams(location.search).get('to') || document.referrer;
if (prevUrl == '' || /.*\/login.*/.test(prevUrl) || /.*\/logout.*/.test(prevUrl) || /.*\/register.*/.test(prevUrl) || /.*\/reset_password.*/.test(prevUrl)) { if (prevUrl == '' || /.*\/login.*/.test(prevUrl) || /.*\/logout.*/.test(prevUrl) || /.*\/register.*/.test(prevUrl) || /.*\/reset_password.*/.test(prevUrl)) {
prevUrl = '/'; prevUrl = '/';
}; };

4
web/app/libs/uoj-html-lib.php
View File

@ -69,9 +69,9 @@ function permanentlyRedirectToHTTP() {
} }
function redirectToLogin() { function redirectToLogin() {
if (UOJContext::isAjax()) { if (UOJContext::isAjax()) {
die('please <a href="' . HTML::url('/login') . '">login</a>'); die('please <a href="' . HTML::url('/login', ['params' => ['to' => UOJContext::requestPath()]]) . '">login</a>');
} else { } else {
header('Location: ' . HTML::url('/login')); header('Location: ' . HTML::url('/login', ['params' => ['to' => UOJContext::requestPath()]]));
die(); die();
} }
} }