From a939f681bb4982a5cc5114ac946fd69472499890 Mon Sep 17 00:00:00 2001 From: dongsheng Date: Thu, 22 May 2008 07:20:45 +0000 Subject: [PATCH] "MDL-14129, fix print_error call" --- mod/assignment/delete.php | 12 ++++++------ mod/assignment/grade.php | 6 +++--- mod/assignment/index.php | 2 +- mod/assignment/lib.php | 12 ++++++------ mod/assignment/mod_form.php | 4 ++-- mod/assignment/submissions.php | 12 ++++++------ mod/assignment/type/online/file.php | 12 ++++++------ mod/assignment/type/upload/assignment.class.php | 4 ++-- mod/assignment/type/upload/notes.php | 12 ++++++------ mod/assignment/upload.php | 12 ++++++------ mod/assignment/view.php | 12 ++++++------ 11 files changed, 50 insertions(+), 50 deletions(-) diff --git a/mod/assignment/delete.php b/mod/assignment/delete.php index fe3e2039ee..c00668a097 100644 --- a/mod/assignment/delete.php +++ b/mod/assignment/delete.php @@ -8,25 +8,25 @@ if ($id) { if (! $cm = get_coursemodule_from_id('assignment', $id)) { - print_error("Course Module ID was incorrect"); + print_error('invalidcoursemodule'); } if (! $assignment = get_record('assignment', 'id', $cm->instance)) { - print_error("assignment ID was incorrect"); + print_error('invalidid', 'assignment'); } if (! $course = get_record('course', 'id', $assignment->course)) { - print_error("Course is misconfigured"); + print_error('coursemisconf', 'assignment'); } } else { if (!$assignment = get_record('assignment', 'id', $a)) { - print_error("Course module is incorrect"); + print_error('invalidcoursemodule'); } if (! $course = get_record('course', 'id', $assignment->course)) { - print_error("Course is misconfigured"); + print_error('coursemisconf', 'assignement'); } if (! $cm = get_coursemodule_from_instance('assignment', $assignment->id, $course->id)) { - print_error("Course Module ID was incorrect"); + print_error('invalidcoursemodule'); } } diff --git a/mod/assignment/grade.php b/mod/assignment/grade.php index 4bc1b99d67..dc8a6a42ce 100644 --- a/mod/assignment/grade.php +++ b/mod/assignment/grade.php @@ -5,15 +5,15 @@ $id = required_param('id', PARAM_INT); // Course module ID if (! $cm = get_coursemodule_from_id('assignment', $id)) { - print_error("Course Module ID was incorrect"); + print_error('invalidcoursemodule'); } if (! $assignment = get_record("assignment", "id", $cm->instance)) { - print_error("assignment ID was incorrect"); + print_error('invalidid', 'assignment'); } if (! $course = get_record("course", "id", $assignment->course)) { - print_error("Course is misconfigured"); + print_error('coursemisconf', 'assignment'); } require_login($course->id, false, $cm); diff --git a/mod/assignment/index.php b/mod/assignment/index.php index df277d87eb..646f35c5a5 100644 --- a/mod/assignment/index.php +++ b/mod/assignment/index.php @@ -7,7 +7,7 @@ $id = required_param('id', PARAM_INT); // course if (! $course = get_record("course", "id", $id)) { - print_error("Course ID is incorrect"); + print_error('invalidcourseid'); } require_course_login($course); diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index bf0d0af4bd..0b3cd7e6bd 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -52,7 +52,7 @@ class assignment_base { if ($cm) { $this->cm = $cm; } else if (! $this->cm = get_coursemodule_from_id('assignment', $cmid)) { - print_error('Course Module ID was incorrect'); + print_error('invalidcoursemodule'); } $this->context = get_context_instance(CONTEXT_MODULE, $this->cm->id); @@ -62,13 +62,13 @@ class assignment_base { } else if ($this->cm->course == $COURSE->id) { $this->course = $COURSE; } else if (! $this->course = get_record('course', 'id', $this->cm->course)) { - print_error('Course is misconfigured'); + print_error('invalidid', 'assignment'); } if ($assignment) { $this->assignment = $assignment; } else if (! $this->assignment = get_record('assignment', 'id', $this->cm->instance)) { - print_error('assignment ID was incorrect'); + print_error('invalidid', 'assignment'); } $this->assignment->cmidnumber = $this->cm->id; // compatibility with modedit assignment obj @@ -235,7 +235,7 @@ class assignment_base { /// We need the teacher info if (!$teacher = get_record('user', 'id', $graded_by)) { - print_error('Could not find the teacher'); + print_error('cannotfindteacher'); } /// Print the feedback @@ -787,7 +787,7 @@ class assignment_base { $offset = required_param('offset', PARAM_INT);//offset for where to start looking for student. if (!$user = get_record('user', 'id', $userid)) { - print_error('No such user!'); + print_error('nousers'); } if (!$submission = $this->get_submission($user->id)) { @@ -1490,7 +1490,7 @@ class assignment_base { } $newsubmission = $this->prepare_new_submission($userid, $teachermodified); if (!insert_record("assignment_submissions", $newsubmission)) { - print_error("Could not insert a new empty submission"); + print_error('cannotinsertempty', 'assignment'); } return get_record('assignment_submissions', 'assignment', $this->assignment->id, 'userid', $userid); diff --git a/mod/assignment/mod_form.php b/mod/assignment/mod_form.php index 33a0eb0e28..b9ffcb3e96 100644 --- a/mod/assignment/mod_form.php +++ b/mod/assignment/mod_form.php @@ -12,7 +12,7 @@ class mod_assignment_mod_form extends moodleform_mod { if($ass = get_record('assignment', 'id', (int)$this->_instance)) { $type = $ass->assignmenttype; } else { - print_error('incorrect assignment'); + print_error('invalidassignment', 'assignment'); } } else { $type = required_param('type', PARAM_ALPHA); @@ -68,4 +68,4 @@ class mod_assignment_mod_form extends moodleform_mod { } -?> \ No newline at end of file +?> diff --git a/mod/assignment/submissions.php b/mod/assignment/submissions.php index 14428765b1..abf87994cb 100644 --- a/mod/assignment/submissions.php +++ b/mod/assignment/submissions.php @@ -9,25 +9,25 @@ if ($id) { if (! $cm = get_coursemodule_from_id('assignment', $id)) { - print_error("Course Module ID was incorrect"); + print_error('invalidcoursemodule'); } if (! $assignment = get_record("assignment", "id", $cm->instance)) { - print_error("assignment ID was incorrect"); + print_error('invalidid', 'assignment'); } if (! $course = get_record("course", "id", $assignment->course)) { - print_error("Course is misconfigured"); + print_error('coursemisconf', 'assignment'); } } else { if (!$assignment = get_record("assignment", "id", $a)) { - print_error("Course module is incorrect"); + print_error('invalidcoursemodule'); } if (! $course = get_record("course", "id", $assignment->course)) { - print_error("Course is misconfigured"); + print_error('coursemisconf', 'assignment'); } if (! $cm = get_coursemodule_from_instance("assignment", $assignment->id, $course->id)) { - print_error("Course Module ID was incorrect"); + print_error('invalidcoursemodule'); } } diff --git a/mod/assignment/type/online/file.php b/mod/assignment/type/online/file.php index 63df4d05e4..85018ec47c 100644 --- a/mod/assignment/type/online/file.php +++ b/mod/assignment/type/online/file.php @@ -8,29 +8,29 @@ $userid = required_param('userid', PARAM_INT); // User ID if (! $cm = get_coursemodule_from_id('assignment', $id)) { - print_error("Course Module ID was incorrect"); + print_error('invalidcoursemodule'); } if (! $assignment = get_record("assignment", "id", $cm->instance)) { - print_error("Assignment ID was incorrect"); + print_error('invalidid', 'assignment'); } if (! $course = get_record("course", "id", $assignment->course)) { - print_error("Course is misconfigured"); + print_error('coursemisconf', 'assignment'); } if (! $user = get_record("user", "id", $userid)) { - print_error("User is misconfigured"); + print_error('usermisconf', 'assignment'); } require_login($course->id, false, $cm); if (($USER->id != $user->id) && !has_capability('mod/assignment:grade', get_context_instance(CONTEXT_MODULE, $cm->id))) { - print_error("You can not view this assignment"); + print_error('cannotviewassignment', 'assignment'); } if ($assignment->assignmenttype != 'online') { - print_error("Incorrect assignment type"); + print_error('invalidtype', 'assignment'); } $assignmentinstance = new assignment_online($cm->id, $assignment, $cm, $course); diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php index aaa0f335c6..b0390e3629 100644 --- a/mod/assignment/type/upload/assignment.class.php +++ b/mod/assignment/type/upload/assignment.class.php @@ -105,7 +105,7 @@ class assignment_upload extends assignment_base { /// We need the teacher info if (!$teacher = get_record('user', 'id', $graded_by)) { - print_error('Could not find the teacher'); + print_error('cannotfindteacher'); } /// Print the feedback @@ -466,7 +466,7 @@ class assignment_upload extends assignment_base { case 'editnotes': $this->upload_notes(); default: - print_error('Error: Unknow upload action ('.$action.').'); + print_error('unknowuploadaction', '', '', $action); } } diff --git a/mod/assignment/type/upload/notes.php b/mod/assignment/type/upload/notes.php index 77cc82a6bb..0ac6afec85 100644 --- a/mod/assignment/type/upload/notes.php +++ b/mod/assignment/type/upload/notes.php @@ -10,29 +10,29 @@ $mode = optional_param('mode', '', PARAM_ALPHA); if (! $cm = get_coursemodule_from_id('assignment', $id)) { - print_error("Course Module ID was incorrect"); + print_error('invalidcoursemodule'); } if (! $assignment = get_record('assignment', 'id', $cm->instance)) { - print_error("Assignment ID was incorrect"); + print_error('invalidid', 'assignment'); } if (! $course = get_record('course', 'id', $assignment->course)) { - print_error("Course is misconfigured"); + print_error('coursemisconf', 'assignment'); } if (! $user = get_record('user', 'id', $userid)) { - print_error("User is misconfigured"); + print_error("invaliduserid"); } require_login($course->id, false, $cm); if (!has_capability('mod/assignment:grade', get_context_instance(CONTEXT_MODULE, $cm->id))) { - print_error("You can not view this assignment"); + print_error('cannotviewassignment', 'assignment'); } if ($assignment->assignmenttype != 'upload') { - print_error("Incorrect assignment type"); + print_error('invalidtype', 'assignment'); } $assignmentinstance = new assignment_upload($cm->id, $assignment, $cm, $course); diff --git a/mod/assignment/upload.php b/mod/assignment/upload.php index 759a4724c8..0a0509fe52 100644 --- a/mod/assignment/upload.php +++ b/mod/assignment/upload.php @@ -8,25 +8,25 @@ if ($id) { if (! $cm = get_coursemodule_from_id('assignment', $id)) { - print_error("Course Module ID was incorrect"); + print_error('invalidcoursemodule'); } if (! $assignment = get_record("assignment", "id", $cm->instance)) { - print_error("assignment ID was incorrect"); + print_error('invalidid', 'assignment'); } if (! $course = get_record("course", "id", $assignment->course)) { - print_error("Course is misconfigured"); + print_error('coursemisconf', 'assignment'); } } else { if (!$assignment = get_record("assignment", "id", $a)) { - print_error("Course module is incorrect"); + print_error('invalidcoursemodule'); } if (! $course = get_record("course", "id", $assignment->course)) { - print_error("Course is misconfigured"); + print_error('invalidid', 'assignment'); } if (! $cm = get_coursemodule_from_instance("assignment", $assignment->id, $course->id)) { - print_error("Course Module ID was incorrect"); + print_error('invalidcoursemodule', 'assignement'); } } diff --git a/mod/assignment/view.php b/mod/assignment/view.php index 123b54a2d4..2499c98bae 100644 --- a/mod/assignment/view.php +++ b/mod/assignment/view.php @@ -8,25 +8,25 @@ if ($id) { if (! $cm = get_coursemodule_from_id('assignment', $id)) { - print_error("Course Module ID was incorrect"); + print_error('invalidcoursemodule'); } if (! $assignment = get_record("assignment", "id", $cm->instance)) { - print_error("assignment ID was incorrect"); + print_error('invalidid', 'assignment'); } if (! $course = get_record("course", "id", $assignment->course)) { - print_error("Course is misconfigured"); + print_error('coursemisconf', 'assignment'); } } else { if (!$assignment = get_record("assignment", "id", $a)) { - print_error("Course module is incorrect"); + print_error('invalidid', 'assignment'); } if (! $course = get_record("course", "id", $assignment->course)) { - print_error("Course is misconfigured"); + print_error('coursemisconf', 'assignment'); } if (! $cm = get_coursemodule_from_instance("assignment", $assignment->id, $course->id)) { - print_error("Course Module ID was incorrect"); + print_error('invalidcoursemodule'); } } -- 2.39.5