X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnotifier.php;h=5de6eafd10eafb9f19b08803bb8f87b514553a9d;hb=ae3c9b7b2b6f6b8bf7a5d5e72bd66f1bff3b081d;hp=bd061a0c6ea356137112135d110d5539ea35a3dc;hpb=c052d688284fda76c612325b237d8352f2abb5d4;p=friendica.git diff --git a/include/notifier.php b/include/notifier.php index bd061a0c6e..5de6eafd10 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -191,8 +191,8 @@ function notifier_run($argv, $argc){ $contacts = $r; } - $feed_template = file_get_contents('view/atom_feed.tpl'); - $mail_template = file_get_contents('view/atom_mail.tpl'); + $feed_template = get_markup_template('atom_feed.tpl'); + $mail_template = get_markup_template('atom_mail.tpl'); $atom = ''; $slaps = array(); @@ -329,6 +329,7 @@ function notifier_run($argv, $argc){ } break; case 'stat': + if($followup && $contact['notify']) { logger('notifier: slapdelivery: ' . $contact['name']); $deliver_status = slapper($owner,$contact['notify'],$slap); @@ -373,7 +374,7 @@ function notifier_run($argv, $argc){ } break; case 'mail': - + // WARNING: does not currently convert to RFC2047 header encodings, etc. $addr = $contact['addr']; @@ -511,6 +512,8 @@ function notifier_run($argv, $argc){ if((count($r)) && (($max_allowed == 0) || (count($r) < $max_allowed))) { + logger('pubdeliver: ' . print_r($r,true)); + foreach($r as $rr) { /* Don't deliver to folks who have already been delivered to */