MDL-20766 message_send() used intead of events, it will enable us to improve performa...

diff --git a/admin/handlevirus.php b/admin/handlevirus.php
index c84428077e40adc8f9a8475e677b72ef7f17cf40..5a131fa849f7f04af0d181ea6185fbe70717ccaf 100644 (file)
--- a/admin/handlevirus.php
+++ b/admin/handlevirus.php
@@ -68,7 +68,7 @@ function notify_user($user,$subject,$a) {
     $eventdata->fullmessageformat = FORMAT_PLAIN;
     $eventdata->fullmessagehtml   = '';
     $eventdata->smallmessage      = '';
-    events_trigger('message_send', $eventdata);
+    message_send($eventdata);
 }
 
 
@@ -87,7 +87,7 @@ function notify_admins($user,$subject,$a) {
         $eventdata->fullmessageformat = FORMAT_PLAIN;
         $eventdata->fullmessagehtml   = '';
         $eventdata->smallmessage      = '';
-        events_trigger('message_send', $eventdata);
+        message_send($eventdata);
     }
 }
 
@@ -108,7 +108,7 @@ function notify_admins_unknown($file,$a) {
         $eventdata->fullmessageformat = FORMAT_PLAIN;
         $eventdata->fullmessagehtml   = '';
         $eventdata->smallmessage      = '';
-        events_trigger('message_send', $eventdata);
+        message_send($eventdata);
     }
 }
 

diff --git a/backup/backup_scheduled.php b/backup/backup_scheduled.php
index fdf5168d99b83fcaeef2d4f7b04bcc541a30be79..87ab3a1ef7bfd166ddf639dc8ef4777729c291a9 100644 (file)
--- a/backup/backup_scheduled.php
+++ b/backup/backup_scheduled.php
@@ -210,7 +210,7 @@ function schedule_backup_cron() {
         $eventdata->fullmessageformat = FORMAT_PLAIN;
         $eventdata->fullmessagehtml   = '';
         $eventdata->smallmessage      = '';
-        events_trigger('message_send', $eventdata);
+        message_send($eventdata);
     }
 
     //Everything is finished stop backup_sche_running

diff --git a/course/lib.php b/course/lib.php
index f599fcf50b5c0317e48ac3f07d513feb63c15ddc..dbf7f90e49904a7b54f5805bc4364eab3f1b42e0 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -3996,6 +3996,6 @@ class course_request {
         $eventdata->fullmessageformat = FORMAT_PLAIN;
         $eventdata->fullmessagehtml   = '';
         $eventdata->smallmessage      = '';
-        events_trigger('message_send', $eventdata);
+        message_send($eventdata);
     }
 }
\ No newline at end of file

diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php
index c2afaea55f1fde8768605a231b5a15557dd8b4f5..7040492622c4ffdf821ea0132ee7411a57fafa47 100755 (executable)
--- a/enrol/authorize/enrol.php
+++ b/enrol/authorize/enrol.php
@@ -252,7 +252,7 @@ class enrolment_plugin_authorize
                             $eventdata->fullmessageformat = FORMAT_PLAIN;
                             $eventdata->fullmessagehtml   = '';
                             $eventdata->smallmessage      = '';
-                            events_trigger('message_send', $eventdata);
+                            message_send($eventdata);
                         }
                     }
                     redirect($CFG->wwwroot, get_string("reviewnotify", "enrol_authorize"), '30');
@@ -285,7 +285,7 @@ class enrolment_plugin_authorize
                             $eventdata->fullmessageformat = FORMAT_PLAIN;
                             $eventdata->fullmessagehtml   = '';
                             $eventdata->smallmessage      = '';
-                            events_trigger('message_send', $eventdata);
+                            message_send($eventdata);
                         }
                         if (!empty($CFG->enrol_mailadmins)) {
                             $a = new stdClass;
@@ -302,7 +302,7 @@ class enrolment_plugin_authorize
                                 $eventdata->fullmessageformat = FORMAT_PLAIN;
                                 $eventdata->fullmessagehtml   = '';
                                 $eventdata->smallmessage      = '';
-                                events_trigger('message_send', $eventdata);
+                                message_send($eventdata);
                             }
                         }
                     }
