mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
ROLES AND PERMISSIONS - FIRST CHECK-IN
======================================= WARNING: DEV IS CURRENTLY VERY UNSTABLE. This is a mega-checkin of the new Roles system. A lot of changes have been made in core and modules. Currently there are a lot of rough edges and known problems. We are working hard on these .. .the reason for getting this into HEAD at this stage is enable us to move faster (our branch was diverging from HEAD too much). Please keep an eye on http://docs.moodle.org/en/Roles for current status and information for developers on how to use the new Roles system.
This commit is contained in:
parent
394577c3e4
commit
bbbf2d4015
139 changed files with 40452 additions and 2001 deletions
80
mod/chat/db/access.php
Normal file
80
mod/chat/db/access.php
Normal file
|
@ -0,0 +1,80 @@
|
|||
<?php
|
||||
//
|
||||
// Capability definitions for the chat module.
|
||||
//
|
||||
// The capabilities are loaded into the database table when the module is
|
||||
// installed or updated. Whenever the capability definitions are updated,
|
||||
// the module version number should be bumped up.
|
||||
//
|
||||
// The system has four possible values for a capability:
|
||||
// CAP_ALLOW, CAP_PREVENT, CAP_PROHIBIT, and inherit (not set).
|
||||
//
|
||||
//
|
||||
// CAPABILITY NAMING CONVENTION
|
||||
//
|
||||
// It is important that capability names are unique. The naming convention
|
||||
// for capabilities that are specific to modules and blocks is as follows:
|
||||
// [mod/block]/<component_name>:<capabilityname>
|
||||
//
|
||||
// component_name should be the same as the directory name of the mod or block.
|
||||
//
|
||||
// Core moodle capabilities are defined thus:
|
||||
// moodle/<capabilityclass>:<capabilityname>
|
||||
//
|
||||
// Examples: mod/forum:viewpost
|
||||
// block/recent_activity:view
|
||||
// moodle/site:deleteuser
|
||||
//
|
||||
// The variable name for the capability definitions array follows the format
|
||||
// $<componenttype>_<component_name>_capabilities
|
||||
//
|
||||
// For the core capabilities, the variable is $moodle_capabilities.
|
||||
|
||||
|
||||
$mod_chat_capabilities = array(
|
||||
|
||||
'mod/chat:chat' => array(
|
||||
|
||||
'captype' => 'write',
|
||||
'contextlevel' => CONTEXT_MODULE,
|
||||
'legacy' => array(
|
||||
'guest' => CAP_PREVENT,
|
||||
'student' => CAP_ALLOW,
|
||||
'teacher' => CAP_ALLOW,
|
||||
'editingteacher' => CAP_ALLOW,
|
||||
'coursecreator' => CAP_ALLOW,
|
||||
'admin' => CAP_ALLOW
|
||||
)
|
||||
),
|
||||
|
||||
'mod/chat:readlog' => array(
|
||||
|
||||
'captype' => 'read',
|
||||
'contextlevel' => CONTEXT_MODULE,
|
||||
'legacy' => array(
|
||||
'guest' => CAP_PREVENT,
|
||||
'student' => CAP_ALLOW,
|
||||
'teacher' => CAP_ALLOW,
|
||||
'editingteacher' => CAP_ALLOW,
|
||||
'coursecreator' => CAP_ALLOW,
|
||||
'admin' => CAP_ALLOW
|
||||
)
|
||||
),
|
||||
|
||||
'mod/chat:deletelog' => array(
|
||||
|
||||
'captype' => 'write',
|
||||
'contextlevel' => CONTEXT_MODULE,
|
||||
'legacy' => array(
|
||||
'guest' => CAP_PREVENT,
|
||||
'student' => CAP_PREVENT,
|
||||
'teacher' => CAP_ALLOW,
|
||||
'editingteacher' => CAP_ALLOW,
|
||||
'coursecreator' => CAP_ALLOW,
|
||||
'admin' => CAP_ALLOW
|
||||
)
|
||||
)
|
||||
|
||||
);
|
||||
|
||||
?>
|
|
@ -17,13 +17,17 @@
|
|||
if (!$cm = get_coursemodule_from_instance('chat', $chat->id, $course->id)) {
|
||||
error('Course Module ID was incorrect');
|
||||
}
|
||||
|
||||
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
|
||||
|
||||
require_login($course->id, false, $cm);
|
||||
|
||||
require_login($course->id, false, $cm);
|
||||
|
||||
has_capability('mod/chat:chat',$context->id, true);
|
||||
/*
|
||||
if (isguest()) {
|
||||
error('Guest does not have access to chat rooms');
|
||||
}
|
||||
|
||||
*/
|
||||
if (!$cm->visible and !isteacher($course->id)) {
|
||||
print_header();
|
||||
notice(get_string("activityiscurrentlyhidden"));
|
||||
|
|
|
@ -199,7 +199,19 @@ function chat_print_recent_activity($course, $isteacher, $timestart) {
|
|||
$current = 0;
|
||||
}
|
||||
if ($chat = get_record('chat', 'id', $chatuser->chatid)) {
|
||||
if (!($isteacher or instance_is_visible('chat', $chat))) { // Chat hidden to students
|
||||
|
||||
// we find the course module id
|
||||
$chatmod = get_record('modules', 'name', 'chat');
|
||||
$SQL = "select * from {$CFG->prefix}course_modules where
|
||||
course = $course->id
|
||||
and module = $chatmod->id
|
||||
and instance = $chat->id";
|
||||
$cm = get_records_sql($SQL);
|
||||
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
|
||||
|
||||
// needs to be fixed
|
||||
if (!(has_capability('mod/chat:readlog', $context->id) or instance_is_visible('chat', $chat))) { // Chat hidden to students
|
||||
//if (!($isteacher or instance_is_visible('chat', $chat))) { // Chat hidden to students
|
||||
continue;
|
||||
}
|
||||
if (!$outputstarted) {
|
||||
|
|
|
@ -21,14 +21,16 @@
|
|||
error('Course is misconfigured');
|
||||
}
|
||||
|
||||
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
|
||||
require_login($course->id, false, $cm);
|
||||
|
||||
$isteacher = isteacher($course->id);
|
||||
$isteacheredit = isteacheredit($course->id);
|
||||
|
||||
if (isguest() or (!$isteacher and !$chat->studentlogs)) {
|
||||
error('You can not view these chat reports');
|
||||
}
|
||||
//if (isguest() or (!$isteacher and !$chat->studentlogs)) {
|
||||
//error('You can not view these chat reports');
|
||||
//}
|
||||
has_capability('mod/chat:readlog', $context->id, true); // if can't even read, kill
|
||||
|
||||
add_to_log($course->id, 'chat', 'report', "report.php?id=$cm->id", $chat->id, $cm->id);
|
||||
|
||||
|
@ -62,7 +64,8 @@
|
|||
$groupselect = "";
|
||||
}
|
||||
|
||||
if ($deletesession and $isteacheredit) {
|
||||
//if ($deletesession and $isteacheredit) {
|
||||
if ($deletesession and has_capability('mod/chat:deletelog', $context->id)) {
|
||||
notice_yesno(get_string('deletesessionsure', 'chat'),
|
||||
"report.php?id=$cm->id&deletesession=1&confirmdelete=1&start=$start&end=$end&sesskey=$USER->sesskey",
|
||||
"report.php?id=$cm->id");
|
||||
|
@ -86,7 +89,8 @@
|
|||
print_simple_box_end('center');
|
||||
}
|
||||
|
||||
if (!$deletesession or !$isteacheredit) {
|
||||
if (!$deletesession or !has_capability('mod/chat:deletelog', $context->id)) {
|
||||
//if (!$deletesession or !$isteacheredit) {
|
||||
print_continue("report.php?id=$cm->id");
|
||||
}
|
||||
|
||||
|
@ -120,7 +124,8 @@
|
|||
|
||||
/// Delete a session if one has been specified
|
||||
|
||||
if ($deletesession and $isteacheredit and $confirmdelete and $start and $end and confirm_sesskey()) {
|
||||
if ($deletesession and has_capability('mod/chat:deletelog', $context->id) and $confirmdelete and $start and $end and confirm_sesskey()) {
|
||||
//if ($deletesession and $isteacheredit and $confirmdelete and $start and $end and confirm_sesskey()) {
|
||||
delete_records_select('chat_messages', "chatid = $chat->id AND
|
||||
timestamp >= '$start' AND
|
||||
timestamp <= '$end' $groupselect");
|
||||
|
@ -181,14 +186,15 @@
|
|||
foreach ($sessionusers as $sessionuser => $usermessagecount) {
|
||||
if ($user = get_record('user', 'id', $sessionuser)) {
|
||||
print_user_picture($user->id, $course->id, $user->picture);
|
||||
echo ' '.fullname($user, $isteacher);
|
||||
echo ' '.fullname($user, $isteacher); // need to fix this
|
||||
echo " ($usermessagecount)<br />";
|
||||
}
|
||||
}
|
||||
|
||||
echo '<p align="right">';
|
||||
echo "<a href=\"report.php?id=$cm->id&start=$sessionstart&end=$sessionend\">$strseesession</a>";
|
||||
if ($isteacheredit) {
|
||||
//if ($isteacheredit)
|
||||
if (has_capability('mod/chat:deletelog', $context->id)) {
|
||||
echo "<br /><a href=\"report.php?id=$cm->id&start=$sessionstart&end=$sessionend&deletesession=1\">$strdeletesession</a>";
|
||||
}
|
||||
echo '</p>';
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
/// This fragment is called by moodle_needs_upgrading() and /admin/index.php
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
$module->version = 2005031000; // The (date) version of this module
|
||||
$module->version = 2006080800; // The (date) version of this module
|
||||
$module->requires = 2005031000; // Requires this Moodle version
|
||||
$module->cron = 300; // How often should cron check this module (seconds)?
|
||||
|
||||
|
|
|
@ -40,9 +40,12 @@
|
|||
}
|
||||
}
|
||||
|
||||
require_course_login($course, true, $cm);
|
||||
|
||||
add_to_log($course->id, 'chat', 'view', "view.php?id=$cm->id", $chat->id, $cm->id);
|
||||
require_course_login($course, true, $cm);
|
||||
|
||||
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
|
||||
|
||||
add_to_log($course->id, 'chat', 'view', "view.php?id=$cm->id", $chat->id, $cm->id);
|
||||
|
||||
// Initialize $PAGE, compute blocks
|
||||
|
||||
|
@ -72,8 +75,9 @@
|
|||
}
|
||||
|
||||
echo '<td id="middle-column">';
|
||||
|
||||
if (($chat->studentlogs or isteacher($course->id)) and !isguest()) {
|
||||
|
||||
if ($chat->studentlogs or has_capability('mod/chat:readlog',$context->id)) {
|
||||
//if (($chat->studentlogs or isteacher($course->id)) and !isguest()) {
|
||||
echo '<div class="reportlink">';
|
||||
echo "<a href=\"report.php?id=$cm->id\">".
|
||||
get_string('viewreport', 'chat').'</a>';
|
||||
|
@ -99,13 +103,14 @@
|
|||
|
||||
/// Print the main part of the page
|
||||
|
||||
if (!isguest()) {
|
||||
//if (!isguest()) {
|
||||
if (has_capability('mod/chat:chat',$context->id, true)) {
|
||||
print_simple_box_start('center');
|
||||
link_to_popup_window ("/mod/chat/gui_$CFG->chat_method/index.php?id=$chat->id$groupparam",
|
||||
"chat$course->id$chat->id$groupparam", "$strenterchat", 500, 700, get_string('modulename', 'chat'));
|
||||
print_simple_box_end();
|
||||
} else {
|
||||
|
||||
/*
|
||||
$wwwroot = $CFG->wwwroot.'/login/index.php';
|
||||
if (!empty($CFG->loginhttps)) {
|
||||
$wwwroot = str_replace('http:','https:', $wwwroot);
|
||||
|
@ -116,6 +121,7 @@
|
|||
|
||||
print_footer($course);
|
||||
exit;
|
||||
*/
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue