badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more referer dedupe

Browse source
This commit is contained in:
Shish 2020-03-27 20:24:26 +00:00
parent 85662575c5
commit 02675609b4
3 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/urls.php
View file

@ -117,7 +117,13 @@ function make_http(string $link): string
return $link; return $link;
} }
function referer_or(string $dest): string function referer_or(string $dest, ?array $blacklist=null): string
{ {
return $_SERVER['HTTP_REFERER'] ?? $dest; if(empty($_SERVER['HTTP_REFERER'])) return $dest;
if($blacklist) {
foreach($blacklist as $b) {
if(strstr($_SERVER['HTTP_REFERER'], $b)) return $dest;
}
}
return $_SERVER['HTTP_REFERER'];
} }

6
ext/image/main.php
View file

@ -53,11 +53,7 @@ class ImageIO extends Extension
if ($image) { if ($image) {
send_event(new ImageDeletionEvent($image)); send_event(new ImageDeletionEvent($image));
$page->set_mode(PageMode::REDIRECT); $page->set_mode(PageMode::REDIRECT);
if (isset($_SERVER['HTTP_REFERER']) && !strstr($_SERVER['HTTP_REFERER'], 'post/view')) { $page->set_redirect(referer_or(make_link("post/list"), ['post/view']));
$page->set_redirect($_SERVER['HTTP_REFERER']);
} else {
$page->set_redirect(make_link("post/list"));
}
} }
} }
} elseif ($event->page_matches("image/replace")) { } elseif ($event->page_matches("image/replace")) {

13
ext/user/main.php
View file

@ -391,10 +391,8 @@ class UserPage extends Extension
$page->set_mode(PageMode::REDIRECT); $page->set_mode(PageMode::REDIRECT);
// Try returning to previous page // Try returning to previous page
if ($config->get_int("user_loginshowprofile", 0) == 0 && if ($config->get_int("user_loginshowprofile", 0)) {
isset($_SERVER['HTTP_REFERER']) && $page->set_redirect(referer_or(make_link(), ["user/"]));
strstr($_SERVER['HTTP_REFERER'], "post/")) {
$page->set_redirect($_SERVER['HTTP_REFERER']);
} else { } else {
$page->set_redirect(make_link("user")); $page->set_redirect(make_link("user"));
} }
@ -416,11 +414,8 @@ class UserPage extends Extension
$page->set_mode(PageMode::REDIRECT); $page->set_mode(PageMode::REDIRECT);
// Try forwarding to same page on logout unless user comes from registration page // Try forwarding to same page on logout unless user comes from registration page
if ($config->get_int("user_loginshowprofile", 0) == 0 && if ($config->get_int("user_loginshowprofile", 0)) {
isset($_SERVER['HTTP_REFERER']) && $page->set_redirect(referer_or(make_link(), ["post/"]));
strstr($_SERVER['HTTP_REFERER'], "post/")
) {
$page->set_redirect($_SERVER['HTTP_REFERER']);
} else { } else {
$page->set_redirect(make_link()); $page->set_redirect(make_link());
} }