$cmd = $argv[1];
$item_id = intval($argv[2]);
- $contact_id = intval($argv[3]);
- // Some other process may have delivered this item already.
+ for($x = 3; $x < $argc; $x ++) {
- $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)) {
- return;
- }
-
- $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;
- }
- }
+ $contact_id = intval($argv[x]);
- // It's ours to deliver. Remove it from the queue.
+ // Some other process may have delivered this item already.
- q("delete from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
- dbesc($cmd),
- dbesc($item_id),
- dbesc($contact_id)
- );
+ $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)) {
+ 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;
+ }
+ }
- if((! $item_id) || (! $contact_id))
- return;
+ // It's ours to deliver. Remove it from the queue.
- $expire = false;
- $top_level = false;
- $recipients = array();
- $url_recipients = array();
+ q("delete from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
+ dbesc($cmd),
+ dbesc($item_id),
+ dbesc($contact_id)
+ );
- $normal_mode = true;
+ if((! $item_id) || (! $contact_id))
+ continue;
- $recipients[] = $contact_id;
+ $expire = false;
+ $top_level = false;
+ $recipients = array();
+ $url_recipients = array();
- if($cmd === 'expire') {
- $normal_mode = false;
- $expire = true;
- $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))
- return;
- }
- else {
+ $normal_mode = true;
- // find ancestors
- $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
- intval($item_id)
- );
+ $recipients[] = $contact_id;
- if((! count($r)) || (! intval($r[0]['parent']))) {
- return;
+ if($cmd === 'expire') {
+ $normal_mode = false;
+ $expire = true;
+ $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 {
- $target_item = $r[0];
- $parent_id = intval($r[0]['parent']);
- $uid = $r[0]['uid'];
- $updated = $r[0]['edited'];
+ // find ancestors
+ $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
+ intval($item_id)
+ );
- if(! $parent_id)
- return;
+ if((! count($r)) || (! intval($r[0]['parent']))) {
+ continue;
+ }
+ $target_item = $r[0];
+ $parent_id = intval($r[0]['parent']);
+ $uid = $r[0]['uid'];
+ $updated = $r[0]['edited'];
- $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(! $parent_id)
+ continue;
- if(! count($items)) {
- return;
- }
- $icontacts = null;
- $contacts_arr = array();
- 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 ) "
+ $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( ! ($icontacts && count($icontacts)))
- return;
- // avoid race condition with deleting entries
+ if(! count($items)) {
+ continue;
+ }
- if($items[0]['deleted']) {
+ $icontacts = null;
+ $contacts_arr = array();
foreach($items as $item)
- $item['deleted'] = 1;
- }
+ 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)))
+ continue;
+
+ // avoid race condition with deleting entries
- if((count($items) == 1) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
- logger('delivery: top level post');
- $top_level = true;
+ if($items[0]['deleted']) {
+ foreach($items as $item)
+ $item['deleted'] = 1;
+ }
+
+ if((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`
- WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
- intval($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`.`prvnets`
+ FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
+ WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
+ intval($uid)
+ );
- if(! count($r))
- return;
+ if(! count($r))
+ continue;
- $owner = $r[0];
+ $owner = $r[0];
- $walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
+ $walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
- $public_message = true;
+ $public_message = true;
- // fill this in with a single salmon slap if applicable
+ // fill this in with a single salmon slap if applicable
- $slap = '';
+ $slap = '';
- require_once('include/group.php');
+ require_once('include/group.php');
- $parent = $items[0];
+ $parent = $items[0];
- // This is IMPORTANT!!!!
+ // This is IMPORTANT!!!!
- // We will only send a "notify owner to relay" or followup message if the referenced post
- // originated on our system by virtue of having our hostname somewhere
- // 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
- // 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
- // by stringing togther an array of retractions and sending them onward.
+ // We will only send a "notify owner to relay" or followup message if the referenced post
+ // originated on our system by virtue of having our hostname somewhere
+ // 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
+ // 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
+ // by stringing togther an array of retractions and sending them onward.
- $localhost = $a->get_hostname();
- if(strpos($localhost,':'))
- $localhost = substr($localhost,0,strpos($localhost,':'));
+ $localhost = $a->get_hostname();
+ if(strpos($localhost,':'))
+ $localhost = substr($localhost,0,strpos($localhost,':'));
/**
*
*
*/
- if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) {
- logger('relay denied for delivery agent.');
+ 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 */
- return;
- }
+ /* 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
- }
+ if((strlen($parent['allow_cid']))
+ || (strlen($parent['allow_gid']))
+ || (strlen($parent['deny_cid']))
+ || (strlen($parent['deny_gid']))) {
+ $public_message = false; // private recipients, not public
+ }
- $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0",
- intval($contact_id)
- );
+ $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0",
+ intval($contact_id)
+ );
- if(count($r))
- $contact = $r[0];
+ if(count($r))
+ $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);
- require_once('include/salmon.php');
+ require_once('include/salmon.php');
- if($contact['self'])
- return;
+ if($contact['self'])
+ continue;
- $deliver_status = 0;
+ $deliver_status = 0;
- switch($contact['network']) {
+ switch($contact['network']) {
- case NETWORK_DFRN :
- logger('notifier: dfrndelivery: ' . $contact['name']);
+ case NETWORK_DFRN :
+ logger('notifier: dfrndelivery: ' . $contact['name']);
- $feed_template = get_markup_template('atom_feed.tpl');
- $mail_template = get_markup_template('atom_mail.tpl');
+ $feed_template = get_markup_template('atom_feed.tpl');
+ $mail_template = get_markup_template('atom_mail.tpl');
- $atom = '';
+ $atom = '';
- $birthday = feed_birthday($owner['uid'],$owner['timezone']);
+ $birthday = feed_birthday($owner['uid'],$owner['timezone']);
- if(strlen($birthday))
- $birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>';
+ if(strlen($birthday))
+ $birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn: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) ? '<dfrn:community>1</dfrn:community>' : '')
- ));
+ $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) ? '<dfrn:community>1</dfrn:community>' : '')
+ ));
- foreach($items as $item) {
- if(! $item['parent'])
- continue;
+ 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;
+ // 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;
+ $item_contact = get_item_contact($item,$icontacts);
+ if(! $item_contact)
+ continue;
- if($normal_mode) {
- if($item_id == $item['id'] || $item['id'] == $item['parent'])
+ if($normal_mode) {
+ if($item_id == $item['id'] || $item['id'] == $item['parent'])
+ $atom .= atom_entry($item,'text',null,$owner,true);
+ }
+ else
$atom .= atom_entry($item,'text',null,$owner,true);
- }
- else
- $atom .= atom_entry($item,'text',null,$owner,true);
-
- }
- $atom .= '</feed>' . "\r\n";
-
- 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())) {
+ $atom .= '</feed>' . "\r\n";
+
+ 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())) {
+
+ $nickname = basename($contact['url']);
+ if($contact['issued-id'])
+ $sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id']));
+ 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`,
+ `contact`.`url` as `url`,
+ `contact`.`name` as `senderName`,
+ `user`.*
+ FROM `contact`
+ LEFT 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",
+ dbesc(NETWORK_DFRN),
+ dbesc($nickname)
+ );
- $nickname = basename($contact['url']);
- if($contact['issued-id'])
- $sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id']));
- 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`,
- `contact`.`url` as `url`,
- `contact`.`name` as `senderName`,
- `user`.*
- FROM `contact`
- LEFT 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",
- 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",
+ intval($x[0]['id'])
+ );
+ $x[0]['writable'] = 1;
+ }
- if(count($x)) {
- if($owner['page-flags'] == PAGE_COMMUNITY && ! $x[0]['writable']) {
- q("update contact set writable = 1 where id = %d limit 1",
- intval($x[0]['id'])
- );
- $x[0]['writable'] = 1;
- }
+ $ssl_policy = get_config('system','ssl_policy');
+ fix_contact_ssl_policy($x[0],$ssl_policy);
- $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 input from this person
+ if($x[0]['page-flags'] == PAGE_SOAPBOX)
+ break;
- if($x[0]['page-flags'] == PAGE_SOAPBOX)
+ require_once('library/simplepie/simplepie.inc');
+ logger('mod-delivery: local delivery');
+ local_delivery($x[0],$atom);
break;
-
- require_once('library/simplepie/simplepie.inc');
- logger('mod-delivery: local delivery');
- local_delivery($x[0],$atom);
- break;
+ }
}
- }
-
- if(! was_recently_delayed($contact['id']))
- $deliver_status = dfrn_deliver($owner,$contact,$atom);
- else
- $deliver_status = (-1);
-
- logger('notifier: dfrn_delivery returns ' . $deliver_status);
- if($deliver_status == (-1)) {
- logger('notifier: delivery failed: queuing message');
- add_to_queue($contact['id'],NETWORK_DFRN,$atom);
- }
- break;
+ if(! was_recently_delayed($contact['id']))
+ $deliver_status = dfrn_deliver($owner,$contact,$atom);
+ else
+ $deliver_status = (-1);
- case NETWORK_OSTATUS :
+ logger('notifier: dfrn_delivery returns ' . $deliver_status);
- // Do not send to otatus if we are not configured to send to public networks
- if($owner['prvnets'])
- break;
- if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
+ if($deliver_status == (-1)) {
+ logger('notifier: delivery failed: queuing message');
+ add_to_queue($contact['id'],NETWORK_DFRN,$atom);
+ }
break;
- // only send salmon if public - e.g. if it's ok to notify
- // a public hub, it's ok to send a salmon
+ case NETWORK_OSTATUS :
- if(($public_message) && (! $expire)) {
- $slaps = array();
+ // Do not send to otatus if we are not configured to send to public networks
+ if($owner['prvnets'])
+ break;
+ if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
+ break;
- foreach($items as $item) {
- if(! $item['parent'])
- continue;
+ // only send salmon if public - e.g. if it's ok to notify
+ // a public hub, it's ok to send a salmon
- // private emails may be in included in public conversations. Filter them.
- if(($public_message) && $item['private'])
- continue;
+ if(($public_message) && (! $expire)) {
+ $slaps = array();
- $item_contact = get_item_contact($item,$icontacts);
- if(! $item_contact)
- continue;
+ foreach($items as $item) {
+ if(! $item['parent'])
+ continue;
- if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire))
- $slaps[] = atom_entry($item,'html',null,$owner,true);
- }
+ // 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;
- 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);
+ 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);
+ }
}
}
}
- }
-
- break;
-
- case NETWORK_MAIL :
- case NETWORK_MAIL2:
- if(get_config('system','dfrn_only'))
break;
- // WARNING: does not currently convert to RFC2047 header encodings, etc.
- $addr = $contact['addr'];
- if(! strlen($addr))
- break;
-
- if($cmd === 'wall-new' || $cmd === 'comment-new') {
+ case NETWORK_MAIL :
+ case NETWORK_MAIL2:
- $it = null;
- if($cmd === 'wall-new')
- $it = $items[0];
- else {
- $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($argv[2]),
- intval($uid)
- );
- if(count($r))
- $it = $r[0];
- }
- if(! $it)
+ if(get_config('system','dfrn_only'))
break;
-
+ // WARNING: does not currently convert to RFC2047 header encodings, etc.
- $local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
- intval($uid)
- );
- if(! count($local_user))
+ $addr = $contact['addr'];
+ if(! strlen($addr))
break;
+
+ if($cmd === 'wall-new' || $cmd === 'comment-new') {
+
+ $it = null;
+ if($cmd === 'wall-new')
+ $it = $items[0];
+ else {
+ $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ intval($argv[2]),
+ intval($uid)
+ );
+ if(count($r))
+ $it = $r[0];
+ }
+ if(! $it)
+ break;
- $reply_to = '';
- $r1 = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
- intval($uid)
- );
- 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")) ;
+ $local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+ intval($uid)
+ );
+ 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'])
+ $reply_to = $r1[0]['reply_to'];
- // only expose our real email address to true friends
+ $subject = (($it['title']) ? email_header_encode($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
- 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";
+ // only expose our real email address to true friends
- if($reply_to)
- $headers .= 'Reply-to: ' . $reply_to . "\n";
+ 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";
- // for testing purposes: Collect exported mails
- // $file = tempnam("/tmp/friendica/", "mail-out-");
- // file_put_contents($file, json_encode($it));
+ if($reply_to)
+ $headers .= 'Reply-to: ' . $reply_to . "\n";
- $headers .= 'Message-Id: <' . iri2msgid($it['uri']). '>' . "\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";
- //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);
+ //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']) . '>' . "\n";
+ if(!strlen($it['title'])) {
+ $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
+ dbesc($it['parent-uri']));
- if(count($r) AND ($r[0]['title'] != ''))
- $subject = $r[0]['title'];
+ if(count($r) AND ($r[0]['title'] != ''))
+ $subject = $r[0]['title'];
+ }
+ if(strncasecmp($subject,'RE:',3))
+ $subject = 'Re: '.$subject;
}
- if(strncasecmp($subject,'RE:',3))
- $subject = 'Re: '.$subject;
+ email_send($addr, $subject, $headers, $it);
}
- email_send($addr, $subject, $headers, $it);
- }
- break;
+ break;
- case NETWORK_DIASPORA :
- if($public_message)
- $loc = 'public batch ' . $contact['batch'];
- else
- $loc = $contact['name'];
+ 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))
- break;
+ if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode))
+ break;
- if((! $contact['pubkey']) && (! $public_message))
- break;
+ if((! $contact['pubkey']) && (! $public_message))
+ break;
- if($target_item['verb'] === ACTIVITY_DISLIKE) {
- // unsupported
- break;
- }
- elseif(($target_item['deleted']) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
- logger('delivery: diaspora retract: ' . $loc);
- // diaspora delete,
- diaspora_send_retraction($target_item,$owner,$contact,$public_message);
- break;
- }
- elseif($target_item['parent'] != $target_item['id']) {
+ if($target_item['verb'] === ACTIVITY_DISLIKE) {
+ // unsupported
+ break;
+ }
+ elseif(($target_item['deleted']) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
+ logger('delivery: diaspora retract: ' . $loc);
+ // diaspora delete,
+ diaspora_send_retraction($target_item,$owner,$contact,$public_message);
+ break;
+ }
+ elseif($target_item['parent'] != $target_item['id']) {
- logger('delivery: diaspora relay: ' . $loc);
+ logger('delivery: diaspora relay: ' . $loc);
- // we are the relay - send comments, likes and unlikes to our conversants
- diaspora_send_relay($target_item,$owner,$contact,$public_message);
- break;
- }
- 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);
- break;
- }
+ // we are the relay - send comments, likes and unlikes to our conversants
+ diaspora_send_relay($target_item,$owner,$contact,$public_message);
+ break;
+ }
+ 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);
+ break;
+ }
- logger('delivery: diaspora unknown mode: ' . $contact['name']);
+ logger('delivery: diaspora unknown mode: ' . $contact['name']);
- break;
+ break;
- case NETWORK_FEED :
- case NETWORK_FACEBOOK :
- if(get_config('system','dfrn_only'))
+ case NETWORK_FEED :
+ case NETWORK_FACEBOOK :
+ if(get_config('system','dfrn_only'))
+ break;
+ default:
break;
- default:
- break;
+ }
}
return;
projects / friendica.git / commitdiff