X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=24c466bba5655e9533073ffe5d89d383e7ffb9cb;hb=8c245a5d2f4e6882211ac17561f86537a7089c73;hp=844fbbf6d01bc0e6318ed8c69c394ff66a1b184c;hpb=43283fd35fb9987a1554612220f11a0875697bd4;p=friendica.git

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 844fbbf6d0..24c466bba5 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -245,6 +245,29 @@ function dfrn_request_post(&$a) {
 			} 
 		}
 
+		/**
+		 *
+		 * Cleanup old introductions that remain blocked. 
+		 * Also remove the contact record, but only if there is no existing relationship
+		 *
+		 */
+
+		$r = q("SELECT `intro`.*, `intro`.`id` AS `iid`, `contact`.`id` AS `cid`, `contact`.`rel` 
+			FROM `intro` LEFT JOIN `contact` on `intro`.`contact-id` = `contact`.`id`
+			WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0 AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ");
+		if(count($r)) {
+			foreach($r as $rr) {
+				if(! $rr['rel']) {
+					q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1",
+						intval($rr['cid'])
+					);
+				}
+				q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1",
+					intval($rr['iid'])
+				);
+			}
+		}
+
 		$url = trim($_POST['dfrn_url']);
 		if(! strlen($url)) {
 			notice( t("Invalid locator") . EOL );
@@ -452,6 +475,12 @@ function dfrn_request_content(&$a) {
 
 		if(! local_user()) {
 			notice( t("Please login to confirm introduction.") . EOL );
+
+			/* setup the return URL to come back to this page if they use openid */
+
+			$stripped = str_replace('q=','',$a->query_string);
+			$_SESSION['return_url'] = trim($stripped,'/');
+
 			return login();
 		}
 
@@ -561,8 +590,12 @@ function dfrn_request_content(&$a) {
 				$myaddr = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3 );
 			}
 		}
-		else { 
-			$myaddr = ((x($_GET,'address')) ? urldecode($_GET['address']) : '');
+		elseif(x($_GET,'addr')) {
+			$myaddr = hex2bin($_GET['addr']);
+		}
+		else {
+			/* $_GET variables are already urldecoded */ 
+			$myaddr = ((x($_GET,'address')) ? $_GET['address'] : '');
 		}
 
 		/**