Add Contact Object

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index e0e30a24883032751c3dbfaf925628644ab140bb..74f6d4e9f4164b2944cfaa3c2417051944024e31 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -9,12 +9,11 @@
 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/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);
@@ -185,8 +184,8 @@ function dfrn_notify_post(App $a) {
                                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,
@@ -196,10 +195,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');
                                }