@@ -723,7 +723,7 @@ class enrolment_plugin_authorize
             $eventdata->fullmessageformat = FORMAT_PLAIN;
             $eventdata->fullmessagehtml   = '';
             $eventdata->smallmessage      = '';
-            events_trigger('message_send', $eventdata);
+            message_send($eventdata);
         }
         if (!empty($CFG->enrol_mailadmins)) {
             $eventdata = new object();
@@ -735,7 +735,7 @@ class enrolment_plugin_authorize
             $eventdata->fullmessageformat = FORMAT_PLAIN;
             $eventdata->fullmessagehtml   = '';
             $eventdata->smallmessage      = '';
-            events_trigger('message_send', $eventdata);
+            message_send($eventdata);
         }
 
         // Send emails to students about which courses have enrolled.
@@ -803,7 +803,7 @@ class enrolment_plugin_authorize
                 $eventdata->fullmessageformat = FORMAT_PLAIN;
                 $eventdata->fullmessagehtml   = '';
                 $eventdata->smallmessage      = '';
-                events_trigger('message_send', $eventdata);
+                message_send($eventdata);
             }
             mtrace("        users who have 'enrol/authorize:uploadcsv' were mailed");
         }
@@ -847,7 +847,7 @@ class enrolment_plugin_authorize
         $eventdata->fullmessageformat = FORMAT_PLAIN;
         $eventdata->fullmessagehtml   = '';
         $eventdata->smallmessage      = '';
-        events_trigger('message_send', $eventdata);
+        message_send($eventdata);
 
         // Email to payment managers
         if (empty($CFG->an_emailexpiredteacher)) {
@@ -895,7 +895,7 @@ class enrolment_plugin_authorize
                     $eventdata->fullmessageformat = FORMAT_PLAIN;
                     $eventdata->fullmessagehtml   = '';
                     $eventdata->smallmessage      = '';
-                    events_trigger('message_send', $eventdata);
+                    message_send($eventdata);
                 }
             }
         }

diff --git a/enrol/authorize/localfuncs.php b/enrol/authorize/localfuncs.php
index 29870c508cdaef82e42a0b71e33ee97249c4c3d6..d577736b2a9e09f7d114653f6b043c99e8c5ab6e 100644 (file)
--- a/enrol/authorize/localfuncs.php
+++ b/enrol/authorize/localfuncs.php
@@ -131,7 +131,7 @@ function message_to_admin($subject, $data)
     $eventdata->fullmessageformat = FORMAT_PLAIN;
     $eventdata->fullmessagehtml   = '';
     $eventdata->smallmessage      = '';
-    events_trigger('message_send', $eventdata);
+    message_send($eventdata);
 }
 
 function send_welcome_messages($orderdata)
@@ -198,7 +198,7 @@ function send_welcome_messages($orderdata)
                 $eventdata->fullmessageformat = FORMAT_PLAIN;
                 $eventdata->fullmessagehtml   = '';
                 $eventdata->smallmessage      = '';
-                events_trigger('message_send', $eventdata);
+                message_send($eventdata);
             }
         }
         while ($ei);

diff --git a/enrol/authorize/uploadcsv.php b/enrol/authorize/uploadcsv.php
index dfa0617613449d38045e8192e8b2c1dfe6392b77..b2a50942e19ee618f48d4f3c72d2cb3956c116e6 100644 (file)
--- a/enrol/authorize/uploadcsv.php
+++ b/enrol/authorize/uploadcsv.php
@@ -241,7 +241,7 @@ function authorize_process_csv($filename)
         $eventdata->fullmessageformat = FORMAT_PLAIN;
         $eventdata->fullmessagehtml   = '';
         $eventdata->smallmessage      = '';                    
-        events_trigger('message_send', $eventdata);
+        message_send($eventdata);
     }
 
 /// Send welcome messages to users

