X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fredir.php;h=998e9cc0bd9bdac5a34195090074a3a429a267db;hb=10ede7314136edb1c475e1af546a59ff4c5648cf;hp=9223e5483c0c5b816485e8c7dd62ac88402bf3ca;hpb=c3139fa0fd49b0b4de4568d46a6946c75ccb2a62;p=friendica.git

diff --git a/mod/redir.php b/mod/redir.php
index 9223e5483c..998e9cc0bd 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,30 +1,56 @@
 <?php
 
-function redir_init(&$a) {
+use Friendica\App;
+use Friendica\Core\System;
+
+function redir_init(App $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 (!dbm::is_result($r)) {
+				goaway(System::baseUrl());
+			}
+			if ($r[0]['network'] !== NETWORK_DFRN) {
+				goaway(($url != '' ? $url : $r[0]['url']));
+			}
+			$cid = $r[0]['id'];
+		} else {
+			$cid = $a->argv[1];
 
-		if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
-			goaway(z_root());
+			$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+				intval($cid),
+				intval(local_user())
+			);
+
+			if (!dbm::is_result($r)) {
+				goaway(System::baseUrl());
+			}
+			if ($r[0]['network'] !== NETWORK_DFRN) {
+				goaway(($url != '' ? $url : $r[0]['url']));
+			}
+		}
 
 		$dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
 
-		if($r[0]['duplex'] && $r[0]['issued-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']) {
+		if ($r[0]['duplex'] && $r[0]['dfrn-id']) {
 			$orig_id = $r[0]['dfrn-id'];
 			$dfrn_id = '0:' . $orig_id;
 		}
@@ -40,21 +66,23 @@ function redir_init(&$a) {
 			intval(time() + 45)
 		);
 
-		logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); 
+		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 );
+		goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
+			. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet);
 	}
 
-	if(local_user())
-		$handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3);
-	if(remote_user())
+	if (local_user()) {
+		$handle = $a->user['nickname'] . '@' . substr(System::baseUrl(),strpos(System::baseUrl(),'://')+3);
+	}
+	if (remote_user()) {
 		$handle = $_SESSION['handle'];
+	}
 
-	if($url) {
+	if ($url) {
 		$url = str_replace('{zid}','&zid=' . $handle,$url);
 		goaway($url);
 	}
 
-	goaway(z_root());
+	goaway(System::baseUrl());
 }