Ensure that Red members never see the accursed "and nobody was found..." when you've put in an explicit address of a channel you know for certain exists.

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;
@@ -30,27 +32,59 @@ 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;
 	}
 
-	$observer = $a->get_observer();
+	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' => $url
 	));

mod/directory.php

@@ -57,7 +57,6 @@ function directory_content(&$a) {
 		if($search)
 			$query .= '&name=' . urlencode($search);
 
-		}
 		if($a->pager['page'] != 1)
 			$query .= '&p=' . $a->pager['page'];
 
@@ -67,7 +66,9 @@ function directory_content(&$a) {
 		if($x['success']) {
 			$t = 0;
 			$j = json_decode($x['body'],true);
-			if($j && $j['results']) {
+			if($j) {
+
+				if($j['results']) {
 
 					$entries = array();
 
@@ -75,9 +76,6 @@ function directory_content(&$a) {
 
 					foreach($j['results'] as $rr) {
 
-
-
-
 						$profile_link = chanlink_url($rr['url']);
 		
 						$pdesc = (($rr['description']) ? $rr['description'] . '<br />' : '');
@@ -150,7 +148,7 @@ function directory_content(&$a) {
 
 					}
 
-				logger('entries: ' . print_r($entries,true));
+					logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA);
 
 					$o .= replace_macros($tpl, array(
 						'$search' => $search,
@@ -166,12 +164,15 @@ function directory_content(&$a) {
 					$o .= alt_pager($a,$j['records'], t('more'), t('back'));
 
 				}
-
+				else {
-			else
+					if($a->pager['page'] == 1 && $j['records'] == 0 && strpos($search,'@')) {
-				info( t("No entries (some entries may be hidden).") . EOL);
+						goaway(z_root() . '/chanview/?f=&address=' . $search);
-
+					}
+					info( t("No entries (some entries may be hidden).") . EOL);
+				}
+			}
+		}
 	}
-
 	return $o;
 }
 

mod/dirsearch.php

@@ -78,11 +78,13 @@ function dirsearch_content(&$a) {
 		$qlimit = " LIMIT $limit ";
 	else {
 		$qlimit = " LIMIT " . intval($startrec) . " , " . intval($perpage);
+		if($return_total) {
 			$r = q("SELECT COUNT(xchan_hash) AS `total` FROM xchan left join xprof on xchan_hash = xprof_hash where 1 $sql_extra");
 			if($r) {
 				$ret['total_items'] = $r[0]['total'];
 			}
 		}
+	}
 
 	$order = " ORDER BY `xchan_name` ASC ";
 	$logic = ((strlen($sql_extra)) ? 0 : 1);