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

MDL-34695 Wiki Module: add prevention to create new record when userid is 0

Browse Source
This commit is contained in:
Huy Hoang
2012-11-01 17:42:45 +08:00
committed by Rossiani Wijaya
parent ec07ff69f2
commit 71ff0a2f85
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/wiki/files.php
-5
View File
@@ -49,11 +49,6 @@ if ($wid) {
print_error('incorrectwikiid', 'wiki');
}
if (!$subwiki = wiki_get_subwiki_by_group($wiki->id, $currentgroup, $userid)) {
// trap anomalous parameters that would lead to a shared subwiki being created for an individual user
if ($wiki->wikimode == 'individual' && $userid == 0) {
throw new coding_exception('Tried creating a shared subwiki in \'individual\' mode. This shouldn\'t happen.');
}
// create subwiki if doesn't exist
$subwikiid = wiki_add_subwiki($wiki->id, $currentgroup, $userid);
$subwiki = wiki_get_subwiki($subwikiid);
mod/wiki/pagelib.php
-5
View File
@@ -947,11 +947,6 @@ class page_wiki_create extends page_wiki {
$groupid = '0';
}
if (empty($this->subwiki)) {
// trap anomalous parameters that would lead to a shared subwiki being created for an individual user
if ($PAGE->activityrecord->wikimode == 'individual' && $this->uid == 0) {
throw new coding_exception('Tried creating a shared subwiki in \'individual\' mode. This shouldn\'t happen.');
}
// If subwiki is not set then try find one and set else create one.
if (!$this->subwiki = wiki_get_subwiki_by_group($this->wid, $groupid, $this->uid)) {
$swid = wiki_add_subwiki($PAGE->activityrecord->id, $groupid, $this->uid);
mod/wiki/view.php
+6 -4
View File
@@ -68,6 +68,8 @@ if ($id) {
// Checking course instance
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
require_login($course, true, $cm);
// Checking wiki instance
if (!$wiki = wiki_get_wiki($cm->instance)) {
print_error('incorrectwikiid', 'wiki');
@@ -138,6 +140,7 @@ if ($id) {
// Checking course instance
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
require_login($course, true, $cm);
/*
* Case 2:
*
@@ -166,9 +169,9 @@ if ($id) {
}
// Checking course instance
if (!$course = $DB->get_record("course", array("id" => $cm->course))) {
print_error('coursemisconf');
}
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
require_login($course, true, $cm);
$groupmode = groups_get_activity_groupmode($cm);
@@ -267,7 +270,6 @@ if ($id) {
} else {
print_error('incorrectparameters');
}
require_login($course, true, $cm);
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
require_capability('mod/wiki:viewpage', $context);