MDL-27814 blogs: Cleaning up contexts in blogs

All blogs pages should be in system context. Blogs are in system context just about various things (course, activity etc)
moodle · Apr 12, 2013 · 68fc1cc · 68fc1cc
1 parent b3661ab
commit 68fc1cc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 27 deletions.
diff --git a/blog/edit.php b/blog/edit.php
@@ -45,21 +45,19 @@
 
 if (!empty($courseid) && empty($modid)) {
     $returnurl->param('courseid', $courseid);
-    $PAGE->set_context(context_course::instance($courseid));
 }
 
 // If a modid is given, guess courseid
 if (!empty($modid)) {
     $returnurl->param('modid', $modid);
     $courseid = $DB->get_field('course_modules', 'course', array('id' => $modid));
     $returnurl->param('courseid', $courseid);
-    $PAGE->set_context(context_module::instance($modid));
 }
 
-// If courseid is empty use the system context
+// Blogs are always in system context.
-if (empty($courseid)) {
+$sitecontext = context_system::instance();
-    $PAGE->set_context(context_system::instance());
+$PAGE->set_context($sitecontext);
-}
+
 
 $blogheaders = blog_get_headers();
 
@@ -77,7 +75,6 @@
     print_error('noguestentry', 'blog');
 }
 
-$sitecontext = context_system::instance();
 if (!has_capability('moodle/blog:create', $sitecontext) && !has_capability('moodle/blog:manageentries', $sitecontext)) {
     print_error('cannoteditentryorblog');
 }

diff --git a/blog/edit_form.php b/blog/edit_form.php
@@ -141,7 +141,7 @@ function validation($data, $files) {
 
         // validate course association
         if (!empty($data['courseassoc'])) {
-            $coursecontext = context::instance_by_id($data['courseassoc'], IGNORE_MISSING);
+            $coursecontext = context::instance_by_id($data['courseassoc']);
 
             $canassociatecourse = has_capability('moodle/blog:associatecourse', $coursecontext);
             if ($coursecontext->contextlevel == CONTEXT_COURSE && $canassociatecourse) {
@@ -156,7 +156,7 @@ function validation($data, $files) {
         // validate mod association
         if (!empty($data['modassoc'])) {
             $modcontextid = $data['modassoc'];
-            $modcontext = context::instance_by_id($modcontextid, IGNORE_MISSING);
+            $modcontext = context::instance_by_id($modcontextid);
 
             $canassociatemodule = has_capability('moodle/blog:associatemodule', $modcontext);
             if ($canassociatemodule) {

diff --git a/blog/index.php b/blog/index.php
@@ -57,6 +57,8 @@
 }
 
 $sitecontext = context_system::instance();
+// Blogs are always in system context.
+$PAGE->set_context($sitecontext);
 
 // check basic permissions
 if ($CFG->bloglevel == BLOG_GLOBAL_LEVEL) {
@@ -199,15 +201,6 @@
 
 $courseid = (empty($courseid)) ? SITEID : $courseid;
 
-if (empty($entryid) && empty($modid) && empty($groupid)) {
-    $PAGE->set_context(context_user::instance($USER->id));
-} else if (!empty($modid)) {
-    $PAGE->set_context(context_module::instance($modid));
-} else if (!empty($courseid)) {
-    $PAGE->set_context(context_course::instance($courseid));
-} else {
-    $PAGE->set_context(context_system::instance());
-}
 
 $blogheaders = blog_get_headers();
 

diff --git a/blog/preferences.php b/blog/preferences.php
@@ -55,20 +55,16 @@
 $PAGE->set_url($url);
 $PAGE->set_pagelayout('standard');
 
-if ($courseid == SITEID) {
+$sitecontext = context_system::instance();
-    require_login();
+$PAGE->set_context($sitecontext);
-    $context = context_system::instance();
+require_login($courseid);
-    $PAGE->set_context($context);
-} else {
-    require_login($courseid);
-    $context = context_course::instance($courseid);
-}
 
 if (empty($CFG->enableblogs)) {
     print_error('blogdisable', 'blog');
 }
 
-require_capability('moodle/blog:view', $context);
+// The preference is site wide not blog specific. Hence user should have permissions in site level.
+require_capability('moodle/blog:view', $sitecontext);
 
 /// If data submitted, then process and store.