diff --git a/enrol/flatfile/enrol.php b/enrol/flatfile/enrol.php
index a34d219b9e4d82196ea00b3a8fd9a9cc22bfd0cb..e074621c513a0ad58c19db09ec974c3e1695241f 100644 (file)
--- a/enrol/flatfile/enrol.php
+++ b/enrol/flatfile/enrol.php
@@ -227,7 +227,7 @@ function get_access_icons($course) {
                             $eventdata->fullmessageformat = FORMAT_PLAIN;
                             $eventdata->fullmessagehtml   = '';
                             $eventdata->smallmessage      = '';
-                            events_trigger('message_send', $eventdata);
+                            message_send($eventdata);
                         }
 
                         if (!empty($CFG->enrol_mailteachers) && $teachers) {
@@ -247,7 +247,7 @@ function get_access_icons($course) {
                                     $eventdata->fullmessageformat = FORMAT_PLAIN;
                                     $eventdata->fullmessagehtml   = '';
                                     $eventdata->smallmessage      = '';                        
-                                    events_trigger('message_send', $eventdata);
+                                    message_send($eventdata);
                                 }
                             }
                         }
@@ -274,7 +274,7 @@ function get_access_icons($course) {
                 $eventdata->fullmessageformat = FORMAT_PLAIN;
                 $eventdata->fullmessagehtml   = '';
                 $eventdata->smallmessage      = '';
-                events_trigger('message_send', $eventdata);
+                message_send($eventdata);
                 $this->log .= "Error unlinking file $filename\n";
             }
 
@@ -288,7 +288,7 @@ function get_access_icons($course) {
                 $eventdata->fullmessageformat = FORMAT_PLAIN;
                 $eventdata->fullmessagehtml   = '';
                 $eventdata->smallmessage      = '';
-                events_trigger('message_send', $eventdata);
+                message_send($eventdata);
             }
 
         } // end of if(file_exists)

diff --git a/enrol/imsenterprise/enrol.php b/enrol/imsenterprise/enrol.php
index 4c15a88dd11b7f83d440dd1491d50c84dfa3bdf0..db1e9134aca7fed81b09dbe0f5e7cbc6bd931c38 100644 (file)
--- a/enrol/imsenterprise/enrol.php
+++ b/enrol/imsenterprise/enrol.php
@@ -389,7 +389,7 @@ function cron() {
         $eventdata->fullmessageformat = FORMAT_PLAIN;
         $eventdata->fullmessagehtml   = '';
         $eventdata->smallmessage      = '';                    
-        events_trigger('message_send', $eventdata);
+        message_send($eventdata);
 
         $this->log_line('Notification email sent to administrator.');
 

diff --git a/enrol/manual/enrol.php b/enrol/manual/enrol.php
index 98300e277dd74dbe282c1d6cde46176c9ba96070..67b5a02dce2aac1a3df9da012e8212081c24c203 100644 (file)
--- a/enrol/manual/enrol.php
+++ b/enrol/manual/enrol.php
@@ -330,7 +330,7 @@ function cron() {
                             $eventdata->fullmessageformat = FORMAT_PLAIN;
                             $eventdata->fullmessagehtml   = '';
                             $eventdata->smallmessage      = '';                        
-                            events_trigger('message_send', $eventdata);
+                            message_send($eventdata);
                         }
                     }
                 }
@@ -355,7 +355,7 @@ function cron() {
                         $eventdata->fullmessageformat = FORMAT_PLAIN;
                         $eventdata->fullmessagehtml   = '';
                         $eventdata->smallmessage      = '';                    
-                        events_trigger('message_send', $eventdata);
+                        message_send($eventdata);
                     }
                 }
             }

diff --git a/enrol/paypal/ipn.php b/enrol/paypal/ipn.php
index 5cc24f3fa6cfaf628401dadaf262474730aa0607..b0c22dd227235516e7cd0aa8d1b234bbe6f43d7e 100644 (file)
--- a/enrol/paypal/ipn.php
+++ b/enrol/paypal/ipn.php
@@ -118,7 +118,7 @@
                 $eventdata->fullmessageformat = FORMAT_PLAIN;
                 $eventdata->fullmessagehtml   = '';
                 $eventdata->smallmessage      = '';
