Forum mail now logs differently if mail was just blocked (rather than

flagging it as an error)

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index f8ec2f35a1e217bb91338512d47024006ac802ac..72db922bc9064fd0c56bce485f0b3da9151cce8e 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -298,10 +298,16 @@ function forum_cron () {
                     $posttext = forum_make_mail_text($course, $forum, $discussion, $post, $userfrom, $userto);
                     $posthtml = forum_make_mail_html($course, $forum, $discussion, $post, $userfrom, $userto);
 
-                    if (! email_to_user($userto, $userfrom, $postsubject, $posttext, $posthtml, '', '', $CFG->forum_replytouser)) {
-                        echo "Error: mod/forum/cron.php: Could not send out mail for id $post->id to user $userto->id ($userto->email) .. not trying again.\n";
-                        add_to_log($course->id, 'forum', 'mail error', "discuss.php?d=$discussion->id#$post->id", substr($post->subject,0,15), $cm->id, $userto->id);
+                    if (!$mailresult = email_to_user($userto, $userfrom, $postsubject, $posttext, 
+                                                     $posthtml, '', '', $CFG->forum_replytouser)) {
+                        echo "Error: mod/forum/cron.php: Could not send out mail for id $post->id to user $userto->id".
+                             " ($userto->email) .. not trying again.\n";
+                        add_to_log($course->id, 'forum', 'mail error', "discuss.php?d=$discussion->id#$post->id", 
+                                   substr($post->subject,0,30), $cm->id, $userto->id);
                         $errorcount++;
+                    } else if ($mailresult == 'emailstop') {
+                        add_to_log($course->id, 'forum', 'mail blocked', "discuss.php?d=$discussion->id#$post->id", 
+                                   substr($post->subject,0,30), $cm->id, $userto->id);
                     } else {
                         $mailcount++;
                     }
@@ -469,10 +475,13 @@ function forum_cron () {
                 }
                 $posthtml .= '</body>';
 
-                if (! email_to_user($userto, $site->shortname, $postsubject, $posttext, $posthtml, '', '', $CFG->forum_replytouser)) {
+                if (!$mailresult =  email_to_user($userto, $site->shortname, $postsubject, $posttext, $posthtml, 
+                                                  '', '', $CFG->forum_replytouser)) {
                     echo "ERROR!\n";
                     echo "Error: mod/forum/cron.php: Could not send out digest mail to user $userto->id ($userto->email)... not trying again.\n";
                     add_to_log($course->id, 'forum', 'mail digest error', '', '', $cm->id, $userto->id);
+                } else if ($mailresult == 'emailstop') {
+                    add_to_log($course->id, 'forum', 'mail digest blocked', '', '', $cm->id, $userto->id);
                 } else {
                     echo "success.\n";
                     $usermailcount++;