X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fredir.php;h=ac21aa17eb91c6c8e3ca1f006491837a4b59e893;hb=8c245a5d2f4e6882211ac17561f86537a7089c73;hp=88b291146bed494e32d83fed9385f290635a9fed;hpb=b49858b038a0a05bbe7685929e88071d0e125538;p=friendica.git

diff --git a/mod/redir.php b/mod/redir.php
index 88b291146b..ac21aa17eb 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -4,21 +4,41 @@ function redir_init(&$a) {
 
 	if((! local_user()) || (! ($a->argc == 2)) || (! intval($a->argv[1])))
 		goaway($a->get_baseurl());
-	$r = q("SELECT `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))
+	$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'] !== 'dfrn'))
 		goaway($a->get_baseurl());
 
-	$dfrn_id = (($r[0]['duplex']) ? $r[0]['dfrn-id'] : $r[0]['issued-id']);
+	$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']),
+	$sec = random_string();
+
+	q("INSERT INTO `profile_check` ( `uid`, `cid`, `dfrn_id`, `sec`, `expire`)
+		VALUES( %d, %s, '%s', '%s', %d )",
+		intval(local_user()),
+		intval($cid),
 		dbesc($dfrn_id),
-		intval(time() + 45));
-	goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id . '&type=profile');
+		dbesc($sec),
+		intval(time() + 45)
+	);
 
+	logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); 
+
+	goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id 
+		. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec);
 	
-	
-}
\ No newline at end of file
+}