MDL-10107 - Removed old email_to_user with we still arround and added default message...

adminuser and on messagelib

diff --git a/admin/handlevirus.php b/admin/handlevirus.php
index 03e3a056de99e591021a8be91ad73aad154d9ec6..6311887fa2d2cd5186a253ee023520f6ee744a54 100644 (file)
--- a/admin/handlevirus.php
+++ b/admin/handlevirus.php
@@ -72,11 +72,6 @@ function notify_user($user,$subject,$a) {
     $eventdata->fullmessagehtml   = '';
     $eventdata->smallmessage      = '';
     events_trigger('message_send', $eventdata);
-
-
-    /*
-    email_to_user($user,get_admin(),$subject,$body);
-    */
 }
 
 
@@ -96,10 +91,6 @@ function notify_admins($user,$subject,$a) {
         $eventdata->fullmessagehtml   = '';
         $eventdata->smallmessage      = '';                        
         events_trigger('message_send', $eventdata);
-
-        /*
-        email_to_user($admin,$admin,$subject,$body);
-        */
     }
 }
 
@@ -121,10 +112,6 @@ function notify_admins_unknown($file,$a) {
         $eventdata->fullmessagehtml   = '';
         $eventdata->smallmessage      = '';
         events_trigger('message_send', $eventdata);
-    
-        /*
-        email_to_user($admin,$admin,$subject,$body);
-        */
     }
 }
 

diff --git a/backup/backup_scheduled.php b/backup/backup_scheduled.php
index 3db929bab5b8ff95f21c3a5921b3dd1cfaba18f7..f339b2cccec046744d788aaca428fcda04c864da 100644 (file)
--- a/backup/backup_scheduled.php
+++ b/backup/backup_scheduled.php
@@ -207,13 +207,8 @@ function schedule_backup_cron() {
         $eventdata->fullmessagehtml   = '';
         $eventdata->smallmessage      = '';
         events_trigger('message_send', $eventdata);
-
-        /*
-        email_to_user($admin,$admin,$subject,$message);
-        */
     }
 
-
     //Everything is finished stop backup_sche_running
     backup_set_config("backup_sche_running","0");
 

diff --git a/course/pending.php b/course/pending.php
index 6e46a2f1c24e749d8e220ce876d93544d637b463..fe28ed5f126b12e37284b04b94aec2ef5717cf95 100644 (file)
--- a/course/pending.php
+++ b/course/pending.php
@@ -65,9 +65,6 @@
                 $eventdata->smallmessage      = '';                        
                 events_trigger('message_send', $eventdata);
 
-                /*
-                email_to_user($user,$USER,get_string('courseapprovedsubject'),get_string('courseapprovedemail','moodle',$a));
-                */
                 redirect($CFG->wwwroot.'/course/edit.php?id='.$courseid);
                 exit;
             }
@@ -105,9 +102,7 @@
                 $eventdata->fullmessagehtml   = '';
                 $eventdata->smallmessage      = '';                        
                 events_trigger('message_send', $eventdata);
-                /*
-                email_to_user($user,$USER,get_string('courserejectsubject'),get_string('courserejectemail','moodle',$rejectnotice));
-                */
+            
                 $DB->delete_records("course_request", array("id"=>$reject->id));
                 notice(get_string('courserejected'),'pending.php');
             }

diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php
index e2c680b3811c085dbedbd43ca10cacabc9f6c759..8327487cd366e9a53da92a62378188656be96e63 100755 (executable)
--- a/enrol/authorize/enrol.php
+++ b/enrol/authorize/enrol.php
@@ -253,10 +253,6 @@ class enrolment_plugin_authorize
                             $eventdata->fullmessagehtml   = '';
                             $eventdata->smallmessage      = '';
                             events_trigger('message_send', $eventdata);
-
-                            /*
-                            email_to_user($paymentmanager, $USER, $emailsubject, $emailmessage);
-                            */
                         }
                     }
                     redirect($CFG->wwwroot, get_string("reviewnotify", "enrol_authorize"), '30');
@@ -290,15 +286,6 @@ class enrolment_plugin_authorize
                             $eventdata->fullmessagehtml   = '';
                             $eventdata->smallmessage      = '';
                             events_trigger('message_send', $eventdata);
