From b3e900cee637600437b3cca3b830f1e032241d57 Mon Sep 17 00:00:00 2001 From: toyomoyo Date: Wed, 16 Aug 2006 09:11:43 +0000 Subject: [PATCH] some more UI change --- admin/roles/assign.php | 18 +++++++++++++++++- admin/roles/manage.html | 19 +++---------------- admin/roles/override.php | 26 +++++++++++++++++++++----- blog/header.php | 4 +++- course/user.php | 1 + mod/forum/user.php | 1 + user/edit.php | 1 + user/tabs.php | 37 ++++++++++++++++++++----------------- 8 files changed, 67 insertions(+), 40 deletions(-) diff --git a/admin/roles/assign.php b/admin/roles/assign.php index 89b69df3d2..a648d455df 100755 --- a/admin/roles/assign.php +++ b/admin/roles/assign.php @@ -55,9 +55,25 @@ $context = get_record('context', 'id', $contextid); + $participants = get_string("participants"); + $user = get_record('user', 'id', $userid); + $fullname = fullname($user, isteacher($course->id)); + // we got a few tabs there if ($context->level == CONTEXT_USERID) { - print_header(); + /// course header + if ($courseid!= SITEID) { + print_header("$fullname", "$fullname", + "id\">$course->shortname -> + wwwroot."/user/index.php?id=$course->id\">$participants -> wwwroot."/user/view.php?id=".$userid."&course=".$courseid."\">$fullname ->".get_string('assign', 'roles'), + "", "", true, " ", navmenu($course)); + + /// site header + } else { + print_header("$course->fullname: $fullname", "$course->fullname", + "wwwroot."/user/view.php?id=".$userid."&course=".$courseid."\">$fullname -> $straction", "", "", true, " ", navmenu($course)); + } + $showroles = 1; $currenttab = 'assign'; include_once($CFG->dirroot.'/user/tabs.php'); diff --git a/admin/roles/manage.html b/admin/roles/manage.html index bf97a1467e..cb6d3cc92b 100755 --- a/admin/roles/manage.html +++ b/admin/roles/manage.html @@ -35,23 +35,10 @@ foreach ($capabilities as $capability) { $contextlevel = $capability->contextlevel; $component = $capability->component; - // check the capability override for this cap, this role in this context + // check the capability override for this cap, this role in this context + $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); - $SQL = "select * from {$CFG->prefix}role_capabilities where - roleid = $roleid and capability = '$capability->name' and contextid = $contextid"; - get_record_sql($SQL); - - $localoverride = get_local_override($roleid, $contextid, $capability->name); - - if (isset($r_caps[$capability->name])) { - $isallow = $r_caps[$capability->name] > 0; - $isprevent = $r_caps[$capability->name] < 0 && $r_caps[$capability->name] > -500; - $isprohibit = $r_caps[$capability->name] <= -500; - } else { - $isallow = 0; - $isprevent = 0; - $isprohibit = 0; - } + $localoverride = get_local_override($roleid, $sitecontext->id, $capability->name); ?> diff --git a/admin/roles/override.php b/admin/roles/override.php index 54c816b8bb..e7fd3829a0 100755 --- a/admin/roles/override.php +++ b/admin/roles/override.php @@ -30,12 +30,27 @@ $strshowall = get_string('showall'); $context = get_record('context', 'id', $contextid); - - $straction = get_string('overrideroles', 'role'); + $participants = get_string("participants"); + $user = get_record('user', 'id', $userid); + $fullname = fullname($user, isteacher($course->id)); + $straction = get_string('overrideroles', 'role'); + // we got a few tabs there if ($context->level == CONTEXT_USERID) { - print_header(); + + /// course header + if ($courseid!= SITEID) { + print_header("$fullname", "$fullname", + "id\">$course->shortname -> + wwwroot."/user/index.php?id=$course->id\">$participants -> wwwroot."/user/view.php?id=".$userid."&course=".$courseid."\">$fullname -> $straction", + "", "", true, " ", navmenu($course)); + + /// site header + } else { + print_header("$course->fullname: $fullname", "$course->fullname", + "wwwroot."/user/view.php?id=".$userid."&course=".$courseid."\">$fullname -> $straction", "", "", true, " ", navmenu($course)); + } $showroles = 1; $currenttab = 'override'; include_once($CFG->dirroot.'/user/tabs.php'); @@ -58,9 +73,9 @@ } $SQL = "select * from {$CFG->prefix}role_capabilities where - roleid = $roleid and capability = '$capname' and contextid = $contextid"; + roleid = $roleid and capability = '$capname' and contextid = $contextid"; - $localoverride = get_record_sql($SQL); + $localoverride = get_record_sql($SQL); if ($localoverride) { // update current overrides @@ -73,6 +88,7 @@ $localoverride->permission = $value; $localoverride->timemodified = time(); $localoverride->modifierid = $USER->id; + update_record('role_capabilities', $localoverride); } diff --git a/blog/header.php b/blog/header.php index 5c37590504..e5ba7a2b7a 100755 --- a/blog/header.php +++ b/blog/header.php @@ -184,7 +184,9 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') { /// We are in edit mode, print the } /// close switch // prints the tabs -$showroles = 1; +if ($filtertype=='user') { + $showroles = 1; +} $currenttab = 'blogs'; $user = $USER; if (!$course) { diff --git a/course/user.php b/course/user.php index a9c4b5a6d2..4519103d00 100644 --- a/course/user.php +++ b/course/user.php @@ -57,6 +57,7 @@ /// /user/edit.php /// /course/user.php $currenttab = $mode; + $showroles = 1; include($CFG->dirroot.'/user/tabs.php'); get_all_mods($course->id, $mods, $modnames, $modnamesplural, $modnamesused); diff --git a/mod/forum/user.php b/mod/forum/user.php index 7963775c59..db762af8ed 100644 --- a/mod/forum/user.php +++ b/mod/forum/user.php @@ -49,6 +49,7 @@ } $currenttab = $mode; + $showroles = 1; include($CFG->dirroot.'/user/tabs.php'); /// Prints out tabs as part of user page $isseparategroups = /* diff --git a/user/edit.php b/user/edit.php index 0b614639bf..cb92a27e61 100644 --- a/user/edit.php +++ b/user/edit.php @@ -340,6 +340,7 @@ /// /user/view.php /// /user/edit.php /// /course/user.php + $showroles = 1; $currenttab = 'editprofile'; include('tabs.php'); } diff --git a/user/tabs.php b/user/tabs.php index bda6e745c1..24a496bc0d 100644 --- a/user/tabs.php +++ b/user/tabs.php @@ -89,7 +89,7 @@ $toprow[] = new tabobject('profile', $CFG->wwwroot.'/user/view.php?id='.$user->id.'&course='.$course->id, get_string('profile')); - + $personalcontext = get_context_instance(CONTEXT_USERID, $user->id); /// Can only edit profile if it belongs to user or current user is admin and not editing primary admin if (($mainadmin = get_admin()) === false) { @@ -107,26 +107,27 @@ $toprow[] = new tabobject('editprofile', $wwwroot.'/user/edit.php?id='.$user->id.'&course='.$course->id, get_string('editmyprofile')); } - /// Everyone can see posts for this user + + /// add logic to see course read posts permission + if (has_capability('moodle/user:readuserposts', $personalcontext) || has_capability('mod/forum:viewdiscussion', get_context_instance(CONTEXT_COURSE, $courseid))) { + $toprow[] = new tabobject('forumposts', $CFG->wwwroot.'/mod/forum/user.php?id='.$user->id.'&course='.$course->id, + get_string('forumposts', 'forum')); - $toprow[] = new tabobject('forumposts', $CFG->wwwroot.'/mod/forum/user.php?id='.$user->id.'&course='.$course->id, - get_string('forumposts', 'forum')); - - if (in_array($currenttab, array('posts', 'discussions'))) { - $inactive = array('forumposts'); - $activetwo = array('forumposts'); + if (in_array($currenttab, array('posts', 'discussions'))) { + $inactive = array('forumposts'); + $activetwo = array('forumposts'); - $secondrow = array(); - $secondrow[] = new tabobject('posts', $CFG->wwwroot.'/mod/forum/user.php?course='.$course->id. + $secondrow = array(); + $secondrow[] = new tabobject('posts', $CFG->wwwroot.'/mod/forum/user.php?course='.$course->id. '&id='.$user->id.'&mode=posts', get_string('posts', 'forum')); - $secondrow[] = new tabobject('discussions', $CFG->wwwroot.'/mod/forum/user.php?course='.$course->id. + $secondrow[] = new tabobject('discussions', $CFG->wwwroot.'/mod/forum/user.php?course='.$course->id. '&id='.$user->id.'&mode=discussions', get_string('discussions', 'forum')); - } - + } + } /// Blog entry, everyone can view - if ($CFG->bloglevel > 0) { // only if blog is enabled. Permission check kicks in when display list + if ($CFG->bloglevel > 0 && has_capability('moodle/user:readuserblogs')) { // only if blog is enabled. Permission check kicks in when display list $toprow[] = new tabobject('blogs', $CFG->wwwroot.'/blog/index.php?userid='.$user->id.'&courseid='.$course->id, get_string('blogs', 'blog')); } @@ -135,7 +136,9 @@ //print_object($course); //print_object($user); - if (isteacher($course->id) or ($course->showreports and $USER->id == $user->id)) { + + // add in logic to check course read report + if (has_capability('moodle/user:viewactivitiesreport', $personalcontext) || ($course->showreports and $USER->id == $user->id)) { $toprow[] = new tabobject('reports', $CFG->wwwroot.'/course/user.php?id='.$course->id. '&user='.$user->id.'&mode=outline', get_string('activityreports')); @@ -183,9 +186,9 @@ $secondrow = array(); $secondrow[] = new tabobject('assign', $CFG->wwwroot.'/admin/roles/assign.php?contextid='.$usercontext->id.'&userid='.$user->id.'&courseid='.$course->id - ,get_string('assign')); + ,get_string('assignroles', 'role')); $secondrow[] = new tabobject('override', $CFG->wwwroot.'/admin/roles/override.php?contextid='.$usercontext->id.'&userid='.$user->id.'&courseid='.$course->id - ,get_string('override')); + ,get_string('overrideroles', 'role')); } } -- 2.39.5