mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 20:50:21 +01:00
Code Issues Projects Releases Wiki Activity

MDL-10107 - Removed old email_to_user with we still arround and added default message processor for user,

Browse Source 
adminuser and on messagelib
This commit is contained in:
lfrodrigues 2008-08-02 00:04:29 +00:00
parent 8fdfa54768
commit 2044a2b26f
20 changed files with 49 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
admin/handlevirus.php
View File

@ -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);
*/
}
}

5
backup/backup_scheduled.php
View File

@ -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");

7
course/pending.php
View File

@ -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');
}

41
enrol/authorize/enrol.php
View File

@ -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);
*/
}
}
}

7
enrol/authorize/localfuncs.php
View File

@ -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);

4
enrol/authorize/uploadcsv.php
View File

@ -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

18
enrol/flatfile/enrol.php
View File

@ -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)

3
enrol/imsenterprise/enrol.php
View File

@ -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.');
}

8
enrol/manual/enrol.php
View File

@ -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);
*/
}
}
}

21
enrol/paypal/ipn.php
View File

@ -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);
*/
}
?>

8
error/index.php
View File

@ -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;
}

5
lib/adminlib.php
View File

@ -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);

43
lib/messagelib.php
View File

@ -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 );
}
?>

4
lib/uploadlib.php
View File

@ -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);
*/
}
}

10
mod/assignment/lib.php
View File

@ -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;

12
mod/feedback/lib.php
View File

@ -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);
*/
}
}
}

11
mod/forum/lib.php
View File

@ -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';

5
mod/lesson/essay.php
View File

@ -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;

12
mod/quiz/locallib.php
View File

@ -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);
*/
}
/**

14
user/editadvanced.php
View File

@ -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);