mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
MDL-47162 core_message: Add course id to message eventdata
This commit is contained in:
parent
577bd70d38
commit
cc350fd9c8
34 changed files with 345 additions and 76 deletions
|
@ -186,7 +186,7 @@ class enrol_flatfile_plugin extends enrol_plugin {
|
|||
|
||||
if ($processed and $mailadmins) {
|
||||
if ($log = $buffer->get_buffer()) {
|
||||
$eventdata = new stdClass();
|
||||
$eventdata = new \core\message\message();
|
||||
$eventdata->modulename = 'moodle';
|
||||
$eventdata->component = 'enrol_flatfile';
|
||||
$eventdata->name = 'flatfile_enrolment';
|
||||
|
@ -340,7 +340,7 @@ class enrol_flatfile_plugin extends enrol_plugin {
|
|||
}
|
||||
|
||||
if (!unlink($filelocation)) {
|
||||
$eventdata = new stdClass();
|
||||
$eventdata = new \core\message\message();
|
||||
$eventdata->modulename = 'moodle';
|
||||
$eventdata->component = 'enrol_flatfile';
|
||||
$eventdata->name = 'flatfile_enrolment';
|
||||
|
@ -463,7 +463,7 @@ class enrol_flatfile_plugin extends enrol_plugin {
|
|||
$a->profileurl = "$CFG->wwwroot/user/view.php?id=$user->id&course=$course->id";
|
||||
$subject = get_string('enrolmentnew', 'enrol', format_string($course->shortname, true, array('context' => $context)));
|
||||
|
||||
$eventdata = new stdClass();
|
||||
$eventdata = new \core\message\message();
|
||||
$eventdata->modulename = 'moodle';
|
||||
$eventdata->component = 'enrol_flatfile';
|
||||
$eventdata->name = 'flatfile_enrolment';
|
||||
|
@ -494,7 +494,7 @@ class enrol_flatfile_plugin extends enrol_plugin {
|
|||
$a->user = fullname($user);
|
||||
$subject = get_string('enrolmentnew', 'enrol', format_string($course->shortname, true, array('context' => $context)));
|
||||
|
||||
$eventdata = new stdClass();
|
||||
$eventdata = new \core\message\message();
|
||||
$eventdata->modulename = 'moodle';
|
||||
$eventdata->component = 'enrol_flatfile';
|
||||
$eventdata->name = 'flatfile_enrolment';
|
||||
|
|
|
@ -222,7 +222,7 @@ class enrol_imsenterprise_plugin extends enrol_plugin {
|
|||
$msg .= "Logging is currently not active.";
|
||||
}
|
||||
|
||||
$eventdata = new stdClass();
|
||||
$eventdata = new \core\message\message();
|
||||
$eventdata->modulename = 'moodle';
|
||||
$eventdata->component = 'enrol_imsenterprise';
|
||||
$eventdata->name = 'imsenterprise_enrolment';
|
||||
|
|
|
@ -152,7 +152,7 @@ if (strlen($result) > 0) {
|
|||
// Email user to let them know. Email admin.
|
||||
|
||||
if ($data->payment_status == "Pending" and $data->pending_reason != "echeck") {
|
||||
$eventdata = new stdClass();
|
||||
$eventdata = new \core\message\message();
|
||||
$eventdata->modulename = 'moodle';
|
||||
$eventdata->component = 'enrol_paypal';
|
||||
$eventdata->name = 'paypal_enrolment';
|
||||
|
@ -259,7 +259,7 @@ if (strlen($result) > 0) {
|
|||
$a->coursename = format_string($course->fullname, true, array('context' => $coursecontext));
|
||||
$a->profileurl = "$CFG->wwwroot/user/view.php?id=$user->id";
|
||||
|
||||
$eventdata = new stdClass();
|
||||
$eventdata = new \core\message\message();
|
||||
$eventdata->modulename = 'moodle';
|
||||
$eventdata->component = 'enrol_paypal';
|
||||
$eventdata->name = 'paypal_enrolment';
|
||||
|
@ -278,7 +278,7 @@ if (strlen($result) > 0) {
|
|||
$a->course = format_string($course->fullname, true, array('context' => $coursecontext));
|
||||
$a->user = fullname($user);
|
||||
|
||||
$eventdata = new stdClass();
|
||||
$eventdata = new \core\message\message();
|
||||
$eventdata->modulename = 'moodle';
|
||||
$eventdata->component = 'enrol_paypal';
|
||||
$eventdata->name = 'paypal_enrolment';
|
||||
|
@ -297,7 +297,7 @@ if (strlen($result) > 0) {
|
|||
$a->user = fullname($user);
|
||||
$admins = get_admins();
|
||||
foreach ($admins as $admin) {
|
||||
$eventdata = new stdClass();
|
||||
$eventdata = new \core\message\message();
|
||||
$eventdata->modulename = 'moodle';
|
||||
$eventdata->component = 'enrol_paypal';
|
||||
$eventdata->name = 'paypal_enrolment';
|
||||
|
@ -320,3 +320,49 @@ if (strlen($result) > 0) {
|
|||
|
||||
exit;
|
||||
|
||||
|
||||
//--- HELPER FUNCTIONS --------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
function message_paypal_error_to_admin($subject, $data) {
|
||||
echo $subject;
|
||||
$admin = get_admin();
|
||||
$site = get_site();
|
||||
|
||||
$message = "$site->fullname: Transaction failed.\n\n$subject\n\n";
|
||||
|
||||
foreach ($data as $key => $value) {
|
||||
$message .= "$key => $value\n";
|
||||
}
|
||||
|
||||
$eventdata = new \core\message\message();
|
||||
$eventdata->modulename = 'moodle';
|
||||
$eventdata->component = 'enrol_paypal';
|
||||
$eventdata->name = 'paypal_enrolment';
|
||||
$eventdata->userfrom = $admin;
|
||||
$eventdata->userto = $admin;
|
||||
$eventdata->subject = "PAYPAL ERROR: ".$subject;
|
||||
$eventdata->fullmessage = $message;
|
||||
$eventdata->fullmessageformat = FORMAT_PLAIN;
|
||||
$eventdata->fullmessagehtml = '';
|
||||
$eventdata->smallmessage = '';
|
||||
message_send($eventdata);
|
||||
}
|
||||
|
||||
/**
|
||||
* Silent exception handler.
|
||||
*
|
||||
* @param Exception $ex
|
||||
* @return void - does not return. Terminates execution!
|
||||
*/
|
||||
function enrol_paypal_ipn_exception_handler($ex) {
|
||||
$info = get_exception_info($ex);
|
||||
|
||||
$logerrmsg = "enrol_paypal IPN exception handler: ".$info->message;
|
||||
if (debugging('', DEBUG_NORMAL)) {
|
||||
$logerrmsg .= ' Debug: '.$info->debuginfo."\n".format_backtrace($info->backtrace, true);
|
||||
}
|
||||
error_log($logerrmsg);
|
||||
|
||||
exit(0);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue