X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=14ea0fdd4a9773d6c04515f2cd6065ec301f791d;hb=fc9dbc0899aed223378be677356cd74e722dfd14;hp=c05bcf1d195209ed51ce09c08fc182e796eddd33;hpb=fa8eb101d4a9a98d58bfcbf9df7ef5ac233d9019;p=friendica.git

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index c05bcf1d19..14ea0fdd4a 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -8,6 +8,8 @@
  * friend requests.
  *
  * @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
+ *    You also find a graphic which describes the confirmation process at
+ *    https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_request.png
  */
 
 require_once('include/enotify.php');
@@ -89,7 +91,7 @@ function dfrn_request_post(&$a) {
 					dbesc(normalise_link($dfrn_url))
 				);
 
-				if(count($r)) {
+				if (dbm::is_result($r)) {
 					if(strlen($r[0]['dfrn-id'])) {
 
 						/*
@@ -183,7 +185,7 @@ function dfrn_request_post(&$a) {
 					dbesc($dfrn_url),
 					$parms['key'] // this was already escaped
 				);
-				if(count($r)) {
+				if (dbm::is_result($r)) {
 					$def_gid = get_default_group(local_user(), $r[0]["network"]);
 					if(intval($def_gid))
 						group_add_member(local_user(), '', $r[0]['id'], $def_gid);
@@ -191,19 +193,22 @@ function dfrn_request_post(&$a) {
 					if (isset($photo))
 						update_contact_avatar($photo, local_user(), $r[0]["id"], true);
 
-					$forwardurl = $a->get_baseurl()."/contacts/".$r[0]['id'];
-				} else
-					$forwardurl = $a->get_baseurl()."/contacts";
+					$forwardurl = App::get_baseurl()."/contacts/".$r[0]['id'];
+				} else {
+					$forwardurl = App::get_baseurl()."/contacts";
+				}
 
 				/*
 				 * Allow the blocked remote notification to complete
 				 */
 
-				if(is_array($contact_record))
+				if (is_array($contact_record)) {
 					$dfrn_request = $contact_record['request'];
+				}
 
-				if(strlen($dfrn_request) && strlen($confirm_key))
+				if (strlen($dfrn_request) && strlen($confirm_key)) {
 					$s = fetch_url($dfrn_request . '?confirm_key=' . $confirm_key);
+				}
 
 				// (ignore reply, nothing we can do it failed)
 
@@ -271,7 +276,7 @@ function dfrn_request_post(&$a) {
 				dbesc(datetime_convert('UTC','UTC','now - 24 hours')),
 				intval($uid)
 			);
-			if(count($r) > $maxreq) {
+			if (dbm::is_result($r) && count($r) > $maxreq) {
 				notice( sprintf( t('%s has received too many connection requests today.'),  $a->profile['name']) . EOL);
 				notice( t('Spam protection measures have been invoked.') . EOL);
 				notice( t('Friends are advised to please try again in 24 hours.') . EOL);
@@ -293,7 +298,7 @@ function dfrn_request_post(&$a) {
 			AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ",
 			dbesc(NETWORK_MAIL2)
 		);
-		if(count($r)) {
+		if (dbm::is_result($r)) {
 			foreach($r as $rr) {
 				if(! $rr['rel']) {
 					q("DELETE FROM `contact` WHERE `id` = %d",
@@ -318,7 +323,7 @@ function dfrn_request_post(&$a) {
 			AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 3 DAY ",
 			dbesc(NETWORK_MAIL2)
 		);
-		if(count($r)) {
+		if (dbm::is_result($r)) {
 			foreach($r as $rr) {
 				if(! $rr['rel']) {
 					q("DELETE FROM `contact` WHERE `id` = %d",
@@ -368,8 +373,8 @@ function dfrn_request_post(&$a) {
 				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
 					intval($uid)
 				);
-				if(! count($r)) {
 
+				if (! dbm::is_result($r)) {
 					notice( t('This account has not been configured for email. Request failed.') . EOL);
 					return;
 				}
@@ -396,7 +401,7 @@ function dfrn_request_post(&$a) {
 				dbesc($poll),
 				intval($uid)
 			);
-			if(count($r)) {
+			if (dbm::is_result($r)) {
 				$contact_id = $r[0]['id'];
 
 				$def_gid = get_default_group($uid, $r[0]["network"]);
@@ -429,8 +434,8 @@ function dfrn_request_post(&$a) {
 
 			$hash = random_string();
 
-			$r = q("insert into intro ( uid, `contact-id`, knowyou, note, hash, datetime, blocked )
-				values( %d , %d, %d, '%s', '%s', '%s', %d ) ",
+			$r = q("INSERT INTO `intro` ( `uid`, `contact-id`, knowyou, note, hash, datetime, blocked )
+				VALUES( %d , %d, %d, '%s', '%s', '%s', %d ) ",
 				intval($uid),
 				intval($contact_id),
 				((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
@@ -471,7 +476,7 @@ function dfrn_request_post(&$a) {
 				dbesc($url)
 			);
 
-			if(count($ret)) {
+			if (dbm::is_result($ret)) {
 				if(strlen($ret[0]['issued-id'])) {
 					notice( t('You have already introduced yourself here.') . EOL );
 					return;
@@ -499,13 +504,13 @@ function dfrn_request_post(&$a) {
 			else {
 				if(! validate_url($url)) {
 					notice( t('Invalid profile URL.') . EOL);
-					goaway($a->get_baseurl() . '/' . $a->cmd);
+					goaway(App::get_baseurl() . '/' . $a->cmd);
 					return; // NOTREACHED
 				}
 
 				if(! allowed_url($url)) {
 					notice( t('Disallowed profile URL.') . EOL);
-					goaway($a->get_baseurl() . '/' . $a->cmd);
+					goaway(App::get_baseurl() . '/' . $a->cmd);
 					return; // NOTREACHED
 				}
 
@@ -516,7 +521,7 @@ function dfrn_request_post(&$a) {
 
 				if(! count($parms)) {
 					notice( t('Profile location is not valid or does not contain profile information.') . EOL );
-					goaway($a->get_baseurl() . '/' . $a->cmd);
+					goaway(App::get_baseurl() . '/' . $a->cmd);
 				}
 				else {
 					if(! x($parms,'fn'))
@@ -563,28 +568,28 @@ function dfrn_request_post(&$a) {
 				);
 
 				// find the contact record we just created
-				if($r) {
+				if ($r) {
 					$r = q("SELECT `id` FROM `contact`
 						WHERE `uid` = %d AND `url` = '%s' AND `issued-id` = '%s' LIMIT 1",
 						intval($uid),
 						$parms['url'],
 						$parms['issued-id']
 					);
-					if(count($r)) {
+					if (dbm::is_result($r)) {
 						$contact_record = $r[0];
 						update_contact_avatar($photo, $uid, $contact_record["id"], true);
 					}
 				}
 
 			}
-			if($r === false) {
+			if ($r === false) {
 				notice( t('Failed to update contact record.') . EOL );
 				return;
 			}
 
 			$hash = random_string() . (string) time();   // Generate a confirm_key
 
-			if(is_array($contact_record)) {
+			if (is_array($contact_record)) {
 				$ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
 					VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )",
 					intval($uid),
@@ -598,12 +603,13 @@ function dfrn_request_post(&$a) {
 
 			// This notice will only be seen by the requestor if the requestor and requestee are on the same server.
 
-			if(! $failed)
+			if (! $failed) {
 				info( t('Your introduction has been sent.') . EOL );
+			}
 
 			// "Homecoming" - send the requestor back to their site to record the introduction.
 
-			$dfrn_url = bin2hex($a->get_baseurl() . '/profile/' . $nickname);
+			$dfrn_url = bin2hex(App::get_baseurl() . '/profile/' . $nickname);
 			$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
 
 			goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
@@ -631,8 +637,9 @@ function dfrn_request_post(&$a) {
 					$uri .= '/'.$a->get_path();
 
 				$uri = urlencode($uri);
-			} else
-				$uri = $a->get_baseurl().'/profile/'.$nickname;
+			} else {
+				$uri = App::get_baseurl().'/profile/'.$nickname;
+			}
 
 			$url = str_replace('{uri}', $uri, $url);
 			goaway($url);
@@ -649,16 +656,17 @@ function dfrn_request_post(&$a) {
 
 function dfrn_request_content(&$a) {
 
-	if(($a->argc != 2) || (! count($a->profile)))
+	if (($a->argc != 2) || (! count($a->profile))) {
 		return "";
+	}
 
 
 	// "Homecoming". Make sure we're logged in to this site as the correct user. Then offer a confirm button
 	// to send us to the post section to record the introduction.
 
-	if(x($_GET,'dfrn_url')) {
+	if (x($_GET,'dfrn_url')) {
 
-		if(! local_user()) {
+		if (! local_user()) {
 			info( t("Please login to confirm introduction.") . EOL );
 			/* setup the return URL to come back to this page if they use openid */
 			$_SESSION['return_url'] = $a->query_string;
@@ -718,7 +726,7 @@ function dfrn_request_content(&$a) {
 			dbesc($_GET['confirm_key'])
 		);
 
-		if(count($intro)) {
+		if (dbm::is_result($intro)) {
 
 			$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
 				WHERE `contact`.`id` = %d LIMIT 1",
@@ -727,7 +735,7 @@ function dfrn_request_content(&$a) {
 
 			$auto_confirm = false;
 
-			if(count($r)) {
+			if (dbm::is_result($r)) {
 				if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP))
 					$auto_confirm = true;
 
@@ -740,7 +748,7 @@ function dfrn_request_content(&$a) {
 						'to_name'      => $r[0]['username'],
 						'to_email'     => $r[0]['email'],
 						'uid'          => $r[0]['uid'],
-						'link'		   => $a->get_baseurl() . '/notifications/intros',
+						'link'         => App::get_baseurl() . '/notifications/intros',
 						'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
 						'source_link'  => $r[0]['url'],
 						'source_photo' => $r[0]['photo'],
@@ -752,11 +760,11 @@ function dfrn_request_content(&$a) {
 				if($auto_confirm) {
 					require_once('mod/dfrn_confirm.php');
 					$handsfree = array(
-						'uid' => $r[0]['uid'],
-						'node' => $r[0]['nickname'],
-						'dfrn_id' => $r[0]['issued-id'],
+						'uid'      => $r[0]['uid'],
+						'node'     => $r[0]['nickname'],
+						'dfrn_id'  => $r[0]['issued-id'],
 						'intro_id' => $intro[0]['id'],
-						'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0),
+						'duplex'   => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0),
 						'activity' => intval(get_pconfig($r[0]['uid'],'system','post_newfriend'))
 					);
 					dfrn_confirm_post($a,$handsfree);
@@ -804,7 +812,7 @@ function dfrn_request_content(&$a) {
 			$myaddr = $_GET['address'];
 		elseif(local_user()) {
 			if(strlen($a->path)) {
-				$myaddr = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+				$myaddr = App::get_baseurl() . '/profile/' . $a->user['nickname'];
 			}
 			else {
 				$myaddr = $a->user['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
@@ -840,8 +848,9 @@ function dfrn_request_content(&$a) {
 			$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
 				intval($a->profile['uid'])
 			);
-			if(! count($r))
+			if (! dbm::is_result($r)) {
 				$mail_disabled = 1;
+			}
 		}
 
 		// "coming soon" is disabled for now