more ZAT work

4 files changed, 37 insertions, 3 deletions

diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php
index 88ab4995b..d4f3cb9ea 100644
--- a/Zotlabs/Web/WebServer.php
+++ b/Zotlabs/Web/WebServer.php
@@ -59,7 +59,14 @@ class WebServer {
 			\App::$query_string = strip_zids(\App::$query_string);
 			if(! local_channel()) {
 				$_SESSION['my_address'] = $_GET['zid'];
-				zid_init($a);
+				zid_init();
+			}
+		}
+
+		if((x($_GET,'zat')) && (! \App::$install)) {
+			\App::$query_string = strip_zats(\App::$query_string);
+			if(! local_channel()) {
+				zat_init();
 			}
 		}
 
diff --git a/include/channel.php b/include/channel.php
index 95506ed78..1a6508803 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1310,13 +1310,12 @@ function get_my_address() {
  * If somebody arrives at our site using a zid, add their xchan to our DB if we don't have it already.
  * And if they aren't already authenticated here, attempt reverse magic auth.
  *
- * @param App &$a
  *
  * @hooks 'zid_init'
  *      string 'zid' - their zid
  *      string 'url' - the destination url
  */
-function zid_init(&$a) {
+function zid_init() {
 	$tmp_str = get_my_address();
 	if(validate_email($tmp_str)) {
 		Zotlabs\Daemon\Master::Summon(array('Gprobe',bin2hex($tmp_str)));
@@ -1343,6 +1342,28 @@ function zid_init(&$a) {
 }
 
 /**
+ * @brief
+ *
+ * If somebody arrives at our site using a zat, authenticate them
+ *
+ */
+
+function zat_init() {
+	if(local_channel() || remote_channel())
+		return;
+
+	$r = q("select * from atoken where atoken_token = '%s' limit 1",
+		dbesc($_REQUEST['zat'])
+	);
+	if($r) {
+		atoken_login($r[0]);
+	}
+
+}
+
+
+
+/**
  * @brief Adds a zid parameter to a url.
  *
  * @param string $s
diff --git a/include/security.php b/include/security.php
index 55e9d906f..c2515a6e1 100644
--- a/include/security.php
+++ b/include/security.php
@@ -102,6 +102,8 @@ function atoken_xchan($atoken) {
 
 	return [ 
 		'xchan_hash' =>  $atoken['atoken_uid'] . '.' . $atoken['atoken_name'],
+		'xchan_name' => $atoken['atoken_name'],
+		'xchan_addr' => t('guest:') . $atoken['atoken_name'] . '@' . \App::get_hostname(),
 		'xchan_network' => 'unknown',
 		'xchan_hidden' => 1,
 		'xchan_photo_mimetype' => 'image/jpeg',
diff --git a/include/text.php b/include/text.php
index 986e3b56c..0b4f039af 100644
--- a/include/text.php
+++ b/include/text.php
@@ -774,6 +774,10 @@ function strip_zids($s) {
 	return preg_replace('/[\?&]zid=(.*?)(&|$)/ism','$2',$s);
 }
 
+function strip_zats($s) {
+	return preg_replace('/[\?&]zat=(.*?)(&|$)/ism','$2',$s);
+}
+
 
 // quick and dirty quoted_printable encoding