X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdfrn_request.php;h=24c466bba5655e9533073ffe5d89d383e7ffb9cb;hb=af12c696cbcd6d38db7421aa3a1c02fbb9f90912;hp=d5c5b83d5b861efc9086c2ed7008f92f37647552;hpb=ffbdad704130fc9a50636057c9965bd79b7cbf60;p=friendica.git

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index d5c5b83d5b..24c466bba5 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -256,7 +256,7 @@ function dfrn_request_post(&$a) {
 			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) {
+			foreach($r as $rr) {
 				if(! $rr['rel']) {
 					q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1",
 						intval($rr['cid'])
@@ -590,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'] : '');
 		}
 
 		/**