-                            
-                            /*
-                            email_to_user(
-                                $paymentmanager,
-                                $USER,
-                                get_string("enrolmentnew", '', format_string($course->shortname)),
-                                get_string('enrolmentnewuser', '', $a)
-                            );
-                            */
                         }
                         if (!empty($CFG->enrol_mailadmins)) {
                             $a = new stdClass;
@@ -316,15 +303,6 @@ class enrolment_plugin_authorize
                                 $eventdata->fullmessagehtml   = '';
                                 $eventdata->smallmessage      = '';
                                 events_trigger('message_send', $eventdata);
-
-                                /*
-                                email_to_user(
-                                    $admin,
-                                    $USER,
-                                    get_string("enrolmentnew", '', format_string($course->shortname)),
-                                    get_string('enrolmentnewuser', '', $a)
-                                );
-                                */
                             }
                         }
                     }
@@ -746,10 +724,6 @@ class enrolment_plugin_authorize
             $eventdata->fullmessagehtml   = '';
             $eventdata->smallmessage      = '';
             events_trigger('message_send', $eventdata);
-
-            /*
-            email_to_user($adminuser, $adminuser, "AUTHORIZE.NET CRON FAULTS", $faults);
-            */
         }
         if (!empty($CFG->enrol_mailadmins)) {
             $eventdata = new object();
@@ -762,9 +736,6 @@ class enrolment_plugin_authorize
             $eventdata->fullmessagehtml   = '';
             $eventdata->smallmessage      = '';
             events_trigger('message_send', $eventdata);
-            /*
-            email_to_user($adminuser, $adminuser, "AUTHORIZE.NET CRON LOG", $this->log);
-            */ 
         }
 
         // Send emails to students about which courses have enrolled.
@@ -833,10 +804,6 @@ class enrolment_plugin_authorize
                 $eventdata->fullmessagehtml   = '';
                 $eventdata->smallmessage      = '';
                 events_trigger('message_send', $eventdata);
-
-                /*
-                @email_to_user($csvuser, $adminuser, $subject, $message);
-                */ 
             }
             mtrace("        users who have 'enrol/authorize:uploadcsv' were mailed");
         }
@@ -882,10 +849,6 @@ class enrolment_plugin_authorize
         $eventdata->smallmessage      = '';    
         events_trigger('message_send', $eventdata);
 
-        /*
-        email_to_user($adminuser, $adminuser, $subject, $message);
-        */
-
         // Email to payment managers
         if (empty($CFG->an_emailexpiredteacher)) {
             return; // email feature disabled for teachers.
@@ -933,10 +896,6 @@ class enrolment_plugin_authorize
                     $eventdata->fullmessagehtml   = '';
                     $eventdata->smallmessage      = '';        
                     events_trigger('message_send', $eventdata);
-
-                    /*
-                    email_to_user($paymentmanager, $adminuser, $subject, $message);
-                    */
                 }
             }
         }

diff --git a/enrol/authorize/localfuncs.php b/enrol/authorize/localfuncs.php
index adf31ef3ec8808f805a3f1f8953650ea2ee08f49..67c3ca0ca4b9ca32a16099ea722c7d2da1fe4184 100644 (file)
--- a/enrol/authorize/localfuncs.php
+++ b/enrol/authorize/localfuncs.php
@@ -132,9 +132,6 @@ function message_to_admin($subject, $data)
     $eventdata->fullmessagehtml   = '';
     $eventdata->smallmessage      = '';    
     events_trigger('message_send', $eventdata);
-    /*
-    email_to_user($admin, $admin, "$SITE->fullname: Authorize.net ERROR", $message);
-    */
 }
 
 function send_welcome_messages($orderdata)
@@ -202,10 +199,6 @@ function send_welcome_messages($orderdata)
                 $eventdata->fullmessagehtml   = '';
                 $eventdata->smallmessage      = '';    
                 events_trigger('message_send', $eventdata);
-
-                /*
-                @email_to_user($user, $sender, get_string("enrolmentnew", '', $SITE->shortname), $emailmessage);
-                */
             }
         }
         while ($ei);

diff --git a/enrol/authorize/uploadcsv.php b/enrol/authorize/uploadcsv.php
index 5e768e6da37c153632f4c8cd551836438a36e8a3..9b34d865ec33deb0a5ca464d8332788d62060384 100644 (file)
--- a/enrol/authorize/uploadcsv.php
+++ b/enrol/authorize/uploadcsv.php
@@ -236,10 +236,6 @@ function authorize_process_csv($filename)
         $eventdata->fullmessagehtml   = '';
         $eventdata->smallmessage      = '';                        
         events_trigger('message_send', $eventdata);
