Merge pull request #1 from friendica/master

get changes

1 files changed, 53 insertions, 7 deletions

diff --git a/mod/chanview.php b/mod/chanview.php
index 1de4f4e1b..92ed757f9 100644
--- a/mod/chanview.php
+++ b/mod/chanview.php
@@ -1,9 +1,11 @@
 <?php
 
 require_once('include/Contact.php');
+require_once('include/zot.php');
 
 function chanview_content(&$a) {
 
+	$observer = $a->get_observer();
 	$xchan = null;
 
 	$r = null;
@@ -13,6 +15,11 @@ function chanview_content(&$a) {
 			dbesc($_REQUEST['hash'])
 		);
 	}
+	if($_REQUEST['address']) {
+		$r = q("select * from xchan where xchan_addr = '%s' limit 1",
+			dbesc($_REQUEST['address'])
+		);
+	}
 	elseif(local_user() && intval($_REQUEST['cid'])) {
 		$r = q("SELECT abook.*, xchan.* 
 			FROM abook left join xchan on abook_xchan = xchan_hash
@@ -25,22 +32,61 @@ function chanview_content(&$a) {
 		$r = q("select * from xchan where xchan_url = '%s' limit 1",
 			dbesc($_REQUEST['url'])
 		);
-		if(! $r)
-			$r = array(array('xchan_url' => $_REQUEST['url']));
 	}
 	if($r) {
 		$xchan = $r[0];
-		if($xchan['xchan_hash'])
-			$a->set_widget('vcard',vcard_from_xchan($xchan));
+	}
+
+
+
+	// Here, let's see if we have an xchan. If we don't, how we proceed is determined by what
+	// info we do have. If it's a URL, we can offer to visit it directly. If it's a webbie or 
+	// address, we can and should try to import it. If it's just a hash, we can't continue, but we 
+	// probably wouldn't have a hash if we don't already have an xchan for this channel.
 
+	if(! $xchan) {
+		logger('mod_chanview: fallback');
+		// This is hackish - construct a zot address from the url
+		if($_REQUEST['url']) {
+			if(preg_match('/https?\:\/\/(.*?)(\/channel\/|\/profile\/)(.*?)$/ism',$_REQUEST['url'],$matches)) {
+				$_REQUEST['address'] = $matches[3] . '@' . $matches[1];
+			}
+			logger('mod_chanview: constructed address ' . print_r($matches,true)); 
+		}
+
+		if($_REQUEST['address']) {
+			$ret = zot_finger($_REQUEST['address'],null);
+			if($ret['success']) {
+				$j = json_decode($ret['body'],true);
+				if($j)
+					import_xchan($j);
+				$r = q("select * from xchan where xchan_addr = '%s' limit 1",
+					dbesc($_REQUEST['address'])
+				);
+				if($r)
+					$xchan = $r[0];
+			}
+
+		}
 	}
-	else {
-		notice( t('No valid channel provided.') . EOL);
+
+	if(! $xchan) {
+		notice( t('Channel not found.') . EOL);
 		return;
 	}
 
+	if($xchan['xchan_hash'])
+		$a->set_widget('vcard',vcard_from_xchan($xchan));
+				
+	$url = (($observer) 
+		? z_root() . '/magic?f=&dest=' . $xchan['xchan_url'] . '&addr=' . $xchan['xchan_addr'] 
+		: $xchan['xchan_url']
+	);
+				
+
+
 	$o = replace_macros(get_markup_template('chanview.tpl'),array(
-		'$url' => z_root() . '/magic?f=&dest=' . $xchan['xchan_url'] . '&addr=' . $xchan['xchan_addr']
+		'$url' => $url
 	));
 
 	return $o;