Merge pull request #3991 from MrPetovan/bug/undefined-variables

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 65e9535c6ab9594867dfec6155c61f14e363b933..61be7966e06b95a036a59bab13d318a08edbb1b1 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -8,12 +8,12 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Protocol\Dfrn;
+use Friendica\Database\DBM;
+use Friendica\Object\Contact;
+use Friendica\Protocol\DFRN;
 
-require_once('include/items.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);
@@ -46,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');
        }
@@ -94,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
@@ -128,13 +128,8 @@ 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');
        }
@@ -180,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,
@@ -195,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');
                                }
@@ -212,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
@@ -284,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;
                }