X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=61be7966e06b95a036a59bab13d318a08edbb1b1;hb=3359f3f5c7ecc4b6a34c4fcfc095ab4dd5fab0f1;hp=a0ac506769be364ec10d7960598f9f75c8d59063;hpb=5c5db127067341ba52c899455ea2b50a735b9905;p=friendica.git

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index a0ac506769..61be7966e0 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -7,12 +7,13 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Object\Contact;
+use Friendica\Protocol\DFRN;
 
-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');
+require_once 'include/items.php';
+require_once 'include/event.php';
 
 function dfrn_notify_post(App $a) {
 	logger(__function__, LOGGER_TRACE);
@@ -45,7 +46,7 @@ function dfrn_notify_post(App $a) {
 		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, 'Could not match challenge');
 	}
@@ -93,7 +94,7 @@ function dfrn_notify_post(App $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, 'Contact not found');
 		//NOTREACHED
@@ -127,18 +128,13 @@ function dfrn_notify_post(App $a) {
 	logger('dfrn_notify: data: ' . $data, LOGGER_DATA);
 
 	if ($dissolve == 1) {
-
-		/*
-		 * Relationship is dissolved permanently
-		 */
-
-		require_once('include/Contact.php');
-		contact_remove($importer['id']);
+		// Relationship is dissolved permanently
+		Contact::remove($importer['id']);
 		logger('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']);
 		xml_status(0, 'relationship dissolved');
 	}
 
-	$rino = get_config('system', 'rino_encrypt');
+	$rino = Config::get('system', 'rino_encrypt');
 	$rino = intval($rino);
 
 	logger("Local rino version: " .  $rino, LOGGER_DEBUG);
@@ -179,12 +175,12 @@ function dfrn_notify_post(App $a) {
 				 *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);
+				$data = DFRN::aesDecrypt(hex2bin($data), $final_key);
 				break;
 			case 2:
 				try {
-					$data = Crypto::decrypt(hex2bin($data), $final_key);
-				} catch (InvalidCiphertext $ex) { // VERY IMPORTANT
+					$data = \Crypto::decrypt(hex2bin($data), $final_key);
+				} catch (\InvalidCiphertextException $ex) { // VERY IMPORTANT
 					/*
 					 * Either:
 					 *   1. The ciphertext was modified by the attacker,
@@ -194,10 +190,10 @@ function dfrn_notify_post(App $a) {
 					 */
 					logger('The ciphertext has been tampered with!');
 					xml_status(0, 'The ciphertext has been tampered with!');
-				} catch (Ex\CryptoTestFailed $ex) {
+				} catch (\CryptoTestFailedException $ex) {
 					logger('Cannot safely perform dencryption');
 					xml_status(0, 'CryptoTestFailed');
-				} catch (Ex\CannotPerformOperation $ex) {
+				} catch (\CannotPerformOperationException $ex) {
 					logger('Cannot safely perform decryption');
 					xml_status(0, 'Cannot safely perform decryption');
 				}
@@ -211,7 +207,7 @@ function dfrn_notify_post(App $a) {
 		logger('rino: decrypted data: ' . $data, LOGGER_DATA);
 	}
 
-	$ret = dfrn::import($data, $importer);
+	$ret = DFRN::import($data, $importer);
 	xml_status($ret, 'Processed');
 
 	// NOTREACHED
@@ -283,7 +279,7 @@ function dfrn_notify_content(App $a) {
 				dbesc($a->argv[1])
 		);
 
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			$status = 1;
 		}
 
@@ -312,7 +308,7 @@ function dfrn_notify_content(App $a) {
 		$encrypted_id = bin2hex($encrypted_id);
 
 
-		$rino = get_config('system', 'rino_encrypt');
+		$rino = Config::get('system', 'rino_encrypt');
 		$rino = intval($rino);
 
 		logger("Local rino version: ". $rino, LOGGER_DEBUG);