From: agrabs <agrabs>
Date: Mon, 28 Apr 2008 21:19:27 +0000 (+0000)
Subject: fixed required_sesskey missing on complete_guest.php
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=6178c62a9a2f7416a642efe4f73b2a2a296eeb18;p=moodle.git
fixed required_sesskey missing on complete_guest.php
added grouping feature (it have to be tested yet)
---
diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php
index a48a622c0b..67192edd12 100644
--- a/mod/feedback/analysis.php
+++ b/mod/feedback/analysis.php
@@ -51,7 +51,7 @@
}
$capabilities = feedback_load_capabilities($cm->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
if( !( (intval($feedback->publish_stats) == 1) || $capabilities->viewreports)) {
error(get_string('error'));
diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php
index ed7d2cc3e6..2088aadb62 100644
--- a/mod/feedback/analysis_course.php
+++ b/mod/feedback/analysis_course.php
@@ -41,7 +41,7 @@
}
$capabilities = feedback_load_capabilities($cm->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
if( !( (intval($feedback->publish_stats) == 1) || $capabilities->viewreports)) {
error(get_string('error'));
diff --git a/mod/feedback/analysis_to_excel.php b/mod/feedback/analysis_to_excel.php
index 8bcf9d58aa..c73ce1759c 100644
--- a/mod/feedback/analysis_to_excel.php
+++ b/mod/feedback/analysis_to_excel.php
@@ -31,7 +31,7 @@
}
$capabilities = feedback_load_capabilities($cm->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
if(!$capabilities->viewreports){
error(get_string('error'));
diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index 0207f64f53..90f959dc74 100644
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -80,9 +80,9 @@
}
if($feedback->anonymous != FEEDBACK_ANONYMOUS_YES) {
- require_login($course->id);
+ require_login($course->id, true, $cm);
} else {
- require_course_login($course);
+ require_course_login($course, true, $cm);
}
if($courseid AND $courseid != SITEID) {
diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php
index a69a7ce6be..1fe50bc25b 100644
--- a/mod/feedback/complete_guest.php
+++ b/mod/feedback/complete_guest.php
@@ -272,6 +272,7 @@
echo '<tr><td colspan="3" align="center">
<input type="hidden" name="anonymous" value="0" />
<input type="hidden" name="anonymous_response" value="'.FEEDBACK_ANONYMOUS_YES.'" />
+ <input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />
</td></tr>';
//check, if there exists required-elements
diff --git a/mod/feedback/delete_completed.php b/mod/feedback/delete_completed.php
index 79ebcc00ee..312e11697d 100644
--- a/mod/feedback/delete_completed.php
+++ b/mod/feedback/delete_completed.php
@@ -34,7 +34,7 @@
}
$capabilities = feedback_load_capabilities($cm->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
if(!$capabilities->deletesubmissions){
error(get_string('error'));
diff --git a/mod/feedback/delete_item.php b/mod/feedback/delete_item.php
index 586829f28d..e1d0e5c25a 100644
--- a/mod/feedback/delete_item.php
+++ b/mod/feedback/delete_item.php
@@ -30,7 +30,7 @@
}
$capabilities = feedback_load_capabilities($cm->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
if(!$capabilities->edititems){
error(get_string('error'));
diff --git a/mod/feedback/delete_template.php b/mod/feedback/delete_template.php
index c49f1dca90..5c41f71471 100644
--- a/mod/feedback/delete_template.php
+++ b/mod/feedback/delete_template.php
@@ -43,7 +43,7 @@
}
$capabilities = feedback_load_capabilities($cm->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
if(!$capabilities->deletetemplate){
error(get_string('error'));
diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php
index 6e737a60a6..33e1c660aa 100644
--- a/mod/feedback/edit.php
+++ b/mod/feedback/edit.php
@@ -43,7 +43,7 @@
}
$capabilities = feedback_load_capabilities($cm->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
if(!$capabilities->edititems){
error(get_string('error'));
diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php
index 2f584bd67f..dcb2bbd435 100644
--- a/mod/feedback/edit_item.php
+++ b/mod/feedback/edit_item.php
@@ -40,7 +40,7 @@
}
$capabilities = feedback_load_capabilities($cm->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
if(!$capabilities->edititems){
error(get_string('error'));
diff --git a/mod/feedback/export.php b/mod/feedback/export.php
index 3a4b78d46b..9793c382e4 100644
--- a/mod/feedback/export.php
+++ b/mod/feedback/export.php
@@ -30,7 +30,7 @@
}
$capabilities = feedback_load_capabilities($cm->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
if(!$capabilities->edititems){
error('this action is not allowed');
diff --git a/mod/feedback/import.php b/mod/feedback/import.php
index 42a1a6ab52..cf49496bfa 100644
--- a/mod/feedback/import.php
+++ b/mod/feedback/import.php
@@ -35,7 +35,7 @@
}
$capabilities = feedback_load_capabilities($cm->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
if(!$capabilities->edititems){
error('this action is not allowed');
diff --git a/mod/feedback/index.php b/mod/feedback/index.php
index dbf34e6f93..2844e2f469 100644
--- a/mod/feedback/index.php
+++ b/mod/feedback/index.php
@@ -18,7 +18,7 @@
}
$capabilities = feedback_load_course_capabilities($course->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
add_to_log($course->id, "feedback", "view all", htmlspecialchars('index.php?id='.$course->id), "");
diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php
index 75007ec22d..dad9c4926f 100644
--- a/mod/feedback/mapcourse.php
+++ b/mod/feedback/mapcourse.php
@@ -39,7 +39,7 @@
}
$capabilities = feedback_load_capabilities($cm->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
if (!$capabilities->mapcourse) {
error ('access not allowed');
diff --git a/mod/feedback/mod_form.php b/mod/feedback/mod_form.php
index 2b094e8a0f..b503a321db 100644
--- a/mod/feedback/mod_form.php
+++ b/mod/feedback/mod_form.php
@@ -81,7 +81,11 @@ class mod_feedback_mod_form extends moodleform_mod {
$mform->setType('page_after_submit', PARAM_RAW);
$mform->setHelpButton('page_after_submit', array('writing', 'questions', 'richtext'), false, 'editorhelpbutton');
//-------------------------------------------------------------------------------
- $this->standard_coursemodule_elements();
+ $features = new stdClass;
+ $features->groups = true;
+ $features->groupings = true;
+ $features->groupmembersonly = true;
+ $this->standard_coursemodule_elements($features);
//-------------------------------------------------------------------------------
// buttons
$this->add_action_buttons();
diff --git a/mod/feedback/print.php b/mod/feedback/print.php
index dfbd503547..dd5f2af27c 100644
--- a/mod/feedback/print.php
+++ b/mod/feedback/print.php
@@ -30,7 +30,7 @@
}
$capabilities = feedback_load_capabilities($cm->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
if(!$capabilities->edititems){
error(get_string('error'));
diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php
index 204f74ec9c..07bcf2b1f1 100644
--- a/mod/feedback/show_entries.php
+++ b/mod/feedback/show_entries.php
@@ -62,7 +62,7 @@
}
$capabilities = feedback_load_capabilities($cm->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
if(($formdata = data_submitted('nomatch')) AND !confirm_sesskey()) {
error('no sesskey defined');
diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php
index c776de40b1..44918f3078 100644
--- a/mod/feedback/show_entries_anonym.php
+++ b/mod/feedback/show_entries_anonym.php
@@ -36,7 +36,7 @@
}
$capabilities = feedback_load_capabilities($cm->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
if(!$capabilities->viewreports){
error(get_string('error'));
diff --git a/mod/feedback/use_templ.php b/mod/feedback/use_templ.php
index 5bcda2bdc8..d46223cb6a 100644
--- a/mod/feedback/use_templ.php
+++ b/mod/feedback/use_templ.php
@@ -35,7 +35,7 @@
}
$capabilities = feedback_load_capabilities($cm->id);
- require_login($course->id);
+ require_login($course->id, true, $cm);
if(!$capabilities->edititems){
error(get_string('error'));
diff --git a/mod/feedback/version.php b/mod/feedback/version.php
index c4788a76af..443c161f30 100644
--- a/mod/feedback/version.php
+++ b/mod/feedback/version.php
@@ -10,7 +10,7 @@
*/
- $module->version = 2008042401; // The current module version (Date: YYYYMMDDXX)
+ $module->version = 2008042800; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2007101503; // 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)
diff --git a/mod/feedback/view.php b/mod/feedback/view.php
index 3a00dad429..20b3c9fe2e 100644
--- a/mod/feedback/view.php
+++ b/mod/feedback/view.php
@@ -42,9 +42,9 @@
}
if($feedback->anonymous != FEEDBACK_ANONYMOUS_YES) {
- require_login($course->id);
+ require_login($course->id, true, $cm);
} else {
- require_course_login($course);
+ require_course_login($course, true, $cm);
}
if($feedback->anonymous == FEEDBACK_ANONYMOUS_NO) {