Skip to content

Commit

Permalink
MDL-7693 fixed participans block on frontpage; notloggedin and authen…
Browse files Browse the repository at this point in the history 
…ticated roles overrides to be fixed later in separate bug; merged from MOODLE_18_STABLE
  • Loading branch information
skodak committed Mar 5, 2007
1 parent 346c3e2 commit 224aa44
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 75 deletions.
54 changes: 18 additions & 36 deletions blocks/participants/block_participants.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,59 +7,41 @@ function init() {
}

function get_content() {

global $USER, $CFG;


global $CFG;

if (empty($this->instance)) {
$this->content = '';
return $this->content;
}

// the following 3 lines is need to pass _self_test();
if (empty($this->instance->pageid)) {
return '';
}


// only 2 possible contexts, site or course
if ($this->instance->pageid == SITEID) { // site context
$currentcontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
$canviewparticipants = has_capability('moodle/site:viewparticipants', $currentcontext);
} else { // course context
$currentcontext = get_context_instance(CONTEXT_COURSE, $this->instance->pageid);
$canviewparticipants = has_capability('moodle/course:viewparticipants', $currentcontext);
}

if (!$canviewparticipants) {
$this->context = '';
return $this->content;
return '';
}

if ($this->content !== NULL) {
if (!$currentcontext = get_context_instance(CONTEXT_COURSE, $this->instance->pageid)) {
$this->content = '';
return $this->content;
}
if (empty($this->instance)) {

if (!has_capability('moodle/course:viewparticipants', $currentcontext)) {
$this->content = '';
return $this->content;
}

$this->content = new stdClass;
$this->content = new object();
$this->content->items = array();
$this->content->icons = array();
$this->content->footer = '';


if (empty($this->instance->pageid)) {
$this->instance->pageid = SITEID;
}

if ($this->instance->pageid != SITEID
|| $canviewparticipants) {

$this->content->items[] = '<a title="'.get_string('listofallpeople').'" href="'.
$CFG->wwwroot.'/user/index.php?contextid='.$currentcontext->id.'">'.get_string('participants').'</a>';
$this->content->icons[] = '<img src="'.$CFG->pixpath.'/i/users.gif" class="icon" alt="" />';
}

$this->content->items[] = '<a title="'.get_string('listofallpeople').'" href="'.
$CFG->wwwroot.'/user/index.php?contextid='.$currentcontext->id.'">'.get_string('participants').'</a>';
$this->content->icons[] = '<img src="'.$CFG->pixpath.'/i/users.gif" class="icon" alt="" />';

return $this->content;
}

// my moodle can only have SITEID and it's redundant here, so take it away
function applicable_formats() {
return array('all' => true, 'my' => false);
Expand Down
10 changes: 0 additions & 10 deletions lib/db/access.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,16 +205,6 @@
)
),

'moodle/site:viewparticipants' => array(

'captype' => 'read',
'contextlevel' => CONTEXT_SYSTEM,
'legacy' => array(
'editingteacher' => CAP_ALLOW,
'admin' => CAP_ALLOW
)
),

'moodle/site:viewreports' => array(

'riskbitmask' => RISK_PERSONAL,
Expand Down
42 changes: 13 additions & 29 deletions user/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,11 @@
unset($contextid);
unset($courseid);

require_login($course->id);
require_login($course);

if (!has_capability('moodle/course:viewparticipants', $context)
&& !has_capability('moodle/site:viewparticipants', $context)) {
$sitecontext = get_context_instance(CONTEXT_SYSTEM);

if (!has_capability('moodle/course:viewparticipants', $context)) {
print_error('nopermissions');
}

Expand All @@ -53,7 +54,6 @@
// We should exclude "admin" users (those with "doanything" at site level) because
// Otherwise they appear in every participant list

$sitecontext = get_context_instance(CONTEXT_SYSTEM);
$doanythingroles = get_roles_with_capability('moodle/site:doanything', CAP_ALLOW, $sitecontext);

foreach ($roles as $role) {
Expand All @@ -74,14 +74,6 @@
}
}

if ($course->id == SITEID) {
if (!has_capability('moodle/course:viewparticipants', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
print_header("$course->shortname: ".get_string('participants'), $course->fullname,
get_string('participants'), "", "", true, "&nbsp;", navmenu($course));
notice(get_string('sitepartlist'));
}
}

add_to_log($course->id, 'user', 'view all', 'index.php?id='.$course->id, '');

$bulkoperations = has_capability('moodle/course:bulkmessaging', $context);
Expand Down Expand Up @@ -120,7 +112,7 @@
}

$isseparategroups = ($course->groupmode == SEPARATEGROUPS and $course->groupmodeforce and
!has_capability('moodle/site:accessallgroups', get_context_instance(CONTEXT_COURSE, $course->id)));
!has_capability('moodle/site:accessallgroups', $context));

if ($isseparategroups and (!$currentgroup) ) {
print_header("$course->shortname: ".get_string('participants'), $course->fullname,
Expand All @@ -146,7 +138,7 @@
}


//setting up tags
/// setting up tags
if ($course->id == SITEID) {
$filtertype = 'site';
} else if ($course->id && !$currentgroup) {
Expand All @@ -163,7 +155,7 @@


/// Get the hidden field list
if (has_capability('moodle/course:viewhiddenuserfields', get_context_instance(CONTEXT_COURSE, $course->id))) {
if (has_capability('moodle/course:viewhiddenuserfields', $context)) {
$hiddenfields = array(); // teachers and admins are allowed to see everything
} else {
$hiddenfields = array_flip(explode(',', $CFG->hiddenuserfields));
Expand All @@ -177,19 +169,16 @@
/// Print my course menus
if ($mycourses = get_my_courses($USER->id)) {
echo '<td class="left">';
print_string('mycourses');
echo ': ';

$courselist = array();
foreach ($mycourses as $mycourse) {
$courselist[$mycourse->id] = $mycourse->shortname;
}
popup_form($CFG->wwwroot.'/user/index.php?roleid='.$roleid.'&amp;sifirst=&amp;silast=&amp;id=',
$courselist, 'courseform',$course->id);
$courselist, 'courseform', $course->id, '', '', '', false, 'self', get_string('mycourses'));
echo '</td>';
}

if ($groupmode == VISIBLEGROUPS or ($groupmode and has_capability('moodle/site:accessallgroups', get_context_instance(CONTEXT_COURSE, $course->id)))) {
if ($groupmode == VISIBLEGROUPS or ($groupmode and has_capability('moodle/site:accessallgroups', $context))) {
if ($groups_names = groups_get_groups_names($course->id)) { //TODO:
echo '<td class="left">';
print_group_menu($groups_names, $groupmode, $currentgroup, $baseurl);
Expand Down Expand Up @@ -236,28 +225,26 @@

if (count($timeoptions) > 1) {
echo '<td class="left">';
echo get_string('usersnoaccesssince').': ';
$baseurl = preg_replace('/&amp;accesssince='.$accesssince.'/','',$baseurl);
echo popup_form($baseurl.'&amp;accesssince=',$timeoptions,'timeoptions',$accesssince,'','','',true);
popup_form($baseurl.'&amp;accesssince=',$timeoptions,'timeoptions',$accesssince, '', '', '', false, 'self', get_string('usersnoaccesssince'));
echo '</td>';
}


echo '<td class="right">';
echo get_string('userlist').': ';
$formatmenu = array( '0' => get_string('detailedless'),
'1' => get_string('detailedmore'));
echo popup_form($baseurl.'&amp;mode=', $formatmenu, 'formatmenu', $fullmode, '', '', '', true);
popup_form($baseurl.'&amp;mode=', $formatmenu, 'formatmenu', $fullmode, '', '', '', false, 'self', get_string('userlist'));
echo '</td></tr></table>';

if ($currentgroup and (!$isseparategroups or has_capability('moodle/site:accessallgroups', get_context_instance(CONTEXT_COURSE, $course->id)))) { /// Display info about the group
if ($currentgroup and (!$isseparategroups or has_capability('moodle/site:accessallgroups', $context))) { /// Display info about the group
if ($group = groups_get_group($currentgroup)) { //TODO:
if (!empty($group->description) or (!empty($group->picture) and empty($group->hidepicture))) {
echo '<table class="groupinfobox"><tr><td class="left side picture">';
print_group_picture($group, $course->id, true, false, false);
echo '</td><td class="content">';
echo '<h3>'.$group->name;
if (has_capability('moodle/course:managegroups', get_context_instance(CONTEXT_COURSE, $course->id))) {
if (has_capability('moodle/course:managegroups', $context)) {
echo '&nbsp;<a title="'.get_string('editgroupprofile').'" href="'.groups_group_edit_url($course->id, $group->id).'">';
echo '<img src="'.$CFG->pixpath.'/t/edit.gif" alt="'.get_string('editgroupprofile').'" />';
echo '</a>';
Expand Down Expand Up @@ -324,7 +311,6 @@
if ($usercontexts = get_parent_contexts($context)) {
$listofcontexts = '('.implode(',', $usercontexts).')';
} else {
$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
$listofcontexts = '('.$sitecontext->id.')'; // must be site
}
if ($roleid) {
Expand Down Expand Up @@ -462,8 +448,6 @@ function checkchecked(form) {
';
echo '<form action="action_redir.php" method="post" id="participantsform" onsubmit="return checksubmit(this);">';
echo '<div>';
// added url encode for xhtml strict MDL-7861
echo '<input type="hidden" name="returnto" value="'.urlencode($_SERVER['REQUEST_URI']).'" />';
echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
}

Expand Down

0 comments on commit 224aa44

Please sign in to comment.