rating MDL-21657 switched from putting permissions in constants to us…

…ing literal strings
crazyserver · Mar 18, 2010 · bab7e00 · bab7e00
1 parent 09fa5f0
commit bab7e00
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/rating/index.php b/rating/index.php
@@ -40,10 +40,10 @@
 }
 $PAGE->set_url($url);
 
-if ( !has_capability(RATING_VIEW,$context) ) {
+if ( !has_capability('moodle/rating:view',$context) ) {
     print_error('noviewrate', 'rating');
 }
-if ( !has_capability(RATING_VIEW,$context) and $USER->id != $item->userid) {
+if ( !has_capability('moodle/rating:viewall',$context) and $USER->id != $item->userid) {
     print_error('noviewanyrate', 'rating');
 }
 

diff --git a/rating/lib.php b/rating/lib.php
@@ -23,10 +23,6 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-define('RATING_VIEW','moodle/rating:view');
-define('RATING_VIEW_ALL','moodle/rating:viewall');
-define('RATING_RATE','moodle/rating:rate');
-
 define('RATING_UNSET_RATING', -999);
 
 //define ('RATING_AGGREGATE_NONE', 0); //no ratings
@@ -282,9 +278,9 @@ public static function load_ratings($context, $items, $aggregate=RATING_AGGREGAT
         $settings->returnurl = $returnurl;
 
         $settings->permissions = new stdclass();
-        $settings->permissions->canview = has_capability(RATING_VIEW,$context);
-        $settings->permissions->canviewall = has_capability(RATING_VIEW_ALL,$context);
-        $settings->permissions->canrate = has_capability(RATING_RATE,$context);
+        $settings->permissions->canview = has_capability('moodle/rating:view',$context);
+        $settings->permissions->canviewall = has_capability('moodle/rating:viewall',$context);
+        $settings->permissions->canrate = has_capability('moodle/rating:rate',$context);
 
         $rating = null;
         foreach($items as $item) {

diff --git a/rating/rate.php b/rating/rate.php
@@ -48,7 +48,7 @@
 list($context, $course, $cm) = get_context_info_array($contextid);
 require_login($course, false, $cm);
 
-if( !has_capability(RATING_RATE,$context) ) {
+if( !has_capability('moodle/rating:rate',$context) ) {
     if( $returnurl ) { //if its a non-ajax request
         echo $OUTPUT->header();
         echo get_string('ratepermissiondenied', 'ratings');