*/
namespace Friendica\Worker;
+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\DBM;
-use Friendica\Model\Contact;
-use Friendica\Model\Item;
-use Friendica\Model\Queue;
-use Friendica\Model\User;
+use Friendica\Database\DBA;
+use Friendica\Model;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\Email;
-use dba;
-
-require_once 'include/items.php';
-
-/// @todo This is some ugly code that needs to be split into several methods
-
-class Delivery {
- public static function execute($cmd, $item_id, $contact_id) {
- global $a;
-
- logger('delivery: invoked: '.$cmd.': '.$item_id.' to '.$contact_id, LOGGER_DEBUG);
+use Friendica\Util\Strings;
+use Friendica\Util\Network;
+use Friendica\Core\Worker;
+
+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 PROFILEUPDATE = 'profileupdate';
+
+ public static function execute($cmd, $target_id, $contact_id)
+ {
+ Logger::log('Invoked: ' . $cmd . ': ' . $target_id . ' to ' . $contact_id, Logger::DEBUG);
$top_level = false;
- $recipients = [];
$followup = false;
+ $public_message = false;
- $recipients[] = $contact_id;
-
- if ($cmd == DELIVER_MAIL) {
- $target_item = dba::selectFirst('mail', [], ['id' => $item_id]);
- if (!DBM::is_result($message)) {
+ $items = [];
+ if ($cmd == self::MAIL) {
+ $target_item = DBA::selectFirst('mail', [], ['id' => $target_id]);
+ if (!DBA::isResult($target_item)) {
return;
}
$uid = $target_item['uid'];
- $recipients[] = $target_item['contact-id'];
- } elseif ($cmd == DELIVER_SUGGESTION) {
- $target_item = dba::selectFirst('fsuggest', [], ['id' => $item_id]);
- if (!DBM::is_result($message)) {
+ } elseif ($cmd == self::SUGGESTION) {
+ $target_item = DBA::selectFirst('fsuggest', [], ['id' => $target_id]);
+ if (!DBA::isResult($target_item)) {
return;
}
$uid = $target_item['uid'];
- $recipients[] = $target_item['contact-id'];
- } elseif ($cmd == DELIVER_RELOCATION) {
- $uid = $item_id;
+ } elseif ($cmd == self::RELOCATION) {
+ $uid = $target_id;
+ $target_item = [];
} else {
- // find ancestors
- $target_item = dba::fetch_first("SELECT `item`.*, `contact`.`uid` AS `cuid`,
- `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
- FROM `item`
- INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
- WHERE `item`.`id` = ? AND `visible` AND NOT `moderated`", $item_id);
-
- if (!DBM::is_result($target_item) || !intval($target_item['parent'])) {
+ $item = Model\Item::selectFirst(['parent'], ['id' => $target_id]);
+ if (!DBA::isResult($item) || empty($item['parent'])) {
return;
}
+ $parent_id = intval($item['parent']);
- $parent_id = intval($target_item['parent']);
- $uid = $target_item['cuid'];
- $updated = $target_item['edited'];
+ $condition = ['id' => [$target_id, $parent_id], 'visible' => true, 'moderated' => false];
+ $params = ['order' => ['id']];
+ $itemdata = Model\Item::select([], $condition, $params);
- $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
- FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
- WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC",
- intval($parent_id)
- );
+ while ($item = Model\Item::fetch($itemdata)) {
+ if ($item['id'] == $parent_id) {
+ $parent = $item;
+ }
+ if ($item['id'] == $target_id) {
+ $target_item = $item;
+ }
+ $items[] = $item;
+ }
+ DBA::close($itemdata);
- if (!DBM::is_result($items)) {
+ if (empty($target_item)) {
+ Logger::log('Item ' . $target_id . "wasn't found. Quitting here.");
return;
}
- $icontacts = null;
- $contacts_arr = [];
- foreach ($items as $item) {
- if (!in_array($item['contact-id'],$contacts_arr)) {
- $contacts_arr[] = intval($item['contact-id']);
- }
- }
- if (count($contacts_arr)) {
- $str_contacts = implode(',',$contacts_arr);
- $icontacts = q("SELECT * FROM `contact`
- WHERE `id` IN ( $str_contacts ) "
- );
+ if (empty($parent)) {
+ Logger::log('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here.");
+ return;
}
- if (!DBM::is_result($icontacts)) {
+
+ 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 ' . $target_id, Logger::DEBUG);
return;
}
// avoid race condition with deleting entries
-
if ($items[0]['deleted']) {
foreach ($items as $item) {
$item['deleted'] = 1;
// When commenting too fast after delivery, a post wasn't recognized as top level post.
// 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 ((($items[0]['id'] == $item_id) || (count($items) == 1)) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
- logger('delivery: top level post');
+ if ((($parent['id'] == $target_id) || (count($items) == 1)) && ($parent['uri'] === $parent['parent-uri'])) {
+ Logger::log('Top level post');
$top_level = true;
}
- }
-
- $owner = User::getOwnerDataById($uid);
- if (!$owner) {
- return;
- }
-
- // We don't treat Forum posts as "wall-to-wall" to be able to post them via Diaspora
- $walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY);
-
- $public_message = true;
-
- if (!in_array($cmd, [DELIVER_MAIL, DELIVER_SUGGESTION, DELIVER_RELOCATION])) {
- $parent = $items[0];
// This is IMPORTANT!!!!
// if $parent['wall'] == 1 we will already have the parent message in our array
// and we will relay the whole lot.
- $localhost = $a->get_hostname();
- if (strpos($localhost,':')) {
- $localhost = substr($localhost,0,strpos($localhost,':'));
+ $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 (strlen($parent['allow_cid'])
- || strlen($parent['allow_gid'])
- || strlen($parent['deny_cid'])
- || strlen($parent['deny_gid'])
- || $parent["private"]) {
- $public_message = false; // private recipients, not public
+ if (empty($parent['allow_cid'])
+ && empty($parent['allow_gid'])
+ && empty($parent['deny_cid'])
+ && empty($parent['deny_gid'])
+ && !$parent["private"]) {
+ $public_message = true;
}
}
+ if (empty($items)) {
+ Logger::log('No delivery data for ' . $cmd . ' - Item ID: ' .$target_id . ' - Contact ID: ' . $contact_id);
+ }
+
+ $owner = Model\User::getOwnerDataById($uid);
+ if (!DBA::isResult($owner)) {
+ return;
+ }
+
// We don't deliver our items to blocked or pending contacts, and not to ourselves either
- $contact = dba::selectFirst('contact', [],
+ $contact = DBA::selectFirst('contact', [],
['id' => $contact_id, 'blocked' => false, 'pending' => false, 'self' => false]
);
- if (!DBM::is_result($contact)) {
+ if (!DBA::isResult($contact)) {
return;
}
- $deliver_status = 0;
+ 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'] == Protocol::DIASPORA) && ($contact['network'] == Protocol::DFRN)) {
+ $contact['network'] = Protocol::DIASPORA;
+ }
- logger("Delivering " . $cmd . " followup=$followup - network ".$contact['network']);
+ Logger::log("Delivering " . $cmd . " followup=$followup - via network " . $contact['network']);
switch ($contact['network']) {
- case NETWORK_DFRN:
- self::deliverDFRN($cmd, $contact, $icontacts, $owner, $items, $target_item, $public_message, $top_level, $followup);
+ case Protocol::DFRN:
+ self::deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
+
+ if (in_array($cmd, [Delivery::POST, Delivery::COMMENT])) {
+ Model\ItemDeliveryData::incrementQueueDone($target_id);
+ }
break;
- case NETWORK_DIASPORA:
- self::deliverDiaspora($cmd, $contact, $owner, $target_item, $public_message, $top_level, $followup, $walltowall);
+ case Protocol::DIASPORA:
+ self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
+
+ if (in_array($cmd, [Delivery::POST, Delivery::COMMENT])) {
+ Model\ItemDeliveryData::incrementQueueDone($target_id);
+ }
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;
return;
}
- private static function deliverDFRN($cmd, $contact, $icontacts, $owner, $items, $target_item, $public_message, $top_level, $followup)
+ /**
+ * @brief Deliver content via DFRN
+ *
+ * @param string $cmd Command
+ * @param array $contact Contact record of the receiver
+ * @param array $owner Owner record of the sender
+ * @param array $items Item record of the content and the parent
+ * @param array $target_item Item record of the content
+ * @param boolean $public_message Is the content public?
+ * @param boolean $top_level Is it a thread starter?
+ * @param boolean $followup Is it an answer to a remote post?
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
+ */
+ private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
{
- logger('notifier: '.$target_item["guid"].' dfrndelivery: '.$contact['name']);
+ Logger::log('Deliver ' . defaults($target_item, 'guid', $target_item['id']) . ' via DFRN to ' . (empty($contact['addr']) ? $contact['url'] : $contact['addr']));
- if ($cmd == DELIVER_MAIL) {
+ if ($cmd == self::MAIL) {
$item = $target_item;
- $item['body'] = Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']);
+ $item['body'] = Model\Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']);
$atom = DFRN::mail($item, $owner);
- } elseif ($cmd == DELIVER_SUGGESTION) {
+ } elseif ($cmd == self::SUGGESTION) {
$item = $target_item;
$atom = DFRN::fsuggest($item, $owner);
- dba::delete('fsuggest', ['id' => $item['id']]);
- } elseif ($cmd == DELIVER_RELOCATION) {
+ DBA::delete('fsuggest', ['id' => $item['id']]);
+ } elseif ($cmd == self::RELOCATION) {
$atom = DFRN::relocate($owner, $owner['uid']);
} elseif ($followup) {
- $msgitems = [];
- $msgitems[] = $target_item;
+ $msgitems = [$target_item];
$atom = DFRN::entries($msgitems, $owner);
} else {
$msgitems = [];
foreach ($items as $item) {
- if (!$item['parent']) {
- return;
- }
-
- // private emails may be in included in public conversations. Filter them.
- if ($public_message && $item['private']) {
- return;
- }
-
- $item_contact = self::getItemContact($item, $icontacts);
- if (!$item_contact) {
- return;
- }
-
- if (!in_array($cmd, [DELIVER_MAIL, DELIVER_SUGGESTION, DELIVER_RELOCATION])) {
- // Only add the parent when we don't delete other items.
- if ($target_item['id'] == $item['id'] || (($item['id'] == $item['parent']) && ($cmd != DELIVER_DELETION))) {
- $item["entry:comment-allow"] = true;
- $item["entry:cid"] = ($top_level ? $contact['id'] : 0);
- $msgitems[] = $item;
- }
- } else {
+ // Only add the parent when we don't delete other items.
+ if (($target_item['id'] == $item['id']) || ($cmd != self::DELETION)) {
$item["entry:comment-allow"] = true;
+ $item["entry:cid"] = ($top_level ? $contact['id'] : 0);
$msgitems[] = $item;
}
}
- $atom = DFRN::entries($msgitems,$owner);
+ $atom = DFRN::entries($msgitems, $owner);
}
- logger('notifier entry: '.$contact["url"].' '.$target_item["guid"].' entry: '.$atom, LOGGER_DEBUG);
+ Logger::log('Notifier entry: ' . $contact["url"] . ' ' . defaults($target_item, 'guid', $target_item['id']) . ' entry: ' . $atom, Logger::DATA);
- logger('notifier: '.$atom, LOGGER_DATA);
- $basepath = implode('/', array_slice(explode('/',$contact['url']),0,3));
+ $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];
- $target_self = dba::selectFirst('contact', ['uid'], $condition);
- if (!DBM::is_result($target_self)) {
+ 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;
}
$target_uid = $target_self['uid'];
// Check if the user has got this contact
- $cid = Contact::getIdForURL($owner['url'], $target_uid);
+ $cid = Model\Contact::getIdForURL($owner['url'], $target_uid);
if (!$cid) {
// Otherwise there should be a public contact
- $cid = Contact::getIdForURL($owner['url']);
+ $cid = Model\Contact::getIdForURL($owner['url']);
if (!$cid) {
return;
}
}
- // We now have some contact, so we fetch it
- $target_importer = dba::fetch_first("SELECT *, `name` as `senderName`
- FROM `contact`
- WHERE NOT `blocked` AND `id` = ? LIMIT 1",
- $cid);
-
- // This should never fail
- if (!DBM::is_result($target_importer)) {
+ $target_importer = DFRN::getImporter($cid, $target_uid);
+ if (empty($target_importer)) {
+ // This should never happen
return;
}
- // 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;
}
- if ($items[0]['uid'] == 0) {
- $deliver_status = DFRN::transmit($owner, $contact, $atom);
- if ($deliver_status < 200) {
+ // We don't have a relationship with contacts on a public post.
+ // Se we transmit with the new method and via Diaspora as a fallback
+ if (!empty($items) && (($items[0]['uid'] == 0) || ($contact['uid'] == 0))) {
+ // Transmit in public if it's a relay post
+ $public_dfrn = ($contact['contact-type'] == Model\Contact::TYPE_RELAY);
+
+ $deliver_status = DFRN::transmit($owner, $contact, $atom, $public_dfrn);
+
+ // We never spool failed relay deliveries
+ if ($public_dfrn) {
+ Logger::log('Relay delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status);
+ return;
+ }
+
+ if (($deliver_status < 200) || ($deliver_status > 299)) {
// Transmit via Diaspora if not possible via Friendica
- self::deliverDiaspora($cmd, $contact, $owner, $target_item, $public_message, $top_level, $followup, false);
+ self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
return;
}
+ } elseif ($cmd != self::RELOCATION) {
$deliver_status = DFRN::deliver($owner, $contact, $atom);
+ } else {
+ $deliver_status = DFRN::deliver($owner, $contact, $atom, false, true);
}
- logger('notifier: dfrn_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('notifier: delivery failed: queuing message');
- Queue::add($contact['id'], NETWORK_DFRN, $atom, false, $target_item['guid']);
+ Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]);
+ Worker::defer();
}
if (($deliver_status >= 200) && ($deliver_status <= 299)) {
// We successfully delivered a message, the contact is alive
- Contact::unmarkForArchival($contact);
+ Model\Contact::unmarkForArchival($contact);
} else {
// The message could not be delivered. We mark the contact as "dead"
- Contact::markForArchival($contact);
+ Model\Contact::markForArchival($contact);
+
+ // Transmit via Diaspora when all other methods (legacy DFRN and new one) are failing.
+ // This is a fallback for systems that don't know the new methods.
+ self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
}
}
- private static function deliverDiaspora($cmd, $contact, $owner, $target_item, $public_message, $top_level, $followup, $walltowall)
+ /**
+ * @brief Deliver content via Diaspora
+ *
+ * @param string $cmd Command
+ * @param array $contact Contact record of the receiver
+ * @param array $owner Owner record of the sender
+ * @param array $items Item record of the content and the parent
+ * @param array $target_item Item record of the content
+ * @param boolean $public_message Is the content public?
+ * @param boolean $top_level Is it a thread starter?
+ * @param boolean $followup Is it an answer to a remote post?
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
+ */
+ private static function deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
{
+ // We don't treat Forum posts as "wall-to-wall" to be able to post them via Diaspora
+ $walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != Model\User::ACCOUNT_TYPE_COMMUNITY);
+
if ($public_message) {
$loc = 'public batch ' . $contact['batch'];
} else {
- $loc = $contact['name'];
+ $loc = $contact['addr'];
}
- logger('delivery: diaspora batch deliver: ' . $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 ($cmd == DELIVER_MAIL) {
+ if ($cmd == self::MAIL) {
Diaspora::sendMail($target_item, $owner, $contact);
return;
}
- if ($cmd == DELIVER_SUGGESTION) {
+ if ($cmd == self::SUGGESTION) {
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 == DELIVER_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 '.$contact['name']);
+ Logger::log('Unknown mode ' . $cmd . ' for ' . $loc);
}
+ /**
+ * @brief Deliver content via mail
+ *
+ * @param string $cmd Command
+ * @param array $contact Contact record of the receiver
+ * @param array $owner Owner record of the sender
+ * @param array $target_item Item record of the content
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
+ */
private static function deliverMail($cmd, $contact, $owner, $target_item)
{
- global $a;
-
if (Config::get('system','dfrn_only')) {
return;
}
return;
}
- if (!in_array($cmd, [DELIVER_POST, DELIVER_COMMENT])) {
+ if (!in_array($cmd, [self::POST, self::COMMENT])) {
return;
}
- $local_user = dba::selectFirst('user', [], ['uid' => $owner['uid']]);
- if (!DBM::is_result($local_user)) {
+ $local_user = DBA::selectFirst('user', [], ['uid' => $owner['uid']]);
+ if (!DBA::isResult($local_user)) {
return;
}
+ Logger::log('Deliver ' . $target_item["guid"] . ' via mail to ' . $contact['addr']);
+
$reply_to = '';
- $mailacct = dba::selectFirst('mailacct', ['reply_to'], ['uid' => $owner['uid']]);
- if (DBM::is_result($mailacct) && !empty($mailacct['reply_to'])) {
+ $mailacct = DBA::selectFirst('mailacct', ['reply_to'], ['uid' => $owner['uid']]);
+ if (DBA::isResult($mailacct) && !empty($mailacct['reply_to'])) {
$reply_to = $mailacct['reply_to'];
}
// only expose our real email address to true friends
- if (($contact['rel'] == CONTACT_IS_FRIEND) && !$contact['blocked']) {
+ if (($contact['rel'] == Model\Contact::FRIEND) && !$contact['blocked']) {
if ($reply_to) {
$headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $reply_to.'>' . "\n";
$headers .= 'Sender: ' . $local_user['email'] . "\n";
$headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8').' <' . $local_user['email'] . '>' . "\n";
}
} else {
- $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . $a->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 = dba::selectFirst('item', ['title'], $condition);
- if (DBM::is_result($title) && ($title['title'] != '')) {
+ $title = Model\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 = dba::selectFirst('item', ['title'], $condition);
- if (DBM::is_result($title) && ($title['title'] != '')) {
+ $title = Model\Item::selectFirst(['title'], $condition);
+
+ if (DBA::isResult($title) && ($title['title'] != '')) {
$subject = $title['title'];
}
}
}
- if (strncasecmp($subject, 'RE:', 3)) {
+
+ if (strncasecmp($subject, 'RE:', 3)) {
$subject = 'Re: ' . $subject;
}
}
- Email::send($addr, $subject, $headers, $target_item);
- }
- private static function getItemContact($item, $contacts)
- {
- if (!count($contacts) || !is_array($item)) {
- return false;
- }
- foreach ($contacts as $contact) {
- if ($contact['id'] == $item['contact-id']) {
- return $contact;
- }
- }
- return false;
+ Email::send($addr, $subject, $headers, $target_item);
}
}
projects / friendica.git / blobdiff