diff options
| author | friendica <info@friendica.com> | 2013-04-16 20:16:44 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-04-16 20:16:44 -0700 |
| commit | f72d3512242d13fbba69b77a739319a9cd58627c (patch) | |
| tree | d59c8904fda78b04ee19e42343d8c7ca56c67a5f /mod/magic.php | |
| parent | 3e7e0a3c43ddb742a6518a3b38b89e3d9675eae5 (diff) | |
| parent | 23f897b8aedac8a99aa81ac7799ec67ca196d407 (diff) | |
| download | volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.tar.gz volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.tar.bz2 volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.zip | |
Merge branch 'master' into photothread
Diffstat (limited to 'mod/magic.php')
| -rw-r--r-- | mod/magic.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mod/magic.php b/mod/magic.php index 0f9a66c5b..e655e9737 100644 --- a/mod/magic.php +++ b/mod/magic.php @@ -35,7 +35,6 @@ function magic_init(&$a) { } - if(! $x) { // Finger them if they've never been seen here before @@ -60,6 +59,9 @@ function magic_init(&$a) { return; } + // This is ready-made for a plugin that provides a blacklist or "ask me" before blindly authenticating. + // By default, we'll proceed without asking. + $arr = array( 'channel_id' => local_user(), 'xchan' => $x[0], @@ -117,7 +119,7 @@ function magic_init(&$a) { goaway($x[0]['hubloc_callback'] . '/' . substr($x[0]['hubloc_addr'],0,strpos($x[0]['hubloc_addr'],'@')) . '/?f=&auth=' . $channel['channel_address'] . '@' . $a->get_hostname() - . '&sec=' . $token . '&dest=' . $dest . '&version=' . ZOT_REVISION); + . '&sec=' . $token . '&dest=' . urlencode($dest) . '&version=' . ZOT_REVISION); } if(strpos($dest,'/')) |