use Friendica\BaseObject;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\Email;
-
-require_once 'include/items.php';
+use Friendica\Util\Strings;
+use Friendica\Util\Network;
class Delivery extends BaseObject
{
- const MAIL = 'mail';
- const SUGGESTION = 'suggest';
- const RELOCATION = 'relocate';
- const DELETION = 'drop';
- const POST = 'wall-new';
- const COMMENT = 'comment-new';
- const REMOVAL = 'removeme';
+ const MAIL = 'mail';
+ const SUGGESTION = 'suggest';
+ const RELOCATION = 'relocate';
+ const DELETION = 'drop';
+ const POST = 'wall-new';
+ const COMMENT = 'comment-new';
+ const REMOVAL = 'removeme';
+ const PROFILEUPDATE = 'profileupdate';
public static function execute($cmd, $item_id, $contact_id)
{
- logger('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $contact_id, LOGGER_DEBUG);
+ Logger::log('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $contact_id, Logger::DEBUG);
$top_level = false;
$followup = false;
$public_message = false;
+ $items = [];
if ($cmd == self::MAIL) {
$target_item = DBA::selectFirst('mail', [], ['id' => $item_id]);
if (!DBA::isResult($target_item)) {
return;
}
$uid = $target_item['uid'];
- $items = [];
} elseif ($cmd == self::SUGGESTION) {
$target_item = DBA::selectFirst('fsuggest', [], ['id' => $item_id]);
if (!DBA::isResult($target_item)) {
$uid = $target_item['uid'];
} elseif ($cmd == self::RELOCATION) {
$uid = $item_id;
+ $target_item = [];
} else {
$item = Item::selectFirst(['parent'], ['id' => $item_id]);
if (!DBA::isResult($item) || empty($item['parent'])) {
$params = ['order' => ['id']];
$itemdata = Item::select([], $condition, $params);
- $items = [];
while ($item = Item::fetch($itemdata)) {
if ($item['id'] == $parent_id) {
$parent = $item;
DBA::close($itemdata);
if (empty($target_item)) {
- logger('Item ' . $item_id . "wasn't found. Quitting here.");
+ Logger::log('Item ' . $item_id . "wasn't found. Quitting here.");
return;
}
if (empty($parent)) {
- logger('Parent ' . $parent_id . ' for item ' . $item_id . "wasn't found. Quitting here.");
+ Logger::log('Parent ' . $parent_id . ' for item ' . $item_id . "wasn't found. Quitting here.");
return;
}
- $uid = $target_item['contact-uid'];
+ if (!empty($target_item['contact-uid'])) {
+ $uid = $target_item['contact-uid'];
+ } elseif (!empty($target_item['uid'])) {
+ $uid = $target_item['uid'];
+ } else {
+ Logger::log('Only public users for item ' . $item_id, Logger::DEBUG);
+ return;
+ }
// avoid race condition with deleting entries
if ($items[0]['deleted']) {
// The count then showed more than one entry. The additional check should help.
// The check for the "count" should be superfluous, but I'm not totally sure by now, so we keep it.
if ((($parent['id'] == $item_id) || (count($items) == 1)) && ($parent['uri'] === $parent['parent-uri'])) {
- logger('Top level post');
+ Logger::log('Top level post');
$top_level = true;
}
// if $parent['wall'] == 1 we will already have the parent message in our array
// and we will relay the whole lot.
- $localhost = self::getApp()->get_hostname();
+ $localhost = self::getApp()->getHostName();
if (strpos($localhost, ':')) {
$localhost = substr($localhost, 0, strpos($localhost, ':'));
}
*/
if (!$top_level && ($parent['wall'] == 0) && stristr($target_item['uri'], $localhost)) {
- logger('Followup ' . $target_item["guid"], LOGGER_DEBUG);
+ Logger::log('Followup ' . $target_item["guid"], Logger::DEBUG);
// local followup to remote post
$followup = true;
}
}
if (empty($items)) {
- logger('No delivery data for ' . $cmd . ' - Item ID: ' .$item_id . ' - Contact ID: ' . $contact_id);
+ Logger::log('No delivery data for ' . $cmd . ' - Item ID: ' .$item_id . ' - Contact ID: ' . $contact_id);
}
$owner = User::getOwnerDataById($uid);
return;
}
+ if (Network::isUrlBlocked($contact['url'])) {
+ return;
+ }
+
// Transmit via Diaspora if the thread had started as Diaspora post
// This is done since the uri wouldn't match (Diaspora doesn't transmit it)
- if (isset($parent) && ($parent['network'] == NETWORK_DIASPORA) && ($contact['network'] == NETWORK_DFRN)) {
- $contact['network'] = NETWORK_DIASPORA;
+ if (isset($parent) && ($parent['network'] == Protocol::DIASPORA) && ($contact['network'] == Protocol::DFRN)) {
+ $contact['network'] = Protocol::DIASPORA;
}
- logger("Delivering " . $cmd . " followup=$followup - via network " . $contact['network']);
+ Logger::log("Delivering " . $cmd . " followup=$followup - via network " . $contact['network']);
switch ($contact['network']) {
- case NETWORK_DFRN:
+ case Protocol::DFRN:
self::deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
break;
- case NETWORK_DIASPORA:
+ case Protocol::DIASPORA:
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
break;
- case NETWORK_OSTATUS:
+ case Protocol::OSTATUS:
// Do not send to otatus if we are not configured to send to public networks
if ($owner['prvnets']) {
break;
// This is done in "notifier.php" (See "url_recipients" and "push_notify")
break;
- case NETWORK_MAIL:
+ case Protocol::MAIL:
self::deliverMail($cmd, $contact, $owner, $target_item);
break;
*/
private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
{
- logger('Deliver ' . $target_item["guid"] . ' via DFRN to ' . (empty($contact['addr']) ? $contact['url'] : $contact['addr']));
+ Logger::log('Deliver ' . defaults($target_item, 'guid', $target_item['id']) . ' via DFRN to ' . (empty($contact['addr']) ? $contact['url'] : $contact['addr']));
if ($cmd == self::MAIL) {
$item = $target_item;
$atom = DFRN::entries($msgitems, $owner);
}
- logger('Notifier entry: ' . $contact["url"] . ' ' . $target_item["guid"] . ' entry: ' . $atom, LOGGER_DATA);
+ Logger::log('Notifier entry: ' . $contact["url"] . ' ' . defaults($target_item, 'guid', $target_item['id']) . ' entry: ' . $atom, Logger::DATA);
$basepath = implode('/', array_slice(explode('/', $contact['url']), 0, 3));
// perform local delivery if we are on the same site
- if (link_compare($basepath, System::baseUrl())) {
- $condition = ['nurl' => normalise_link($contact['url']), 'self' => true];
+ if (Strings::compareLink($basepath, System::baseUrl())) {
+ $condition = ['nurl' => Strings::normaliseLink($contact['url']), 'self' => true];
$target_self = DBA::selectFirst('contact', ['uid'], $condition);
if (!DBA::isResult($target_self)) {
return;
}
}
- // We now have some contact, so we fetch it
- $target_importer = DBA::fetchFirst("SELECT *, `name` as `senderName`
- FROM `contact`
- WHERE NOT `blocked` AND `id` = ? LIMIT 1",
- $cid);
-
- // This should never fail
- if (!DBA::isResult($target_importer)) {
- return;
- }
-
- $user = DBA::selectFirst('user', [], ['uid' => $target_uid]);
-
- // This should also never fail
- if (!DBA::isResult($user)) {
- logger('No user found for uid ' . $target_uid);
+ $target_importer = DFRN::getImporter($cid, $target_uid);
+ if (empty($target_importer)) {
+ // This should never happen
return;
}
- $target_importer = array_merge($target_importer, $user);
-
- // Set the user id. This is important if this is a public contact
- $target_importer['importer_uid'] = $target_uid;
DFRN::import($atom, $target_importer);
return;
}
// We never spool failed relay deliveries
if ($public_dfrn) {
- logger('Relay delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status);
+ Logger::log('Relay delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status);
return;
}
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
return;
}
- } else {
+ } elseif ($cmd != self::RELOCATION) {
$deliver_status = DFRN::deliver($owner, $contact, $atom);
+ } else {
+ $deliver_status = DFRN::deliver($owner, $contact, $atom, false, true);
}
- logger('Delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status);
+ Logger::log('Delivery to ' . $contact['url'] . ' with guid ' . defaults($target_item, 'guid', $target_item['id']) . ' returns ' . $deliver_status);
if ($deliver_status < 0) {
- logger('Delivery failed: queuing message ' . $target_item["guid"] );
- Queue::add($contact['id'], NETWORK_DFRN, $atom, false, $target_item['guid']);
+ Logger::log('Delivery failed: queuing message ' . defaults($target_item, 'guid', $target_item['id']));
+ Queue::add($contact['id'], Protocol::DFRN, $atom, false, $target_item['guid']);
}
if (($deliver_status >= 200) && ($deliver_status <= 299)) {
$loc = $contact['addr'];
}
- logger('Deliver ' . $target_item["guid"] . ' via Diaspora to ' . $loc);
+ Logger::log('Deliver ' . defaults($target_item, 'guid', $target_item['id']) . ' via Diaspora to ' . $loc);
if (Config::get('system', 'dfrn_only') || !Config::get('system', 'diaspora_enabled')) {
return;
if (!$contact['pubkey'] && !$public_message) {
return;
}
- if (($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
+ if ($cmd == self::RELOCATION) {
+ Diaspora::sendAccountMigration($owner, $contact, $owner['uid']);
+ return;
+ } elseif ($target_item['deleted'] && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
// top-level retraction
- logger('diaspora retract: ' . $loc);
+ Logger::log('diaspora retract: ' . $loc);
Diaspora::sendRetraction($target_item, $owner, $contact, $public_message);
return;
- } elseif ($cmd == self::RELOCATION) {
- Diaspora::sendAccountMigration($owner, $contact, $owner['uid']);
- return;
} elseif ($followup) {
// send comments and likes to owner to relay
- logger('diaspora followup: ' . $loc);
+ Logger::log('diaspora followup: ' . $loc);
Diaspora::sendFollowup($target_item, $owner, $contact, $public_message);
return;
} elseif ($target_item['uri'] !== $target_item['parent-uri']) {
// we are the relay - send comments, likes and relayable_retractions to our conversants
- logger('diaspora relay: ' . $loc);
+ Logger::log('diaspora relay: ' . $loc);
Diaspora::sendRelay($target_item, $owner, $contact, $public_message);
return;
} elseif ($top_level && !$walltowall) {
// currently no workable solution for sending walltowall
- logger('diaspora status: ' . $loc);
+ Logger::log('diaspora status: ' . $loc);
Diaspora::sendStatus($target_item, $owner, $contact, $public_message);
return;
}
- logger('Unknown mode ' . $cmd . ' for ' . $loc);
+ Logger::log('Unknown mode ' . $cmd . ' for ' . $loc);
}
/**
return;
}
- logger('Deliver ' . $target_item["guid"] . ' via mail to ' . $contact['addr']);
+ Logger::log('Deliver ' . $target_item["guid"] . ' via mail to ' . $contact['addr']);
$reply_to = '';
$mailacct = DBA::selectFirst('mailacct', ['reply_to'], ['uid' => $owner['uid']]);
$headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8').' <' . $local_user['email'] . '>' . "\n";
}
} else {
- $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . self::getApp()->get_hostname() . '>' . "\n";
+ $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . self::getApp()->getHostName() . '>' . "\n";
}
$headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n";
if (($target_item["thr-parent"] != "") && ($target_item["thr-parent"] != $target_item["parent-uri"])) {
$headers .= " <".Email::iri2msgid($target_item["thr-parent"]).">";
}
+
$headers .= "\n";
if (empty($target_item['title'])) {
$condition = ['uri' => $target_item['parent-uri'], 'uid' => $owner['uid']];
$title = Item::selectFirst(['title'], $condition);
+
if (DBA::isResult($title) && ($title['title'] != '')) {
$subject = $title['title'];
} else {
$condition = ['parent-uri' => $target_item['parent-uri'], 'uid' => $owner['uid']];
$title = Item::selectFirst(['title'], $condition);
+
if (DBA::isResult($title) && ($title['title'] != '')) {
$subject = $title['title'];
}
}
}
+
if (strncasecmp($subject, 'RE:', 3)) {
$subject = 'Re: ' . $subject;
}
}
+
Email::send($addr, $subject, $headers, $target_item);
}
}
projects / friendica.git / blobdiff