mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-25 08:11:39 +02:00
Code Issues Projects Releases Wiki Activity

MDL-23929 WIKI, fixed has_capability parameter

Browse Source
This commit is contained in:
Dongsheng Cai
2010-11-19 02:59:10 +00:00
parent 7a534d7a5c
commit cece1791b0
3 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
mod/wiki/locallib.php
View File

@@ -704,20 +704,20 @@ function wiki_user_can_view($subwiki) {
// There is one wiki for all the class.
//
// Only view capbility needed
return has_capability('mod/wiki:viewpage', $context, $USER);
return has_capability('mod/wiki:viewpage', $context);
} else if ($wiki->wikimode == 'individual') {
// Individual Mode:
// Each person owns a wiki.
if ($subwiki->userid == $USER->id) {
// Only the owner of the wiki can view it
return has_capability('mod/wiki:viewpage', $context, $USER);
return has_capability('mod/wiki:viewpage', $context);
} else { // User has special capabilities
// User must have:
// mod/wiki:viewpage capability
// and
// mod/wiki:managewiki capability
$view = has_capability('mod/wiki:viewpage', $context, $USER);
$manage = has_capability('mod/wiki:managewiki', $context, $USER);
$view = has_capability('mod/wiki:viewpage', $context);
$manage = has_capability('mod/wiki:managewiki', $context);
return $view && $manage;
}
@@ -736,7 +736,7 @@ function wiki_user_can_view($subwiki) {
// Only members of subwiki group could view that wiki
if ($subwiki->groupid == groups_get_activity_group($cm)) {
// Only view capability needed
return has_capability('mod/wiki:viewpage', $context, $USER);
return has_capability('mod/wiki:viewpage', $context);
} else { // User is not part of that group
// User must have:
@@ -745,9 +745,9 @@ function wiki_user_can_view($subwiki) {
// moodle/site:accessallgroups capability
// and
// mod/wiki:viewpage capability
$view = has_capability('mod/wiki:viewpage', $context, $USER);
$manage = has_capability('mod/wiki:managewiki', $context, $USER);
$access = has_capability('moodle/site:accessallgroups', $context, $USER);
$view = has_capability('mod/wiki:viewpage', $context);
$manage = has_capability('mod/wiki:managewiki', $context);
$access = has_capability('moodle/site:accessallgroups', $context);
return ($manage || $access) && $view;
}
} else {
@@ -765,7 +765,7 @@ function wiki_user_can_view($subwiki) {
// Everybody can read all wikis
//
// Only view capability needed
return has_capability('mod/wiki:viewpage', $context, $USER);
return has_capability('mod/wiki:viewpage', $context);
} else {
//Error
return false;
@@ -796,22 +796,22 @@ function wiki_user_can_edit($subwiki) {
// There is a wiki for all the class.
//
// Only edit capbility needed
return has_capability('mod/wiki:editpage', $context, $USER);
return has_capability('mod/wiki:editpage', $context);
} else if ($wiki->wikimode == 'individual') {
// Individual Mode
// There is a wiki per user
// Only the owner of that wiki can edit it
if ($subwiki->userid == $USER->id) {
return has_capability('mod/wiki:editpage', $context, $USER);
return has_capability('mod/wiki:editpage', $context);
} else { // Current user is not the owner of that wiki.
// User must have:
// mod/wiki:editpage capability
// and
// mod/wiki:managewiki capability
$edit = has_capability('mod/wiki:editpage', $context, $USER);
$manage = has_capability('mod/wiki:managewiki', $context, $USER);
$edit = has_capability('mod/wiki:editpage', $context);
$manage = has_capability('mod/wiki:managewiki', $context);
return $edit && $manage;
}
@@ -827,7 +827,7 @@ function wiki_user_can_edit($subwiki) {
// Only members of subwiki group could edit that wiki
if ($subwiki->groupid == groups_get_activity_group($cm)) {
// Only edit capability needed
return has_capability('mod/wiki:editpage', $context, $USER);
return has_capability('mod/wiki:editpage', $context);
} else { // User is not part of that group
// User must have:
// mod/wiki:managewiki capability
@@ -835,9 +835,9 @@ function wiki_user_can_edit($subwiki) {
// moodle/site:accessallgroups capability
// and
// mod/wiki:editpage capability
$manage = has_capability('mod/wiki:managewiki', $context, $USER);
$access = has_capability('moodle/site:accessallgroups', $context, $USER);
$edit = has_capability('mod/wiki:editpage', $context, $USER);
$manage = has_capability('mod/wiki:managewiki', $context);
$access = has_capability('moodle/site:accessallgroups', $context);
$edit = has_capability('mod/wiki:editpage', $context);
return $manage && $access && $edit;
}
} else if ($wiki->wikimode == 'individual') {
@@ -846,7 +846,7 @@ function wiki_user_can_edit($subwiki) {
//
// Only the owner of that wiki can edit it
if ($subwiki->userid == $USER->id) {
return has_capability('mod/wiki:editpage', $context, $USER);
return has_capability('mod/wiki:editpage', $context);
} else { // Current user is not the owner of that wiki.
// User must have:
// mod/wiki:managewiki capability
@@ -854,9 +854,9 @@ function wiki_user_can_edit($subwiki) {
// moodle/site:accessallgroups capability
// and
// mod/wiki:editpage capability
$manage = has_capability('mod/wiki:managewiki', $context, $USER);
$access = has_capability('moodle/site:accessallgroups', $context, $USER);
$edit = has_capability('mod/wiki:editpage', $context, $USER);
$manage = has_capability('mod/wiki:managewiki', $context);
$access = has_capability('moodle/site:accessallgroups', $context);
$edit = has_capability('mod/wiki:editpage', $context);
return $manage && $access && $edit;
}
} else {
@@ -871,14 +871,14 @@ function wiki_user_can_edit($subwiki) {
// Only members of subwiki group could edit that wiki
if ($subwiki->groupid == groups_get_activity_group($cm)) {
// Only edit capability needed
return has_capability('mod/wiki:editpage', $context, $USER);
return has_capability('mod/wiki:editpage', $context);
} else { // User is not part of that group
// User must have:
// mod/wiki:managewiki capability
// and
// mod/wiki:editpage capability
$manage = has_capability('mod/wiki:managewiki', $context, $USER);
$edit = has_capability('mod/wiki:editpage', $context, $USER);
$manage = has_capability('mod/wiki:managewiki', $context);
$edit = has_capability('mod/wiki:editpage', $context);
return $manage && $edit;
}
} else if ($wiki->wikimode == 'individual') {
@@ -887,14 +887,14 @@ function wiki_user_can_edit($subwiki) {
//
// Only the owner of that wiki can edit it
if ($subwiki->userid == $USER->id) {
return has_capability('mod/wiki:editpage', $context, $USER);
return has_capability('mod/wiki:editpage', $context);
} else { // Current user is not the owner of that wiki.
// User must have:
// mod/wiki:managewiki capability
// and
// mod/wiki:editpage capability
$manage = has_capability('mod/wiki:managewiki', $context, $USER);
$edit = has_capability('mod/wiki:editpage', $context, $USER);
$manage = has_capability('mod/wiki:managewiki', $context);
$edit = has_capability('mod/wiki:editpage', $context);
return $manage && $edit;
}
} else {

8
mod/wiki/renderer.php
View File

@@ -303,8 +303,8 @@ class mod_wiki_renderer extends plugin_renderer_base {
} else if ($wiki->wikimode == 'individual') {
// We have private wikis here
$view = has_capability('mod/wiki:viewpage', $context, $USER);
$manage = has_capability('mod/wiki:managewiki', $context, $USER);
$view = has_capability('mod/wiki:viewpage', $context);
$manage = has_capability('mod/wiki:managewiki', $context);
// Only people with these capabilities can view all wikis
if ($view && $manage) {
@@ -340,8 +340,8 @@ class mod_wiki_renderer extends plugin_renderer_base {
return;
} else if ($wiki->wikimode == 'individual') {
// @TODO: Print here a combo that contains all users of that subwiki.
$view = has_capability('mod/wiki:viewpage', $context, $USER);
$manage = has_capability('mod/wiki:managewiki', $context, $USER);
$view = has_capability('mod/wiki:viewpage', $context);
$manage = has_capability('mod/wiki:managewiki', $context);
// Only people with these capabilities can view all wikis
if ($view && $manage) {

2
mod/wiki/view.php
View File

@@ -248,7 +248,7 @@ if ($id) {
// *
// * Error. No more options
// */
} else {
} else {
print_error('incorrectparameters');
}
require_course_login($course, true, $cm);