X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fredir.php;h=5427d8c786e93f5be407bca3b099f4f8fc071314;hb=9513f1f1668a33be3fc2b241fe3662e9de42d84b;hp=ee15a18d4b2ae7198aa943b559c0fc22dc349b52;hpb=6348e70daa113e8b3203de8fbc919d08c90d972e;p=friendica.git

diff --git a/mod/redir.php b/mod/redir.php
index ee15a18d4b..5427d8c786 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -4,18 +4,29 @@ function redir_init(&$a) {
 
 	if((! local_user()) || (! ($a->argc == 2)) || (! intval($a->argv[1])))
 		goaway($a->get_baseurl());
-	$r = q("SELECT `dfrn-id`, `poll` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+	$r = q("SELECT `network`, `issued-id`, `dfrn-id`, `duplex`, `poll` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($a->argv[1]),
-		intval($_SESSION['uid']));
-	if(! count($r))
+		intval(local_user())
+	);
+	if((! count($r)) || ($r[0]['network'] !== 'dfrn'))
 		goaway($a->get_baseurl());
+
+	$dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
+
+	if($r[0]['duplex'] && $r[0]['issued-id']) {
+		$orig_id = $r[0]['issued-id'];
+		$dfrn_id = '1:' . $orig_id;
+	}
+	if($r[0]['duplex'] && $r[0]['dfrn-id']) {
+		$orig_id = $r[0]['dfrn-id'];
+		$dfrn_id = '0:' . $orig_id;
+	}
 	q("INSERT INTO `profile_check` ( `uid`, `dfrn_id`, `expire`)
 		VALUES( %d, '%s', %d )",
 		intval($_SESSION['uid']),
-		dbesc($r[0]['dfrn-id']),
-		intval(time() + 30));
-	goaway ($r[0]['poll'] . '?dfrn_id=' . $r[0]['dfrn-id'] . '&type=profile');
-
-	
+		dbesc($dfrn_id),
+		intval(time() + 45));
+	goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id 
+		. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile');
 	
-}
\ No newline at end of file
+}