<?php
-require_once("boot.php");
+
+use \Friendica\Core\Config;
+
require_once('include/queue_fn.php');
require_once('include/html2plain.php');
-require_once("include/Scrape.php");
+require_once('include/Scrape.php');
require_once('include/diaspora.php');
-require_once("include/ostatus.php");
-require_once("include/dfrn.php");
+require_once('include/ostatus.php');
+require_once('include/dfrn.php');
function delivery_run(&$argv, &$argc){
- global $a, $db;
-
- if (is_null($a)){
- $a = new App;
- }
+ global $a;
- if (is_null($db)) {
- @include(".htconfig.php");
- require_once("include/dba.php");
- $db = new dba($db_host, $db_user, $db_pass, $db_data);
- unset($db_host, $db_user, $db_pass, $db_data);
- }
-
- require_once("include/session.php");
- require_once("include/datetime.php");
+ require_once('include/datetime.php');
require_once('include/items.php');
require_once('include/bbcode.php');
require_once('include/email.php');
- load_config('config');
- load_config('system');
-
- load_hooks();
-
- if ($argc < 3)
+ if ($argc < 3) {
return;
-
- $a->set_baseurl(get_config('system','url'));
+ }
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 (!dbm::is_result($r)) {
+ if (!$item_id || !$contact_id) {
continue;
}
- if ($a->maxload_reached())
- return;
-
- // It's ours to deliver. Remove it from the queue.
-
- q("DELETE FROM `deliverq` WHERE `cmd` = '%s' AND `item` = %d AND `contact` = %d",
- dbesc($cmd),
- dbesc($item_id),
- dbesc($contact_id)
- );
-
- if (!$item_id || !$contact_id)
- continue;
-
$expire = false;
$mail = false;
$fsuggest = false;
$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
intval($item_id)
);
- if (!count($message)){
+ if (!count($message)) {
return;
}
$uid = $message[0]['uid'];
$recipients[] = $message[0]['contact-id'];
$item = $message[0];
- }
- elseif ($cmd === 'expire') {
+ } elseif ($cmd === 'expire') {
$normal_mode = false;
$expire = true;
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
);
$uid = $item_id;
$item_id = 0;
- if (!count($items))
+ if (!count($items)) {
continue;
- }
- elseif ($cmd === 'suggest') {
+ }
+ } elseif ($cmd === 'suggest') {
$normal_mode = false;
$fsuggest = true;
$suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
intval($item_id)
);
- if (!count($suggest))
+ if (!count($suggest)) {
return;
+ }
$uid = $suggest[0]['uid'];
$recipients[] = $suggest[0]['cid'];
$item = $suggest[0];
$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`
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)
+ 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;
}
intval($uid)
);
- if (!dbm::is_result($r))
+ if (!dbm::is_result($r)) {
continue;
+ }
$owner = $r[0];
$localhost = $a->get_hostname();
- if (strpos($localhost,':'))
+ if (strpos($localhost,':')) {
$localhost = substr($localhost,0,strpos($localhost,':'));
-
+ }
/**
*
* Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes
intval($contact_id)
);
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
$contact = $r[0];
-
- 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']);
} elseif ($fsuggest) {
$atom = dfrn::fsuggest($item, $owner);
q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1", intval($item['id']));
- } elseif ($relocate)
+ } elseif ($relocate) {
$atom = dfrn::relocate($owner, $uid);
- elseif ($followup) {
+ } elseif ($followup) {
$msgitems = array();
- foreach($items as $item) { // there is only one item
- if (!$item['parent'])
+ 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;
$atom = dfrn::entries($msgitems,$owner);
} else {
$msgitems = array();
- foreach($items as $item) {
- if (!$item['parent'])
+ foreach ($items as $item) {
+ if (!$item['parent']) {
continue;
+ }
// private emails may be in included in public conversations. Filter them.
- if ($public_message && $item['private'])
+ if ($public_message && $item['private']) {
continue;
+ }
$item_contact = get_item_contact($item,$icontacts);
- if (!$item_contact)
+ if (!$item_contact) {
continue;
+ }
if ($normal_mode) {
if ($item_id == $item['id'] || $item['id'] == $item['parent']) {
// 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`,
// If we are setup as a soapbox we aren't accepting top level posts from this person
- if (($x[0]['page-flags'] == PAGE_SOAPBOX) AND $top_level)
+ if (($x[0]['page-flags'] == PAGE_SOAPBOX) AND $top_level) {
break;
-
+ }
logger('mod-delivery: local delivery');
dfrn::import($atom, $x[0]);
break;
}
}
- if (!was_recently_delayed($contact['id']))
+ if (!was_recently_delayed($contact['id'])) {
$deliver_status = dfrn::deliver($owner,$contact,$atom);
- else
+ } else {
$deliver_status = (-1);
+ }
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);
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;
+ }
// There is currently no code here to distribute anything to OStatus.
// This is done in "notifier.php" (See "url_recipients" and "push_notify")
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') {
$it = null;
- if ($cmd === 'wall-new')
+ if ($cmd === 'wall-new') {
$it = $items[0];
- else {
+ } else {
$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($argv[2]),
intval($uid)
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
+ } else {
$headers = 'From: '.email_header_encode($local_user[0]['username'],'UTF-8').' <'.$local_user[0]['email'].'>'."\n";
- } else
+ }
+ } 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";
dbesc($it['parent-uri']),
intval($uid));
- if (dbm::is_result($r) AND ($r[0]['title'] != ''))
+ if (dbm::is_result($r) AND ($r[0]['title'] != '')) {
$subject = $r[0]['title'];
- else {
+ } else {
$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($it['parent-uri']),
intval($uid));
break;
if ($mail) {
- diaspora::send_mail($item,$owner,$contact);
+ Diaspora::send_mail($item,$owner,$contact);
break;
}
if (!$contact['pubkey'] && !$public_message)
break;
- $unsupported_activities = array(ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE);
-
- //don't transmit activities which are not supported by diaspora
- foreach($unsupported_activities as $act) {
- if (activity_match($target_item['verb'],$act)) {
- break 2;
- }
- }
-
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);
+ 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);
+ 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);
+ Diaspora::send_relay($target_item,$owner,$contact,$public_message);
break;
} elseif ($top_level && !$walltowall) {
// currently no workable solution for sending walltowall
logger('diaspora status: '.$loc);
- diaspora::send_status($target_item,$owner,$contact,$public_message);
+ Diaspora::send_status($target_item,$owner,$contact,$public_message);
break;
}
return;
}
-
-if (array_search(__file__,get_included_files())===0){
- delivery_run($_SERVER["argv"],$_SERVER["argc"]);
- killme();
-}
projects / friendica.git / blobdiff