X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=eebaa076d94b9bc0ece344ee5e09ae9478f8ee37;hb=061bcd7d2fcfb8da18e63ed4fde436b38463539d;hp=edf419e92907a5a1430b5327f9850872af46e691;hpb=cc3419f1016d2adc41996c077143bf872ace2383;p=friendica.git

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index edf419e929..eebaa076d9 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -1,13 +1,18 @@
 <?php
 
-require_once('library/simplepie/simplepie.inc');
+/**
+ * @file mod/dfrn_notify.php
+ * @brief The dfrn notify endpoint
+ * @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
+ */
 require_once('include/items.php');
+require_once('include/dfrn.php');
 require_once('include/event.php');
 
 require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
 
-function dfrn_notify_post(&$a) {
-    logger(__function__, LOGGER_TRACE);
+function dfrn_notify_post(App &$a) {
+	logger(__function__, LOGGER_TRACE);
 	$dfrn_id      = ((x($_POST,'dfrn_id'))      ? notags(trim($_POST['dfrn_id']))   : '');
 	$dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version']    : 2.0);
 	$challenge    = ((x($_POST,'challenge'))    ? notags(trim($_POST['challenge'])) : '');
@@ -37,7 +42,7 @@ function dfrn_notify_post(&$a) {
 		dbesc($dfrn_id),
 		dbesc($challenge)
 	);
-	if(! count($r)) {
+	if (! dbm::is_result($r)) {
 		logger('dfrn_notify: could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
 		xml_status(3);
 	}
@@ -83,7 +88,7 @@ function dfrn_notify_post(&$a) {
 		dbesc($a->argv[1])
 	);
 
-	if(! count($r)) {
+	if (! dbm::is_result($r)) {
 		logger('dfrn_notify: contact not found for dfrn_id ' . $dfrn_id);
 		xml_status(3);
 		//NOTREACHED
@@ -117,7 +122,7 @@ function dfrn_notify_post(&$a) {
 
 	if($dissolve == 1) {
 
-		/**
+		/*
 		 * Relationship is dissolved permanently
 		 */
 
@@ -130,12 +135,15 @@ function dfrn_notify_post(&$a) {
 
 
 	// If we are setup as a soapbox we aren't accepting input from this person
-
-	if($importer['page-flags'] == PAGE_SOAPBOX)
-		xml_status(0);
+	// This behaviour is deactivated since it really doesn't make sense to even disallow comments
+	// The check if someone is a friend or simply a follower is done in a later place so it needn't to be done here
+	//if($importer['page-flags'] == PAGE_SOAPBOX)
+	//	xml_status(0);
 
 	$rino = get_config('system','rino_encrypt');
 	$rino = intval($rino);
+	// use RINO1 if mcrypt isn't installed and RINO2 was selected
+	if ($rino==2 and !function_exists('mcrypt_create_iv')) $rino=1;
 
 	logger("Local rino version: ". $rino, LOGGER_DEBUG);
 
@@ -206,14 +214,14 @@ function dfrn_notify_post(&$a) {
 		logger('rino: decrypted data: ' . $data, LOGGER_DATA);
 	}
 
-	$ret = local_delivery($importer,$data);
+	$ret = dfrn::import($data, $importer);
 	xml_status($ret);
 
 	// NOTREACHED
 }
 
 
-function dfrn_notify_content(&$a) {
+function dfrn_notify_content(App &$a) {
 
 	if(x($_GET,'dfrn_id')) {
 
@@ -276,8 +284,9 @@ function dfrn_notify_content(&$a) {
 				dbesc($a->argv[1])
 		);
 
-		if(! count($r))
+		if (! dbm::is_result($r)) {
 			$status = 1;
+		}
 
 		logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DEBUG);
 
@@ -306,6 +315,8 @@ function dfrn_notify_content(&$a) {
 
 		$rino = get_config('system','rino_encrypt');
 		$rino = intval($rino);
+		// use RINO1 if mcrypt isn't installed and RINO2 was selected
+		if ($rino==2 and !function_exists('mcrypt_create_iv')) $rino=1;
 
 		logger("Local rino version: ". $rino, LOGGER_DEBUG);