From 2585a68d5469ba24e086b9e0264551111682cc47 Mon Sep 17 00:00:00 2001 From: vyshane Date: Fri, 16 Feb 2007 08:46:55 +0000 Subject: [PATCH] Merged from 1.8. --- blocks/rss_client/db/access.php | 3 --- course/category.php | 2 +- course/delete.php | 4 +++- course/edit.php | 1 - course/lib.php | 33 ++++++++++++++++++++++++++++++++- lib/db/access.php | 30 ------------------------------ mod/assignment/db/access.php | 2 -- mod/chat/db/access.php | 3 --- mod/choice/db/access.php | 4 ---- mod/data/db/access.php | 10 ---------- mod/exercise/db/access.php | 1 - mod/forum/db/access.php | 16 ---------------- mod/forum/lib.php | 2 +- mod/glossary/db/access.php | 10 ---------- mod/hotpot/db/access.php | 4 ---- mod/lesson/db/access.php | 2 -- mod/quiz/db/access.php | 6 ------ mod/scorm/db/access.php | 4 +--- mod/survey/db/access.php | 3 --- mod/wiki/db/access.php | 2 -- mod/workshop/db/access.php | 1 - 21 files changed, 38 insertions(+), 105 deletions(-) diff --git a/blocks/rss_client/db/access.php b/blocks/rss_client/db/access.php index 3c67fa2cfc..7b53f2ca51 100644 --- a/blocks/rss_client/db/access.php +++ b/blocks/rss_client/db/access.php @@ -40,7 +40,6 @@ $block_rss_client_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -51,7 +50,6 @@ $block_rss_client_capabilities = array( 'contextlevel' => CONTEXT_SYSTEM, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -63,7 +61,6 @@ $block_rss_client_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), diff --git a/course/category.php b/course/category.php index 36a6ceb5fe..25faccaab9 100644 --- a/course/category.php +++ b/course/category.php @@ -325,7 +325,7 @@ echo''.get_string('assignroles', 'role').''; } - if (has_capability('moodle/course:delete', $coursecontext)) { + if (can_delete_course($acourse->id)) { echo ''. ''.$strdelete.' '; } diff --git a/course/delete.php b/course/delete.php index c0f6fc332f..2063d9347a 100644 --- a/course/delete.php +++ b/course/delete.php @@ -8,7 +8,9 @@ require_login(); - require_capability('moodle/course:delete', get_context_instance(CONTEXT_SYSTEM, SITEID)); + if (!can_delete_course($id)) { + error('You do not have the permission to delete this course.'); + } if (!$site = get_site()) { error("Site not found!"); diff --git a/course/edit.php b/course/edit.php index e2bf1d4504..61ff051c0e 100644 --- a/course/edit.php +++ b/course/edit.php @@ -26,7 +26,6 @@ error('Category ID was incorrect'); } require_capability('moodle/course:create', get_context_instance(CONTEXT_COURSECAT, $category->id)); - } else { error('Either course id or category must be specified'); } diff --git a/course/lib.php b/course/lib.php index 2f0b637317..3123708988 100644 --- a/course/lib.php +++ b/course/lib.php @@ -2540,4 +2540,35 @@ function get_section_name($format) { return $sectionname; } -?> +/** + * Can the current user delete this course? + * @param int $courseid + * @return boolean + * + * Exception here to fix MDL-7796. + * + * FIXME + * Course creators who can manage activities in the course + * shoule be allowed to delete the course. We do it this + * way because we need a quick fix to bring the functionality + * in line with what we had pre-roles. We can't give the + * default course creator role moodle/course:delete at + * CONTEXT_SYSTEM level because this will allow them to + * delete any course in the site. So we hard code this here + * for now. + * + * @author vyshane AT gmail.com + */ +function can_delete_course($courseid) { + + $context = get_context_instance(CONTEXT_COURSE, $courseid); + + return ( has_capability('moodle/course:delete', $context) + || (has_capability('moodle/legacy:coursecreator', $context) + && has_capability('moodle/course:manageactivities', $context)) ); +} + + + + +?> \ No newline at end of file diff --git a/lib/db/access.php b/lib/db/access.php index 7fe2e915e8..4e9c865334 100644 --- a/lib/db/access.php +++ b/lib/db/access.php @@ -178,7 +178,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_SYSTEM, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -190,7 +189,6 @@ $moodle_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -213,7 +211,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_SYSTEM, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -227,7 +224,6 @@ $moodle_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -348,7 +344,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_SYSTEM, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -477,7 +472,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -491,7 +485,6 @@ $moodle_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -505,7 +498,6 @@ $moodle_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -519,7 +511,6 @@ $moodle_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -529,7 +520,6 @@ $moodle_capabilities = array( 'captype' => 'read', 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -539,7 +529,6 @@ $moodle_capabilities = array( 'captype' => 'write', 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -552,7 +541,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -565,7 +553,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -576,7 +563,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -587,7 +573,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -599,7 +584,6 @@ $moodle_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -612,7 +596,6 @@ $moodle_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -625,7 +608,6 @@ $moodle_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -636,7 +618,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -647,7 +628,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -658,7 +638,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -725,7 +704,6 @@ $moodle_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -751,7 +729,6 @@ $moodle_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -791,7 +768,6 @@ $moodle_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -837,7 +813,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -873,7 +848,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -894,7 +868,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -905,7 +878,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -919,7 +891,6 @@ $moodle_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -932,7 +903,6 @@ $moodle_capabilities = array( 'contextlevel' => CONTEXT_COURSE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), diff --git a/mod/assignment/db/access.php b/mod/assignment/db/access.php index 0028495591..0bce5db912 100644 --- a/mod/assignment/db/access.php +++ b/mod/assignment/db/access.php @@ -42,7 +42,6 @@ $mod_assignment_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -63,7 +62,6 @@ $mod_assignment_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ) diff --git a/mod/chat/db/access.php b/mod/chat/db/access.php index 202b4baa96..e3d25887c0 100644 --- a/mod/chat/db/access.php +++ b/mod/chat/db/access.php @@ -43,7 +43,6 @@ $mod_chat_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -56,7 +55,6 @@ $mod_chat_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -68,7 +66,6 @@ $mod_chat_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ) diff --git a/mod/choice/db/access.php b/mod/choice/db/access.php index c97a321856..a75fc9ec67 100644 --- a/mod/choice/db/access.php +++ b/mod/choice/db/access.php @@ -41,7 +41,6 @@ $mod_choice_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -53,7 +52,6 @@ $mod_choice_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -65,7 +63,6 @@ $mod_choice_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -77,7 +74,6 @@ $mod_choice_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ) diff --git a/mod/data/db/access.php b/mod/data/db/access.php index 29ba9fc2fc..341f0dae17 100644 --- a/mod/data/db/access.php +++ b/mod/data/db/access.php @@ -42,7 +42,6 @@ $mod_data_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -57,7 +56,6 @@ $mod_data_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -72,7 +70,6 @@ $mod_data_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -84,7 +81,6 @@ $mod_data_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -96,7 +92,6 @@ $mod_data_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -108,7 +103,6 @@ $mod_data_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -122,7 +116,6 @@ $mod_data_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -136,7 +129,6 @@ $mod_data_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -150,7 +142,6 @@ $mod_data_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -162,7 +153,6 @@ $mod_data_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), diff --git a/mod/exercise/db/access.php b/mod/exercise/db/access.php index 12223a1d92..ebedaae380 100644 --- a/mod/exercise/db/access.php +++ b/mod/exercise/db/access.php @@ -40,7 +40,6 @@ $mod_exercise_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ) diff --git a/mod/forum/db/access.php b/mod/forum/db/access.php index cdfafbe399..2519629d47 100644 --- a/mod/forum/db/access.php +++ b/mod/forum/db/access.php @@ -42,7 +42,6 @@ $mod_forum_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -54,7 +53,6 @@ $mod_forum_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -69,7 +67,6 @@ $mod_forum_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -84,7 +81,6 @@ $mod_forum_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -97,7 +93,6 @@ $mod_forum_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -109,7 +104,6 @@ $mod_forum_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -121,7 +115,6 @@ $mod_forum_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -136,7 +129,6 @@ $mod_forum_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -149,7 +141,6 @@ $mod_forum_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -161,7 +152,6 @@ $mod_forum_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -173,7 +163,6 @@ $mod_forum_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -185,7 +174,6 @@ $mod_forum_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -199,7 +187,6 @@ $mod_forum_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -211,7 +198,6 @@ $mod_forum_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -223,7 +209,6 @@ $mod_forum_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -235,7 +220,6 @@ $mod_forum_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 7ee86c434d..3a42cc2c68 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -291,7 +291,7 @@ function forum_cron() { 'Precedence: Bulk', 'List-Id: "'.$cleanforumname.'" id.'@'.$hostname.'>', 'List-Help: '.$CFG->wwwroot.'/mod/forum/view.php?f='.$forum->id, - 'Message-Id: id.'@'.$hostname.'>', + 'Message-ID: id.'@'.$hostname.'>', 'In-Reply-To: parent.'@'.$hostname.'>', 'References: parent.'@'.$hostname.'>', 'X-Course-Id: '.$course->id, diff --git a/mod/glossary/db/access.php b/mod/glossary/db/access.php index 0f9ce1df51..b00f92691a 100644 --- a/mod/glossary/db/access.php +++ b/mod/glossary/db/access.php @@ -43,7 +43,6 @@ $mod_glossary_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -57,7 +56,6 @@ $mod_glossary_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -71,7 +69,6 @@ $mod_glossary_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -86,7 +83,6 @@ $mod_glossary_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -100,7 +96,6 @@ $mod_glossary_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -114,7 +109,6 @@ $mod_glossary_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -126,7 +120,6 @@ $mod_glossary_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -140,7 +133,6 @@ $mod_glossary_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -152,7 +144,6 @@ $mod_glossary_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -164,7 +155,6 @@ $mod_glossary_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), diff --git a/mod/hotpot/db/access.php b/mod/hotpot/db/access.php index 65f461d9fc..a3983164d2 100644 --- a/mod/hotpot/db/access.php +++ b/mod/hotpot/db/access.php @@ -41,7 +41,6 @@ $mod_hotpot_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -53,7 +52,6 @@ $mod_hotpot_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -65,7 +63,6 @@ $mod_hotpot_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -76,7 +73,6 @@ $mod_hotpot_capabilities = array( 'contextlevel' => CONTEXT_MODULE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ) diff --git a/mod/lesson/db/access.php b/mod/lesson/db/access.php index 4cb192b81a..0c010a9324 100644 --- a/mod/lesson/db/access.php +++ b/mod/lesson/db/access.php @@ -14,7 +14,6 @@ $mod_lesson_capabilities = array( 'contextlevel' => CONTEXT_MODULE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -26,7 +25,6 @@ $mod_lesson_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ) diff --git a/mod/quiz/db/access.php b/mod/quiz/db/access.php index cba0de1c2f..720e0e6e86 100644 --- a/mod/quiz/db/access.php +++ b/mod/quiz/db/access.php @@ -17,7 +17,6 @@ $mod_quiz_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -39,7 +38,6 @@ $mod_quiz_capabilities = array( 'contextlevel' => CONTEXT_MODULE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -52,7 +50,6 @@ $mod_quiz_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -65,7 +62,6 @@ $mod_quiz_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -78,7 +74,6 @@ $mod_quiz_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -90,7 +85,6 @@ $mod_quiz_capabilities = array( 'contextlevel' => CONTEXT_MODULE, 'legacy' => array( 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), diff --git a/mod/scorm/db/access.php b/mod/scorm/db/access.php index 5a693b564b..3f4a7dfbfe 100644 --- a/mod/scorm/db/access.php +++ b/mod/scorm/db/access.php @@ -40,7 +40,6 @@ $mod_scorm_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -62,7 +61,7 @@ $mod_scorm_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, + 'admin' => CAP_ALLOW ) ), @@ -74,7 +73,6 @@ $mod_scorm_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ) diff --git a/mod/survey/db/access.php b/mod/survey/db/access.php index 0327500c5b..3b533c4ab4 100644 --- a/mod/survey/db/access.php +++ b/mod/survey/db/access.php @@ -41,7 +41,6 @@ $mod_survey_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -53,7 +52,6 @@ $mod_survey_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -65,7 +63,6 @@ $mod_survey_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ) diff --git a/mod/wiki/db/access.php b/mod/wiki/db/access.php index b12074b91e..c05b08f71f 100644 --- a/mod/wiki/db/access.php +++ b/mod/wiki/db/access.php @@ -16,7 +16,6 @@ $mod_wiki_capabilities = array( 'student' => CAP_ALLOW, 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ), @@ -43,7 +42,6 @@ $mod_wiki_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ) diff --git a/mod/workshop/db/access.php b/mod/workshop/db/access.php index 7609303280..0518d090c9 100644 --- a/mod/workshop/db/access.php +++ b/mod/workshop/db/access.php @@ -26,7 +26,6 @@ $mod_workshop_capabilities = array( 'legacy' => array( 'teacher' => CAP_ALLOW, 'editingteacher' => CAP_ALLOW, - 'coursecreator' => CAP_ALLOW, 'admin' => CAP_ALLOW ) ) -- 2.39.5