From 17870912e456a616454f1b03fcb0d60a402334c9 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 8 Apr 2013 20:57:36 -0700
Subject: document the ability to provide a selective magic-auth filter as a
 plugin plugin

---
 mod/magic.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'mod/magic.php')

diff --git a/mod/magic.php b/mod/magic.php
index 0f9a66c5b..d6697f6cc 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],
-- 
cgit v1.2.3


From 15ceaeb62483f28558bf870ed256793fab01cb24 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 10 Apr 2013 23:00:41 -0700
Subject: magic auth doco

---
 mod/magic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/magic.php')

diff --git a/mod/magic.php b/mod/magic.php
index d6697f6cc..e655e9737 100644
--- a/mod/magic.php
+++ b/mod/magic.php
@@ -119,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,'/'))
-- 
cgit v1.2.3