Skip to content

Commit

Permalink
replace print_error with throw new moodle_exception in blue team modu…
Browse files Browse the repository at this point in the history
…les #655900
  • Loading branch information
AeonvanGardingen authored and sammarshallou committed Jun 15, 2023
1 parent 403c911 commit 8e42655
Show file tree
Hide file tree
Showing 27 changed files with 146 additions and 146 deletions.
6 changes: 3 additions & 3 deletions allposts.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
$page = optional_param('page', 0, PARAM_INT);

if (!$oublog = $DB->get_record("oublog", array("global"=>1))) { // The personal blogs module.
print_error('personalblognotsetup', 'oublog');
throw new moodle_exception('personalblognotsetup', 'oublog');
}

if (!$cm = get_coursemodule_from_instance('oublog', $oublog->id)) {
print_error('invalidcoursemodule');
throw new moodle_exception('invalidcoursemodule');
}

if (!$course = $DB->get_record("course", array("id" => $cm->course))) {
print_error('coursemisconf');
throw new moodle_exception('coursemisconf');
}

$postperpage = $oublog->postperpage;
Expand Down
20 changes: 10 additions & 10 deletions approve.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

// Load comment and check it
if (!($mcomment = $DB->get_record('oublog_comments_moderated', array('id'=> $mcommentid)))) {
print_error('invalidrequest', 'error');
throw new moodle_exception('invalidrequest', 'error');
}

// Use post page for continue on error messages
Expand All @@ -51,24 +51,24 @@

// Load post, blog, etc
if (!$post = oublog_get_post($mcomment->postid, false)) {
print_error('error_unspecified', 'oublog', $backlink, 'A1');
throw new moodle_exception('error_unspecified', 'oublog', $backlink, 'A1');
}
if (!($oublog = oublog_get_blog_from_postid($post->id))) {
print_error('error_unspecified', 'oublog', $backlink, 'A2');
throw new moodle_exception('error_unspecified', 'oublog', $backlink, 'A2');
}
if (!$cm = get_coursemodule_from_instance('oublog', $oublog->id)) {
print_error('invalidcoursemodule', 'error', $backlink);
throw new moodle_exception('invalidcoursemodule', 'error', $backlink);
}
if (!$course = $DB->get_record("course", array("id"=>$cm->course))) {
print_error('coursemisconf', 'error', $backlink);
throw new moodle_exception('coursemisconf', 'error', $backlink);
}

// Check state
if ($mcomment->approval) {
print_error('error_alreadyapproved', 'oublog', $backlink);
throw new moodle_exception('error_alreadyapproved', 'oublog', $backlink);
}
if ($email && $key !== $mcomment->secretkey) {
print_error('error_wrongkey', 'oublog', $backlink);
throw new moodle_exception('error_wrongkey', 'oublog', $backlink);
}

// Require login, it to be your own post, and commenting permission
Expand All @@ -78,18 +78,18 @@
if ($USER->id !== $post->userid ||
!oublog_can_view_post($post, $USER, $context, $cm, $oublog) ||
!oublog_can_comment($cm, $oublog, $post)) {
print_error('accessdenied', 'oublog', $backlink);
throw new moodle_exception('accessdenied', 'oublog', $backlink);
}

// The post must (still) allow public comments
if ($post->allowcomments < OUBLOG_COMMENTS_ALLOWPUBLIC ||
$oublog->allowcomments < OUBLOG_COMMENTS_ALLOWPUBLIC) {
print_error('error_moderatednotallowed', 'oublog', $backlink);
throw new moodle_exception('error_moderatednotallowed', 'oublog', $backlink);
}

// OK they are actually allowed to approve / reject this
if (!$approvedcomment = oublog_approve_comment($mcomment, $approve)) {
print_error('error_unspecified', 'oublog', 'A5', $backlink);
throw new moodle_exception('error_unspecified', 'oublog', 'A5', $backlink);
}

// Redirect back to view post
Expand Down
10 changes: 5 additions & 5 deletions deletecomment.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,23 @@
$cmid = optional_param('cmid', null, PARAM_INT);
$referurl = optional_param('referurl', null, PARAM_LOCALURL);
if (!$comment = $DB->get_record('oublog_comments', array('id'=>$commentid))) {
print_error('invalidcomment', 'oublog');
throw new moodle_exception('invalidcomment', 'oublog');
}

if (!$post = oublog_get_post($comment->postid)) {
print_error("invalidpost", 'oublog');
throw new moodle_exception("invalidpost", 'oublog');
}

if (!$cm = get_coursemodule_from_instance('oublog', $post->oublogid)) {
print_error('invalidcoursemodule');
throw new moodle_exception('invalidcoursemodule');
}

if (!$course = $DB->get_record("course", array("id"=>$cm->course))) {
print_error('coursemisconf');
throw new moodle_exception('coursemisconf');
}

if (!$oublog = $DB->get_record("oublog", array("id"=>$cm->instance))) {
print_error('invalidcoursemodule');
throw new moodle_exception('invalidcoursemodule');
}
$url = new moodle_url('/mod/oublog/deletepost.php', array('comment'=>$commentid, 'confirm'=>$confirm));
$PAGE->set_url($url);
Expand Down
8 changes: 4 additions & 4 deletions deletelink.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@
$cmid = optional_param('cmid', null, PARAM_INT);

