friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Only some blanks removed, no changes in functionality

This commit is contained in:
Michael Vogel 2014-08-07 07:59:43 +02:00
parent e974e586cc
commit 1104ad4f26
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
include/delivery.php
View File

@ -186,29 +186,29 @@ function delivery_run(&$argv, &$argc){
// in the URI, AND it was a comment (not top_level) AND the parent originated elsewhere. // 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 // if $parent['wall'] == 1 we will already have the parent message in our array
// and we will relay the whole lot. // and we will relay the whole lot.
// expire sends an entire group of expire messages and cannot be forwarded. // 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. // be notified during this run.
// Other DFRN conversation members will be alerted during polled updates. // Other DFRN conversation members will be alerted during polled updates.
// Diaspora members currently are not notified of expirations, and other networks have // 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. // by stringing togther an array of retractions and sending them onward.
$localhost = $a->get_hostname(); $localhost = $a->get_hostname();
if(strpos($localhost,':')) if(strpos($localhost,':'))
$localhost = substr($localhost,0,strpos($localhost,':')); $localhost = substr($localhost,0,strpos($localhost,':'));
/** /**
* *
* Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes * 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 * have been known to cause runaway conditions which affected several servers, along with
* permissions issues. * permissions issues.
* *
*/ */
if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) { if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) {
logger('relay denied for delivery agent.'); logger('relay denied for delivery agent.');
@ -216,9 +216,9 @@ function delivery_run(&$argv, &$argc){
continue; continue;
} }
if((strlen($parent['allow_cid'])) if((strlen($parent['allow_cid']))
|| (strlen($parent['allow_gid'])) || (strlen($parent['allow_gid']))
|| (strlen($parent['deny_cid'])) || (strlen($parent['deny_cid']))
|| (strlen($parent['deny_gid']))) { || (strlen($parent['deny_gid']))) {
$public_message = false; // private recipients, not public $public_message = false; // private recipients, not public
} }
@ -229,7 +229,7 @@ function delivery_run(&$argv, &$argc){
if(count($r)) if(count($r))
$contact = $r[0]; $contact = $r[0];
$hubxml = feed_hublinks(); $hubxml = feed_hublinks();
logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA); logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
@ -297,7 +297,7 @@ function delivery_run(&$argv, &$argc){
} }
$atom .= '</feed>' . "\r\n"; $atom .= '</feed>' . "\r\n";
logger('notifier: ' . $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));
@ -311,15 +311,15 @@ function delivery_run(&$argv, &$argc){
else else
$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($contact['dfrn-id'])); $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($contact['dfrn-id']));
$x = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, $x = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
`contact`.`pubkey` AS `cpubkey`, `contact`.`pubkey` AS `cpubkey`,
`contact`.`prvkey` AS `cprvkey`, `contact`.`prvkey` AS `cprvkey`,
`contact`.`thumb` AS `thumb`, `contact`.`thumb` AS `thumb`,
`contact`.`url` as `url`, `contact`.`url` as `url`,
`contact`.`name` as `senderName`, `contact`.`name` as `senderName`,
`user`.* `user`.*
FROM `contact` FROM `contact`
INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s' AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
$sql_extra $sql_extra
@ -390,7 +390,7 @@ function delivery_run(&$argv, &$argc){
if(! $item_contact) if(! $item_contact)
continue; continue;
if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire)) if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire))
$slaps[] = atom_entry($item,'html',null,$owner,true); $slaps[] = atom_entry($item,'html',null,$owner,true);
} }
@ -426,7 +426,7 @@ function delivery_run(&$argv, &$argc){
if($cmd === 'wall-new' || $cmd === 'comment-new') { if($cmd === 'wall-new' || $cmd === 'comment-new') {
$it = null; $it = null;
if($cmd === 'wall-new') if($cmd === 'wall-new')
$it = $items[0]; $it = $items[0];
else { else {
$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@ -509,7 +509,7 @@ function delivery_run(&$argv, &$argc){
case NETWORK_DIASPORA : case NETWORK_DIASPORA :
if($public_message) if($public_message)
$loc = 'public batch ' . $contact['batch']; $loc = 'public batch ' . $contact['batch'];
else else
$loc = $contact['name']; $loc = $contact['name'];
logger('delivery: diaspora batch deliver: ' . $loc); logger('delivery: diaspora batch deliver: ' . $loc);