1
0
Fork 0

Merge pull request #2323 from annando/1601-dfrn-import

Complete rewrite of DFRN import
This commit is contained in:
fabrixxm 2016-02-08 15:48:16 +01:00
commit 0c67c89715
7 changed files with 1451 additions and 2192 deletions

View file

@ -1,6 +1,7 @@
<?php
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');
@ -209,7 +210,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