From 1a3e93ffe69df247d314abb81613504f533ac413 Mon Sep 17 00:00:00 2001 From: vyshane Date: Fri, 25 Aug 2006 08:51:50 +0000 Subject: [PATCH] Added has_capability checks --- course/report/log/graph.php | 4 +++- course/report/log/index.php | 15 +++++---------- course/report/log/live.php | 5 +++-- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/course/report/log/graph.php b/course/report/log/graph.php index 976e13f125..b2dd3117e4 100644 --- a/course/report/log/graph.php +++ b/course/report/log/graph.php @@ -15,8 +15,10 @@ } require_login($course->id); + $context = get_context_instance(CONTEXT_COURSE, $course->id); - if (! (isteacher($course->id) or ($course->showreports and $USER->id == $user))) { + if (! (has_capability('moodle/site:viewreports', $context) + or ($course->showreports and $USER->id == $user)) ) { error("Sorry, you aren't allowed to see this."); } diff --git a/course/report/log/index.php b/course/report/log/index.php index 1b1cba9289..8504157812 100644 --- a/course/report/log/index.php +++ b/course/report/log/index.php @@ -24,15 +24,10 @@ if (! $course = get_record('course', 'id', $id) ) { error('That\'s an invalid course id'); } - - if (! isteacher($course->id)) { - error('Only teachers can view logs'); - } - - if (! $course->category) { - if (!isadmin()) { - error('Only administrators can look at the site logs'); - } + + $context = get_context_instance(CONTEXT_COURSE, $course->id); + if (!has_capability('moodle/site:viewreports', $context)) { + error('You need do not have the required permission to view this report'); } add_to_log($course->id, "course", "report log", "report/log/index.php?id=$course->id", $course->id); @@ -51,7 +46,7 @@ if (!$u = get_record('user', 'id', $user) ) { error('That\'s an invalid user!'); } - $userinfo = fullname($u, isteacher($course->id)); + $userinfo = fullname($u, has_capability('moodle/site:viewfullnames', $context)); } if ($date) { $dateinfo = userdate($date, get_string('strftimedaydate')); diff --git a/course/report/log/live.php b/course/report/log/live.php index 33da4af39f..a1c89b76be 100644 --- a/course/report/log/live.php +++ b/course/report/log/live.php @@ -13,8 +13,9 @@ error("That's an invalid course id"); } - if (! isteacher($course->id)) { - error("Only teachers can view logs"); + $context = get_context_instance(CONTEXT_COURSE, $course->id); + if (!has_capability('moodle/site:viewreports', $context)) { + error('You need do not have the required permission to view this report'); } add_to_log($course->id, "course", "report live", "report/log/live.php?id=$course->id", $course->id); -- 2.39.5