X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=5aea4eede967524f4b093dd04657aebadb985479;hb=e20e64390b4e0075c49d9b3b16137a6056e10a16;hp=9c70ba21ab4c19c4721d7b8d345d489af4eb350f;hpb=0f8148a4cb7c477b363cccdb5c638cd10d9df531;p=friendica.git

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 9c70ba21ab..5aea4eede9 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -1,27 +1,32 @@
 <?php
 
-/*
- * Module: dfrn_confirm
+/**
+ * @file mod/dfrn_confirm.php
+ * @brief Module: dfrn_confirm
  * Purpose: Friendship acceptance for DFRN contacts
- *
+ *.
  * There are two possible entry points and three scenarios.
- *
+ *.
  *   1. A form was submitted by our user approving a friendship that originated elsewhere.
  *      This may also be called from dfrn_request to automatically approve a friendship.
  *
  *   2. We may be the target or other side of the conversation to scenario 1, and will
  *      interact with that process on our own user's behalf.
- *
+ *.
+ *  @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_confirmation.png
  */
 
 require_once('include/enotify.php');
 require_once('include/group.php');
+require_once('include/Probe.php');
 
 function dfrn_confirm_post(&$a,$handsfree = null) {
 
 	if(is_array($handsfree)) {
 
-		/**
+		/*
 		 * We were called directly from dfrn_request due to automatic friend acceptance.
 		 * Any $_POST parameters we may require are supplied in the $handsfree array.
 		 *
@@ -36,7 +41,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			$node = $a->argv[1];
 	}
 
-		/**
+		/*
 		 *
 		 * Main entry point. Scenario 1. Our user received a friend request notification (perhaps
 		 * from another site) and clicked 'Approve'.
@@ -86,7 +91,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			$activity = ((x($_POST,'activity'))   ? intval($_POST['activity'])      : 0 );
 		}
 
-		/**
+		/*
 		 *
 		 * Ensure that dfrn_id has precedence when we go to find the contact record.
 		 * We only want to search based on contact id if there is no dfrn_id,
@@ -102,7 +107,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			logger('Confirming follower with contact_id: ' . $cid);
 
 
-		/**
+		/*
 		 *
 		 * The other person will have been issued an ID when they first requested friendship.
 		 * Locate their record. At this time, their record will have both pending and blocked set to 1.
@@ -138,7 +143,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 		if($network === NETWORK_DFRN) {
 
-			/**
+			/*
 			 *
 			 * Generate a key pair for all further communications with this person.
 			 * We have a keypair for every contact, and a site key for unknown people.
@@ -165,7 +170,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 			$params = array();
 
-			/**
+			/*
 			 *
 			 * Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our
 			 * site private key (person on the other end can decrypt it with our site public key).
@@ -211,7 +216,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 			logger('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA);
 
-			/**
+			/*
 			 *
 			 * POST all this stuff to the other site.
 			 * Temporarily raise the network timeout to 120 seconds because the default 60
@@ -356,7 +361,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			$poll   = (($contact['poll']) ? $contact['poll'] : '');
 
 			if((! $contact['notify']) || (! $contact['poll'])) {
-				$arr = lrdd($contact['url']);
+				$arr = Probe::lrdd($contact['url']);
 				if(count($arr)) {
 					foreach($arr as $link) {
 						if($link['@attributes']['rel'] === 'salmon')
@@ -486,7 +491,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 					$i = item_store($arr);
 					if($i)
-				    	proc_run('php',"include/notifier.php","activity","$i");
+						proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
 				}
 			}
 		}
@@ -505,7 +510,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		//NOTREACHED
 	}
 
-	/**
+	/*
 	 *
 	 *
 	 * End of Scenario 1. [Local confirmation of remote friend request].
@@ -783,7 +788,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 					$i = item_store($arr);
 					if($i)
-				    	proc_run('php',"include/notifier.php","activity","$i");
+						proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
 
 				}
 			}