-                events_trigger('message_send', $eventdata);
+                message_send($eventdata);
 
                 message_paypal_error_to_admin("Payment pending", $data);
                 die;
@@ -203,7 +203,7 @@
                     $eventdata->fullmessageformat = FORMAT_PLAIN;
                     $eventdata->fullmessagehtml   = '';
                     $eventdata->smallmessage      = '';
-                    events_trigger('message_send', $eventdata);
+                    message_send($eventdata);
 
                 }
 
@@ -220,7 +220,7 @@
                     $eventdata->fullmessageformat = FORMAT_PLAIN;
                     $eventdata->fullmessagehtml   = '';
                     $eventdata->smallmessage      = '';                        
-                    events_trigger('message_send', $eventdata);
+                    message_send($eventdata);
                 }
 
                 if (!empty($CFG->enrol_mailadmins)) {
@@ -237,7 +237,7 @@
                         $eventdata->fullmessageformat = FORMAT_PLAIN;
                         $eventdata->fullmessagehtml   = '';
                         $eventdata->smallmessage      = '';
-                        events_trigger('message_send', $eventdata);
+                        message_send($eventdata);
                     }
                 }
 
@@ -277,7 +277,7 @@ function message_paypal_error_to_admin($subject, $data) {
     $eventdata->fullmessageformat = FORMAT_PLAIN;
     $eventdata->fullmessagehtml   = '';
     $eventdata->smallmessage      = '';
-    events_trigger('message_send', $eventdata);
+    message_send($eventdata);
 }
 
 

diff --git a/error/index.php b/error/index.php
index bf7f1c93c86afd93e8ffd52101040f6f7a983697..3642da0a88c3ec7596b3077711a0d28e4d9a3114 100644 (file)
--- a/error/index.php
+++ b/error/index.php
@@ -31,7 +31,7 @@
         $eventdata->fullmessageformat = FORMAT_PLAIN;
         $eventdata->fullmessagehtml   = '';
         $eventdata->smallmessage      = '';
-        events_trigger('message_send', $eventdata);
+        message_send($eventdata);
 
         redirect($CFG->wwwroot .'/course/', 'Message sent, thanks', 3);
         exit;

diff --git a/lib/adminlib.php b/lib/adminlib.php
index df3848cdd16dc7b78ac0aedfe87767b3c2b46d29..5e0562987f3dfa38ae8518b30edfa6c080450e2f 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -114,7 +114,6 @@
 /// Add libraries
 require_once($CFG->libdir.'/ddllib.php');
 require_once($CFG->libdir.'/xmlize.php');
-require_once($CFG->libdir.'/messagelib.php');      // Messagelib functions
 
 define('INSECURE_DATAROOT_WARNING', 1);
 define('INSECURE_DATAROOT_ERROR', 2);

