L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-25375 - mod/feedback/complete.php throws exception if email notifications are enabled

Browse Source
This commit is contained in:
Andreas Grabs
2010-11-23 17:56:24 +00:00
parent 423b992ee3
commit 51c49cc056
4 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/feedback/db/messages.php
+32
View File
@@ -0,0 +1,32 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Defines message providers (types of messages being sent)
*
* @package mod-assignment
* @copyright 2010 onwards Aparup Banerjee http://moodle.com
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$messageproviders = array (
/// Submitting a feedback
'submission' => array (
)
);
mod/feedback/lang/en/feedback.php
+1
View File
@@ -162,6 +162,7 @@ you can associate them with this feedback using map course(s). Multiple courses
$string['mappedcourses'] = 'Mapped courses';
$string['max_args_exceeded'] = 'Max 6 arguments can be handled, too many arguments for';
$string['maximal'] = 'maximal';
$string['messageprovider:submission'] = 'Feedback notifications';
$string['mode'] = 'Mode';
$string['modulename'] = 'Feedback';
$string['modulename_help'] = 'The feedback modules enables custom surveys to be created.';
mod/feedback/lib.php
+6 -6
View File
@@ -2582,8 +2582,8 @@ function feedback_send_email($cm, $feedback, $course, $userid) {
if($feedback->anonymous == FEEDBACK_ANONYMOUS_NO) {
$eventdata = new stdClass();
$eventdata->name = 'feedback';
$eventdata->component = 'mod';
$eventdata->name = 'submission';
$eventdata->component = 'mod_feedback';
$eventdata->userfrom = $user;
$eventdata->userto = $teacher;
$eventdata->subject = $postsubject;
@@ -2594,8 +2594,8 @@ function feedback_send_email($cm, $feedback, $course, $userid) {
message_send($eventdata);
}else {
$eventdata = new stdClass();
$eventdata->name = 'feedback';
$eventdata->component = 'mod';
$eventdata->name = 'submission';
$eventdata->component = 'mod_feedback';
$eventdata->userfrom = $teacher;
$eventdata->userto = $teacher;
$eventdata->subject = $postsubject;
@@ -2646,8 +2646,8 @@ function feedback_send_email_anonym($cm, $feedback, $course) {
$posthtml = ($teacher->mailformat == 1) ? feedback_send_email_html($info, $course, $cm) : '';
$eventdata = new stdClass();
$eventdata->name = 'feedback';
$eventdata->component = 'mod';
$eventdata->name = 'submission';
$eventdata->component = 'mod_feedback';
$eventdata->userfrom = $teacher;
$eventdata->userto = $teacher;
$eventdata->subject = $postsubject;
mod/feedback/version.php
+1 -1
View File
@@ -9,7 +9,7 @@
*/
$module->version = 2010103100; // The current module version (Date: YYYYMMDDXX)
$module->version = 2010112302; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2010080300; // Requires this Moodle version
$feedback_version_intern = 1; //this version is used for restore older backups
$module->cron = 0; // Period for cron to check this module (secs)