From 8a8e02cb84799c0d4257f6276a7cc83007f62ea8 Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Sat, 16 Feb 2013 11:38:41 -0700
Subject: [PATCH] add support for doing a redir/ based on contact url

---
 mod/redir.php | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/mod/redir.php b/mod/redir.php
index 7687bfbe70..632c395786 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -4,20 +4,36 @@ function redir_init(&$a) {
 
 	$url = ((x($_GET,'url')) ? $_GET['url'] : '');
 	$quiet = ((x($_GET,'quiet')) ? '&quiet=1' : '');
+	$con_url = ((x($_GET,'conurl')) ? $_GET['conurl'] : '');
 
 	// traditional DFRN
 
-	if(local_user() && $a->argc > 1 && intval($a->argv[1])) {
+	if( $con_url || (local_user() && $a->argc > 1 && intval($a->argv[1])) ) {
 
-		$cid = $a->argv[1];
+		if($con_url) {
+			$con_url = str_replace('https', 'http', $con_url);
 
-		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($cid),
-			intval(local_user())
-		);
+			$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+				dbesc($con_url),
+				intval(local_user())
+			);
 
-		if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
-			goaway(z_root());
+			if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
+				goaway(z_root());
+
+			$cid = $r[0]['id'];
+		}
+		else {
+			$cid = $a->argv[1];
+
+			$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+				intval($cid),
+				intval(local_user())
+			);
+
+			if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
+				goaway(z_root());
+		}
 
 		$dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);