Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-31 21:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14298 from annando/issue-14295

Browse source 
Issue 14295: Store the return url as hex string
This commit is contained in:
Tobias Diekershoff 2024-07-16 07:12:07 +02:00 committed by GitHub
commit aba11f5e5c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Content/Text/HTML.php
View file

@ -868,7 +868,7 @@ class HTML
'$save_label' => $save_label,
'$search_hint' => DI::l10n()->t('@name, !group, #tags, content'),
'$mode' => $mode,
'$return_url' => urlencode(Search::getSearchPath($s)),
'$return_url' => bin2hex(Search::getSearchPath($s)),
];
if (!$aside) {

2
src/Content/Widget/SavedSearches.php
View file

@ -61,7 +61,7 @@ class SavedSearches
'$add' => '',
'$searchbox' => '',
'$saved' => $saved,
'$return_url' => urlencode($return_url),
'$return_url' => bin2hex($return_url),
]);
}
}

2
src/Module/Post/Tag/Remove.php
View file

@ -68,7 +68,7 @@ class Remove extends \Friendica\BaseModule
protected function content(array $request = []): string
{
$returnUrl = $request['return'] ?? '';
$returnUrl = hex2bin($request['return'] ?? '');
if (!$this->session->getLocalUserId()) {
$this->baseUrl->redirect($returnUrl);

6
src/Module/Search/Saved.php
View file

@ -48,7 +48,11 @@ class Saved extends BaseModule
$action = $this->args->get(2, 'none');
$search = trim(rawurldecode($_GET['term'] ?? ''));
$return_url = $_GET['return_url'] ?? Search::getSearchPath($search);
if (!empty($_GET['return_url'])) {
$return_url = hex2bin($_GET['return_url']);
} else {
$return_url = Search::getSearchPath($search);
}
if (DI::userSession()->getLocalUserId() && $search) {
switch ($action) {