Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index fe7adca4134d69e882da3feef4d4c9de28ae176a..780fb456f5cd33f43e7bc6783196fd15e55570f1 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once('library/simplepie/simplepie.inc');
 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');
@@ -137,6 +137,8 @@ function dfrn_notify_post(&$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);
 
@@ -207,7 +209,7 @@ 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
@@ -307,6 +309,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);