? FICHEIROS
? config.php
? diff
? moodledata
? message/output/email/db/upgrade.php
? message/output/jabber/db/upgrade.php
? mod/feedback/version.php
Index: version.php
===================================================================
RCS file: /cvsroot/moodle/moodle/version.php,v
retrieving revision 1.463
diff -r1.463 version.php
9c9
<    $version = 2007060502;  // YYYYMMDD = date
---
>    $version = 2007061900;  // YYYYMMDD = date
Index: admin/handlevirus.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/handlevirus.php,v
retrieving revision 1.8
diff -r1.8 handlevirus.php
62c62,72
<     email_to_user($user,get_admin(),$subject,$body);
---
>     $eventdata = new object();
>     $eventdata->modulename       = 'moodle';
>     $eventdata->userfrom         = get_admin();
>     $eventdata->userto           = $user;
>     $eventdata->subject          = $subject;
>     $eventdata->smallmessage     = '';
>     $eventdata->fullmessagetext  = $body;
>     $eventdata->fullmessagehtml  = $body;
>     events_trigger('message_send', $eventdata);
> 
>     //email_to_user($user,get_admin(),$subject,$body);
72c82,92
<         email_to_user($admin,$admin,$subject,$body);
---
>         $eventdata = new object();
> 	$eventdata->modulename       = 'moodle';
> 	$eventdata->userfrom         = $admin;
> 	$eventdata->userto           = $admin;
> 	$eventdata->subject          = $subject;
> 	$eventdata->smallmessage     = '';
> 	$eventdata->fullmessagetext  = $body;
> 	$eventdata->fullmessagehtml  = $body;
> 	events_trigger('message_send', $eventdata);
> 
>         //email_to_user($admin,$admin,$subject,$body);
84c104,114
<         email_to_user($admin,$admin,$subject,$body);
---
>         $eventdata = new object();
> 	$eventdata->modulename       = 'moodle';
> 	$eventdata->userfrom         = $admin;
> 	$eventdata->userto           = $admin;
> 	$eventdata->subject          = $subject;
> 	$eventdata->smallmessage     = '';
> 	$eventdata->fullmessagetext  = $body;
> 	$eventdata->fullmessagehtml  = $body;
> 	events_trigger('message_send', $eventdata);
> 
>         //email_to_user($admin,$admin,$subject,$body);
Index: admin/process_email.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/process_email.php,v
retrieving revision 1.5
diff -r1.5 process_email.php
36,37c36,47
<     
<     email_to_user($user,$from,$subject,$body);
---
>    
>     $eventdata = new object();
>     $eventdata->modulename       = 'moodle';
>     $eventdata->userfrom         = $from;
>     $eventdata->userto           = $user;
>     $eventdata->subject          = $subject;
>     $eventdata->smallmessage     = '';
>     $eventdata->fullmessagetext  = $body;
>     $eventdata->fullmessagehtml  = $body;
>     events_trigger('message_send', $eventdata);
> 
>     //email_to_user($user,$from,$subject,$body);
Index: backup/backup_scheduled.php
===================================================================
RCS file: /cvsroot/moodle/moodle/backup/backup_scheduled.php,v
retrieving revision 1.36
diff -r1.36 backup_scheduled.php
199c199,209
<         email_to_user($admin,$admin,$subject,$message);
---
> 	$eventdata = new object();
> 	$eventdata->modulename       = 'moodle';
> 	$eventdata->userfrom         = $admin;
> 	$eventdata->userto           = $admin;
> 	$eventdata->subject          = $subject;
> 	$eventdata->smallmessage     = '';
> 	$eventdata->fullmessagetext  = $message;
> 	$eventdata->fullmessagehtml  = $message;
> 	events_trigger('message_send', $eventdata);
> 
>         //email_to_user($admin,$admin,$subject,$message);
Index: course/pending.php
===================================================================
RCS file: /cvsroot/moodle/moodle/course/pending.php,v
retrieving revision 1.10
diff -r1.10 pending.php
62c62,73
<                 email_to_user($user,$USER,get_string('courseapprovedsubject'),get_string('courseapprovedemail','moodle',$a));
---
> 		
> 		$eventdata = new object();
> 		$eventdata->modulename       = 'moodle';
> 		$eventdata->userfrom         = $USER;
> 		$eventdata->userto           = $user;
> 		$eventdata->subject          = get_string('courseapprovedsubject');
> 		$eventdata->smallmessage     = '';
> 		$eventdata->fullmessagetext  = get_string('courseapprovedemail','moodle',$a);
> 		$eventdata->fullmessagehtml  = get_string('courseapprovedemail','moodle',$a);
> 		events_trigger('message_send', $eventdata);
> 
>                 //email_to_user($user,$USER,get_string('courseapprovedsubject'),get_string('courseapprovedemail','moodle',$a));
89c100,111
<                 email_to_user($user,$USER,get_string('courserejectsubject'),get_string('courserejectemail','moodle',$rejectnotice));
---
> 		
> 		$eventdata = new object();
> 		$eventdata->modulename       = 'moodle';
> 		$eventdata->userfrom         = $USER;
> 		$eventdata->userto           = $user;
> 		$eventdata->subject          = get_string('courserejectsubject');
> 		$eventdata->smallmessage     = '';
> 		$eventdata->fullmessagetext  = get_string('courserejectemail','moodle',$rejectnotice);
> 		$eventdata->fullmessagehtml  = get_string('courserejectemail','moodle',$rejectnotice);
> 		events_trigger('message_send', $eventdata);
> 
>                 //email_to_user($user,$USER,get_string('courserejectsubject'),get_string('courserejectemail','moodle',$rejectnotice));
Index: enrol/authorize/enrol.php
===================================================================
RCS file: /cvsroot/moodle/moodle/enrol/authorize/enrol.php,v
retrieving revision 1.134
diff -r1.134 enrol.php
240c240,250
<                     email_to_user($paymentmanager, $USER, $emailsubject, $emailmessage);
---
> 		    $eventdata = new object();
> 		    $eventdata->modulename       = 'moodle';
> 		    $eventdata->userfrom         = $USER;
> 		    $eventdata->userto           = $paymentmanager;
> 		    $eventdata->subject          = $emailsubject;
> 		    $eventdata->smallmessage     = '';
> 		    $eventdata->fullmessagetext  = $emailmessage;
> 		    $eventdata->fullmessagehtml  = $emailmessage;
> 		    events_trigger('message_send', $eventdata);
> 
>                     //email_to_user($paymentmanager, $USER, $emailsubject, $emailmessage);
259,262c269,283
<                 email_to_user($paymentmanager,
<                               $USER,
<                               get_string("enrolmentnew", '', format_string($course->shortname)),
<                               get_string('enrolmentnewuser', '', $a));
---
> 
> 		$eventdata = new object();
> 		$eventdata->modulename       = 'moodle';
> 		$eventdata->userfrom         = $USER;
> 		$eventdata->userto           = $paymentmanager;
> 		$eventdata->subject          = get_string("enrolmentnew", '', format_string($course->shortname));
> 		$eventdata->smallmessage     = '';
> 		$eventdata->fullmessagetext  = get_string('enrolmentnewuser', '', $a);
> 		$eventdata->fullmessagehtml  = get_string('enrolmentnewuser', '', $a);
> 		events_trigger('message_send', $eventdata);
> 
>                 //email_to_user($paymentmanager,
>                 //              $USER,
>                 //             get_string("enrolmentnew", '', format_string($course->shortname)),
> 		//              get_string('enrolmentnewuser', '', $a));
270,273c291,304
<                     email_to_user($admin,
<                                   $USER,
<                                   get_string("enrolmentnew", '', format_string($course->shortname)),
<                                   get_string('enrolmentnewuser', '', $a));
---
> 		    $eventdata = new object();
> 		    $eventdata->modulename       = 'moodle';
> 		    $eventdata->userfrom         = $USER;
> 		    $eventdata->userto           = $admin;
> 		    $eventdata->subject          = get_string("enrolmentnew", '', format_string($course->shortname));
> 		    $eventdata->smallmessage     = '';
> 		    $eventdata->fullmessagetext  = get_string('enrolmentnewuser', '', $a);
> 		    $eventdata->fullmessagehtml  = get_string('enrolmentnewuser', '', $a);
> 		    events_trigger('message_send', $eventdata);
> 		    
>                     //email_to_user($admin,
>                     //              $USER,
>                     //              get_string("enrolmentnew", '', format_string($course->shortname)),
>                     //              get_string('enrolmentnewuser', '', $a));
673c704,713
<             email_to_user($adminuser, $adminuser, "AUTHORIZE.NET CRON FAULTS", $faults);
---
>   	    $eventdata = new object();
> 	    $eventdata->modulename       = 'moodle';
> 	    $eventdata->userfrom         = $adminuser;
> 	    $eventdata->userto           = $adminuser;
> 	    $eventdata->subject          = 'AUTHORIZE.NET CRON FAULTS';
> 	    $eventdata->smallmessage     = '';
> 	    $eventdata->fullmessagetext  = $faults;
> 	    $eventdata->fullmessagehtml  = $faults;
> 	    events_trigger('message_send', $eventdata);
>             //email_to_user($adminuser, $adminuser, "AUTHORIZE.NET CRON FAULTS", $faults);
676c716,726
<             email_to_user($adminuser, $adminuser, "AUTHORIZE.NET CRON LOG", $this->log);
---
> 	    $eventdata = new object();
> 	    $eventdata->modulename       = 'moodle';
> 	    $eventdata->userfrom         = $adminuser;
> 	    $eventdata->userto           = $adminuser;
> 	    $eventdata->subject          = 'AUTHORIZE.NET CRON LOG';
> 	    $eventdata->smallmessage     = '';
> 	    $eventdata->fullmessagetext  = $this->log;
> 	    $eventdata->fullmessagehtml  = $this->log;
> 	    events_trigger('message_send', $eventdata);
> 
> 	    //email_to_user($adminuser, $adminuser, "AUTHORIZE.NET CRON LOG", $this->log);
732c782,793
<             @email_to_user($adminuser, $adminuser, $subject, $message);
---
> 
> 	    $eventdata = new object();
> 	    $eventdata->modulename       = 'moodle';
> 	    $eventdata->userfrom         = $adminuser;
> 	    $eventdata->userto           = $adminuser;
> 	    $eventdata->subject          = $subject;
> 	    $eventdata->smallmessage     = '';
> 	    $eventdata->fullmessagetext  = $message;
> 	    $eventdata->fullmessagehtml  = $message;
> 	    events_trigger('message_send', $eventdata);
> 
>             //@email_to_user($adminuser, $adminuser, $subject, $message);
761c822,833
<         email_to_user($adminuser, $adminuser, $subject, $message);
---
> 
> 	$eventdata = new object();
> 	$eventdata->modulename       = 'moodle';
> 	$eventdata->userfrom         = $adminuser;
> 	$eventdata->userto           = $adminuser;
> 	$eventdata->subject          = $subject;
> 	$eventdata->smallmessage     = '';
> 	$eventdata->fullmessagetext  = $message;
> 	$eventdata->fullmessagehtml  = $message;
> 	events_trigger('message_send', $eventdata);
> 
>         //email_to_user($adminuser, $adminuser, $subject, $message);
798c870,880
<                     email_to_user($paymentmanager, $adminuser, $subject, $message);
---
> 		    $eventdata = new object();
> 		    $eventdata->modulename       = 'moodle';
> 		    $eventdata->userfrom         = $adminuser;
> 		    $eventdata->userto           = $paymentmanager;
> 		    $eventdata->subject          = $subject;
> 		    $eventdata->smallmessage     = '';
> 		    $eventdata->fullmessagetext  = $message;
> 		    $eventdata->fullmessagehtml  = $message;
> 		    events_trigger('message_send', $eventdata);
> 
>                     //email_to_user($paymentmanager, $adminuser, $subject, $message);
Index: enrol/authorize/localfuncs.php
===================================================================
RCS file: /cvsroot/moodle/moodle/enrol/authorize/localfuncs.php,v
retrieving revision 1.10
diff -r1.10 localfuncs.php
165c165,176
<         @email_to_user($user, $sender, get_string("enrolmentnew", '', $SITE->shortname), $emailmessage);
---
> 
> 	$eventdata = new object();
> 	$eventdata->modulename       = 'moodle';
> 	$eventdata->userfrom         = $sender;
> 	$eventdata->userto           = $user;
> 	$eventdata->subject          = get_string("enrolmentnew", '', $SITE->shortname);
> 	$eventdata->smallmessage     = '';
> 	$eventdata->fullmessagetext  = $emailmessage;
> 	$eventdata->fullmessagehtml  = $emailmessage;
> 	events_trigger('message_send', $eventdata);
> 
>         //@email_to_user($user, $sender, get_string("enrolmentnew", '', $SITE->shortname), $emailmessage);
Index: enrol/authorize/uploadcsv.php
===================================================================
RCS file: /cvsroot/moodle/moodle/enrol/authorize/uploadcsv.php,v
retrieving revision 1.11
diff -r1.11 uploadcsv.php
222c222,232
<         email_to_user($admin, $admin, "$SITE->fullname: Authorize.net CSV ERROR LOG", $ignoredlines);
---
> 
> 	$eventdata = new object();
> 	$eventdata->modulename       = 'moodle';
> 	$eventdata->userfrom         = $admin;
> 	$eventdata->userto           = $admin;
> 	$eventdata->subject          = "$SITE->fullname: Authorize.net CSV ERROR LOG";
> 	$eventdata->smallmessage     = '';
> 	$eventdata->fullmessagetext  = $ignoredlines;
> 	$eventdata->fullmessagehtml  = $ignoredlines;
> 	events_trigger('message_send', $eventdata);
>         //email_to_user($admin, $admin, "$SITE->fullname: Authorize.net CSV ERROR LOG", $ignoredlines);
Index: enrol/flatfile/enrol.php
===================================================================
RCS file: /cvsroot/moodle/moodle/enrol/flatfile/enrol.php,v
retrieving revision 1.8
diff -r1.8 enrol.php
261,262c261,272
<                             email_to_user($user, $teacher, get_string("enrolmentnew", '', $course->shortname), 
<                                           get_string('welcometocoursetext', '', $a));
---
> 
> 			    $eventdata = new object();
> 			    $eventdata->modulename       = 'moodle';
> 			    $eventdata->userfrom         = $teacher;
> 			    $eventdata->userto           = $user;
> 			    $eventdata->subject          = get_string("enrolmentnew", '', $course->shortname);
> 			    $eventdata->smallmessage     = '';
> 			    $eventdata->fullmessagetext  = get_string('welcometocoursetext', '', $a);
> 			    $eventdata->fullmessagehtml  = get_string('welcometocoursetext', '', $a);
> 			    events_trigger('message_send', $eventdata);
>                             //email_to_user($user, $teacher, get_string("enrolmentnew", '', $course->shortname), 
>                             //              get_string('welcometocoursetext', '', $a));
272,273c282,294
<                                     email_to_user($teacher, $user, get_string("enrolmentnew", '', $course->shortname), 
<                                                   get_string('enrolmentnewuser', '', $a));
---
> 				    
> 				    $eventdata = new object();
> 				    $eventdata->modulename       = 'moodle';
> 				    $eventdata->userfrom         = $user;
> 				    $eventdata->userto           = $teacher;
> 				    $eventdata->subject          = get_string("enrolmentnew", '', $course->shortname);
> 				    $eventdata->smallmessage     = '';
> 				    $eventdata->fullmessagetext  = get_string('enrolmentnewuser', '', $a);
> 				    $eventdata->fullmessagehtml  = get_string('enrolmentnewuser', '', $a);
> 				    events_trigger('message_send', $eventdata);
> 
>                                     //email_to_user($teacher, $user, get_string("enrolmentnew", '', $course->shortname), 
>                                     //              get_string('enrolmentnewuser', '', $a));
291c312,322
<                 email_to_user(get_admin(), get_admin(), get_string("filelockedmailsubject", "enrol_flatfile"), get_string("filelockedmail", "enrol_flatfile", $filename));
---
> 	        $eventdata = new object();
> 		$eventdata->modulename       = 'moodle';
> 		$eventdata->userfrom         = get_admin();
> 		$eventdata->userto           = get_admin();
> 		$eventdata->subject          = get_string("filelockedmailsubject", "enrol_flatfile");
> 		$eventdata->smallmessage     = '';
> 		$eventdata->fullmessagetext  = get_string("filelockedmail", "enrol_flatfile", $filename);
> 		$eventdata->fullmessagehtml  = get_string("filelockedmail", "enrol_flatfile", $filename);
> 		events_trigger('message_send', $eventdata);
> 
>                 //email_to_user(get_admin(), get_admin(), get_string("filelockedmailsubject", "enrol_flatfile"), get_string("filelockedmail", "enrol_flatfile", $filename));
296c327,337
<                 email_to_user(get_admin(), get_admin(), "Flatfile Enrolment Log", $this->log);
---
> 	        $eventdata = new object();
> 		$eventdata->modulename       = 'moodle';
> 		$eventdata->userfrom         = get_admin();
> 		$eventdata->userto           = get_admin();
> 		$eventdata->subject          = 'Flatfile Enrolment Log';
> 		$eventdata->smallmessage     = '';
> 		$eventdata->fullmessagetext  = $this->log;
> 		$eventdata->fullmessagehtml  = $this->log;
> 		events_trigger('message_send', $eventdata);
> 
>                 //email_to_user(get_admin(), get_admin(), "Flatfile Enrolment Log", $this->log);
Index: enrol/imsenterprise/enrol.php
===================================================================
RCS file: /cvsroot/moodle/moodle/enrol/imsenterprise/enrol.php,v
retrieving revision 1.9
diff -r1.9 enrol.php
380c380,390
<         email_to_user(get_admin(), get_admin(), "Moodle IMS Enterprise enrolment notification", $msg);
---
> 	$eventdata = new object();
> 	$eventdata->modulename       = 'moodle';
> 	$eventdata->userfrom         = get_admin();
> 	$eventdata->userto           = get_admin();
> 	$eventdata->subject          = 'Moodle IMS Enterprise enrolment notification';
> 	$eventdata->smallmessage     = '';
> 	$eventdata->fullmessagetext  = $msg;
> 	$eventdata->fullmessagehtml  = $msg;
> 	events_trigger('message_send', $eventdata);
> 
>         //email_to_user(get_admin(), get_admin(), "Moodle IMS Enterprise enrolment notification", $msg);
Index: enrol/manual/enrol.php
===================================================================
RCS file: /cvsroot/moodle/moodle/enrol/manual/enrol.php,v
retrieving revision 1.16
diff -r1.16 enrol.php
312,313c312,322
<                             email_to_user($user, $teacher, $SITE->fullname .' '. $strexpirynotify, 
<                                           $strexpirynotifystudentsemail);
---
> 			    $eventdata = new object();
> 			    $eventdata->modulename       = 'moodle';
> 			    $eventdata->userfrom         = $teacher;
> 			    $eventdata->userto           = $user;
> 			    $eventdata->subject          = $SITE->fullname .' '. $strexpirynotify;
> 			    $eventdata->smallmessage     = '';
> 			    $eventdata->fullmessagetext  = $strexpirynotifystudentsemail;
> 			    $eventdata->fullmessagehtml  = $strexpirynotifystudentsemail;
> 			    events_trigger('message_send', $eventdata);
>                             //email_to_user($user, $teacher, $SITE->fullname .' '. $strexpirynotify, 
>                             //              $strexpirynotifystudentsemail);
328c337,347
<                             email_to_user($teacher, $admin, $a->coursename .' '. $strexpirynotify, $strexpirynotifyemail);
---
> 			    $eventdata = new object();
> 			    $eventdata->modulename       = 'moodle';
> 			    $eventdata->userfrom         = $admin;
> 			    $eventdata->userto           = $teacher;
> 			    $eventdata->subject          = $a->coursename .' '. $strexpirynotify;
> 			    $eventdata->smallmessage     = '';
> 			    $eventdata->fullmessagetext  = $strexpirynotifyemail;
> 			    $eventdata->fullmessagehtml  = $strexpirynotifyemail;
> 			    events_trigger('message_send', $eventdata);
> 
> 			    //email_to_user($teacher, $admin, $a->coursename .' '. $strexpirynotify, $strexpirynotifyemail);
Index: enrol/paypal/ipn.php
===================================================================
RCS file: /cvsroot/moodle/moodle/enrol/paypal/ipn.php,v
retrieving revision 1.19
diff -r1.19 ipn.php
105c105,115
<                 email_to_user($user, get_admin(), "Moodle: PayPal payment", "Your PayPal payment is pending.");
---
> 	        $eventdata = new object();
> 		$eventdata->modulename       = 'moodle';
>                 $eventdata->userfrom         = get_admin();
>                 $eventdata->userto           = $user;
>                 $eventdata->subject          = 'Moodle: PayPal payment';
>                 $eventdata->smallmessage     = '';
>                 $eventdata->fullmessagetext  = 'Your PayPal payment is pending.';
>                 $eventdata->fullmessagehtml  = 'Your PayPal payment is pending.';
> 		events_trigger('message_send', $eventdata);
> 
>                 //email_to_user($user, get_admin(), "Moodle: PayPal payment", "Your PayPal payment is pending.");
173,174c183,194
<                     email_to_user($user, $teacher, get_string("enrolmentnew", '', $course->shortname),
<                                   get_string('welcometocoursetext', '', $a));
---
> 
> 		    $eventdata = new object();
> 		    $eventdata->modulename       = 'moodle';
> 		    $eventdata->userfrom         = $teacher;
> 		    $eventdata->userto           = $user;
> 		    $eventdata->subject          = get_string("enrolmentnew", '', $course->shortname);
> 		    $eventdata->smallmessage     = '';
> 		    $eventdata->fullmessagetext  = get_string('welcometocoursetext', '', $a);
> 		    $eventdata->fullmessagehtml  = get_string('welcometocoursetext', '', $a);
> 		    events_trigger('message_send', $eventdata);
>                     //email_to_user($user, $teacher, get_string("enrolmentnew", '', $course->shortname),
> 		    //           get_string('welcometocoursetext', '', $a));
180,181c200,212
<                     email_to_user($teacher, $user, get_string("enrolmentnew", '', $course->shortname),
<                                   get_string('enrolmentnewuser', '', $a));
---
> 
> 		    $eventdata = new object();
> 		    $eventdata->modulename       = 'moodle';
> 		    $eventdata->userfrom         = $user;
> 		    $eventdata->userto           = $teacher;
> 		    $eventdata->subject          = get_string("enrolmentnew", '', $course->shortname);
> 		    $eventdata->smallmessage     = '';
> 		    $eventdata->fullmessagetext  = get_string('enrolmentnewuser', '', $a);
> 		    $eventdata->fullmessagehtml  = get_string('enrolmentnewuser', '', $a);
> 		    events_trigger('message_send', $eventdata);
> 
> 		    // email_to_user($teacher, $user, get_string("enrolmentnew", '', $course->shortname),
>                     //              get_string('enrolmentnewuser', '', $a));
189,190c220,231
<                         email_to_user($admin, $user, get_string("enrolmentnew", '', $course->shortname),
<                                       get_string('enrolmentnewuser', '', $a));
---
> 		        $eventdata = new object();
> 			$eventdata->modulename       = 'moodle';
> 			$eventdata->userfrom         = $user;
> 			$eventdata->userto           = $admin;
> 			$eventdata->subject          = get_string("enrolmentnew", '', $course->shortname);
> 			$eventdata->smallmessage     = '';
> 			$eventdata->fullmessagetext  = get_string('enrolmentnewuser', '', $a);
> 			$eventdata->fullmessagehtml  = get_string('enrolmentnewuser', '', $a);
> 			events_trigger('message_send', $eventdata);
> 
>                         //email_to_user($admin, $user, get_string("enrolmentnew", '', $course->shortname),
> 			//               get_string('enrolmentnewuser', '', $a));
219a261,270
>     
>     $eventdata = new object();
>     $eventdata->modulename       = 'moodle';
>     $eventdata->userfrom         = $admin;
>     $eventdata->userto           = $admin;
>     $eventdata->subject          = 'PAYPAL ERROR: '.$subject;
>     $eventdata->smallmessage     = '';
>     $eventdata->fullmessagetext  = $message;
>     $eventdata->fullmessagehtml  = $message;
>     events_trigger('message_send', $eventdata);
221c272
<     email_to_user($admin, $admin, "PAYPAL ERROR: ".$subject, $message);
---
>     //email_to_user($admin, $admin, "PAYPAL ERROR: ".$subject, $message);
Index: error/index.php
===================================================================
RCS file: /cvsroot/moodle/moodle/error/index.php,v
retrieving revision 1.16
diff -r1.16 index.php
15c15,25
<         email_to_user($admin, $user, 'Error: '. $form->referer .' -> '. $form->requested, $form->text);
---
> 	$eventdata = new object();
> 	$eventdata->modulename       = 'moodle';
> 	$eventdata->userfrom         = $admin;
> 	$eventdata->userto           = $user;
> 	$eventdata->subject          = 'Error';
> 	$eventdata->smallmessage     = '';
> 	$eventdata->fullmessagetext  = 'Error: '. $form->referer .' -> '. $form->requested, $form->text;
> 	$eventdata->fullmessagehtml  = 'Error: '. $form->referer .' -> '. $form->requested, $form->text;
> 	events_trigger('message_send', $eventdata);
> 
>         //email_to_user($admin, $user, 'Error: '. $form->referer .' -> '. $form->requested, $form->text);
Index: lang/en_utf8/message.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/message.php,v
retrieving revision 1.5
diff -r1.5 message.php
69a70,76
> //luis: used in the message system
> $string['editmymessage'] = 'Messaging';
> $string['guestnoeditmessage'] = 'Guest user can not edit messaging options';
> $string['guestnoeditmessageother'] = 'Guest user can not edit other user messaging options';
> 
> 
> 
Index: lang/en_utf8/role.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/role.php,v
retrieving revision 1.35
diff -r1.35 role.php
147a148,152
> //LUIS: new message system
> $string['user:editmessageprofile'] = 'Edit user messaging profile';
> $string['user:editownmessageprofile'] = 'Edit own user messaging profile';
> 
> 
Index: lib/eventslib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/eventslib.php,v
retrieving revision 1.14
diff -r1.14 eventslib.php
233a234
> 
239d239
< 
244a245,246
> 
> 
376a379
> 
386a390,391
> 
> 
398a404
> 
Index: lib/uploadlib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/uploadlib.php,v
retrieving revision 1.25
diff -r1.25 uploadlib.php
683c683,693
<         email_to_user($admin, get_admin(), $subject, $notice);
---
>         $eventdata = new object();
> 	$eventdata->modulename       = 'moodle';
> 	$eventdata->userfrom         = $get_admin();
> 	$eventdata->userto           = $admin;
> 	$eventdata->subject          = $subject;
> 	$eventdata->smallmessage     = '';
> 	$eventdata->fullmessagetext  = $notice;
> 	$eventdata->fullmessagehtml  = $notice;
> 	events_trigger('message_send', $eventdata);
> 
>         //email_to_user($admin, get_admin(), $subject, $notice);
Index: lib/db/access.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/db/access.php,v
retrieving revision 1.59
diff -r1.59 access.php
791a792,815
>     //capabilities designed for the new message system configuration
>     'moodle/user:editmessageprofile' => array(
> 
>         'riskbitmask' => RISK_SPAM,
> 
>         'captype' => 'write',
>         'contextlevel' => CONTEXT_USER,
>         'legacy' => array(
>             'admin' => CAP_ALLOW
>         )
>     ),
> 
>     'moodle/user:editownmessageprofile' => array(      
> 
>         'captype' => 'write',     
>         'contextlevel' => CONTEXT_SYSTEM,      
>         'legacy' => array(   
>             'guest' => CAP_PROHIBIT,
>             'user' => CAP_ALLOW,
>             'admin' => CAP_ALLOW
>         )    
>     ),
> 
> 
Index: lib/db/events.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/db/events.php,v
retrieving revision 1.4
diff -r1.4 events.php
29c29,75
< $handlers = array (); // no handlers for now in core
---
> $handlers = array (
> 
>  /*
>   * Messaging Events
>   */
> /*
>  * required parameters (object):
>  *  modulename     - 
>  *  modulefile     - 
>  *
>  */
>     'message_provider_register' => array (
>          'handlerfile'      => '/lib/message.php',
>          'handlerfunction'  => 'message_provider_register_handler', 
>          'schedule'         => 'instant'
>     ),
> 
> /*
>  * required parameters (object):
>  *  modulename     - 
>  *
>  */
> 
>     'message_provider_unregister' => array (
>          'handlerfile'      => '/lib/message.php',
>          'handlerfunction'  => 'message_provider_unregister_handler', 
>          'schedule'         => 'instant'
>      ),
> 
> /* required parameters (object):
>  *  modulename     - 
>  *  userfrom
>  *  userto
>  *  subject
>  *  smallmessage - the small version of the message
>  *  fullmessagetext  - the full version (the message processor will choose with one to use) 
>  *  fullmessagehtml  - the full version (the message processor will choose with one to use) 
>  */
> 
>     'message_send' => array (
>          'handlerfile'      => '/lib/message.php',
>          'handlerfunction'  => 'message_send_handler', 
>          'schedule'         => 'instant'
>      )
> 
> 
> );
Index: lib/db/install.xml
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/db/install.xml,v
retrieving revision 1.73
diff -r1.73 install.xml
2c2
< <XMLDB PATH="lib/db" VERSION="20070605" COMMENT="XMLDB file for core Moodle tables"
---
> <XMLDB PATH="lib/db" VERSION="20070613" COMMENT="XMLDB file for core Moodle tables"
1423c1423
<     <TABLE NAME="grade_import_newitem" COMMENT="temporary table for storing new grade_item names from grade import" PREVIOUS="grade_import_values">
---
>     <TABLE NAME="grade_import_newitem" COMMENT="temporary table for storing new grade_item names from grade import" PREVIOUS="grade_import_values" NEXT="message_providers">
1432a1433,1451
>     <TABLE NAME="message_providers" COMMENT="This table stores the message providers (modules and core systems)" PREVIOUS="grade_import_newitem" NEXT="message_processors">
>       <FIELDS>
>         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" SEQUENCE="true" ENUM="false" COMMENT="id of the table, please edit me" NEXT="modulename"/>
>         <FIELD NAME="modulename" TYPE="char" LENGTH="166" NOTNULL="true" SEQUENCE="false" ENUM="false" COMMENT="Module Name" PREVIOUS="id" NEXT="modulefile"/>
>         <FIELD NAME="modulefile" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" COMMENT="The main module file" PREVIOUS="modulename"/>
>       </FIELDS>
>       <KEYS>
>         <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="primary key of the table, please edit me"/>
>       </KEYS>
>     </TABLE>
>     <TABLE NAME="message_processors" COMMENT="List of message output plugins" PREVIOUS="message_providers">
>       <FIELDS>
>         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" SEQUENCE="true" ENUM="false" COMMENT="id of the table, please edit me" NEXT="name"/>
>         <FIELD NAME="name" TYPE="char" LENGTH="166" NOTNULL="true" SEQUENCE="false" ENUM="false" COMMENT="Default comment for the field, please edit me" PREVIOUS="id"/>
>       </FIELDS>
>       <KEYS>
>         <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="primary key of the table, please edit me"/>
>       </KEYS>
>     </TABLE>
1435c1454
<     <STATEMENT NAME="insert log_display" TYPE="insert" TABLE="log_display" COMMENT="Initial insert of records on table log_display">
---
>     <STATEMENT NAME="insert log_display" TYPE="insert" TABLE="log_display" COMMENT="Initial insert of records on table log_display" NEXT="insert message_processors">
1454a1474,1485
>     <STATEMENT NAME="insert message_processors" TYPE="insert" TABLE="message_processors" COMMENT="Initial insert of do nothing record in message_processors" PREVIOUS="insert log_display" NEXT="insert message_providers">
>       <SENTENCES>
>         <SENTENCE TEXT="(name) VALUES ('nothing')" />
>         <SENTENCE TEXT="(name) VALUES ('email')" />
>       </SENTENCES>
>     </STATEMENT>
>     <STATEMENT NAME="insert message_providers" TYPE="insert" TABLE="message_providers" COMMENT="Initial insert of moodle record in message_providers" PREVIOUS="insert message_processors">
>       <SENTENCES>
>         <SENTENCE TEXT="(modulename, modulefile) VALUES ('moodle', 'index.php')" />
>       </SENTENCES>
>     </STATEMENT>
> 
Index: lib/db/upgrade.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/db/upgrade.php,v
retrieving revision 1.66
diff -r1.66 upgrade.php
1394a1395,1433
> 
>     if ($result && $oldversion < 2009060500) {
>         //create the database tables for message_processors and message_providers
>         $table = new XMLDBTable('message_provider');
>         $table->addFieldInfo('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null, null, null);
>         $table->addFieldInfo('modulename', XMLDB_TYPE_CHAR, '166', null, XMLDB_NOTNULL, null, null, null, null);
>         $table->addFieldInfo('modulefile', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, null, null, null);
>         $table->addKeyInfo('primary', XMLDB_KEY_PRIMARY, array('id'));
> 	$result = $result && create_table($table);
> 
> 	$table = new XMLDBTable('message_processor');
>         $table->addFieldInfo('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null, null, null);
>         $table->addFieldInfo('name', XMLDB_TYPE_CHAR, '166', null, XMLDB_NOTNULL, null, null, null, null);
>         $table->addKeyInfo('primary', XMLDB_KEY_PRIMARY, array('id'));
>         $result = $result && create_table($table);
> 
> 
>       
>         //just process the WIDGET_install to create the entries for the processors while upgrading      
>         if (!$mods = get_list_of_plugins('mod') ) {
> 	    error('No modules installed!');
> 	}
> 
> 	foreach ($mods as $mod) {
> 	  include_once($CFG->dirroot .'/mod/'. $mod .'/lib.php');  // defines upgrading and/or installing functions
> 
> 	  /// Run local install function if there is one
> 	  $installfunction = $mod.'_install';
> 	  if (function_exists($installfunction)) {
> 	    if (! $installfunction() ) {
> 	      notify('Encountered a problem running install function for '.$mod.'!');
> 	    }
> 	  }
> 	  
> 	}
> 
>     }
> 
> 	  
Index: message/discussion.php
===================================================================
RCS file: /cvsroot/moodle/moodle/message/discussion.php,v
retrieving revision 1.13
diff -r1.13 discussion.php
114c114
<             message_post_message($USER, $user, $message, $format, 'direct');
---
> 	         message_post_message($USER, $user, $message, $format, 'direct');
Index: message/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/message/lib.php,v
retrieving revision 1.59
diff -r1.59 lib.php
1006c1006,1007
<         if ((time() - $userto->lastaccess) > ((int)$preference->message_emailtimenosee * 60)) { // Long enough
---
> 	//for now allways send using events
>         //if ((time() - $userto->lastaccess) > ((int)$preference->message_emailtimenosee * 60)) { // Long enough
1026,1027c1027,1039
<             email_to_user($userto, $userfrom, $messagesubject, $messagetext, $messagehtml);
<         }
---
> 
> 	    $eventdata = new object();
> 	    $eventdata->modulename       = 'moodle';
> 	    $eventdata->userfrom         = $userfrom;
> 	    $eventdata->userto           = $userto;
> 	    $eventdata->subject          = $messagesubject;
> 	    $eventdata->smallmessage     = '';
> 	    $eventdata->fullmessagetext  = $messagetext;
> 	    $eventdata->fullmessagehtml  = $messagehtml;
> 	    events_trigger('message_send', $eventdata);
> 
> 	    //email_to_user($userto, $userfrom, $messagesubject, $messagetext, $messagehtml);
>        //}
Index: mod/assignment/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/assignment/lib.php,v
retrieving revision 1.243
diff -r1.243 lib.php
1361c1361,1372
<                 @email_to_user($teacher, $user, $postsubject, $posttext, $posthtml);  // If it fails, oh well, too bad.
---
> 		$eventdata = new object();
> 		$eventdata->modulename       = 'assignment';
> 		$eventdata->userfrom         = $user;
> 		$eventdata->userto           = $teacher;
> 		$eventdata->subject          = $postsubject;
> 		$eventdata->smallmessage     = '';
> 		$eventdata->fullmessagetext  = $posttext;
> 		$eventdata->fullmessagehtml  = $posthtml;
> 		if ( events_trigger('message_send', $eventdata) > 0 ){
> 		}
> 
> 		// @email_to_user($teacher, $user, $postsubject, $posttext, $posthtml);  // If it fails, oh well, too bad.
1633a1645,1658
> /** 
>  * Code to be executed when a module is installed
>  * now is just used to register the module as message provider
>  */ 
> function assignment_install() {
>   $eventdata = new object();
>   $eventdata->modulename = 'assignment';
>   $eventdata->modulefile = 'mod/assignment/index.php';
>   events_trigger('message_provider_register', $eventdata); 
>   
>   return true; 
> }
> 
> 
1809a1835,1846
> 	    
> 	    $eventdata = new object();
> 	    $eventdata->modulename       = 'assignment';
> 	    $eventdata->userfrom         = $teacher;
> 	    $eventdata->userto           = $user;
> 	    $eventdata->subject          = $postsubject;
> 	    $eventdata->smallmessage     = '';
> 	    $eventdata->fullmessagetext  = $posttext;
> 	    $eventdata->fullmessagehtml  = $posthtml;
> 	    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";
> 	    }
1810a1848
> 	    /*
1813a1852
> 	    */
Index: mod/exercise/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/exercise/lib.php,v
retrieving revision 1.48
diff -r1.48 lib.php
51a52,65
> 
> /** 
>  * Code to be executed when a module is installed
>  * now is just used to register the module as message provider
>  */ 
> function exercise_install() {
>     $eventdata = new object();
>     $eventdata->modulename = 'exercise';
>     $eventdata->modulefile = 'mod/exercise/index.php';
>     events_trigger('message_provider_register', $eventdata); 
> 
>     return true; 
> }
> 
228a243,255
> 	    $eventdata = new object();
> 	    $eventdata->modulename       = 'exercise';
> 	    $eventdata->userfrom         = $sendto;
> 	    $eventdata->userto           = $teacher;
> 	    $eventdata->subject          = $postsubject;
> 	    $eventdata->smallmessage     = '';
> 	    $eventdata->fullmessagetext  = $posttext;
> 	    $eventdata->fullmessagehtml  = $posthtml;
> 	    if ( events_trigger('message_send', $eventdata) > 0 ){
> 	      echo "Error: exercise cron: Could not send out mail for id $submission->id to user $sendto->id ($sendto->email)\n";
> 	    }
> 
> 	    /*
231a259
> 	    */
Index: mod/forum/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/lib.php,v
retrieving revision 1.579
diff -r1.579 lib.php
3a4
> require_once($CFG->libdir.'/eventslib.php');
88a90,102
> /** 
>  * Code to be executed when a module is installed
>  * now is just used to register the module as message provider
>  */ 
> function forum_install() {
>     $eventdata = new object();
>     $eventdata->modulename = 'forum';
>     $eventdata->modulefile = 'mod/forum/index.php';
>     events_trigger('message_provider_register', $eventdata); 
> 
>     return true; 
> }
> 
451c465
<                 if (!$mailresult = email_to_user($userto, $userfrom, $postsubject, $posttext,
---
> 		  /*                if (!$mailresult = email_to_user($userto, $userfrom, $postsubject, $posttext,
452a467,478
> 		  */
> 
> 
> 		$eventdata = new object();
> 		$eventdata->modulename       = 'forum';
> 		$eventdata->userfrom         = $userto;
> 		$eventdata->userto           = $userfrom;
> 		$eventdata->subject          = $postsubject;
> 		$eventdata->smallmessage     = '';
> 		$eventdata->fullmessagetext  = $posttext;
> 		$eventdata->fullmessagehtml  = $posthtml;
> 		if ( events_trigger('message_send', $eventdata) > 0){
700a727
> 		/*
702a730,739
> 		*/
> 		$eventdata = new object();
> 		$eventdata->modulename       = 'forum';
> 		$eventdata->userfrom         = $userto;
> 		$eventdata->userto           = $site->shortname;
> 		$eventdata->subject          = $postsubject;
> 		$eventdata->smallmessage     = '';
> 		$eventdata->fullmessagetext  = $posttext;
> 		$eventdata->fullmessagehtml  = $posthtml;
> 		if ( events_trigger('message_send', $eventdata) > 0){
Index: mod/journal/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/journal/lib.php,v
retrieving revision 1.80
diff -r1.80 lib.php
172a173,184
> 	    $eventdata = new object();
> 	    $eventdata->modulename       = 'lesson';
> 	    $eventdata->userfrom         = $teacher;
> 	    $eventdata->userto           = $user;
> 	    $eventdata->subject          = $postsubject;
> 	    $eventdata->smallmessage     = '';
> 	    $eventdata->fullmessagetext  = $posttext;
> 	    $eventdata->fullmessagehtml  = $posthtml;
> 	    if ( events_trigger('message_send', $eventdata) > 0){
> 	        echo "Error: Journal cron: Could not send out mail for id $entry->id to user $user->id ($user->email)\n";
> 	    }
> 	    /*
175a188
>             */
441a455,468
> /** 
>  * Code to be executed when a module is installed
>  * now is just used to register the module as message provider
>  */ 
> function journal_install() {
>   $eventdata = new object();
>   $eventdata->modulename = 'journal';
>   $eventdata->modulefile = 'mod/journal/index.php';
>   events_trigger('message_provider_register', $eventdata); 
>   
>   return true; 
> }
> 
> 
Index: mod/lesson/essay.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/lesson/essay.php,v
retrieving revision 1.8
diff -r1.8 essay.php
197a198,217
> 		    $eventdata = new object();
> 		    $eventdata->modulename       = 'lesson';
> 		    $eventdata->userfrom         = $USER;
> 		    $eventdata->userto           = $users[$attempt->userid];
> 		    $eventdata->subject          = $subject;
> 		    $eventdata->smallmessage     = '';
> 		    $eventdata->fullmessagetext  = $plaintext;
> 		    $eventdata->fullmessagehtml  = $message;
> 		    if ( events_trigger('message_send', $eventdata) == 0){
>                         $essayinfo->sent = 1;
>                         $attempt->useranswer = addslashes(serialize($essayinfo));
>                         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{
> 		        error('Emailing Failed');
> 		    }
> 
> 
> 		    /*
206a227
>                     */
Index: mod/lesson/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/lesson/lib.php,v
retrieving revision 1.35
diff -r1.35 lib.php
12a13,27
> 
> /** 
>  * Code to be executed when a module is installed
>  * now is just used to register the module as message provider
>  */ 
> function lesson_install() {
>   $eventdata = new object();
>   $eventdata->modulename = 'lesson';
>   $eventdata->modulefile = 'mod/lesson/index.php';
>   events_trigger('message_provider_register', $eventdata); 
>   
>   return true; 
> }
> 
> 
Index: mod/workshop/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/workshop/lib.php,v
retrieving revision 1.96
diff -r1.96 lib.php
79a80,93
> 
> /** 
>  * Code to be executed when a module is installed
>  * now is just used to register the module as message provider
>  */ 
> function workshop_install() {
>     $eventdata = new object();
>     $eventdata->modulename = 'workshop';
>     $eventdata->modulefile = 'mod/workshop/index.php';
>     events_trigger('message_provider_register', $eventdata); 
>   
>     return true; 
> }
> 
269a284,297
> 	    $eventdata = new object();
> 	    $eventdata->modulename       = 'workshop';
> 	    $eventdata->userfrom         = $teacher;
> 	    $eventdata->userto           = $sendto;
> 	    $eventdata->subject          = $postsubject;
> 	    $eventdata->smallmessage     = '';
> 	    $eventdata->fullmessagetext  = $posttext;
> 	    $eventdata->fullmessagehtml  = $posthtml;
> 	    if ( events_trigger('message_send', $eventdata) > 0){
> 	        echo "Error: workshop cron: Could not send out mail for id $submission->id to 
>                     user $sendto->id ($sendto->email)\n";
> 	    }
> 	    
> 	    /*
273a302
>             */
359c388,402
<                 
---
>               
> 	    $eventdata = new object();
> 	    $eventdata->modulename       = 'workshop';
> 	    $eventdata->userfrom         = $teacher;
> 	    $eventdata->userto           = $sendto;
> 	    $eventdata->subject          = $postsubject;
> 	    $eventdata->smallmessage     = '';
> 	    $eventdata->fullmessagetext  = $posttext;
> 	    $eventdata->fullmessagehtml  = $posthtml;
> 	    if ( events_trigger('message_send', $eventdata) > 0){
> 	        echo "Error: workshop cron: Could not send out mail for id $submission->id to 
>                     user $sendto->id ($sendto->email)\n";
> 	    }
> 
> 	    /*
363a407
>             */
460c504,518
<                     
---
>                 
> 		$eventdata = new object();
> 		$eventdata->modulename       = 'workshop';
> 		$eventdata->userfrom         = $teacher;
> 		$eventdata->userto           = $sendto;
> 		$eventdata->subject          = $postsubject;
> 		$eventdata->smallmessage     = '';
> 		$eventdata->fullmessagetext  = $posttext;
> 		$eventdata->fullmessagehtml  = $posthtml;
> 		if ( events_trigger('message_send', $eventdata) > 0){
> 		    echo "Error: workshop cron: Could not send out mail for id $submission->id to user 
>                         $sendto->id ($sendto->email)\n";
> 		}
> 
> 		/*
464a523
>                 */
507c566,580
<                     
---
>                   
> 		$eventdata = new object();
> 		$eventdata->modulename       = 'workshop';
> 		$eventdata->userfrom         = $teacher;
> 		$eventdata->userto           = $sendto;
> 		$eventdata->subject          = $postsubject;
> 		$eventdata->smallmessage     = '';
> 		$eventdata->fullmessagetext  = $posttext;
> 		$eventdata->fullmessagehtml  = $posthtml;
> 		if ( events_trigger('message_send', $eventdata) > 0){
> 		    echo "Error: workshop cron: Could not send out mail for id $submission->id to user 
>                         $sendto->id ($sendto->email)\n";
> 		}
> 
> 		/*
511a585
>                 */
Index: user/tabs.php
===================================================================
RCS file: /cvsroot/moodle/moodle/user/tabs.php,v
retrieving revision 1.39
diff -r1.39 tabs.php
232a233,239
> 
>  //added a new ta
>    if (has_capability('moodle/user:editownmessageprofile', $systemcontext)) {
>        $toprow[] = new tabobject('editmessage', $wwwroot.'/message/edit.php?id='.$user->id.'&amp;course='.$course->id, get_string('editmymessage', 'message'));
>    }
> 
>