diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2019-03-18 08:55:54 +1100 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2019-03-18 08:55:54 +1100 |
| commit | 97009a27482f4a744eded54132f9067e1a2e6c80 (patch) | |
| tree | f7d56c9b097ea63ef0c09d08ac13805188d4e739 /Zotlabs/Module | |
| parent | a976f418e35a8f4651441a952c8f4c037cb8d2f9 (diff) | |
| parent | e28bde6ccdb03b370df1dbc8654d69c905b8a235 (diff) | |
| download | volse-hubzilla-97009a27482f4a744eded54132f9067e1a2e6c80.tar.gz volse-hubzilla-97009a27482f4a744eded54132f9067e1a2e6c80.tar.bz2 volse-hubzilla-97009a27482f4a744eded54132f9067e1a2e6c80.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Dreport.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Zotlabs/Module/Dreport.php b/Zotlabs/Module/Dreport.php index e45f49d7c..0fc36dc29 100644 --- a/Zotlabs/Module/Dreport.php +++ b/Zotlabs/Module/Dreport.php @@ -16,17 +16,20 @@ class Dreport extends \Zotlabs\Web\Controller { $channel = \App::get_channel(); $mid = ((argc() > 1) ? argv(1) : ''); + $encoded_mid = ''; - if(strpos($mid,'b64.') === 0) + if(strpos($mid,'b64.') === 0) { + $encoded_mid = $mid; $mid = @base64url_decode(substr($mid,4)); - - + } if($mid === 'push') { $table = 'push'; $mid = ((argc() > 2) ? argv(2) : ''); - if(strpos($mid,'b64.') === 0) + if(strpos($mid,'b64.') === 0) { + $encoded_mid = $mid; $mid = @base64url_decode(substr($mid,4)); + } if($mid) { $i = q("select id from item where mid = '%s' and uid = %d and ( author_xchan = '%s' or ( owner_xchan = '%s' and item_wall = 1 )) ", @@ -40,7 +43,7 @@ class Dreport extends \Zotlabs\Web\Controller { } } sleep(3); - goaway(z_root() . '/dreport/' . urlencode($mid)); + goaway(z_root() . '/dreport/' . (($encoded_mid) ? $encoded_mid : $mid)); } if($mid === 'mail') { |