moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-46218_disabled2' of https://github.com/andyjdavis/moodle

Browse source
This commit is contained in:
Dan Poltawski 2014-07-14 15:33:12 +01:00
commit 2df87a9d2a
4 changed files with 47 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

41
blog/edit.php
View file

@ -31,8 +31,12 @@ include_once('locallib.php');
$action = required_param('action', PARAM_ALPHA);
$id = optional_param('entryid', 0, PARAM_INT);
$confirm = optional_param('confirm', 0, PARAM_BOOL);
$modid = optional_param('modid', 0, PARAM_INT); // To associate the entry with a module instance
$courseid = optional_param('courseid', 0, PARAM_INT); // To associate the entry with a course
$modid = optional_param('modid', 0, PARAM_INT); // To associate the entry with a module instance.
$courseid = optional_param('courseid', 0, PARAM_INT); // To associate the entry with a course.
if ($action == 'edit') {
$id = required_param('entryid', PARAM_INT);
}
$PAGE->set_url('/blog/edit.php', array('action' => $action, 'entryid' => $id, 'confirm' => $confirm, 'modid' => $modid, 'courseid' => $courseid));
@ -41,6 +45,20 @@ if (!empty($id) && $action == 'add') {
$id = null;
}
// Blogs are always in system context.
$sitecontext = context_system::instance();
$PAGE->set_context($sitecontext);
require_login($courseid);
if (empty($CFG->enableblogs)) {
print_error('blogdisable', 'blog');
}
if (isguestuser()) {
print_error('noguestentry', 'blog');
}
$returnurl = new moodle_url('/blog/index.php');
if (!empty($courseid) && empty($modid)) {
@ -54,27 +72,8 @@ if (!empty($modid)) {
$returnurl->param('courseid', $courseid);
}
// Blogs are always in system context.
$sitecontext = context_system::instance();
$PAGE->set_context($sitecontext);
$blogheaders = blog_get_headers();
require_login($courseid);
if ($action == 'edit') {
$id = required_param('entryid', PARAM_INT);
}
if (empty($CFG->enableblogs)) {
print_error('blogdisable', 'blog');
}
if (isguestuser()) {
print_error('noguestentry', 'blog');
}
if (!has_capability('moodle/blog:create', $sitecontext) && !has_capability('moodle/blog:manageentries', $sitecontext)) {
print_error('cannoteditentryorblog');
}

26
blog/index.php
View file

@ -34,10 +34,6 @@ foreach ($url_params as $var => $val) {
}
$PAGE->set_url('/blog/index.php', $url_params);
if (empty($CFG->enableblogs)) {
print_error('blogdisable', 'blog');
}
//correct tagid if a text tag is provided as a param
if (!empty($tag)) {
if ($tagrec = $DB->get_record('tag', array('name' => $tag))) {
@ -47,15 +43,6 @@ if (!empty($tag)) {
}
}
// add courseid if modid or groupid is specified: This is used for navigation and title
if (!empty($modid) && empty($courseid)) {
$courseid = $DB->get_field('course_modules', 'course', array('id'=>$modid));
}
if (!empty($groupid) && empty($courseid)) {
$courseid = $DB->get_field('groups', 'courseid', array('id'=>$groupid));
}
$sitecontext = context_system::instance();
// Blogs are always in system context.
$PAGE->set_context($sitecontext);
@ -84,6 +71,19 @@ if ($CFG->bloglevel == BLOG_GLOBAL_LEVEL) {
print_error('blogdisable', 'blog');
}
if (empty($CFG->enableblogs)) {
print_error('blogdisable', 'blog');
}
// Add courseid if modid or groupid is specified: This is used for navigation and title.
if (!empty($modid) && empty($courseid)) {
$courseid = $DB->get_field('course_modules', 'course', array('id' => $modid));
}
if (!empty($groupid) && empty($courseid)) {
$courseid = $DB->get_field('groups', 'courseid', array('id' => $groupid));
}
if (!$userid && has_capability('moodle/blog:view', $sitecontext) && $CFG->bloglevel > BLOG_USER_LEVEL) {
if ($entryid) {