-
-        /*
-        email_to_user($admin, $admin, "$SITE->fullname: Authorize.net CSV ERROR LOG", $ignoredlines);
-        */
     }
 
 /// Send welcome messages to users

diff --git a/enrol/flatfile/enrol.php b/enrol/flatfile/enrol.php
index 9cf5a1fe953bd4fd305f1b27a0ea121228224440..e8a86ee24caaafdd68ac7f6a0131fa44e4973bcf 100644 (file)
--- a/enrol/flatfile/enrol.php
+++ b/enrol/flatfile/enrol.php
@@ -228,11 +228,6 @@ function get_access_icons($course) {
                             $eventdata->fullmessagehtml   = '';
                             $eventdata->smallmessage      = '';
                             events_trigger('message_send', $eventdata);
-
-                            /*
-                            email_to_user($user, $teacher, get_string("enrolmentnew", '', $course->shortname), 
-                                          get_string('welcometocoursetext', '', $a));
-                            */ 
                         }
 
                         if (!empty($CFG->enrol_mailteachers) && $teachers) {
@@ -253,11 +248,6 @@ function get_access_icons($course) {
                                     $eventdata->fullmessagehtml   = '';
                                     $eventdata->smallmessage      = '';                            
                                     events_trigger('message_send', $eventdata);
-
-                                    /*
-                                    email_to_user($teacher, $user, get_string("enrolmentnew", '', $course->shortname), 
-                                                  get_string('enrolmentnewuser', '', $a));
-                                    */
                                 }
                             }
                         }
@@ -285,10 +275,6 @@ function get_access_icons($course) {
                 $eventdata->fullmessagehtml   = '';
                 $eventdata->smallmessage      = '';
                 events_trigger('message_send', $eventdata);
-
-                /*
-                email_to_user(get_admin(), get_admin(), get_string("filelockedmailsubject", "enrol_flatfile"), get_string("filelockedmail", "enrol_flatfile", $filename));
-                */
                 $this->log .= "Error unlinking file $filename\n";
             }
 
@@ -303,10 +289,6 @@ function get_access_icons($course) {
                 $eventdata->fullmessagehtml   = '';
                 $eventdata->smallmessage      = '';
                 events_trigger('message_send', $eventdata);
-
-                /*
-                email_to_user(get_admin(), get_admin(), "Flatfile Enrolment Log", $this->log);
-                */
             }
 
         } // end of if(file_exists)

diff --git a/enrol/imsenterprise/enrol.php b/enrol/imsenterprise/enrol.php
index 9a5ee2cd00adbfdd98a5ba0724a8b2fb01368bb4..b7ed0d2dedbbe9875a173d72f4a1a718c9962acc 100644 (file)
--- a/enrol/imsenterprise/enrol.php
+++ b/enrol/imsenterprise/enrol.php
@@ -393,9 +393,6 @@ function cron() {
         $eventdata->smallmessage      = '';                        
         events_trigger('message_send', $eventdata);
 
-        /*
-        email_to_user(get_admin(), get_admin(), "Moodle IMS Enterprise enrolment notification", $msg);
-        */
         $this->log_line('Notification email sent to administrator.');
 
     }

diff --git a/enrol/manual/enrol.php b/enrol/manual/enrol.php
index af7bd3efa66ea4ecb6331a7670fb50c7559a46bd..294a0db7b88209b54389818462c5d2402005f412 100644 (file)
--- a/enrol/manual/enrol.php
+++ b/enrol/manual/enrol.php
@@ -324,10 +324,6 @@ function cron() {
                             $eventdata->fullmessagehtml   = '';
                             $eventdata->smallmessage      = '';                            
                             events_trigger('message_send', $eventdata);
-                            /*
-                            email_to_user($user, $teacher, format_string($SITE->fullname) .' '. $strexpirynotify,
-                                          $strexpirynotifystudentsemail);
-                            */
                         }
                     }
                 }
@@ -354,10 +350,6 @@ function cron() {
                         $eventdata->fullmessagehtml   = '';
                         $eventdata->smallmessage      = '';                        
                         events_trigger('message_send', $eventdata);
-
-                        /*
-                        email_to_user($teacher, $admin, $a->coursename .' '. $strexpirynotify, $strexpirynotifyemail);
-                        */
                     }
                 }
             }