if (!$link = $DB->get_record('oublog_links', array('id'=> $linkid))) {
print_error('invalidlink', 'oublog');
throw new moodle_exception('invalidlink', 'oublog');
}

if (!$cm = get_coursemodule_from_instance('oublog', $link->oublogid)) {
print_error('invalidcoursemodule');
throw new moodle_exception('invalidcoursemodule');
}

if (!$course = $DB->get_record("course", array("id"=> $cm->course))) {
print_error('coursemisconf');
throw new moodle_exception('coursemisconf');
}

if (!$oublog = $DB->get_record("oublog", array("id"=> $cm->instance))) {
print_error('invalidcoursemodule');
throw new moodle_exception('invalidcoursemodule');
}

$url = new moodle_url('/mod/oublog/deletelink.php', array('link'=>$linkid, 'confirm'=>$confirm));
Expand Down
8 changes: 4 additions & 4 deletions deletepost.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@
$cmid = optional_param('cmid', null, PARAM_INT);

if (!$oublog = $DB->get_record("oublog", array("id"=>$blog))) {
print_error('invalidblog', 'oublog');
throw new moodle_exception('invalidblog', 'oublog');
}
if (!$post = oublog_get_post($postid, false)) {
print_error('invalidpost', 'oublog');
throw new moodle_exception('invalidpost', 'oublog');
}
if (!$cm = get_coursemodule_from_instance('oublog', $blog)) {
print_error('invalidcoursemodule');
throw new moodle_exception('invalidcoursemodule');
}
if (!$course = $DB->get_record("course", array("id"=>$oublog->course))) {
print_error('coursemisconf');
throw new moodle_exception('coursemisconf');
}
$url = new moodle_url('/mod/oublog/deletepost.php',
array('blog' => $blog, 'post' => $postid, 'confirm' => $confirm));
Expand Down
10 changes: 5 additions & 5 deletions editcomment.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@
$referurl = optional_param('referurl', 0, PARAM_LOCALURL);

if (!$oublog = $DB->get_record("oublog", array("id"=>$blog))) {
print_error('invalidblog', 'oublog');
throw new moodle_exception('invalidblog', 'oublog');
}
if (!$cm = get_coursemodule_from_instance('oublog', $blog)) {
print_error('invalidcoursemodule');
throw new moodle_exception('invalidcoursemodule');
}
if (!$course = $DB->get_record("course", array("id"=>$oublog->course))) {
print_error('coursemisconf');
throw new moodle_exception('coursemisconf');
}
if (!$post = oublog_get_post($postid)) {
print_error('invalidpost', 'oublog');
throw new moodle_exception('invalidpost', 'oublog');
}
if (!$oubloginstance = $DB->get_record('oublog_instances', array('id'=>$post->oubloginstancesid))) {
print_error('invalidblog', 'oublog');
throw new moodle_exception('invalidblog', 'oublog');
}
$url = new moodle_url('/mod/oublog/editcomment.php', array('blog'=>$blog, 'post'=>$postid, 'comment'=>$commentid));
$PAGE->set_url($url);
Expand Down
14 changes: 7 additions & 7 deletions editinstance.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,24 @@
$postid = optional_param('post', 0, PARAM_INT); // Post ID for editing

if (!$oubloginstance = $DB->get_record('oublog_instances', array('id'=>$bloginstancesid))) {
print_error('invalidblog', 'oublog');
throw new moodle_exception('invalidblog', 'oublog');
}
if (!$oublog = $DB->get_record("oublog", array("id"=>$oubloginstance->oublogid))) {
print_error('invalidblog', 'oublog');
throw new moodle_exception('invalidblog', 'oublog');
}
if (!$oublog->global) {
print_error('invalidblog', 'oublog');
throw new moodle_exception('invalidblog', 'oublog');
}
if (!$cm = get_coursemodule_from_instance('oublog', $oublog->id)) {
print_error('invalidcoursemodule');
throw new moodle_exception('invalidcoursemodule');
}
if (!$course = $DB->get_record("course", array("id"=>$oublog->course))) {
print_error('invalidcoursemodule');
throw new moodle_exception('invalidcoursemodule');
}

// Check security.
if (!$oublog->global) {
print_error('onlyworkspersonal', 'oublog');
throw new moodle_exception('onlyworkspersonal', 'oublog');
}
$url = new moodle_url('/mod/oublog/editinstance.php', array('instance'=>$bloginstancesid, 'post'=>$postid));
$PAGE->set_url($url);
Expand All @@ -59,7 +59,7 @@
$viewurl = 'view.php?user='.$oubloginstance->userid;

if ($USER->id != $oubloginstance->userid && !has_capability('mod/oublog:manageposts', $context)) {
print_error('accessdenied', 'oublog');
throw new moodle_exception('accessdenied', 'oublog');
}

// Get strings.
Expand Down
10 changes: 5 additions & 5 deletions editlink.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@

