novabbs
/
rocksolid-light
3
0
Fork 1
Code Issues 25 Pull Requests Releases Wiki Activity

Fix handling redirects to other section when section names contains +

This commit is contained in:
Retro_Guy 2024-05-10 04:15:55 -07:00
parent b0b1ba8b69
commit 6c20453fa8
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Rocksolid_Light/rocksolid/article-flat.php
View File

@ -57,7 +57,10 @@ if (($findsection) && trim($findsection) !== $config_name) {
$link .= "://"; $link .= "://";
$link .= $_SERVER['HTTP_HOST']; $link .= $_SERVER['HTTP_HOST'];
$link .= $_SERVER['REQUEST_URI']; $link .= $_SERVER['REQUEST_URI'];
$newurl = preg_replace("|/$config_name/|", "/$findsection/", $link);
// May need to add more characters to escape for regex here
$configregex = '|/' . preg_replace('/\+/', '\+', addslashes($config_name)) . '/|';
$newurl = preg_replace($configregex, "/$findsection/", $link);
header("Location:$newurl"); header("Location:$newurl");
die(); die();
} }

9
Rocksolid_Light/rocksolid/thread.php
View File

@ -19,9 +19,10 @@ if (isset($_REQUEST["first"]))
$first = intval($_REQUEST["first"]); $first = intval($_REQUEST["first"]);
if (isset($_REQUEST["last"])) if (isset($_REQUEST["last"]))
$last = intval($_REQUEST["last"]); $last = intval($_REQUEST["last"]);
// Switch to correct section in case group has been moved and link is to old section // Switch to correct section in case group has been moved and link is to old section
$findsection = get_section_by_group($group); $findsection = get_section_by_group($group);
if (trim($findsection) !== $config_name) { if (($findsection) && trim($findsection) !== $config_name) {
if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on')
$link = "https"; $link = "https";
else else
@ -29,10 +30,14 @@ if (trim($findsection) !== $config_name) {
$link .= "://"; $link .= "://";
$link .= $_SERVER['HTTP_HOST']; $link .= $_SERVER['HTTP_HOST'];
$link .= $_SERVER['REQUEST_URI']; $link .= $_SERVER['REQUEST_URI'];
$newurl = preg_replace("|/$config_name/|", "/$findsection/", $link);
// May need to add more characters to escape for regex here
$configregex = '|/' . preg_replace('/\+/', '\+', addslashes($config_name)) . '/|';
$newurl = preg_replace($configregex, "/$findsection/", $link);
header("Location:$newurl"); header("Location:$newurl");
die(); die();
} }
if (isset($_COOKIE['mail_name'])) { if (isset($_COOKIE['mail_name'])) {
if ($userdata = get_user_mail_auth_data($_COOKIE['mail_name'])) { if ($userdata = get_user_mail_auth_data($_COOKIE['mail_name'])) {
$userfile = $spooldir . '/' . strtolower($_COOKIE['mail_name']) . '-articleviews.dat'; $userfile = $spooldir . '/' . strtolower($_COOKIE['mail_name']) . '-articleviews.dat';