diff --git a/enrol/paypal/ipn.php b/enrol/paypal/ipn.php
index e71976ea50f52a6ac515176b32a91b57e05c0820..dede345be1df94b53a8419e7ebdabeed525df584 100644 (file)
--- a/enrol/paypal/ipn.php
+++ b/enrol/paypal/ipn.php
@@ -113,9 +113,6 @@
                 $eventdata->smallmessage      = '';
                 events_trigger('message_send', $eventdata);
 
-                /*
-                email_to_user($user, get_admin(), "Moodle: PayPal payment", "Your PayPal payment is pending.");
-                */
                 message_paypal_error_to_admin("Payment pending", $data);
                 die;
             }
@@ -195,10 +192,6 @@
                     $eventdata->smallmessage      = '';
                     events_trigger('message_send', $eventdata);
                     
-                    /*
-                    email_to_user($user, $teacher, get_string("enrolmentnew", '', $course->shortname),
-                                  get_string('welcometocoursetext', '', $a));
-                    */
                 }
 
                 if (!empty($CFG->enrol_mailteachers)) {
@@ -215,11 +208,6 @@
                     $eventdata->fullmessagehtml   = '';
                     $eventdata->smallmessage      = '';                            
                     events_trigger('message_send', $eventdata); 
-
-                    /*
-                    email_to_user($teacher, $user, get_string("enrolmentnew", '', $course->shortname),
-                                  get_string('enrolmentnewuser', '', $a));
-                    */
                 }
 
                 if (!empty($CFG->enrol_mailadmins)) {
@@ -237,11 +225,6 @@
                         $eventdata->fullmessagehtml   = '';
                         $eventdata->smallmessage      = '';
                         events_trigger('message_send', $eventdata);
-
-                        /*
-                        email_to_user($admin, $user, get_string("enrolmentnew", '', $course->shortname),
-                                      get_string('enrolmentnewuser', '', $a));
-                        */
                     }
                 }
 
@@ -282,10 +265,6 @@ function message_paypal_error_to_admin($subject, $data) {
     $eventdata->fullmessagehtml   = '';
     $eventdata->smallmessage      = '';
     events_trigger('message_send', $eventdata);
-
-/*
-    email_to_user($admin, $admin, "PAYPAL ERROR: ".$subject, $message);
-*/
 }
 
 ?>

diff --git a/error/index.php b/error/index.php
index a2b4b1a409f6cffa6a630c3a56314f17c185de43..05d7b215367002dd969e4033543a6b431ef6304b 100644 (file)
--- a/error/index.php
+++ b/error/index.php
@@ -30,13 +30,9 @@
         $eventdata->fullmessage       = $form->text;
         $eventdata->fullmessageformat = FORMAT_PLAIN;
         $eventdata->fullmessagehtml   = '';
-        $eventdata->smallmessage      = '';                        
+        $eventdata->smallmessage      = '';
         events_trigger('message_send', $eventdata);
-
-    /*
-        email_to_user($supportuser, $USER, 'Error: '. $form->referer .' -> '. $form->requested, $form->text);
-    */
-
+        
         redirect($CFG->wwwroot .'/course/', 'Message sent, thanks', 3);
         exit;
     }

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 610f07401c45837d992febd6ea35b712aa269d9d..0e913554b7cec25406f540c006eca3ed62ca8bd6 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -794,6 +794,11 @@ function create_admin_user($user_input=NULL) {
         foreach ($adminroles as $adminrole) {
             role_assign($adminrole->id, $user->id, 0, $sitecontext->id);
         }
+        
+        //set default message preferences
+        if (!message_set_default_message_preferences( $user )){
+            print_error('cannotsavemessageprefs', 'debug');
+        }
 
         set_config('rolesactive', 1);
 

diff --git a/lib/messagelib.php b/lib/messagelib.php
index 85b36ddbb175895db5c2fbbb31c537b6ecc159bd..26715ee541a18e95e6ccadb0a5a3d8e1b255f551 100644 (file)
--- a/lib/messagelib.php
+++ b/lib/messagelib.php
@@ -70,24 +70,30 @@ function message_send_handler($eventdata){
     $savemessage->timecreated       = time();
 
 /// Find out what processors are defined currently
+/// 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 )){
+            print_error('cannotsavemessageprefs', 'debug');
+        }
+        if ( $userstate == 'loggedin'){
+            $processor='popup';
+        }
+        if ( $userstate == 'loggedoff'){
+            $processor='email';
+        }
+    }
 
