diff options
| author | Mario <mario@mariovavti.com> | 2021-09-06 19:22:39 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-09-06 19:22:39 +0000 |
| commit | c1ce211b566a68b02f1197ef1bd0fc79385c1c48 (patch) | |
| tree | 81d8b40691e73abcb5e988cd42d11d6a1e396c60 /Zotlabs/Module/Pubstream.php | |
| parent | 3d40ea7f4417a1134dc53cc2e804af13370cd57b (diff) | |
| parent | 1aa782633184f41733778ce75139f0d9a890e1e3 (diff) | |
| download | volse-hubzilla-c1ce211b566a68b02f1197ef1bd0fc79385c1c48.tar.gz volse-hubzilla-c1ce211b566a68b02f1197ef1bd0fc79385c1c48.tar.bz2 volse-hubzilla-c1ce211b566a68b02f1197ef1bd0fc79385c1c48.zip | |
Merge branch 'dev' into 6.2RC
Diffstat (limited to 'Zotlabs/Module/Pubstream.php')
| -rw-r--r-- | Zotlabs/Module/Pubstream.php | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 32023d6cc..e1a95be67 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -42,19 +42,16 @@ class Pubstream extends \Zotlabs\Web\Controller { $site_firehose = false; } - $mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : ''); - $hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : ''); - - - if(strpos($mid,'b64.') === 0) - $decoded = @base64url_decode(substr($mid,4)); - if($decoded) - $mid = $decoded; + $mid = ((x($_REQUEST, 'mid')) ? unpack_link_id($_REQUEST['mid']) : ''); + if ($mid === false) { + notice(t('Malformed message id.') . EOL); + return; + } + $hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : ''); $item_normal = item_normal(); $item_normal_update = item_normal_update(); - - $net = ((array_key_exists('net',$_REQUEST)) ? escape_tags($_REQUEST['net']) : ''); + $net = ((array_key_exists('net',$_REQUEST)) ? escape_tags($_REQUEST['net']) : ''); $title = replace_macros(get_markup_template("section_title.tpl"),array( '$title' => (($hashtags) ? '#' . htmlspecialchars($hashtags, ENT_COMPAT,'UTF-8') : '') @@ -115,8 +112,7 @@ class Pubstream extends \Zotlabs\Web\Controller { . "; divmore_height = " . intval($maxheight) . "; </script>\r\n"; //if we got a decoded hash we must encode it again before handing to javascript - if($decoded) - $mid = 'b64.' . base64url_encode($mid); + $mid = gen_link_id($mid); \App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( '$baseurl' => z_root(), |