X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdelivery.php;h=faa1cad6745d45667f4a3e393006f92f6a06772d;hb=48dde02e754ba1252e1d488450298d6210a549d5;hp=e6cfc8155430ecb8f594d8744aa0af1e28787ff0;hpb=12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89;p=friendica.git
diff --git a/include/delivery.php b/include/delivery.php
index e6cfc81554..faa1cad674 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -1,110 +1,100 @@
set_baseurl(get_config('system','url'));
-
- logger('delivery: invoked: ' . print_r($argv,true), LOGGER_DEBUG);
+ logger('delivery: invoked: '. print_r($argv,true), LOGGER_DEBUG);
$cmd = $argv[1];
$item_id = intval($argv[2]);
- for($x = 3; $x < $argc; $x ++) {
+ for ($x = 3; $x < $argc; $x ++) {
$contact_id = intval($argv[$x]);
- // Some other process may have delivered this item already.
-
- $r = q("select * from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
- dbesc($cmd),
- dbesc($item_id),
- dbesc($contact_id)
- );
- if(! count($r)) {
+ if (!$item_id || !$contact_id) {
continue;
- }
-
- $maxsysload = intval(get_config('system','maxloadavg'));
- if($maxsysload < 1)
- $maxsysload = 50;
- if(function_exists('sys_getloadavg')) {
- $load = sys_getloadavg();
- if(intval($load[0]) > $maxsysload) {
- logger('system: load ' . $load . ' too high. Delivery deferred to next queue run.');
- return;
- }
}
- // It's ours to deliver. Remove it from the queue.
-
- q("delete from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
- dbesc($cmd),
- dbesc($item_id),
- dbesc($contact_id)
- );
-
- if((! $item_id) || (! $contact_id))
- continue;
-
$expire = false;
+ $mail = false;
+ $fsuggest = false;
+ $relocate = false;
$top_level = false;
$recipients = array();
$url_recipients = array();
+ $followup = false;
$normal_mode = true;
$recipients[] = $contact_id;
- if($cmd === 'expire') {
+ if ($cmd === 'mail') {
+ $normal_mode = false;
+ $mail = true;
+ $message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
+ intval($item_id)
+ );
+ if (!count($message)) {
+ return;
+ }
+ $uid = $message[0]['uid'];
+ $recipients[] = $message[0]['contact-id'];
+ $item = $message[0];
+ } elseif ($cmd === 'expire') {
$normal_mode = false;
$expire = true;
- $items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
+ $items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 30 MINUTE",
intval($item_id)
);
$uid = $item_id;
$item_id = 0;
- if(! count($items))
- continue;
- }
- else {
+ if (!count($items)) {
+ continue;
+ }
+ } elseif ($cmd === 'suggest') {
+ $normal_mode = false;
+ $fsuggest = true;
+ $suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
+ intval($item_id)
+ );
+ if (!count($suggest)) {
+ return;
+ }
+ $uid = $suggest[0]['uid'];
+ $recipients[] = $suggest[0]['cid'];
+ $item = $suggest[0];
+ } elseif ($cmd === 'relocate') {
+ $normal_mode = false;
+ $relocate = true;
+ $uid = $item_id;
+ } else {
// find ancestors
$r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
intval($item_id)
);
- if((! count($r)) || (! intval($r[0]['parent']))) {
+ if ((!dbm::is_result($r)) || (!intval($r[0]['parent']))) {
continue;
}
@@ -113,57 +103,60 @@ function delivery_run($argv, $argc){
$uid = $r[0]['uid'];
$updated = $r[0]['edited'];
- // The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up
- if(! $parent_id)
- continue;
-
-
- $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
+ $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)
);
- if(! count($items)) {
+ if (!count($items)) {
continue;
}
$icontacts = null;
$contacts_arr = array();
- foreach($items as $item)
- if(! in_array($item['contact-id'],$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`
+ }
+ }
+ if (count($contacts_arr)) {
+ $str_contacts = implode(',',$contacts_arr);
+ $icontacts = q("SELECT * FROM `contact`
WHERE `id` IN ( $str_contacts ) "
);
}
- if( ! ($icontacts && count($icontacts)))
+ if ( !($icontacts && count($icontacts))) {
continue;
+ }
// avoid race condition with deleting entries
- if($items[0]['deleted']) {
- foreach($items as $item)
+ if ($items[0]['deleted']) {
+ foreach ($items as $item) {
$item['deleted'] = 1;
+ }
}
- if((count($items) == 1) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
+ // 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');
$top_level = true;
}
}
- $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
- `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
- `user`.`page-flags`, `user`.`prvnets`
- FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
+ $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
+ `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
+ `user`.`page-flags`, `user`.`account-type`, `user`.`prvnets`
+ FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
intval($uid)
);
- if(! count($r))
+ if (!dbm::is_result($r)) {
continue;
+ }
$owner = $r[0];
@@ -171,13 +164,10 @@ function delivery_run($argv, $argc){
$public_message = true;
- // fill this in with a single salmon slap if applicable
-
- $slap = '';
-
- require_once('include/group.php');
+ if (!($mail || $fsuggest || $relocate)) {
+ require_once('include/group.php');
- $parent = $items[0];
+ $parent = $items[0];
// This is IMPORTANT!!!!
@@ -186,151 +176,158 @@ function delivery_run($argv, $argc){
// in the URI, AND it was a comment (not top_level) AND the parent originated elsewhere.
// if $parent['wall'] == 1 we will already have the parent message in our array
// and we will relay the whole lot.
-
+
// expire sends an entire group of expire messages and cannot be forwarded.
- // However the conversation owner will be a part of the conversation and will
+ // However the conversation owner will be a part of the conversation and will
// be notified during this run.
// Other DFRN conversation members will be alerted during polled updates.
// Diaspora members currently are not notified of expirations, and other networks have
- // either limited or no ability to process deletions. We should at least fix Diaspora
+ // either limited or no ability to process deletions. We should at least fix Diaspora
// by stringing togther an array of retractions and sending them onward.
-
-
- $localhost = $a->get_hostname();
- if(strpos($localhost,':'))
- $localhost = substr($localhost,0,strpos($localhost,':'));
-
- /**
- *
- * Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes
- * have been known to cause runaway conditions which affected several servers, along with
- * permissions issues.
- *
- */
-
- if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) {
- logger('relay denied for delivery agent.');
-
- /* no relay allowed for direct contact delivery */
- continue;
- }
- if((strlen($parent['allow_cid']))
- || (strlen($parent['allow_gid']))
- || (strlen($parent['deny_cid']))
- || (strlen($parent['deny_gid']))) {
- $public_message = false; // private recipients, not public
+
+ $localhost = $a->get_hostname();
+ if (strpos($localhost,':')) {
+ $localhost = substr($localhost,0,strpos($localhost,':'));
+ }
+ /**
+ *
+ * Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes
+ * have been known to cause runaway conditions which affected several servers, along with
+ * permissions issues.
+ *
+ */
+
+ $relay_to_owner = false;
+
+ if (!$top_level && ($parent['wall'] == 0) && !$expire && stristr($target_item['uri'],$localhost)) {
+ $relay_to_owner = true;
+ }
+
+ if ($relay_to_owner) {
+ logger('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
+ }
+
}
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0",
intval($contact_id)
);
- if(count($r))
+ if (dbm::is_result($r)) {
$contact = $r[0];
-
- $hubxml = feed_hublinks();
-
- logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
-
- require_once('include/salmon.php');
-
- if($contact['self'])
+ }
+ if ($contact['self']) {
continue;
-
+ }
$deliver_status = 0;
+ logger("main delivery by delivery: followup=$followup mail=$mail fsuggest=$fsuggest relocate=$relocate - network ".$contact['network']);
+
switch($contact['network']) {
- case NETWORK_DFRN :
- logger('notifier: dfrndelivery: ' . $contact['name']);
-
- $feed_template = get_markup_template('atom_feed.tpl');
- $mail_template = get_markup_template('atom_mail.tpl');
-
- $atom = '';
-
-
- $birthday = feed_birthday($owner['uid'],$owner['timezone']);
-
- if(strlen($birthday))
- $birthday = '' . xmlify($birthday) . '';
-
- $atom .= replace_macros($feed_template, array(
- '$version' => xmlify(FRIENDICA_VERSION),
- '$feed_id' => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
- '$feed_title' => xmlify($owner['name']),
- '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
- '$hub' => $hubxml,
- '$salmon' => '', // private feed, we don't use salmon here
- '$name' => xmlify($owner['name']),
- '$profile_page' => xmlify($owner['url']),
- '$photo' => xmlify($owner['photo']),
- '$thumb' => xmlify($owner['thumb']),
- '$picdate' => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
- '$uridate' => xmlify(datetime_convert('UTC','UTC',$owner['uri-date'] . '+00:00' , ATOM_TIME)) ,
- '$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , ATOM_TIME)) ,
- '$birthday' => $birthday,
- '$community' => (($owner['page-flags'] == PAGE_COMMUNITY) ? '1' : '')
- ));
-
- foreach($items as $item) {
- if(! $item['parent'])
- continue;
-
- // private emails may be in included in public conversations. Filter them.
- if(($public_message) && $item['private'])
- continue;
-
- $item_contact = get_item_contact($item,$icontacts);
- if(! $item_contact)
- continue;
-
- if($normal_mode) {
- if($item_id == $item['id'] || $item['id'] == $item['parent'])
- $atom .= atom_entry($item,'text',null,$owner,true,(($top_level) ? $contact['id'] : 0));
+ case NETWORK_DFRN:
+ logger('notifier: '.$target_item["guid"].' dfrndelivery: '.$contact['name']);
+
+ if ($mail) {
+ $item['body'] = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
+ $atom = dfrn::mail($item, $owner);
+ } elseif ($fsuggest) {
+ $atom = dfrn::fsuggest($item, $owner);
+ q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1", intval($item['id']));
+ } elseif ($relocate) {
+ $atom = dfrn::relocate($owner, $uid);
+ } elseif ($followup) {
+ $msgitems = array();
+ foreach ($items as $item) { // there is only one item
+ if (!$item['parent']) {
+ continue;
+ }
+ if ($item['id'] == $item_id) {
+ logger('followup: item: '. print_r($item,true), LOGGER_DATA);
+ $msgitems[] = $item;
+ }
}
- else
- $atom .= atom_entry($item,'text',null,$owner,true);
+ $atom = dfrn::entries($msgitems,$owner);
+ } else {
+ $msgitems = array();
+ foreach ($items as $item) {
+ if (!$item['parent']) {
+ continue;
+ }
+
+ // private emails may be in included in public conversations. Filter them.
+ if ($public_message && $item['private']) {
+ continue;
+ }
+ $item_contact = get_item_contact($item,$icontacts);
+ if (!$item_contact) {
+ continue;
+ }
+
+ if ($normal_mode) {
+ if ($item_id == $item['id'] || $item['id'] == $item['parent']) {
+ $item["entry:comment-allow"] = true;
+ $item["entry:cid"] = (($top_level) ? $contact['id'] : 0);
+ $msgitems[] = $item;
+ }
+ } else {
+ $item["entry:comment-allow"] = true;
+ $msgitems[] = $item;
+ }
+ }
+ $atom = dfrn::entries($msgitems,$owner);
}
- $atom .= '' . "\r\n";
-
- logger('notifier: ' . $atom, LOGGER_DATA);
+ logger('notifier entry: '.$contact["url"].' '.$target_item["guid"].' entry: '.$atom, LOGGER_DEBUG);
+
+ logger('notifier: '.$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,$a->get_baseurl())) {
+ if (link_compare($basepath,App::get_baseurl())) {
$nickname = basename($contact['url']);
- if($contact['issued-id'])
+ if ($contact['issued-id']) {
$sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id']));
- else
+ } else {
$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($contact['dfrn-id']));
+ }
- $x = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
- `contact`.`pubkey` AS `cpubkey`,
- `contact`.`prvkey` AS `cprvkey`,
- `contact`.`thumb` AS `thumb`,
+ $x = 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`
+ `user`.*
+ FROM `contact`
+ INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
$sql_extra
- AND `user`.`account_expired` = 0 LIMIT 1",
+ AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 LIMIT 1",
dbesc(NETWORK_DFRN),
dbesc($nickname)
);
- if(count($x)) {
- if($owner['page-flags'] == PAGE_COMMUNITY && ! $x[0]['writable']) {
- q("update contact set writable = 1 where id = %d limit 1",
+ if ($x && count($x)) {
+ $write_flag = ((($x[0]['rel']) && ($x[0]['rel'] != CONTACT_IS_SHARING)) ? true : false);
+ if ((($owner['page-flags'] == PAGE_COMMUNITY) || $write_flag) && !$x[0]['writable']) {
+ q("UPDATE `contact` SET `writable` = 1 WHERE `id` = %d",
intval($x[0]['id'])
);
$x[0]['writable'] = 1;
@@ -339,205 +336,197 @@ function delivery_run($argv, $argc){
$ssl_policy = get_config('system','ssl_policy');
fix_contact_ssl_policy($x[0],$ssl_policy);
- // If we are setup as a soapbox we aren't accepting input from this person
+ // If we are setup as a soapbox we aren't accepting top level posts from this person
- if($x[0]['page-flags'] == PAGE_SOAPBOX)
+ if (($x[0]['page-flags'] == PAGE_SOAPBOX) AND $top_level) {
break;
-
- require_once('library/simplepie/simplepie.inc');
+ }
logger('mod-delivery: local delivery');
- local_delivery($x[0],$atom);
+ dfrn::import($atom, $x[0]);
break;
}
}
- if(! was_recently_delayed($contact['id']))
- $deliver_status = dfrn_deliver($owner,$contact,$atom);
- else
+ if (!was_recently_delayed($contact['id'])) {
+ $deliver_status = dfrn::deliver($owner,$contact,$atom);
+ } else {
$deliver_status = (-1);
+ }
- logger('notifier: dfrn_delivery returns ' . $deliver_status);
+ logger('notifier: dfrn_delivery to '.$contact["url"].' with guid '.$target_item["guid"].' returns '.$deliver_status);
- if($deliver_status == (-1)) {
+ if ($deliver_status < 0) {
logger('notifier: delivery failed: queuing message');
add_to_queue($contact['id'],NETWORK_DFRN,$atom);
+
+ // The message could not be delivered. We mark the contact as "dead"
+ mark_for_death($contact);
+ } else {
+ // We successfully delivered a message, the contact is alive
+ unmark_for_death($contact);
}
- break;
- case NETWORK_OSTATUS :
+ break;
+ case NETWORK_OSTATUS:
// Do not send to otatus if we are not configured to send to public networks
- if($owner['prvnets'])
+ if ($owner['prvnets']) {
break;
- if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
+ }
+ if (get_config('system','ostatus_disabled') || get_config('system','dfrn_only')) {
break;
-
- // only send salmon if public - e.g. if it's ok to notify
- // a public hub, it's ok to send a salmon
-
- if(($public_message) && (! $expire)) {
- $slaps = array();
-
- foreach($items as $item) {
- if(! $item['parent'])
- continue;
-
- // private emails may be in included in public conversations. Filter them.
- if(($public_message) && $item['private'])
- continue;
-
- $item_contact = get_item_contact($item,$icontacts);
- if(! $item_contact)
- continue;
-
- if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire))
- $slaps[] = atom_entry($item,'html',null,$owner,true);
- }
-
- logger('notifier: slapdelivery: ' . $contact['name']);
- foreach($slaps as $slappy) {
- if($contact['notify']) {
- if(! was_recently_delayed($contact['id']))
- $deliver_status = slapper($owner,$contact['notify'],$slappy);
- else
- $deliver_status = (-1);
-
- if($deliver_status == (-1)) {
- // queue message for redelivery
- add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy);
- }
- }
- }
}
+ // There is currently no code here to distribute anything to OStatus.
+ // This is done in "notifier.php" (See "url_recipients" and "push_notify")
break;
- case NETWORK_MAIL :
+ case NETWORK_MAIL:
case NETWORK_MAIL2:
- if(get_config('system','dfrn_only'))
+ if (get_config('system','dfrn_only')) {
break;
+ }
// WARNING: does not currently convert to RFC2047 header encodings, etc.
$addr = $contact['addr'];
- if(! strlen($addr))
+ if (!strlen($addr)) {
break;
+ }
- if($cmd === 'wall-new' || $cmd === 'comment-new') {
+ if ($cmd === 'wall-new' || $cmd === 'comment-new') {
$it = null;
- if($cmd === 'wall-new')
+ if ($cmd === 'wall-new') {
$it = $items[0];
- else {
- $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ } else {
+ $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($argv[2]),
intval($uid)
);
- if(count($r))
+ if (dbm::is_result($r))
$it = $r[0];
}
- if(! $it)
+ if (!$it)
break;
-
+
$local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
intval($uid)
);
- if(! count($local_user))
+ if (!count($local_user))
break;
-
+
$reply_to = '';
$r1 = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
intval($uid)
);
- if($r1 && $r1[0]['reply_to'])
+ if ($r1 && $r1[0]['reply_to'])
$reply_to = $r1[0]['reply_to'];
$subject = (($it['title']) ? email_header_encode($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
// only expose our real email address to true friends
- if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked']))
- $headers = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n";
- else
- $headers = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
+ if (($contact['rel'] == CONTACT_IS_FRIEND) && !$contact['blocked']) {
+ if ($reply_to) {
+ $headers = 'From: '.email_header_encode($local_user[0]['username'],'UTF-8').' <'.$reply_to.'>'."\n";
+ $headers .= 'Sender: '.$local_user[0]['email']."\n";
+ } else {
+ $headers = 'From: '.email_header_encode($local_user[0]['username'],'UTF-8').' <'.$local_user[0]['email'].'>'."\n";
+ }
+ } else {
+ $headers = 'From: '. email_header_encode($local_user[0]['username'],'UTF-8') .' <'. t('noreply') .'@'.$a->get_hostname() .'>'. "\n";
+ }
- if($reply_to)
- $headers .= 'Reply-to: ' . $reply_to . "\n";
+ //if ($reply_to)
+ // $headers .= 'Reply-to: '.$reply_to . "\n";
- // for testing purposes: Collect exported mails
- // $file = tempnam("/tmp/friendica/", "mail-out-");
- // file_put_contents($file, json_encode($it));
-
- $headers .= 'Message-Id: <' . iri2msgid($it['uri']). '>' . "\n";
+ $headers .= 'Message-Id: <'. iri2msgid($it['uri']).'>'. "\n";
//logger("Mail: uri: ".$it['uri']." parent-uri ".$it['parent-uri'], LOGGER_DEBUG);
//logger("Mail: Data: ".print_r($it, true), LOGGER_DEBUG);
//logger("Mail: Data: ".print_r($it, true), LOGGER_DATA);
- if($it['uri'] !== $it['parent-uri']) {
- $headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n";
- if(!strlen($it['title'])) {
- $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
- dbesc($it['parent-uri']));
+ if ($it['uri'] !== $it['parent-uri']) {
+ $headers .= "References: <".iri2msgid($it["parent-uri"]).">";
+
+ // If Threading is enabled, write down the correct parent
+ if (($it["thr-parent"] != "") and ($it["thr-parent"] != $it["parent-uri"]))
+ $headers .= " <".iri2msgid($it["thr-parent"]).">";
+ $headers .= "\n";
+
+ if (!$it['title']) {
+ $r = q("SELECT `title` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($it['parent-uri']),
+ intval($uid));
- if(count($r) AND ($r[0]['title'] != ''))
+ if (dbm::is_result($r) AND ($r[0]['title'] != '')) {
$subject = $r[0]['title'];
+ } else {
+ $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($it['parent-uri']),
+ intval($uid));
+
+ if (dbm::is_result($r) AND ($r[0]['title'] != ''))
+ $subject = $r[0]['title'];
+ }
}
- if(strncasecmp($subject,'RE:',3))
+ if (strncasecmp($subject,'RE:',3))
$subject = 'Re: '.$subject;
}
email_send($addr, $subject, $headers, $it);
}
break;
- case NETWORK_DIASPORA :
- if($public_message)
- $loc = 'public batch ' . $contact['batch'];
- else
+ case NETWORK_DIASPORA:
+ if ($public_message)
+ $loc = 'public batch '.$contact['batch'];
+ else
$loc = $contact['name'];
- logger('delivery: diaspora batch deliver: ' . $loc);
+ logger('delivery: diaspora batch deliver: '.$loc);
- if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode))
+ if (get_config('system','dfrn_only') || (!get_config('system','diaspora_enabled')))
break;
- if((! $contact['pubkey']) && (! $public_message))
+ if ($mail) {
+ Diaspora::send_mail($item,$owner,$contact);
break;
+ }
- if($target_item['verb'] === ACTIVITY_DISLIKE) {
- // unsupported
+ if (!$normal_mode)
break;
- }
- elseif(($target_item['deleted']) && ($target_item['uri'] === $target_item['parent-uri'])) {
- // top-level retraction
- logger('delivery: diaspora retract: ' . $loc);
- diaspora_send_retraction($target_item,$owner,$contact,$public_message);
+ if (!$contact['pubkey'] && !$public_message)
break;
- }
- elseif($target_item['uri'] !== $target_item['parent-uri']) {
- // we are the relay - send comments, likes and relayable_retractions to our conversants
- logger('delivery: diaspora relay: ' . $loc);
- diaspora_send_relay($target_item,$owner,$contact,$public_message);
+ if (($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
+ // top-level retraction
+ logger('diaspora retract: '.$loc);
+ Diaspora::send_retraction($target_item,$owner,$contact,$public_message);
+ break;
+ } elseif ($followup) {
+ // send comments and likes to owner to relay
+ logger('diaspora followup: '.$loc);
+ Diaspora::send_followup($target_item,$owner,$contact,$public_message);
+ break;
+ } 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);
+ Diaspora::send_relay($target_item,$owner,$contact,$public_message);
break;
- }
- elseif(($top_level) && (! $walltowall)) {
+ } elseif ($top_level && !$walltowall) {
// currently no workable solution for sending walltowall
- logger('delivery: diaspora status: ' . $loc);
- diaspora_send_status($target_item,$owner,$contact,$public_message);
+ logger('diaspora status: '.$loc);
+ Diaspora::send_status($target_item,$owner,$contact,$public_message);
break;
}
- logger('delivery: diaspora unknown mode: ' . $contact['name']);
+ logger('delivery: diaspora unknown mode: '.$contact['name']);
break;
- case NETWORK_FEED :
- case NETWORK_FACEBOOK :
- if(get_config('system','dfrn_only'))
- break;
default:
break;
}
@@ -545,8 +534,3 @@ function delivery_run($argv, $argc){
return;
}
-
-if (array_search(__file__,get_included_files())===0){
- delivery_run($argv,$argc);
- killme();
-}