diff options
author | Mario Vavti <mario@mariovavti.com> | 2018-07-19 09:12:33 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2018-07-19 09:12:33 +0200 |
commit | fe0e00f8f8c6b94389ee28c84dfabd80ac988ac9 (patch) | |
tree | 700ad3d11c0a1720bc776004d68fda3b3a68dddf /Zotlabs/Module/Magic.php | |
parent | dfbdeafa39da8605c124f47d811ebca2330d9169 (diff) | |
parent | ec852b0c8d6c8e566b2a5fb279ed359630afb5ee (diff) | |
download | volse-hubzilla-fe0e00f8f8c6b94389ee28c84dfabd80ac988ac9.tar.gz volse-hubzilla-fe0e00f8f8c6b94389ee28c84dfabd80ac988ac9.tar.bz2 volse-hubzilla-fe0e00f8f8c6b94389ee28c84dfabd80ac988ac9.zip |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Magic.php')
-rw-r--r-- | Zotlabs/Module/Magic.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php index 25c318f30..be6866592 100644 --- a/Zotlabs/Module/Magic.php +++ b/Zotlabs/Module/Magic.php @@ -14,15 +14,15 @@ class Magic extends \Zotlabs\Web\Controller { logger('mod_magic: args: ' . print_r($_REQUEST,true),LOGGER_DATA); $addr = ((x($_REQUEST,'addr')) ? $_REQUEST['addr'] : ''); + $bdest = ((x($_REQUEST,'bdest')) ? $_REQUEST['bdest'] : ''); $dest = ((x($_REQUEST,'dest')) ? $_REQUEST['dest'] : ''); $test = ((x($_REQUEST,'test')) ? intval($_REQUEST['test']) : 0); $rev = ((x($_REQUEST,'rev')) ? intval($_REQUEST['rev']) : 0); $owa = ((x($_REQUEST,'owa')) ? intval($_REQUEST['owa']) : 0); $delegate = ((x($_REQUEST,'delegate')) ? $_REQUEST['delegate'] : ''); - // Apache(?) appears to perform an htmlentities() operation on this variable - - $dest = html_entity_decode($dest); + if($bdest) + $dest = hex2bin($bdest); $parsed = parse_url($dest); if(! $parsed) { |