From 53ba55eca203becaba5a9ced9b1af6cc2df71fed Mon Sep 17 00:00:00 2001 From: Andreas Grabs Date: Fri, 2 Apr 2010 20:38:17 +0000 Subject: [PATCH] insert calls to require_capability() --- mod/feedback/analysis_to_excel.php | 4 +--- mod/feedback/delete_completed.php | 4 +--- mod/feedback/delete_item.php | 4 +--- mod/feedback/delete_template.php | 4 +--- mod/feedback/edit.php | 4 +--- mod/feedback/edit_item.php | 4 +--- mod/feedback/export.php | 4 +--- mod/feedback/import.php | 4 +--- mod/feedback/mapcourse.php | 4 +--- mod/feedback/print.php | 4 +--- mod/feedback/show_entries.php | 4 +--- mod/feedback/show_entries_anonym.php | 5 +---- mod/feedback/styles.php | 9 +++++++++ mod/feedback/unmapcourse.php | 5 +---- mod/feedback/use_templ.php | 4 +--- 15 files changed, 23 insertions(+), 44 deletions(-) create mode 100644 mod/feedback/styles.php diff --git a/mod/feedback/analysis_to_excel.php b/mod/feedback/analysis_to_excel.php index 937a73abb49..578ccee93d3 100644 --- a/mod/feedback/analysis_to_excel.php +++ b/mod/feedback/analysis_to_excel.php @@ -46,9 +46,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { require_login($course->id, true, $cm); -if(!has_capability('mod/feedback:viewreports', $context)){ - print_error('error'); -} +require_capability('mod/feedback:viewreports', $context); //buffering any output //this prevents some output before the excel-header will be send diff --git a/mod/feedback/delete_completed.php b/mod/feedback/delete_completed.php index be8d4ac2ea3..7b503f8d948 100644 --- a/mod/feedback/delete_completed.php +++ b/mod/feedback/delete_completed.php @@ -41,9 +41,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { require_login($course->id, true, $cm); -if(!has_capability('mod/feedback:deletesubmissions', $context)){ - print_error('error'); -} +require_capability('mod/feedback:deletesubmissions', $context); $mform = new mod_feedback_delete_completed_form(); $newformdata = array('id'=>$id, diff --git a/mod/feedback/delete_item.php b/mod/feedback/delete_item.php index f9d37d8b00e..3f32fbfa8fc 100644 --- a/mod/feedback/delete_item.php +++ b/mod/feedback/delete_item.php @@ -36,9 +36,7 @@ require_login($course->id, true, $cm); - if(!has_capability('mod/feedback:edititems', $context)){ - print_error('error'); - } + require_capability('mod/feedback:edititems', $context); $mform = new mod_feedback_delete_item_form(); $newformdata = array('id'=>$id, diff --git a/mod/feedback/delete_template.php b/mod/feedback/delete_template.php index c7770c0cc41..e528001ce7e 100644 --- a/mod/feedback/delete_template.php +++ b/mod/feedback/delete_template.php @@ -62,9 +62,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { require_login($course->id, true, $cm); -if(!has_capability('mod/feedback:deletetemplate', $context)){ - print_error('error'); -} +require_capability('mod/feedback:deletetemplate', $context); $mform = new mod_feedback_delete_template_form(); $newformdata = array('id'=>$id, diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php index bc20849c99b..b463682e56d 100644 --- a/mod/feedback/edit.php +++ b/mod/feedback/edit.php @@ -52,9 +52,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { require_login($course->id, true, $cm); -if(!has_capability('mod/feedback:edititems', $context)){ - print_error('error'); -} +require_capability('mod/feedback:edititems', $context); //move up/down items if($moveupitem){ diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php index 958add61696..2c313a90857 100644 --- a/mod/feedback/edit_item.php +++ b/mod/feedback/edit_item.php @@ -58,9 +58,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { require_login($course->id, true, $cm); -if(!has_capability('mod/feedback:edititems', $context)){ - print_error('error'); -} +require_capability('mod/feedback:edititems', $context); //if the typ is pagebreak so the item will be saved directly if($typ == 'pagebreak') { diff --git a/mod/feedback/export.php b/mod/feedback/export.php index 04310f91edf..ec9f57b1c8e 100644 --- a/mod/feedback/export.php +++ b/mod/feedback/export.php @@ -41,9 +41,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { require_login($course->id, true, $cm); -if(!has_capability('mod/feedback:edititems', $context)){ - print_error('invalidaction'); -} +require_capability('mod/feedback:edititems', $context); if ($action == 'exportfile') { if(!$exportdata = feedback_get_xml_data($feedback->id)) { diff --git a/mod/feedback/import.php b/mod/feedback/import.php index a91e68cf2c4..b6208f7b546 100644 --- a/mod/feedback/import.php +++ b/mod/feedback/import.php @@ -49,9 +49,7 @@ require_login($course->id, true, $cm); - if(!has_capability('mod/feedback:edititems', $context)){ - print_error('invalidaction'); - } + require_capability('mod/feedback:edititems', $context); unset($filename); if ($action == 'choosefile' AND confirm_sesskey() ) { diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php index f94cff58437..0c4f9547dd4 100644 --- a/mod/feedback/mapcourse.php +++ b/mod/feedback/mapcourse.php @@ -56,9 +56,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { require_login($course->id, true, $cm); -if (!has_capability('mod/feedback:mapcourse', $context)) { - print_error('invalidaccess'); -} +require_capability('mod/feedback:mapcourse', $context); if ($coursefilter) { $map->feedbackid = $feedback->id; diff --git a/mod/feedback/print.php b/mod/feedback/print.php index c2e01249be6..dc800c65450 100644 --- a/mod/feedback/print.php +++ b/mod/feedback/print.php @@ -37,9 +37,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { require_login($course->id, true, $cm); -if(!has_capability('mod/feedback:edititems', $context)){ - print_error('error'); -} +require_capability('mod/feedback:edititems', $context); /// Print the page header $strfeedbacks = get_string("modulenameplural", "feedback"); diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php index ec9c83903e0..c3b9e65cf95 100644 --- a/mod/feedback/show_entries.php +++ b/mod/feedback/show_entries.php @@ -54,9 +54,7 @@ if(($formdata = data_submitted()) AND !confirm_sesskey()) { print_error('invalidsesskey'); } -if(!has_capability('mod/feedback:viewreports', $context)){ - print_error('error'); -} +require_capability('mod/feedback:viewreports', $context); //////////////////////////////////////////////////////// //get the responses of given user diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php index 399ad4b4ae7..7f97c33b98f 100644 --- a/mod/feedback/show_entries_anonym.php +++ b/mod/feedback/show_entries_anonym.php @@ -47,10 +47,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { require_login($course->id, true, $cm); -if(!has_capability('mod/feedback:viewreports', $context)){ - print_error('error'); -} - +require_capability('mod/feedback:viewreports', $context); //get the completeds // if a new anonymous record has not been assigned a random response number diff --git a/mod/feedback/styles.php b/mod/feedback/styles.php new file mode 100644 index 00000000000..2cfc1968d8b --- /dev/null +++ b/mod/feedback/styles.php @@ -0,0 +1,9 @@ +/* styles using by feedback */ +.feedback_required_mark { + color: #FF0000; +} + +.feedback_switchrequired img{ +} + + diff --git a/mod/feedback/unmapcourse.php b/mod/feedback/unmapcourse.php index 45b9a069004..72dbe781321 100644 --- a/mod/feedback/unmapcourse.php +++ b/mod/feedback/unmapcourse.php @@ -38,10 +38,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { print_error('badcontext'); } -if (!has_capability('mod/feedback:mapcourse', $context)) { - print_error('invalidaccess'); -} - +require_capability('mod/feedback:mapcourse', $context); // cleanup all lost entries after deleting courses or feedbacks feedback_clean_up_sitecourse_map(); diff --git a/mod/feedback/use_templ.php b/mod/feedback/use_templ.php index 9fd30516758..c2ce25e2598 100644 --- a/mod/feedback/use_templ.php +++ b/mod/feedback/use_templ.php @@ -46,9 +46,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { require_login($course->id, true, $cm); -if(!has_capability('mod/feedback:edititems', $context)){ - print_error('error'); -} +require_capability('mod/feedback:edititems', $context); $mform = new mod_feedback_use_templ_form(); $newformdata = array('id'=>$id,