-    // XXX TODO
-    // Note this currently defaults to email all the time.  We need a better solution 
-    // to be able to distinguish between a user who has no settings and one who doesn't want contact
-    // ... perhaps a "none" setting
-
-    $processor = get_user_preferences('message_provider_'.$eventdata->component.'_'.$eventdata->name.'_'.$userstate, 'email', $eventdata->userto->id);
-
-/// Now process the message
-
-    if (empty($processor)) {        // There is no processor so just mark it as read
+    //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();        
         $messageid = $message->id;
         unset($message->id);
         $DB->insert_record('message_read', $savemessage);
 
     } else {                        // Process the message
-
     /// Store unread message just in case we can not send it
         $savemessage->id = $DB->insert_record('message', $savemessage);
 
@@ -278,5 +284,20 @@ function message_uninstall($component) {
     return $DB->delete_records('message_providers', array('component' => $component));
 }
 
+/**
+ * Set default message preferences.
+ * @param $user - User to set message preferences
+ */
+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';
+    }    
+    return set_user_preferences( $preferences, $user->id );
+}
 
 ?>

diff --git a/lib/uploadlib.php b/lib/uploadlib.php
index 7fe94c3e2d4f6d4817ace4cfb0f0bf5abb5e18e3..3445c6bf414072e9ab5d96fb1858eb02866107cf 100644 (file)
--- a/lib/uploadlib.php
+++ b/lib/uploadlib.php
@@ -722,10 +722,6 @@ function clam_message_admins($notice) {
         $eventdata->fullmessagehtml   = '';
         $eventdata->smallmessage      = '';
         events_trigger('message_send', $eventdata);
-
-        /*
-        email_to_user($admin, get_admin(), $subject, $notice);
-        */
     }
 }
 

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 99f136500504d54ba5054466eb4e3f0ebd81a7ed..0891a990ddd7d5e84a257112c358ba1085cd0e94 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -1593,10 +1593,6 @@ class assignment_base {
                 $eventdata->smallmessage     = '';
                 if ( events_trigger('message_send', $eventdata) > 0 ){
                 }
-
-                /*
-                @email_to_user($teacher, $user, $postsubject, $posttext, $posthtml);  // If it fails, oh well, too bad.
-                */
             }
         }
     }
@@ -2178,12 +2174,6 @@ function assignment_cron () {
             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";
             }
-
-            /*
-            if (! email_to_user($user, $teacher, $postsubject, $posttext, $posthtml)) {
-                echo "Error: assignment cron: Could not send out mail for id $submission->id to user $user->id ($user->email)\n";
-            }
-            */
         }
 
         $USER = $realuser;

diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index 23b1361d235eb06cd6c787d5e05fb2a69c6ede3f..668d804b891a2d38bb17796f51c7ae26b1a846fa 100644 (file)
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -1839,10 +1839,6 @@ function feedback_send_email($cm, $feedback, $course, $userid) {
                 $eventdata->smallmessage     = '';
                 if ( events_trigger('message_send', $eventdata) > 0 ){
                 }
-
-                /*
-                @email_to_user($teacher, $user, $postsubject, $posttext, $posthtml);
-                */
             }else {
                 $eventdata = new object();
                 $eventdata->modulename       = 'feedback';
@@ -1855,10 +1851,6 @@ function feedback_send_email($cm, $feedback, $course, $userid) {
                 $eventdata->smallmessage     = '';
                 if ( events_trigger('message_send', $eventdata) > 0 ){
                 }
-
-                /*
-                @email_to_user($teacher, $teacher, $postsubject, $posttext, $posthtml);
-                */
             }
         }
     }
