diff options
author | Aleksander Machniak <alec@alec.pl> | 2019-12-18 13:49:51 +0300 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2019-12-18 13:49:51 +0300 |
commit | 226097fc3fe87578e9bd987c18181524096723ba (patch) | |
tree | aec7046ad86e4587c02fb9fe7a35f4db5b828c22 /plugins | |
parent | 5f30dc68a3b67eedb57a5f0115b4bad783cb3347 (diff) |
Markasjunk: Fix marking more than one message as spam/ham with email_learn driver (#7121)
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/markasjunk/drivers/email_learn.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/markasjunk/drivers/email_learn.php b/plugins/markasjunk/drivers/email_learn.php index 98df0eef0..b000448f5 100644 --- a/plugins/markasjunk/drivers/email_learn.php +++ b/plugins/markasjunk/drivers/email_learn.php @@ -45,6 +45,7 @@ class markasjunk_email_learn $from = $identity_arr['email']; $from_string = format_email_recipient($identity_arr['email'], $identity_arr['name']); $attach = $this->rcube->config->get('markasjunk_email_attach', false); + $debug = $this->rcube->config->get('markasjunk_debug'); $temp_dir = unslashify($this->rcube->config->get('temp_dir')); $mailto = $this->rcube->config->get($spam ? 'markasjunk_email_spam' : 'markasjunk_email_ham'); @@ -58,7 +59,7 @@ class markasjunk_email_learn $subject = $this->rcube->config->get('markasjunk_email_subject'); $subject = $this->_parse_vars($subject, $spam, $from); - foreach ($uids as $uid) { + foreach ($uids as $i => $uid) { $MESSAGE = new rcube_message($uid); $message_file = null; @@ -142,7 +143,7 @@ class markasjunk_email_learn )); } - $SENDMAIL->deliver_message($MAIL_MIME); + $SENDMAIL->deliver_message($MAIL_MIME, $i == count($uids) - 1); $message_file = $message_file ?: $MAIL_MIME->mailbody_file; // clean up @@ -150,11 +151,11 @@ class markasjunk_email_learn unlink($message_file); } - if ($this->rcube->config->get('markasjunk_debug')) { - rcube::write_log('', $uid . ($spam ? ' SPAM ' : ' HAM ') . $mailto . ' (' . $subject . ')'); + if ($debug) { + rcube::write_log('markasjunk', $uid . ($spam ? ' SPAM ' : ' HAM ') . $mailto . ' (' . $subject . ')'); if ($smtp_error['vars']) { - rcube::write_log('', $smtp_error['vars']); + rcube::write_log('markasjunk', $smtp_error['vars']); } } } |