merged MDL-9273 related fixes

diff --git a/course/category.php b/course/category.php
index 5c872b0641746d28182043d8303757435e17ca33..ce7cdff9ab6a53d9bd8fac5d78687cb2afe93451 100644 (file)
--- a/course/category.php
+++ b/course/category.php
@@ -135,6 +135,10 @@
 
         if (!empty($moveto) and $data = data_submitted() and confirm_sesskey()) {   // Some courses are being moved
 
+            // user must have category update in both cats to perform this
+            require_capability('moodle/category:update', $context);
+            require_capability('moodle/category:update', get_context_instance(CONTEXT_COURSECAT, $moveto)); 
+            
             if (! $destcategory = get_record("course_categories", "id", $data->moveto)) {
                 error("Error finding the category");
             }
@@ -152,6 +156,7 @@
     /// Hide or show a course
 
         if ((!empty($hide) or !empty($show)) and confirm_sesskey()) {
+            require_capability('moodle/course:visibility', $context);
             if (!empty($hide)) {
                 $course = get_record("course", "id", $hide);
                 $visible = 0;
@@ -170,7 +175,7 @@
     /// Move a course up or down
 
         if ((!empty($moveup) or !empty($movedown)) and confirm_sesskey()) {
-
+            require_capability('moodle/category:update', $context);
             $movecourse = NULL;
             $swapcourse = NULL;
 
@@ -400,8 +405,17 @@
 
         if ($abletomovecourses) {
             echo '<tr><td colspan="3" align="right">';
-            echo '<br />';
+            echo '<br />';    
             unset($displaylist[$category->id]);
+
+            // loop and unset categories the user can't move into
+            
+            foreach ($displaylist as $did=>$dlist) {
+                if (!has_capability('moodle/category:update', get_context_instance(CONTEXT_COURSECAT, $did))) {
+                    unset($displaylist[$did]);  
+                }
+            }
+            
             choose_from_menu ($displaylist, "moveto", "", get_string("moveselectedcoursesto"), "javascript: getElementById('movecourses').submit()");
             echo '<input type="hidden" name="id" value="'.$category->id.'" />';
             echo '</td></tr>';

diff --git a/lib/datalib.php b/lib/datalib.php
index ad0ea507dfd6e80b97a7a37d80428a7c9a76aad3..534d9472a22c08171292c272dcc19b2b1df39869 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -925,10 +925,9 @@ function get_categories($parent='none', $sort='sortorder ASC') {
         $categories = get_records('course_categories', 'parent', $parent, $sort);
     }
     if ($categories) {  /// Remove unavailable categories from the list
-        $creator = has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID));
         foreach ($categories as $key => $category) {
             if (!$category->visible) {
-                if (!$creator) {
+                if (!has_capability('moodle/course:create', get_context_instance(CONTEXT_COURSECAT, $category->id))) {
                     unset($categories[$key]);
                 }
             }