@@ -1908,10 +1900,6 @@ function feedback_send_email_anonym($cm, $feedback, $course) {
             $eventdata->smallmessage     = '';
             if ( events_trigger('message_send', $eventdata) > 0 ){
             }
-
-            /*
-            @email_to_user($teacher, $teacher, $postsubject, $posttext, $posthtml);
-            */
         }
     }
 }

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 9895950cc437809ef9aa474830109719e41ba8d1..cfe3ee599da8448835963a1d86cfc6acd47c42dd 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -532,10 +532,7 @@ function forum_cron() {
                 // Send the post now!
 
                 mtrace('Sending ', '');
-                /*
-                if (!$mailresult = email_to_user($userto, $userfrom, $postsubject, $posttext,
-                                                 $posthtml, '', '', $CFG->forum_replytouser)) {
-                */
+                
                 $eventdata = new object();
                 $eventdata->component        = 'mod/forum';
                 $eventdata->name             = 'posts';
@@ -832,11 +829,7 @@ function forum_cron() {
                     // This user DOESN'T want to receive HTML
                     $posthtml = '';
                 }
-
-                /*
-                if (!$mailresult =  email_to_user($userto, $site->shortname, $postsubject, $posttext, $posthtml,
-                                                  '', '', $CFG->forum_replytouser)) {
-                */
+            
                 $eventdata = new object();
                 $eventdata->component        = 'mod/forum';
                 $eventdata->name             = 'digests';

diff --git a/mod/lesson/essay.php b/mod/lesson/essay.php
index 38c397ce9590e4dbcf1b356285273bce86fa6ce7..19ac3acf9cbb66f556e3644d11dbd3bae492612c 100644 (file)
--- a/mod/lesson/essay.php
+++ b/mod/lesson/essay.php
@@ -219,10 +219,7 @@
 
                     // Subject
                     $subject = get_string('essayemailsubject', 'lesson', format_string($pages[$attempt->pageid]->title,true));
-
-                    /*
-                    if(email_to_user($users[$attempt->userid], $USER, $subject, $plaintxt, $message)) {
-                    */
+                    
                     $eventdata = new object();
                     $eventdata->modulename       = 'lesson';
                     $eventdata->userfrom         = $USER;

diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index 5bfa56ea8178c5908c275ca4f20b337f48bb2b7a..d14519f4a6a60609be01ec31ed3313bda50b2a84 100644 (file)
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -912,7 +912,7 @@ function quiz_get_combined_reviewoptions($quiz, $attempts, $context=null) {
  *
  * @param stdClass $a associative array of replaceable fields for the templates
  *
- * @return bool|string result of email_to_user()
+ * @return bool|string result of events_triger
  */
 function quiz_send_confirmation($a) {
 
@@ -938,10 +938,6 @@ function quiz_send_confirmation($a) {
     $eventdata->fullmessagehtml   = '';
     $eventdata->smallmessage      = '';
     return (events_trigger('message_send', $eventdata) == 0);
-
-    /*
-    return email_to_user($USER, get_admin(), $subject, $body);
-    */
 }
 
 /**
@@ -950,7 +946,7 @@ function quiz_send_confirmation($a) {
  * @param object $recipient user object of the intended recipient
  * @param stdClass $a associative array of replaceable fields for the templates
  *
- * @return bool|string result of email_to_user()
+ * @return bool|string result of events_triger()
  */
 function quiz_send_notification($recipient, $a) {
 
@@ -976,10 +972,6 @@ function quiz_send_notification($recipient, $a) {
     $eventdata->fullmessagehtml   = '';
     $eventdata->smallmessage      = '';
     return (events_trigger('message_send', $eventdata) == 0);
-
-    /*
-    return email_to_user($recipient, $USER, $subject, $body);
-    */
 }
 
 /**

diff --git a/user/editadvanced.php b/user/editadvanced.php
index 2c6268c7c9426836a6bd99adaddd2df514a28676..70a00e27292041a5192cc3924b17f3172802f9ee 100644 (file)
--- a/user/editadvanced.php
+++ b/user/editadvanced.php
@@ -6,6 +6,7 @@
     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();
 
@@ -150,17 +151,10 @@
         
         // trigger events
         if ($usercreated) {
-            //add default preferences for the messageprocessors (by default all users get email)
-            $providers = $DB->get_records('message_providers');
-            $preferences = array();
-            foreach ( $providers as $providerid => $provider){
-                $preferences[ 'message_provider_'.$provider->modulename.'_loggedin'  ] = 'popup';
-                $preferences[ 'message_provider_'.$provider->modulename.'_loggedoff'  ] = 'email';
-            }    
-            if (!set_user_preferences( $preferences, $usernew->id ) ){
-                print_error('Error updating user message preferences');
+            //set default message preferences
+            if (!message_set_default_message_preferences( $usernew )){
+                print_error('cannotsavemessageprefs');
             }
-        
             events_trigger('user_created', $usernew);
         } else {
             events_trigger('user_updated', $usernew);