Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 17:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Differences fixed between old and new code

Browse source
This commit is contained in:
Michael Vogel 2016-02-03 23:04:52 +01:00
parent d9b5d6d5f5
commit 2d0c2990ea
2 changed files with 65 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

30
include/items.php
View file

@ -1696,13 +1696,29 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
return;
}
// dfrn-test
// if ($contact['network'] === NETWORK_DFRN) {
// logger("Consume DFRN messages", LOGGER_DEBUG);
// logger("dfrn-test");
// dfrn2::import($xml,$importer, $contact);
// return;
// }
/*
if ($contact['network'] === NETWORK_DFRN) {
logger("Consume DFRN messages", LOGGER_DEBUG);
logger("dfrn-test");
$r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
`contact`.`pubkey` AS `cpubkey`,
`contact`.`prvkey` AS `cprvkey`,
`contact`.`thumb` AS `thumb`,
`contact`.`url` as `url`,
`contact`.`name` as `senderName`,
`user`.*
FROM `contact`
LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `contact`.`id` = %d AND `user`.`uid` = %d",
dbesc($contact["id"], $importer["uid"]);
);
if ($r) {
dfrn2::import($xml,$r[0], true);
return;
}
}
*/
// Test - remove before flight
//if ($pass < 2) {
// $tempfile = tempnam(get_temppath(), "dfrn-consume-");
@ -2408,7 +2424,7 @@ function item_is_remote_self($contact, &$datarray) {
function local_delivery($importer,$data) {
// dfrn-Test
//return dfrn2::import($data, $importer, $contact);
//return dfrn2::import($data, $importer);
require_once('library/simplepie/simplepie.inc');