harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hook changes to support pubsubhubbub

Browse Source
This commit is contained in:
redmatrix 2016-02-10 19:12:28 -08:00
parent 91801d2e2c
commit d31d3df4ea
3 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -48,7 +48,7 @@ require_once('include/AccessList.php');
define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc'))); define ( 'RED_VERSION', trim(file_get_contents('version.inc')));
define ( 'STD_VERSION', '1.2.1' ); define ( 'STD_VERSION', '1.2.2' );
define ( 'ZOT_REVISION', 1 ); define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1161 ); define ( 'DB_UPDATE_VERSION', 1161 );

34
include/notifier.php
View File

@ -423,6 +423,7 @@ function notifier_run($argv, $argc){
$details = q("select xchan_hash, xchan_instance_url, xchan_network, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . implode(',',$recipients) . ")"); $details = q("select xchan_hash, xchan_instance_url, xchan_network, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . implode(',',$recipients) . ")");
$recip_list = array(); $recip_list = array();
if($details) { if($details) {
@ -437,12 +438,39 @@ function notifier_run($argv, $argc){
if(! $delivery_options) if(! $delivery_options)
format_and_send_email($channel,$d,$target_item); format_and_send_email($channel,$d,$target_item);
} }
} }
} }
$narr = array(
'channel' => $channel,
'env_recips' => $env_recips,
'packet_recips' => $packet_recips,
'recipients' => $recipients,
'item' => $item,
'target_item' => $target_item,
'top_level_post' => $top_level_post,
'private' => $private,
'followup' => $followup,
'relay_to_owner' => $relay_to_owner,
'uplink' => $uplink,
'cmd' => $cmd,
'mail' => $mail,
'location' => $location,
'request' => $request,
'normal_mode' => $normal_mode,
'packet_type' => $packet_type,
'walltowall' => $walltowall,
'queued' => array()
);
call_hooks('notifier_process', $narr);
if($narr['queued']) {
foreach($narr['queued'] as $pq)
$deliveries[] = $pq;
}
if(($private) && (! $env_recips)) { if(($private) && (! $env_recips)) {
// shouldn't happen // shouldn't happen
logger('notifier: private message with no envelope recipients.' . print_r($argv,true), LOGGER_NORMAL, LOG_NOTICE); logger('notifier: private message with no envelope recipients.' . print_r($argv,true), LOGGER_NORMAL, LOG_NOTICE);

2
include/queue_fn.php
View File

@ -101,7 +101,7 @@ function queue_deliver($outq, $immediate = false) {
} }
} }
$arr = array('outq' => $outq, 'handled' => false, 'immediate' => $immediate); $arr = array('outq' => $outq, 'base' => $base, 'handled' => false, 'immediate' => $immediate);
call_hooks('queue_deliver',$arr); call_hooks('queue_deliver',$arr);
if($arr['handled']) if($arr['handled'])
return; return;