diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-29 18:01:51 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-29 18:01:51 -0700 |
| commit | 6e8ad5089e3aeea6377718db91ccf48284a315fa (patch) | |
| tree | 41cfeac8c0e80a135bdb10e9631519b8b2dd3225 /include/notifier.php | |
| parent | 63f2e9b41259975f1af6415cda01dc0f81b1af30 (diff) | |
| parent | 2072ea721fa26b8e5f7dd4067434951b738de92b (diff) | |
| download | volse-hubzilla-6e8ad5089e3aeea6377718db91ccf48284a315fa.tar.gz volse-hubzilla-6e8ad5089e3aeea6377718db91ccf48284a315fa.tar.bz2 volse-hubzilla-6e8ad5089e3aeea6377718db91ccf48284a315fa.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/nl/messages.po
view/nl/strings.php
Diffstat (limited to 'include/notifier.php')
| -rw-r--r-- | include/notifier.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/notifier.php b/include/notifier.php index 7dcf1b5a2..e4cfbd85d 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) @@ -505,6 +505,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); + } + + + } } |