From: dongsheng Date: Fri, 12 Dec 2008 02:30:56 +0000 (+0000) Subject: "MDL-14129, fix error() in forum module" X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=12e57b92ea199366d7f1eeb76c902c0bb1adc65f;p=moodle.git "MDL-14129, fix error() in forum module" --- diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php index 059d6771c8..959fc82715 100644 --- a/lang/en_utf8/error.php +++ b/lang/en_utf8/error.php @@ -361,7 +361,7 @@ $string['nopermissiontoupdateblock'] = 'No permission to update $a!'; $string['nopermissiontoviewpage'] = 'You are not allowed to look at this page'; $string['nopermissiontoviewletergrade'] = 'Missing permission to view letter grades'; $string['nopermissiontomanagegroup'] = 'You do not have the required permissions to manage groups'; -$string['nosite'] = 'No sites'; +$string['nosite'] = 'Could not find a top-level course!'; $string['nositeid'] = 'No site ID'; $string['nofolder'] = 'Requested directory does not exist'; $string['nostatstodisplay'] = 'Sorry, there is no available data to display'; diff --git a/lang/en_utf8/forum.php b/lang/en_utf8/forum.php index 201df84002..a264e9b933 100644 --- a/lang/en_utf8/forum.php +++ b/lang/en_utf8/forum.php @@ -20,6 +20,7 @@ $string['allowsallsubscribe'] = 'This forum allows everyone to choose whether to $string['allowsdiscussions'] = 'This forum allows each person to start one discussion topic.'; $string['allsubscribe'] = 'Subscribe to all forums'; $string['allunsubscribe'] = 'Unsubscribe from all forums'; +$string['alreadyfirstpost'] = 'This is already the first post in the discussion'; $string['anyfile'] = 'Any file'; $string['areaintro'] = 'Forum introduction'; $string['attachment'] = 'Attachment'; @@ -29,17 +30,37 @@ $string['blockafter'] = 'Post threshold for blocking'; $string['blockperiod'] = 'Time period for blocking'; $string['blockperioddisabled'] = 'Don\'t block'; $string['bynameondate'] = 'by $a->name - $a->date'; -$string['cannotviewpostyet'] = 'You cannot read other students questions in this discussion yet because you haven\'t posted'; +$string['cannotadd'] = 'Could not add the discussion for this forum'; +$string['cannotaddteacherforumto'] = 'Could not add converted teacher forum instance to section 0 in the course'; $string['cannotadddiscussion'] = 'Adding discussions to this forum requires group membership.'; $string['cannotadddiscussionall'] = 'You do not have permission to add a new discussion topic for all participants.'; +$string['cannotaddsubscriber'] = 'Could not add subscriber with id $a to this forum!'; +$string['cannotcreateinstanceforteacher'] = 'Could not create new course module instance for the teacher forum'; +$string['cannotcreatediscussion'] = 'Could not create new discussion'; +$string['cannotconvertteachertogeneral'] = 'Could not change forum from type teacher to type general'; $string['cannotdeleteforummodule'] = 'You can not delete the forum module.'; +$string['cannotdeletepost'] = 'You can\'t delete this post!'; +$string['cannoteditposts'] = 'You can\'t edit other people\'s posts!'; $string['cannotsubscribe'] = 'Sorry, but you must be a group member to subscribe.'; +$string['cannotsplit'] = 'Discussions from this forum cannot be split'; $string['cannotunsubscribe'] = 'Could not unsubscribe you from that forum'; -$string['cannotaddsubscriber'] = 'Could not add subscriber with id $a to this forum!'; +$string['cannotupdatecoursemoudle'] = 'Could not update course module with section id'; +$string['cannotupdatediscussion'] = 'Could not update the discussion'; +$string['cannotupdateforum'] = 'Can not update forum'; +$string['cannotupdatefirstpost'] = 'Could not update the first post'; +$string['cannotupdatepost'] = 'You can not update this post'; $string['cannotremovesubscriber'] = 'Could not remove subscriber with id $a from this forum!'; +$string['cannotreply'] = 'You cannot reply to this post'; $string['cannotfindorcreateforum'] = 'Could not find or create a main news forum for the site'; $string['cannotfindfirstpost'] = 'Could not find the first post in this forum'; +$string['cannotfinddisscussion'] = 'Could not find the discussion in this forum'; $string['cannottrack'] = 'Could not stop tracking that forum'; +$string['cannotmovefromsingleforum'] = 'Cannot move discussion from a simple single discussion forum'; +$string['cannotmovetonotexist'] = 'You can\'t move to that forum - it doesn\'t exist!'; +$string['cannotmovetonotfound'] = 'Target forum not found in this course.'; +$string['cannotmovenotvisible'] = 'Forum not visible'; +$string['cannotpurgecachedrss'] = 'Could not purge the cached RSS feeds for the source and/or destination forum(s) - check your file permissionsforums'; +$string['cannotviewpostyet'] = 'You cannot read other students questions in this discussion yet because you haven\'t posted'; $string['cleanreadtime'] = 'Mark old posts as read hour'; $string['completiondiscussions'] = 'User must create discussions:'; $string['completiondiscussionshelp'] = 'requiring discussions to complete'; @@ -96,6 +117,7 @@ $string['eachuserforum'] = 'Each person posts one discussion'; $string['edit'] = 'Edit'; $string['editedby'] = 'Edited by $a->name - original submission $a->date'; $string['editing'] = 'Editing'; +$string['errorwhiledelete'] = 'An error occurred while deleting record.'; $string['emptymessage'] = 'Something was wrong with your post. Perhaps you left it blank, or the attachment was too big. Your changes have NOT been saved.'; $string['everyonecanchoose'] = 'Everyone can choose to be subscribed'; $string['everyonecannowchoose'] = 'Everyone can now choose to be subscribed'; @@ -151,8 +173,9 @@ $string['learningforums'] = 'Learning forums'; $string['logblocked'] = 'Log blocked emails'; $string['longpost'] = 'Long post'; $string['invalidforumid'] = 'Forum ID was incorrect'; -$string['invaliddiscussionid'] = 'Discussion ID was incorrect'; +$string['invaliddiscussionid'] = 'Discussion ID was incorrect or no longer exists'; $string['invalidpostid'] = 'Invalid Post ID - $a'; +$string['invalidparentpostid'] = 'Parent post ID was incorrect'; $string['invalidaccess'] = 'This page was not accessed correctly'; $string['mailnow'] = 'Mail now'; $string['manydiscussions'] = 'Discussions per page'; @@ -193,14 +216,18 @@ $string['noguesttracking'] = 'Sorry, guests are not allowed to set tracking opti $string['nomorepostscontaining'] = 'No more posts containing \'$a\' were found'; $string['nonews'] = 'No news has been posted yet'; $string['nopermissiontosubscribe'] = 'You do not have the permission to view forum subscribers'; +$string['nopermissiontoview'] = 'You do not have permissions to view this post'; $string['nopostforum'] = 'Sorry, you are not allowed to post to this forum'; $string['noposts'] = 'No posts'; $string['nopostscontaining'] = 'No posts containing \'$a\' were found'; $string['noquestions'] = 'There are no questions yet in this forum'; $string['nosubscribers'] = 'There are no subscribers yet for this forum'; +$string['notexists'] = 'Discussion no longer exists'; $string['nothingnew'] = 'Nothing new for $a'; $string['notingroup'] = 'Sorry, but you need to be part of a group to see this forum.'; +$string['notinstalled'] = 'The forum module is not installed'; $string['notrackforum'] = 'Don\'t track unread posts'; +$string['notpartofdiscussion'] = 'This post is not part of a discussion!'; $string['norate'] = 'Rating of items not allowed!'; $string['noviewrate'] = 'You do not have the capability to view post ratings'; $string['noviewanyrate'] = 'You can only look at results for posts that you made'; diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php index db1c1414db..6c1f5169b3 100644 --- a/mod/forum/discuss.php +++ b/mod/forum/discuss.php @@ -14,11 +14,11 @@ $postid = optional_param('postid', 0, PARAM_INT); // Used for tracking read posts if user initiated. if (!$discussion = $DB->get_record('forum_discussions', array('id' => $d))) { - error("Discussion ID was incorrect or no longer exists"); + print_error('invaliddiscussionid', 'forum'); } if (!$course = $DB->get_record('course', array('id' => $discussion->course))) { - error("Course ID is incorrect - discussion is faulty"); + print_error('invalidcourseid'); } if (!$forum = $DB->get_record('forum', array('id' => $discussion->forum))) { @@ -26,7 +26,7 @@ } if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) { - error('Course Module ID was incorrect'); + print_error('invalidcoursemodule'); } require_course_login($course, true, $cm); @@ -38,7 +38,7 @@ if (!($USER->id == $discussion->userid || (($discussion->timestart == 0 || $discussion->timestart <= time()) && ($discussion->timeend == 0 || $discussion->timeend > time())))) { - error('Discussion ID was incorrect or no longer exists', "$CFG->wwwroot/mod/forum/view.php?f=$forum->id"); + print_error('invaliddiscussionid', 'forum', "$CFG->wwwroot/mod/forum/view.php?f=$forum->id"); } } @@ -49,19 +49,19 @@ require_capability('mod/forum:movediscussions', $modcontext); if ($forum->type == 'single') { - error('Cannot move discussion from a simple single discussion forum', $return); + print_error('cannotmovefromsingleforum', 'forum', $return); } if (!$forumto = $DB->get_record('forum', array('id' => $move))) { - error('You can\'t move to that forum - it doesn\'t exist!', $return); + print_error('cannotmovetonotexist', 'forum', $return); } if (!$cmto = get_coursemodule_from_instance('forum', $forumto->id, $course->id)) { - error('Target forum not found in this course.', $return); + print_error('cannotmovetonotfound', 'forum', $return); } if (!coursemodule_visible_for_user($cmto)) { - error('Forum not visible', $return); + print_error('cannotmovenotvisible', 'forum', $return); } if (!forum_move_attachments($discussion, $forum->id, $forumto->id)) { @@ -78,8 +78,7 @@ // the regeneration of the feeds since the discussions have been // moved. if (!forum_rss_delete_file($forum) || !forum_rss_delete_file($forumto)) { - error('Could not purge the cached RSS feeds for the source and/or'. - 'destination forum(s) - check your file permissionsforums', $return); + print_error('cannotpurgecachedrss', 'forum', $return); } redirect($return.'&moved=-1&sesskey='.sesskey()); @@ -110,12 +109,12 @@ } if (! $post = forum_get_post_full($parent)) { - error("Discussion no longer exists", "$CFG->wwwroot/mod/forum/view.php?f=$forum->id"); + print_error("notexists", 'forum', "$CFG->wwwroot/mod/forum/view.php?f=$forum->id"); } if (!forum_user_can_view_post($post, $course, $cm, $forum, $discussion)) { - error('You do not have permissions to view this post', "$CFG->wwwroot/mod/forum/view.php?id=$forum->id"); + print_error('nopermissiontoview', 'forum', "$CFG->wwwroot/mod/forum/view.php?id=$forum->id"); } if ($mark == 'read' or $mark == 'unread') { diff --git a/mod/forum/index.php b/mod/forum/index.php index f7dc2f0dc3..6afbead00e 100644 --- a/mod/forum/index.php +++ b/mod/forum/index.php @@ -9,11 +9,11 @@ if ($id) { if (! $course = $DB->get_record('course', array('id' => $id))) { - error("Course ID is incorrect"); + print_error('invalidcourseid'); } } else { if (! $course = get_site()) { - error("Could not find a top-level course!"); + print_error('nosite'); } } diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 7942bb51a8..f2dd41a816 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -78,7 +78,7 @@ function forum_add_instance($forum) { $message = ''; if (! forum_add_discussion($discussion, null, $message)) { - error('Could not add the discussion for this forum'); + print_error('cannotadd', 'forum'); } } @@ -138,11 +138,11 @@ function forum_update_instance($forum) { notify('Warning! There is more than one discussion in this forum - using the most recent'); $discussion = array_pop($discussions); } else { - error('Could not find the discussion in this forum'); + print_error('cannotfinddisscussion', 'forum'); } } if (! $post = $DB->get_record('forum_posts', array('id'=>$discussion->firstpost))) { - error('Could not find the first post in this forum discussion'); + print_error('cannotfindfirstpost', 'forum'); } $post->subject = $forum->name; @@ -150,18 +150,18 @@ function forum_update_instance($forum) { $post->modified = $forum->timemodified; if (! $DB->update_record('forum_posts', ($post))) { - error('Could not update the first post'); + print_error('cannotupdatefirstpost', 'forum'); } $discussion->name = $forum->name; if (! $DB->update_record('forum_discussions', ($discussion))) { - error('Could not update the discussion'); + print_error('cannotupdatediscussion', 'forum'); } } if (!$DB->update_record('forum', $forum)) { - error('Can not update forum'); + print_error('cannotupdateforum', 'forum'); } forum_grade_item_update($forum); @@ -1063,7 +1063,7 @@ function forum_user_complete($course, $user, $mod, $forum) { if ($posts = forum_get_user_posts($forum->id, $user->id)) { if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) { - error('Course Module ID was incorrect'); + print_error('invalidcoursemodule'); } $discussions = forum_get_user_involved_discussions($forum->id, $user->id); @@ -1745,7 +1745,7 @@ function forum_get_readable_forums($userid, $courseid=0) { require_once($CFG->dirroot.'/course/lib.php'); if (!$forummod = $DB->get_record('modules', array('name' => 'forum'))) { - error('The forum module is not installed'); + print_error('notinstalled', 'forum'); } if ($courseid) { @@ -2838,7 +2838,7 @@ function forum_make_mail_post($course, $cm, $forum, $discussion, $post, $userfro if (!isset($userto->viewfullnames[$forum->id])) { if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) { - error('Course Module ID was incorrect'); + print_error('invalidcoursemodule'); } $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); $viewfullnames = has_capability('moodle/site:viewfullnames', $modcontext, $userto->id); @@ -2878,7 +2878,7 @@ function forum_make_mail_post($course, $cm, $forum, $discussion, $post, $userfro $groups = $userfrom->groups[$forum->id]; } else { if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) { - error('Course Module ID was incorrect'); + print_error('invalidcoursemodule'); } $group = groups_get_all_groups($course->id, $userfrom->id, $cm->groupingid); } @@ -3327,7 +3327,7 @@ function forum_print_discussion_header(&$post, $forum, $group=-1, $datestring="" if (empty($modcontext)) { if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $forum->course)) { - error('Course Module ID was incorrect'); + print_error('invalidcoursemodule'); } $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); } @@ -4670,7 +4670,7 @@ function forum_user_can_post_discussion($forum, $currentgroup=null, $unused=-1, if (!$cm) { debugging('missing cm', DEBUG_DEVELOPER); if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $forum->course)) { - error('Course Module ID was incorrect'); + print_error('invalidcoursemodule'); } } @@ -4739,14 +4739,14 @@ function forum_user_can_post($forum, $discussion, $user=NULL, $cm=NULL, $course= if (!$cm) { debugging('missing cm', DEBUG_DEVELOPER); if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $forum->course)) { - error('Course Module ID was incorrect'); + print_error('invalidcoursemodule'); } } if (!$course) { debugging('missing course', DEBUG_DEVELOPER); if (!$course = $DB->get_record('course', array('id' => $forum->course))) { - error('Incorrect course id'); + print_error('invalidcourseid'); } } @@ -4889,7 +4889,7 @@ function forum_user_can_see_post($forum, $discussion, $post, $user=NULL, $cm=NUL if (!$cm) { debugging('missing cm', DEBUG_DEVELOPER); if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $forum->course)) { - error('Course Module ID was incorrect'); + print_error('invalidcoursemodule'); } } @@ -4950,7 +4950,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=-1, $di if (!$cm) { if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $forum->course)) { - error('Course Module ID was incorrect'); + print_error('invalidcoursemodule'); } } $context = get_context_instance(CONTEXT_MODULE, $cm->id); @@ -6696,7 +6696,7 @@ function forum_check_throttling($forum, $cm=null) { if (!$cm) { if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $forum->course)) { - error('Course Module ID was incorrect'); + print_error('invalidcoursemodule'); } } @@ -6964,14 +6964,14 @@ function forum_convert_to_roles($forum, $forummodid, $teacherroles=array(), $mod->groupmode = 0; if (!$cmid = add_course_module($mod)) { - error('Could not create new course module instance for the teacher forum'); + print_error('cannotcreateinstanceforteacher', 'forum'); } else { $mod->coursemodule = $cmid; if (!$sectionid = add_mod_to_section($mod)) { - error('Could not add converted teacher forum instance to section 0 in the course'); + print_error('cannotaddteacherforumto', 'forum'); } else { if (!$DB->set_field('course_modules', 'section', $sectionid, array('id' => $cmid))) { - error('Could not update course module with section id'); + print_error('cannotupdatecoursemoudle', 'forum'); } } } @@ -6979,7 +6979,7 @@ function forum_convert_to_roles($forum, $forummodid, $teacherroles=array(), // Change the forum type to general. $forum->type = 'general'; if (!$DB->update_record('forum', $forum)) { - error('Could not change forum from type teacher to type general'); + print_error('cannotconvertteachertogeneral', 'forum'); } $context = get_context_instance(CONTEXT_MODULE, $cmid); diff --git a/mod/forum/markposts.php b/mod/forum/markposts.php index 3074a84437..564065d7ac 100644 --- a/mod/forum/markposts.php +++ b/mod/forum/markposts.php @@ -11,15 +11,15 @@ $returnpage = optional_param('returnpage', 'index.php', PARAM_FILE); // Page to return to. if (! $forum = $DB->get_record("forum", array("id" => $f))) { - error("Forum ID was incorrect"); + print_error('invalidforumid', 'forum'); } if (! $course = $DB->get_record("course", array("id" => $forum->course))) { - error("Forum doesn't belong to a course!"); + print_error('invalidcourseid'); } if (!$cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) { - error("Incorrect cm!"); + print_error('invalidcoursemodule'); } $user = $USER; @@ -53,7 +53,7 @@ if ($mark == 'read') { if (!empty($d)) { if (! $discussion = $DB->get_record('forum_discussions', array('id'=> $d, 'forum'=> $forum->id))) { - error("Discussion ID was incorrect"); + print_error('invaliddiscussionid', 'forum'); } if (forum_tp_mark_discussion_read($user, $d)) { @@ -78,7 +78,7 @@ // add_to_log($course->id, "forum", "mark unread", "view.php?f=$forum->id", $forum->id, $cm->id); // redirect($returnto, get_string("nowtracking", "forum", $info), 1); // } else { -// error("Could not start tracking that forum", $_SERVER["HTTP_REFERER"]); +// print_error("Could not start tracking that forum", $_SERVER["HTTP_REFERER"]); // } } diff --git a/mod/forum/post.php b/mod/forum/post.php index 9c7684c5f3..b6249bfe9e 100644 --- a/mod/forum/post.php +++ b/mod/forum/post.php @@ -31,25 +31,25 @@ if (!empty($forum)) { // User is starting a new discussion in a forum if (! $forum = $DB->get_record('forum', array('id' => $forum))) { - error('The forum number was incorrect'); + print_error('invalidforumid', 'forum'); } } else if (!empty($reply)) { // User is writing a new reply if (! $parent = forum_get_post_full($reply)) { - error('Parent post ID was incorrect'); + print_error('invalidparentpostid', 'forum'); } if (! $discussion = $DB->get_record('forum_discussions', array('id' => $parent->discussion))) { - error('This post is not part of a discussion!'); + print_error('notpartofdiscussion', 'forum'); } if (! $forum = $DB->get_record('forum', array('id' => $discussion->forum))) { - error('The forum number was incorrect'); + print_error('invalidforumid'); } } if (! $course = $DB->get_record('course', array('id' => $forum->course))) { - error('The course number was incorrect'); + print_error('invalidcourseid'); } if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) { // For the logs - error('Could not get the course module for the forum instance.'); + print_error('invalidcoursemodule'); } else { $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); } @@ -71,13 +71,13 @@ if (!empty($forum)) { // User is starting a new discussion in a forum if (! $forum = $DB->get_record("forum", array("id" => $forum))) { - error("The forum number was incorrect ($forum)"); + print_error('invalidforumid', 'forum'); } if (! $course = $DB->get_record("course", array("id" => $forum->course))) { - error("The course number was incorrect ($forum->course)"); + print_error('invalidcourseid'); } if (! $cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) { - error("Incorrect course module"); + print_error("invalidcoursemodule"); } $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id); @@ -125,19 +125,19 @@ } else if (!empty($reply)) { // User is writing a new reply if (! $parent = forum_get_post_full($reply)) { - error("Parent post ID was incorrect"); + print_error('invalidparentpostid', 'forum'); } if (! $discussion = $DB->get_record("forum_discussions", array("id" => $parent->discussion))) { - error("This post is not part of a discussion!"); + print_error('notpartofdiscussion', 'forum'); } if (! $forum = $DB->get_record("forum", array("id" => $discussion->forum))) { - error("The forum number was incorrect ($discussion->forum)"); + print_error('invalidforumid', 'forum'); } if (! $course = $DB->get_record("course", array("id" => $discussion->course))) { - error("The course number was incorrect ($discussion->course)"); + print_error('invalidcourseid'); } if (! $cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) { - error("Incorrect cm"); + print_error('invalidcoursemodule'); } $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id); @@ -191,37 +191,37 @@ } else if (!empty($edit)) { // User is editing their own post if (! $post = forum_get_post_full($edit)) { - error("Post ID was incorrect"); + print_error('invalidpostid', 'forum'); } if ($post->parent) { if (! $parent = forum_get_post_full($post->parent)) { - error("Parent post ID was incorrect ($post->parent)"); + print_error('invalidparentpostid', 'forum'); } } if (! $discussion = $DB->get_record("forum_discussions", array("id" => $post->discussion))) { - error("This post is not part of a discussion! ($edit)"); + print_error('notpartofdiscussion', 'forum'); } if (! $forum = $DB->get_record("forum", array("id" => $discussion->forum))) { - error("The forum number was incorrect ($discussion->forum)"); + print_error('invalidforumid', 'forum'); } if (! $course = $DB->get_record("course", array("id" => $discussion->course))) { - error("The course number was incorrect ($discussion->course)"); + print_error('invalidcourseid'); } if (!$cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) { - error('Could not get the course module for the forum instance.'); + print_error('invalidcoursemodule'); } else { $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); } if (!($forum->type == 'news' && !$post->parent && $discussion->timestart > time())) { if (((time() - $post->created) > $CFG->maxeditingtime) and !has_capability('mod/forum:editanypost', $modcontext)) { - error( get_string("maxtimehaspassed", "forum", format_time($CFG->maxeditingtime)) ); + print_error('maxtimehaspassed', 'forum', '', format_time($CFG->maxeditingtime)); } } if (($post->userid <> $USER->id) and !has_capability('mod/forum:editanypost', $modcontext)) { - error("You can't edit other people's posts!"); + print_error('cannoteditposts', 'forum'); } @@ -239,19 +239,19 @@ }else if (!empty($delete)) { // User is deleting a post if (! $post = forum_get_post_full($delete)) { - error("Post ID was incorrect"); + print_error('invalidpostid', 'forum'); } if (! $discussion = $DB->get_record("forum_discussions", array("id" => $post->discussion))) { - error("This post is not part of a discussion!"); + print_error('notpartofdiscussion', 'forum'); } if (! $forum = $DB->get_record("forum", array("id" => $discussion->forum))) { - error("The forum number was incorrect ($discussion->forum)"); + print_error('invalidforumid', 'forum'); } if (!$cm = get_coursemodule_from_instance("forum", $forum->id, $forum->course)) { - error('Could not get the course module for the forum instance.'); + print_error('invalidcoursemodule'); } if (!$course = $DB->get_record('course', array('id' => $forum->course))) { - error('Incorrect course'); + print_error('invalidcourseid'); } require_login($course, false, $cm); @@ -259,7 +259,7 @@ if ( !(($post->userid == $USER->id && has_capability('mod/forum:deleteownpost', $modcontext)) || has_capability('mod/forum:deleteanypost', $modcontext)) ) { - error("You can't delete this post!"); + print_error('cannotdeletepost', 'forum'); } @@ -304,7 +304,7 @@ redirect(forum_go_back_to($discussionurl)); } else { - error("An error occurred while deleting record $post->id"); + print_error('errorwhiledelete', 'forum'); } } @@ -346,27 +346,27 @@ } else if (!empty($prune)) { // Pruning if (!$post = forum_get_post_full($prune)) { - error("Post ID was incorrect"); + print_error('invalidpostid', 'forum'); } if (!$discussion = $DB->get_record("forum_discussions", array("id" => $post->discussion))) { - error("This post is not part of a discussion!"); + print_error('notpartofdiscussion', 'forum'); } if (!$forum = $DB->get_record("forum", array("id" => $discussion->forum))) { - error("The forum number was incorrect ($discussion->forum)"); + print_error('invalidforumid', 'forum'); } if ($forum->type == 'single') { - error('Discussions from this forum cannot be split'); + print_error('cannotsplit', 'forum'); } if (!$post->parent) { - error('This is already the first post in the discussion'); + print_error('alreadyfirstpost', 'forum'); } if (!$cm = get_coursemodule_from_instance("forum", $forum->id, $forum->course)) { // For the logs - error('Could not get the course module for the forum instance.'); + print_error('invalidcoursemodule'); } else { $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); } if (!has_capability('mod/forum:splitdiscussions', $modcontext)) { - error("You can't split discussions!"); + print_error('cannotsplit', 'forum'); } if (!empty($name) && confirm_sesskey()) { // User has confirmed the prune @@ -384,7 +384,7 @@ $newdiscussion->timeend = $discussion->timeend; if (!$newid = $DB->insert_record('forum_discussions', $newdiscussion)) { - error('Could not create new discussion'); + print_error('cannotcreatediscussion', 'forum'); } $newpost = new object(); @@ -393,7 +393,7 @@ $newpost->subject = $name; if (!$DB->update_record("forum_posts", $newpost)) { - error('Could not update the original post'); + print_error('cannotupdatediscussion', 'forum'); } forum_change_discussionid($post->id, $newid); @@ -428,7 +428,7 @@ print_footer($course); die; } else { - error("No operation specified"); + print_error('unknowaction'); } @@ -441,7 +441,7 @@ // from now on user must be logged on properly if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) { // For the logs - error('Could not get the course module for the forum instance.'); + print_error('invalidcoursemodule'); } $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); require_login($course->id, false, $cm); @@ -555,7 +555,7 @@ if ( !(($realpost->userid == $USER->id && (has_capability('mod/forum:replypost', $modcontext) || has_capability('mod/forum:startdiscussion', $modcontext))) || has_capability('mod/forum:editanypost', $modcontext)) ) { - error("You can not update this post"); + print_error('cannotupdatepost', 'forum'); } $updatepost = $fromform; //realpost @@ -649,7 +649,7 @@ } else { // Adding a new discussion if (!forum_user_can_post_discussion($forum, $fromform->groupid, -1, $cm, $modcontext)) { - error('Can not add discussion, sorry.'); + print_error('cannotcreatediscussion', 'forum'); } if (empty($fromform->groupid)) { $fromform->groupid = -1; @@ -717,7 +717,7 @@ if ($post->discussion) { if (! $toppost = $DB->get_record("forum_posts", array("discussion" => $post->discussion, "parent" => 0))) { - error("Could not find top parent of post $post->id"); + print_error("Could not find top parent of post $post->id"); } } else { $toppost->subject = ($forum->type == "news") ? get_string("addanewtopic", "forum") : @@ -761,10 +761,10 @@ // checkup if (!empty($parent) && !forum_user_can_see_post($forum, $discussion, $post, null, $cm)) { - error("You cannot reply to this post"); + print_error('cannotreply', 'forum'); } if (empty($parent) && empty($edit) && !forum_user_can_post_discussion($forum, $groupid, -1, $cm, $modcontext)) { - error("You cannot start a new discussion in this forum"); + print_error('cannotcreatediscussion', 'forum'); } if ($forum->type == 'qanda' @@ -778,7 +778,7 @@ if (!empty($parent)) { if (! $discussion = $DB->get_record('forum_discussions', array('id' => $parent->discussion))) { - error('This post is not part of a discussion!'); + print_error('notpartofdiscussion', 'forum'); } forum_print_post($parent, $discussion, $forum, $cm, $course, false, false, false); diff --git a/mod/forum/user.php b/mod/forum/user.php index 68b4faf438..fadcc41fec 100644 --- a/mod/forum/user.php +++ b/mod/forum/user.php @@ -18,11 +18,11 @@ } if (! $user = $DB->get_record("user", array("id" => $id))) { - error("User ID is incorrect"); + print_error('invaliduserid'); } if (! $course = $DB->get_record("course", array("id" => $course))) { - error("Course id is incorrect."); + print_error('invalidcourseid'); } $syscontext = get_context_instance(CONTEXT_SYSTEM); @@ -107,7 +107,7 @@ if (!isset($discussions[$post->discussion])) { if (! $discussion = $DB->get_record('forum_discussions', array('id' => $post->discussion))) { - error('Discussion ID was incorrect'); + print_error('invaliddiscussionid', 'forum'); } $discussions[$post->discussion] = $discussion; } else { @@ -116,7 +116,7 @@ if (!isset($forums[$discussion->forum])) { if (! $forum = $DB->get_record('forum', array('id' => $discussion->forum))) { - error("Could not find forum $discussion->forum"); + print_error('invalidforumid', 'forum'); } $forums[$discussion->forum] = $forum; } else { @@ -136,7 +136,7 @@ if (!isset($cms[$forum->id])) { if (!$cm = get_coursemodule_from_instance('forum', $forum->id)) { - error('Course Module ID was incorrect'); + print_error('invalidcoursemodule'); } $cms[$forum->id] = $cm; unset($cm); // do not use cm directly, it would break caching