From 0b012e2995322d571ba2764055a48a16f4a98c39 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 29 Jun 2015 16:56:18 -0700 Subject: some prep work --- include/notifier.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'include/notifier.php') diff --git a/include/notifier.php b/include/notifier.php index 46f9eb1de..ecd2ac86f 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -354,7 +354,7 @@ function notifier_run($argv, $argc){ return; } - $s = q("select * from channel where channel_id = %d limit 1", + $s = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1", intval($target_item['uid']) ); if($s) @@ -509,6 +509,15 @@ function notifier_run($argv, $argc){ $recip_list[] = $d['xchan_addr'] . ' (' . $d['xchan_hash'] . ')'; if($private) $env_recips[] = array('guid' => $d['xchan_guid'],'guid_sig' => $d['xchan_guid_sig'],'hash' => $d['xchan_hash']); + + if($d['xchan_network'] === 'mail' && $normal_mode) { + $delivery_options = get_xconfig($d['xchan_hash'],'system','delivery_mode'); + if(! $delivery_options) + format_and_send_email($channel,$d,$target_item); + } + + + } } -- cgit v1.2.3