diff --git a/lib/db/events.php b/lib/db/events.php
index b7751cb173aa6bb492395fd197f341eeab0d0ce8..f90e4065d4bc6f804dfee99737cfcbed9b29e6f5 100644 (file)
--- a/lib/db/events.php
+++ b/lib/db/events.php
@@ -31,23 +31,6 @@
 
 $handlers = array (
 
-/* Messaging required parameters (object):
- *  modulename     -
- *  userfrom
- *  userto
- *  subject
- *  fullmessage - the full message in a given format
- *  fullmessageformat  - the format if the full message (FORMAT_MOODLE, FORMAT_HTML, ..)
- *  fullmessagehtml  - the full version (the message processor will choose with one to use)
- *  smallmessage - the small version of the message
- */
-
-    'message_send' => array (
-         'handlerfile'      => '/lib/messagelib.php',
-         'handlerfunction'  => 'message_send_handler',
-         'schedule'         => 'instant'
-     ),
-
 /*
  * portfolio queued event - for non interactive file transfers
 */

diff --git a/lib/messagelib.php b/lib/messagelib.php
index 58a5d23c111c1b1d30cdcc5c8ea7956fcb9fca3f..ec2d3f28abd42ae90b24a7fa9412841bd55e19e7 100644 (file)
--- a/lib/messagelib.php
+++ b/lib/messagelib.php
@@ -18,28 +18,40 @@
 /**
  * messagelib.php - Contains generic messaging functions for the message system
  *
- * @package moodlecore
+ * @package   moodlecore
  * @copyright Luis Rodrigues and Martin Dougiamas
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-/** TIMETOSHOWUSERS = 300 */
-define('TIMETOSHOWUSERS', 300);
-
 /**
- * Triggered when a message provider wants to send a message.
+ * Called when a message provider wants to send a message.
  * This functions checks the user's processor configuration to send the given type of message,
  * then tries to send it.
- * @param object $eventdata information about the message (origin, destination, type, content)
+ *
+ * Required parameter $eventdata structure:
+ *  modulename     -
+ *  userfrom
+ *  userto
+ *  subject
+ *  fullmessage - the full message in a given format
+ *  fullmessageformat  - the format if the full message (FORMAT_MOODLE, FORMAT_HTML, ..)
+ *  fullmessagehtml  - the full version (the message processor will choose with one to use)
+ *  smallmessage - the small version of the message
+ *
+ * @param object $eventdata information about the message (modulename, userfrom, userto, ...)
  * @return boolean success
  */
-function message_send_handler($eventdata){
+function message_send($eventdata) {
     global $CFG, $DB;
 
+    //TODO: this function is very slow and inefficient, it would be a major bottleneck in cron processing, this has to be improved in 2.0
+    //      probably we could add two parameters with user messaging preferences and we could somehow preload/cache them in cron
+    //TODO: we need to solve problems with database transactions here somehow
+
     if (isset($CFG->block_online_users_timetosee)) {
         $timetoshowusers = $CFG->block_online_users_timetosee * 60;
     } else {
-        $timetoshowusers = TIMETOSHOWUSERS;
+        $timetoshowusers = 300;
     }
 
 /// Work out if the user is logged in or not
@@ -64,19 +76,19 @@ function message_send_handler($eventdata){
 /// When a user doesn't have settings none gets return, if he doesn't want contact "" gets returned
     $processor = get_user_preferences('message_provider_'.$eventdata->component.'_'.$eventdata->name.'_'.$userstate, NULL, $eventdata->userto->id);
 
-    if ($processor == NULL){ //this user never had a preference, save default
-        if (!message_set_default_message_preferences( $eventdata->userto )){
+    if ($processor == NULL) { //this user never had a preference, save default
+        if (!message_set_default_message_preferences($eventdata->userto)) {
             print_error('cannotsavemessageprefs', 'message');
         }
-        if ( $userstate == 'loggedin'){
-            $processor='popup';
+        if ($userstate == 'loggedin') {
+            $processor = 'popup';
         }
-        if ( $userstate == 'loggedoff'){
-            $processor='email';
+        if ($userstate == 'loggedoff') {
+            $processor = 'email';
         }
     }
 
-    //if we are suposed to do something with this message
+    // if we are suposed to do something with this message
     // No processor for this message, mark it as read
     if ($processor == "") {  //this user cleared all the preferences
         $savemessage->timeread = time();
@@ -94,13 +106,13 @@ function message_send_handler($eventdata){
             $processorfile = $CFG->dirroot. '/message/output/'.$procname.'/message_output_'.$procname.'.php';
 
             if (is_readable($processorfile)) {
-                include_once( $processorfile );  // defines $module with version etc
+                include_once($processorfile);  // defines $module with version etc
                 $processclass = 'message_output_' . $procname;
 
                 if (class_exists($processclass)) {
                     $pclass = new $processclass();
 
-                    if (! $pclass->send_message($savemessage)) {
+                    if (!$pclass->send_message($savemessage)) {
                         debugging('Error calling message processor '.$procname);
                         return false;
                     }
@@ -141,8 +153,8 @@ function message_update_providers($component='moodle') {
 
             } else {                                // Update existing one
                 $provider = new object();
-                $provider->id             = $dbproviders[$messagename]->id;
-                $provider->capability     = $fileprovider['capability'];
+                $provider->id         = $dbproviders[$messagename]->id;
+                $provider->capability = $fileprovider['capability'];
                 $DB->update_record('message_providers', $provider);
                 unset($dbproviders[$messagename]);
                 continue;
@@ -199,12 +211,7 @@ function message_get_my_providers() {
 function message_get_providers_from_db($component) {
     global $DB;
 
-    if ($dbproviders = $DB->get_records('message_providers', array('component'=>$component), '',
-                                        'name, id, component, capability')) {  // Name is unique per component
-        return $dbproviders;
-    }
-
-    return array();
+    return $DB->get_records('message_providers', array('component'=>$component), '', 'name, id, component, capability');  // Name is unique per component
 }
 
 /**
@@ -245,14 +252,14 @@ function message_uninstall($component) {
  * Set default message preferences.
  * @param $user - User to set message preferences
  */
-function message_set_default_message_preferences( $user ) {
+function message_set_default_message_preferences($user) {
     global $DB;
 
     $providers = $DB->get_records('message_providers');
     $preferences = array();
-    foreach ( $providers as $providerid => $provider){
-        $preferences[ 'message_provider_'.$provider->component.'_'.$provider->name.'_loggedin'  ] = 'popup';
-        $preferences[ 'message_provider_'.$provider->component.'_'.$provider->name.'_loggedoff'  ] = 'email';
+    foreach ($providers as $providerid => $provider) {
+        $preferences['message_provider_'.$provider->component.'_'.$provider->name.'_loggedin'] = 'popup';
+        $preferences['message_provider_'.$provider->component.'_'.$provider->name.'_loggedoff'] = 'email';
     }
-    return set_user_preferences( $preferences, $user->id );
+    return set_user_preferences($preferences, $user->id);
 }

diff --git a/lib/portfoliolib.php b/lib/portfoliolib.php
index dcd0db2b27e106bbdfbcda349b7bb346c9414f0e..61db888f5f9b70ddd68f9e9544a2ea0c91978b8b 100644 (file)
--- a/lib/portfoliolib.php
+++ b/lib/portfoliolib.php
@@ -994,6 +994,6 @@ function portfolio_insane_notify_admins($insane, $instances=false) {
         $eventdata->fullmessagehtml = $htmlbody;
         $eventdata->smallmessage = $smallbody;
         error_log(print_r($eventdata, true));
-        events_trigger('message_send', $eventdata);
+        message_send($eventdata);
     }
 }

diff --git a/lib/setup.php b/lib/setup.php
index 45e2f5cd0731445381e468d2cf8c1e526cbd01e2..1478abbba4478d2955ae4f4e89f86b4bd63ace66 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -261,6 +261,7 @@ require_once($CFG->libdir .'/eventslib.php');       // Events functions
 require_once($CFG->libdir .'/grouplib.php');        // Groups functions
 require_once($CFG->libdir .'/sessionlib.php');      // All session and cookie related stuff
 require_once($CFG->libdir .'/editorlib.php');       // All text editor related functions and classes
+require_once($CFG->libdir .'/messagelib.php');      // Messagelib functions
 
 //point pear include path to moodles lib/pear so that includes and requires will search there for files before anywhere else
 //the problem is that we need specific version of quickforms and hacked excel files :-(

diff --git a/lib/uploadlib.php b/lib/uploadlib.php
index 91f36ca8547c4c15b78c1986a1865d3c38060761..9adb5561855c2b6748b476d90d9128d51dbab264 100644 (file)
--- a/lib/uploadlib.php
+++ b/lib/uploadlib.php
@@ -746,7 +746,7 @@ function clam_message_admins($notice) {
         $eventdata->fullmessageformat = FORMAT_PLAIN;
         $eventdata->fullmessagehtml   = '';
         $eventdata->smallmessage      = '';
-        events_trigger('message_send', $eventdata);
+        message_send($eventdata);
     }
 }
 

diff --git a/message/edit.php b/message/edit.php
index d3cc1ac9338c783376eb44f8877bbe281c3d1786..104689b355e14fe230644b796023745f98b9ca5e 100644 (file)
--- a/message/edit.php
+++ b/message/edit.php
@@ -24,7 +24,6 @@
  */
 
 require_once('../config.php');
-require_once($CFG->libdir.'/messagelib.php');
 
 $userid = optional_param('id', $USER->id, PARAM_INT);    // user id
 $course = optional_param('course', SITEID, PARAM_INT);   // course id (defaults to Site)

diff --git a/message/lib.php b/message/lib.php
index 29a04c362b2473c69371be7cca8b8d504df0a7f2..a62fec30c908965bed07a215b796aef9ba5b62f6 100644 (file)
--- a/message/lib.php
+++ b/message/lib.php
@@ -1023,7 +1023,7 @@ function message_post_message($userfrom, $userto, $message, $format, $messagetyp
     $eventdata->fullmessagehtml  = '';
     $eventdata->smallmessage     = '';
     $eventdata->timecreated     = time();
-    return events_trigger('message_send', $eventdata);
+    return message_send($eventdata);
 
 }
 

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 0584d17bd41ddb19423b1f7c2272785c9cd2d73d..82d041eb2319886f5fffa2733f77773b613c7f71 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -1681,8 +1681,7 @@ class assignment_base {
                 $eventdata->fullmessageformat = FORMAT_PLAIN;
                 $eventdata->fullmessagehtml  = $posthtml;
                 $eventdata->smallmessage     = '';
-                if ( events_trigger('message_send', $eventdata) > 0 ){
-                }
+                message_send($eventdata);
             }
         }
     }
@@ -2351,9 +2350,7 @@ function assignment_cron () {
             $eventdata->fullmessageformat = FORMAT_PLAIN;
             $eventdata->fullmessagehtml  = $posthtml;
             $eventdata->smallmessage     = '';
-            if ( events_trigger('message_send', $eventdata) > 0 ){
-                echo "Error: assignment cron: Could not send out mail for id $submission->id to user $user->id ($user->email)\n";
-            }
+            message_send($eventdata);
         }
 
         cron_setup_user();

diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index 60b74b6382bb525639301a79be16c4e03a98e13f..862df6eb5d45bbec22713c55caa151e299cf8ac3 100644 (file)
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -2180,8 +2180,7 @@ function feedback_send_email($cm, $feedback, $course, $userid) {
                 $eventdata->fullmessageformat = FORMAT_PLAIN;
                 $eventdata->fullmessagehtml  = $posthtml;
                 $eventdata->smallmessage     = '';
-                if ( events_trigger('message_send', $eventdata) > 0 ){
-                }
+                message_send($eventdata);
             }else {
                 $eventdata = new object();
                 $eventdata->modulename       = 'feedback';
@@ -2192,8 +2191,7 @@ function feedback_send_email($cm, $feedback, $course, $userid) {
                 $eventdata->fullmessageformat = FORMAT_PLAIN;
                 $eventdata->fullmessagehtml  = $posthtml;
                 $eventdata->smallmessage     = '';
-                if ( events_trigger('message_send', $eventdata) > 0 ){
-                }
+                message_send($eventdata);
             }
         }
     }
@@ -2244,8 +2242,7 @@ function feedback_send_email_anonym($cm, $feedback, $course) {
             $eventdata->fullmessageformat = FORMAT_PLAIN;
             $eventdata->fullmessagehtml  = $posthtml;
             $eventdata->smallmessage     = '';
-            if ( events_trigger('message_send', $eventdata) > 0 ){
-            }
+            message_send($eventdata);
         }
     }
 }

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index f7af02e7d0e1cac42cc1238a773625992bb550c7..e9d49704d13945ab67e704d819e5fbfee159e2ca 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -613,7 +613,7 @@ function forum_cron() {
                 $eventdata->fullmessageformat = FORMAT_PLAIN;
                 $eventdata->fullmessagehtml  = $posthtml;
                 $eventdata->smallmessage     = '';
-                if ( events_trigger('message_send', $eventdata) > 0){
+                if (!message_send($eventdata)){
 
                     mtrace("Error: mod/forum/cron.php: Could not send out mail for id $post->id to user $userto->id".
                          " ($userto->email) .. not trying again.");
@@ -907,7 +907,7 @@ function forum_cron() {
                 $eventdata->fullmessageformat = FORMAT_PLAIN;
                 $eventdata->fullmessagehtml  = $posthtml;
                 $eventdata->smallmessage     = '';
-                if ( events_trigger('message_send', $eventdata) > 0){
+                if (!message_send($eventdata)){
                     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/lesson/essay.php b/mod/lesson/essay.php
index 45629aeccd33f9ef55816bea66613b8ad2e21647..9bff13759adbc5d4dc97b82211da51d020c16b2d 100644 (file)
--- a/mod/lesson/essay.php
+++ b/mod/lesson/essay.php
@@ -228,15 +228,12 @@
                     $eventdata->fullmessageformat = FORMAT_PLAIN;
                     $eventdata->fullmessagehtml  = $message;
                     $eventdata->smallmessage     = '';
-                    if ( events_trigger('message_send', $eventdata) == 0){
-                        $essayinfo->sent = 1;
-                        $attempt->useranswer = serialize($essayinfo);
-                        $DB->update_record('lesson_attempts', $attempt);
-                        // Log it
-                        add_to_log($course->id, 'lesson', 'update email essay grade', "essay.php?id=$cm->id", format_string($pages[$attempt->pageid]->title,true).': '.fullname($users[$attempt->userid]), $cm->id);
-                    } else {
-                        print_error('emailfail');
-                    }
+                    message_send($eventdata);
+                    $essayinfo->sent = 1;
+                    $attempt->useranswer = serialize($essayinfo);
+                    $DB->update_record('lesson_attempts', $attempt);
+                    // Log it
+                    add_to_log($course->id, 'lesson', 'update email essay grade', "essay.php?id=$cm->id", format_string($pages[$attempt->pageid]->title,true).': '.fullname($users[$attempt->userid]), $cm->id);
                 }
             }
             lesson_set_message(get_string('emailsuccess', 'lesson'), 'notifysuccess');

diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index 209d69fbe1a7be1f9af9e10e155931a6a30ba9c8..0dfc81820abf89c3c4d6a9888639f195395f1b31 100644 (file)
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -1026,7 +1026,7 @@ function quiz_send_confirmation($a) {
     $eventdata->fullmessageformat = FORMAT_PLAIN;
     $eventdata->fullmessagehtml   = '';
     $eventdata->smallmessage      = '';
-    return (events_trigger('message_send', $eventdata) == 0);
+    return message_send($eventdata);
 }
 
 /**
@@ -1060,7 +1060,7 @@ function quiz_send_notification($recipient, $a) {
     $eventdata->fullmessageformat = FORMAT_PLAIN;
     $eventdata->fullmessagehtml   = '';
     $eventdata->smallmessage      = '';
-    return (events_trigger('message_send', $eventdata) == 0);
+    return message_send($eventdata);
 }
 
 /**

diff --git a/user/editadvanced.php b/user/editadvanced.php
index 9b34f02dea638156ef1072155f8790be9ee7fceb..7f5dfac72143f96fa54e96528bf8204f2f5c5366 100644 (file)
--- a/user/editadvanced.php
+++ b/user/editadvanced.php
@@ -29,7 +29,6 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->dirroot.'/user/editadvanced_form.php');
 require_once($CFG->dirroot.'/user/editlib.php');
 require_once($CFG->dirroot.'/user/profile/lib.php');
-require_once($CFG->libdir .'/messagelib.php');      // Messagelib functions
 
 httpsrequired();