From b58bd1a2fa4492ec2546e39f77f3cfeed66d8324 Mon Sep 17 00:00:00 2001
From: Andrew Davis <andrew@affinitysoftware.net>
Date: Thu, 8 Jul 2010 08:08:16 +0000
Subject: [PATCH] forum MDL-23145 switched forum digests over to just use email
 instead of being chanelled through messaging

---
 mod/forum/db/messages.php |  4 ----
 mod/forum/db/upgrade.php  |  9 +++++++++
 mod/forum/lib.php         | 16 +++++-----------
 mod/forum/version.php     |  4 ++--
 version.php               |  2 +-
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/mod/forum/db/messages.php b/mod/forum/db/messages.php
index 420dc0edfca..51de4344c56 100644
--- a/mod/forum/db/messages.php
+++ b/mod/forum/db/messages.php
@@ -27,10 +27,6 @@ $messageproviders = array (
 
 /// Ordinary single forum posts
     'posts' => array (
-    ),
-
-/// Digests
-    'digests' => array (
     )
 
 );
diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php
index d5a62750381..00ee1fb827b 100644
--- a/mod/forum/db/upgrade.php
+++ b/mod/forum/db/upgrade.php
@@ -284,6 +284,15 @@ function xmldb_forum_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2010042800, 'forum');
     }
 
+    if ($oldversion < 2010070800) {
+
+        // Remove the forum digests message provider MDL-23145
+        $DB->delete_records('message_providers', array('name' => 'digests','component'=>'mod_forum'));
+
+        // forum savepoint reached
+        upgrade_mod_savepoint(true, 2010070800, 'forum');
+    }
+
     return true;
 }
 
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 49e8ebf04b2..efc28013d46 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -903,17 +903,11 @@ function forum_cron() {
                     $posthtml = '';
                 }
 
-                $eventdata = new object();
-                $eventdata->component        = 'mod/forum';
-                $eventdata->name             = 'digests';
-                $eventdata->userfrom         = $site->shortname;
-                $eventdata->userto           = $userto;
-                $eventdata->subject          = $postsubject;
-                $eventdata->fullmessage      = $posttext;
-                $eventdata->fullmessageformat = FORMAT_PLAIN;
-                $eventdata->fullmessagehtml  = $posthtml;
-                $eventdata->smallmessage     = '';
-                if (!message_send($eventdata)){
+                $attachment = $attachname='';
+                $usetrueaddress = true;
+                $mailresult = email_to_user($userto, $userfrom, $postsubject, $posttext, $posthtml, $attachment, $attachname, $usetrueaddress, $CFG->forum_replytouser);
+
+                if (!$mailresult) {
                     mtrace("ERROR!");
                     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);
diff --git a/mod/forum/version.php b/mod/forum/version.php
index 449f1572845..31501a2695e 100644
--- a/mod/forum/version.php
+++ b/mod/forum/version.php
@@ -24,8 +24,8 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$module->version  = 2010042800;
-$module->requires = 2010042800;  // Requires this Moodle version
+$module->version  = 2010070800;
+$module->requires = 2010070800;  // Requires this Moodle version
 $module->cron     = 60;
 
 
diff --git a/version.php b/version.php
index c70bdd79ae7..9f0ea2afa27 100644
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2010070701;  // YYYYMMDD   = date of the last version bump
+    $version = 2010070800;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 Preview 4+ (Build: 20100708)';  // Human-friendly version name