X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=b42ef9b70a82cee1bc669945d2bd8c3c9fba0a27;hb=325d3afe183a397ea6688480c1b2df8e1be99dc1;hp=dfa2af18ce29985901409d3d3149879811a7b8e7;hpb=52f12ee28db97b29ce0f10c8ecf76144b80d4216;p=friendica.git

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index dfa2af18ce..b42ef9b70a 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -11,7 +11,7 @@ require_once('include/event.php');
 
 require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
 
-function dfrn_notify_post(&$a) {
+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);
@@ -28,21 +28,21 @@ function dfrn_notify_post(&$a) {
 	$prv   = (($page == 2) ? 1 : 0);
 
 	$writable = (-1);
-	if($dfrn_version >= 2.21) {
+	if ($dfrn_version >= 2.21) {
 		$writable = (($perm === 'rw') ? 1 : 0);
 	}
 
 	$direction = (-1);
-	if(strpos($dfrn_id,':') == 1) {
-		$direction = intval(substr($dfrn_id,0,1));
-		$dfrn_id = substr($dfrn_id,2);
+	if (strpos($dfrn_id, ':') == 1) {
+		$direction = intval(substr($dfrn_id, 0, 1));
+		$dfrn_id = substr($dfrn_id, 2);
 	}
 
 	$r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1",
 		dbesc($dfrn_id),
 		dbesc($challenge)
 	);
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		logger('dfrn_notify: could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
 		xml_status(3);
 	}
@@ -70,9 +70,11 @@ function dfrn_notify_post(&$a) {
 			break; // NOTREACHED
 	}
 
-	// be careful - $importer will contain both the contact information for the contact
-	// sending us the post, and also the user information for the person receiving it.
-	// since they are mixed together, it is easy to get them confused.
+	/*
+	 * be careful - $importer will contain both the contact information for the contact
+	 * sending us the post, and also the user information for the person receiving it.
+	 * since they are mixed together, it is easy to get them confused.
+	 */
 
 	$r = q("SELECT	`contact`.*, `contact`.`uid` AS `importer_uid`,
 					`contact`.`pubkey` AS `cpubkey`,
@@ -88,7 +90,7 @@ function dfrn_notify_post(&$a) {
 		dbesc($a->argv[1])
 	);
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		logger('dfrn_notify: contact not found for dfrn_id ' . $dfrn_id);
 		xml_status(3);
 		//NOTREACHED
@@ -100,15 +102,16 @@ function dfrn_notify_post(&$a) {
 
 	logger("Remote rino version: ".$rino_remote." for ".$importer["url"], LOGGER_DEBUG);
 
-	if((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $forum) || ($importer['prv'] != $prv)) {
+	if ((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $forum) || ($importer['prv'] != $prv)) {
 		q("UPDATE `contact` SET `writable` = %d, forum = %d, prv = %d WHERE `id` = %d",
 			intval(($writable == (-1)) ? $importer['writable'] : $writable),
 			intval($forum),
 			intval($prv),
 			intval($importer['id'])
 		);
-		if($writable != (-1))
+		if ($writable != (-1)) {
 			$importer['writable'] = $writable;
+		}
 		$importer['forum'] = $page;
 	}
 
@@ -120,7 +123,7 @@ function dfrn_notify_post(&$a) {
 	logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']);
 	logger('dfrn_notify: data: ' . $data, LOGGER_DATA);
 
-	if($dissolve == 1) {
+	if ($dissolve == 1) {
 
 		/*
 		 * Relationship is dissolved permanently
@@ -133,21 +136,12 @@ function dfrn_notify_post(&$a) {
 
 	}
 
-
-	// If we are setup as a soapbox we aren't accepting input from this person
-	// 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 = 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);
+	logger("Local rino version: " .  $rino, LOGGER_DEBUG);
 
-	if(strlen($key)) {
+	if (strlen($key)) {
 
 		// if local rino is lower than remote rino, abort: should not happen!
 		// but only for $remote_rino > 1, because old code did't send rino version
@@ -160,20 +154,17 @@ function dfrn_notify_post(&$a) {
 		logger('rino: md5 raw key: ' . md5($rawkey));
 		$final_key = '';
 
-		if($dfrn_version >= 2.1) {
-			if((($importer['duplex']) && strlen($importer['cprvkey'])) || (! strlen($importer['cpubkey']))) {
-				openssl_private_decrypt($rawkey,$final_key,$importer['cprvkey']);
-			}
-			else {
-				openssl_public_decrypt($rawkey,$final_key,$importer['cpubkey']);
+		if ($dfrn_version >= 2.1) {
+			if ((($importer['duplex']) && strlen($importer['cprvkey'])) || (! strlen($importer['cpubkey']))) {
+				openssl_private_decrypt($rawkey, $final_key, $importer['cprvkey']);
+			} else {
+				openssl_public_decrypt($rawkey, $final_key, $importer['cpubkey']);
 			}
-		}
-		else {
-			if((($importer['duplex']) && strlen($importer['cpubkey'])) || (! strlen($importer['cprvkey']))) {
-				openssl_public_decrypt($rawkey,$final_key,$importer['cpubkey']);
-			}
-			else {
-				openssl_private_decrypt($rawkey,$final_key,$importer['cprvkey']);
+		} else {
+			if ((($importer['duplex']) && strlen($importer['cpubkey'])) || (! strlen($importer['cprvkey']))) {
+				openssl_public_decrypt($rawkey, $final_key, $importer['cpubkey']);
+			} else {
+				openssl_private_decrypt($rawkey, $final_key, $importer['cprvkey']);
 			}
 		}
 
@@ -182,27 +173,31 @@ function dfrn_notify_post(&$a) {
 		switch($rino_remote) {
 			case 0:
 			case 1:
-				// we got a key. old code send only the key, without RINO version.
-				// we assume RINO 1 if key and no RINO version
-				$data = aes_decrypt(hex2bin($data),$final_key);
+				/*
+				 *we got a key. old code send only the key, without RINO version.
+				 * we assume RINO 1 if key and no RINO version
+				 */
+				$data = dfrn::aes_decrypt(hex2bin($data), $final_key);
 				break;
 			case 2:
 				try {
-					$data = Crypto::decrypt(hex2bin($data),$final_key);
+					$data = Crypto::decrypt(hex2bin($data), $final_key);
 				} catch (InvalidCiphertext $ex) { // VERY IMPORTANT
-					// Either:
-					//   1. The ciphertext was modified by the attacker,
-					//   2. The key is wrong, or
-					//   3. $ciphertext is not a valid ciphertext or was corrupted.
-					// Assume the worst.
+					/*
+					 * Either:
+					 *   1. The ciphertext was modified by the attacker,
+					 *   2. The key is wrong, or
+					 *   3. $ciphertext is not a valid ciphertext or was corrupted.
+					 * Assume the worst.
+					 */
 					logger('The ciphertext has been tampered with!');
-					xml_status(0,'The ciphertext has been tampered with!');
+					xml_status(0, 'The ciphertext has been tampered with!');
 				} catch (Ex\CryptoTestFailed $ex) {
 					logger('Cannot safely perform dencryption');
-					xml_status(0,'CryptoTestFailed');
+					xml_status(0, 'CryptoTestFailed');
 				} catch (Ex\CannotPerformOperation $ex) {
 					logger('Cannot safely perform decryption');
-					xml_status(0,'Cannot safely perform decryption');
+					xml_status(0, 'Cannot safely perform decryption');
 				}
 				break;
 			default:
@@ -221,12 +216,14 @@ function dfrn_notify_post(&$a) {
 }
 
 
-function dfrn_notify_content(&$a) {
+function dfrn_notify_content(App $a) {
 
 	if(x($_GET,'dfrn_id')) {
 
-		// initial communication from external contact, $direction is their direction.
-		// If this is a duplex communication, ours will be the opposite.
+		/*
+		 * initial communication from external contact, $direction is their direction.
+		 * If this is a duplex communication, ours will be the opposite.
+		 */
 
 		$dfrn_id = notags(trim($_GET['dfrn_id']));
 		$dfrn_version = (float) $_GET['dfrn_version'];
@@ -284,49 +281,49 @@ function dfrn_notify_content(&$a) {
 				dbesc($a->argv[1])
 		);
 
-		if(! dbm::is_result($r))
+		if (! dbm::is_result($r)) {
 			$status = 1;
+		}
 
 		logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DEBUG);
 
-		$challenge = '';
+		$challenge    = '';
 		$encrypted_id = '';
-		$id_str = $my_id . '.' . mt_rand(1000,9999);
+		$id_str       = $my_id . '.' . mt_rand(1000,9999);
 
 		$prv_key = trim($r[0]['prvkey']);
 		$pub_key = trim($r[0]['pubkey']);
-		$dplx = intval($r[0]['duplex']);
-
-		if((($dplx) && (strlen($prv_key))) || ((strlen($prv_key)) && (!(strlen($pub_key))))) {
-			openssl_private_encrypt($hash,$challenge,$prv_key);
-			openssl_private_encrypt($id_str,$encrypted_id,$prv_key);
-		}
-		elseif(strlen($pub_key)) {
-			openssl_public_encrypt($hash,$challenge,$pub_key);
-			openssl_public_encrypt($id_str,$encrypted_id,$pub_key);
-		}
-		else
+		$dplx    = intval($r[0]['duplex']);
+
+		if ((($dplx) && (strlen($prv_key))) || ((strlen($prv_key)) && (!(strlen($pub_key))))) {
+			openssl_private_encrypt($hash, $challenge, $prv_key);
+			openssl_private_encrypt($id_str, $encrypted_id, $prv_key);
+		} elseif (strlen($pub_key)) {
+			openssl_public_encrypt($hash, $challenge, $pub_key);
+			openssl_public_encrypt($id_str, $encrypted_id, $pub_key);
+		} else {
+			/// @TODO these kind of else-blocks are making the code harder to understand
 			$status = 1;
+		}
 
 		$challenge    = bin2hex($challenge);
 		$encrypted_id = bin2hex($encrypted_id);
 
 
-		$rino = get_config('system','rino_encrypt');
+		$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);
 
 		// if requested rino is lower than enabled local rino, lower local rino version
 		// if requested rino is higher than enabled local rino, reply with local rino
-		if ($rino_remote < $rino) $rino = $rino_remote;
+		if ($rino_remote < $rino) {
+			$rino = $rino_remote;
+		}
 
 		if((($r[0]['rel']) && ($r[0]['rel'] != CONTACT_IS_SHARING)) || ($r[0]['page-flags'] == PAGE_COMMUNITY)) {
 			$perm = 'rw';
-		}
-		else {
+		} else {
 			$perm = 'r';
 		}