L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-30482 - Glossary - Fixing the capability controls for the recent activity block

Browse Source
This commit is contained in:
Jason Fowler
2012-03-22 16:19:38 +08:00
committed by Aparup Banerjee
parent a72996fe71
commit bcab2b21b3
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/glossary_random/block_glossary_random.php
+7 -10
View File
@@ -118,10 +118,6 @@ class block_glossary_random extends block_base {
function get_content() {
global $USER, $CFG, $DB;
if (!has_capability('mod/glossary:view', $this->context)) {
return '';
}
if (empty($this->config->glossary)) {
$this->content = new stdClass();
$this->content->text = get_string('notyetconfigured','block_glossary_random');
@@ -129,12 +125,15 @@ class block_glossary_random extends block_base {
return $this->content;
}
$glossaryid = $this->config->glossary;
$course = $this->page->course;
require_once($CFG->dirroot.'/course/lib.php');
$course = $this->page->course;
$modinfo = get_fast_modinfo($course);
$glossaryid = $this->config->glossary;
$cm = $modinfo->instances['glossary'][$glossaryid];
if (!has_capability('mod/glossary:view', get_context_instance(CONTEXT_MODULE, $cm->id))) {
return '';
}
if (!isset($modinfo->instances['glossary'][$glossaryid])) {
// we can get here if the glossary has been deleted, so
@@ -148,8 +147,6 @@ class block_glossary_random extends block_base {
return $this->content;
}
$cm = $modinfo->instances['glossary'][$glossaryid];
if (empty($this->config->cache)) {
$this->config->cache = '';
}
mod/glossary/lib.php
+11 -11
View File
@@ -329,7 +329,6 @@ function glossary_print_recent_activity($course, $viewfullnames, $timestart) {
if (!defined('GLOSSARY_RECENT_ACTIVITY_LIMIT')) {
define('GLOSSARY_RECENT_ACTIVITY_LIMIT', 50);
}
$modinfo = get_fast_modinfo($course);
$ids = array();
@@ -351,18 +350,20 @@ function glossary_print_recent_activity($course, $viewfullnames, $timestart) {
$approvals = array();
foreach ($ids as $glinstanceid => $glcmid) {
$context = get_context_instance(CONTEXT_MODULE, $glcmid);
if (!has_capability('mod/glossary:view', $context)) {
continue;
if (has_capability('mod/glossary:view', $context)) {
// get records glossary entries that are approved if user has no capability to approve entries.
if (has_capability('mod/glossary:approve', $context)) {
$approvals[] = ' ge.glossaryid = :glsid'.$glinstanceid.' ';
} else {
$approvals[] = ' (ge.approved = 1 AND ge.glossaryid = :glsid'.$glinstanceid.') ';
}
$params['glsid'.$glinstanceid] = $glinstanceid;
}
// get records glossary entries that are approved if user has no capability to approve entries.
if (has_capability('mod/glossary:approve', $context)) {
$approvals[] = ' ge.glossaryid = :glsid'.$glinstanceid.' ';
} else {
$approvals[] = ' (ge.approved = 1 AND ge.glossaryid = :glsid'.$glinstanceid.') ';
}
$params['glsid'.$glinstanceid] = $glinstanceid;
}
if (count($approvals) == 0) {
return false;
}
$selectsql = 'SELECT ge.id, ge.concept, ge.approved, ge.timemodified, ge.glossaryid,
'.user_picture::fields('u',null,'userid');
$countsql = 'SELECT COUNT(*)';
@@ -387,7 +388,6 @@ function glossary_print_recent_activity($course, $viewfullnames, $timestart) {
}
echo $OUTPUT->heading(get_string('newentries', 'glossary').':');
$strftimerecent = get_string('strftimerecent');
$entrycount = 0;
foreach ($entries as $entry) {