if ($blog) {
if (!$oublog = $DB->get_record("oublog", array("id"=>$blog))) {
print_error('invalidblog', 'oublog');
throw new moodle_exception('invalidblog', 'oublog');
}
if (!$cm = get_coursemodule_from_instance('oublog', $blog)) {
print_error('invalidcoursemodule');
throw new moodle_exception('invalidcoursemodule');
}
if (!$course = $DB->get_record("course", array("id"=>$oublog->course))) {
print_error('coursemisconf');
throw new moodle_exception('coursemisconf');
}
}
// TODO: If statement didn't look right! CC-Inline control structures not allowed.
Expand Down Expand Up @@ -129,7 +129,7 @@
$frmlink->oublogid = $oublog->id;

if (!oublog_edit_link($frmlink)) {
print_error('couldnotaddlink', 'oublog');
throw new moodle_exception('couldnotaddlink', 'oublog');
}

} else {
Expand All @@ -138,7 +138,7 @@
$frmlink->oubloginstancesid = $bloginstancesid;

if (!oublog_add_link($frmlink)) {
print_error('couldnotaddlink', 'oublog');
throw new moodle_exception('couldnotaddlink', 'oublog');
}
}

Expand Down
20 changes: 10 additions & 10 deletions editpost.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,21 @@

if ($blog) {
if (!$oublog = $DB->get_record("oublog", array('id' => $blog))) {
print_error('invalidblog', 'oublog');
throw new moodle_exception('invalidblog', 'oublog');
}
if (!$cm = get_coursemodule_from_instance('oublog', $blog)) {
print_error('invalidcoursemodule');
throw new moodle_exception('invalidcoursemodule');
}
if (!$course = $DB->get_record("course", array('id' => $oublog->course))) {
print_error('coursemisconf');
throw new moodle_exception('coursemisconf');
}
}
if ($postid) {
if (!$post = $DB->get_record('oublog_posts', array('id' => $postid))) {
print_error('invalidpost', 'oublog');
throw new moodle_exception('invalidpost', 'oublog');
}
if (!$oubloginstance = $DB->get_record('oublog_instances', array('id' => $post->oubloginstancesid))) {
print_error('invalidblog', 'oublog');
throw new moodle_exception('invalidblog', 'oublog');
}
}
$url = new moodle_url('/mod/oublog/editpost.php', array('blog' => $blog, 'post' => $postid));
Expand Down Expand Up @@ -82,7 +82,7 @@
if (!isset($oubloginstance)) {
$oubloguser = $USER;
if (!$oubloginstance = $DB->get_record('oublog_instances', array('oublogid' => $oublog->id, 'userid' => $USER->id))) {
print_error('invalidblog', 'oublog');
throw new moodle_exception('invalidblog', 'oublog');
}
} else {
$oubloguser = $DB->get_record('user', array('id' => $oubloginstance->userid));
Expand All @@ -101,7 +101,7 @@
// If editing a post, must be your post or you have manageposts.
$canmanage = has_capability('mod/oublog:manageposts', $context);
if (isset($post) && $USER->id != $oubloginstance->userid && !$canmanage) {
print_error('accessdenied', 'oublog');
throw new moodle_exception('accessdenied', 'oublog');
}

// Must be able to post in order to post OR edit a post. This is so that if
Expand All @@ -112,7 +112,7 @@
oublog_can_post($childoublog ? $childoublog : $oublog,
isset($oubloginstance) ? $oubloginstance->userid : 0, $childcm ? $childcm : $cm) ||
(isset($post) && $canmanage))) {
print_error('accessdenied', 'oublog');
throw new moodle_exception('accessdenied', 'oublog');
}

// Get strings.
Expand Down Expand Up @@ -255,13 +255,13 @@
$post->groupid = 0;
} else {
if (!$currentgroup && $groupmode) {
print_error('notaddpostnogroup', 'oublog');
throw new moodle_exception('notaddpostnogroup', 'oublog');
}
$post->groupid = $currentgroup;
}

if (!oublog_add_post($post, $cm, $oublog, $course)) {
print_error('notaddpost', 'oublog');
throw new moodle_exception('notaddpost', 'oublog');
}

// Log add post event.
Expand Down
6 changes: 3 additions & 3 deletions export.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@
$modinfo = get_fast_modinfo($course);
$cm = $modinfo->get_cm($cmid);
if ($cm->modname !== 'oublog') {
print_error('invalidcoursemodule');
throw new moodle_exception('invalidcoursemodule');
}
if (!$oublog = $DB->get_record('oublog', array('id' => $cm->instance))) {
print_error('invalidcoursemodule');
throw new moodle_exception('invalidcoursemodule');
}

$context = context_module::instance($cm->id);
oublog_check_view_permissions($oublog, $context, $cm);
if (empty($CFG->enableportfolios) || !has_capability('mod/oublog:exportpost', $context)) {
print_error('accessdenied', 'oublog');
throw new moodle_exception('accessdenied', 'oublog');
}

$oublogoutput = $PAGE->get_renderer('mod_oublog');
Expand Down
Loading

0 comments on commit 8e42655

Please sign in to comment.