X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fredir.php;h=632c39578696807b3dfd20e6f6658df50656cc99;hb=5299f259202725644cdaa678ea174d55a5126b27;hp=9223e5483c0c5b816485e8c7dd62ac88402bf3ca;hpb=355c42cb309eb1313097411067ca999b699aa620;p=friendica.git

diff --git a/mod/redir.php b/mod/redir.php
index 9223e5483c..632c395786 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -3,20 +3,37 @@
 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 == 2 && 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']);
 
@@ -43,7 +60,7 @@ function redir_init(&$a) {
 		logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); 
 		$dest = (($url) ? '&destination_url=' . $url : '');
 		goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id 
-			. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest );
+			. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet );
 	}
 
 	if(local_user())