MDL-23048 reworked frontpage exceptions

admin/roles/assign.php

@@ -36,13 +36,16 @@ list($context, $course, $cm) = get_context_info_array($contextid);
 
 $url = new moodle_url('/admin/roles/assign.php', array('contextid' => $contextid));
 
-if (!$course) {
+if ($course) {
+    $isfrontpage = ($course->id == SITEID);
+} else {
+    $isfrontpage = false;
     if ($context->contextlevel == CONTEXT_USER) {
         $course = $DB->get_record('course', array('id'=>optional_param('courseid', SITEID, PARAM_INT)), '*', MUST_EXIST);
         $user = $DB->get_record('user', array('id'=>$context->instanceid), '*', MUST_EXIST);
         $url->param('courseid', $course->id);
         $url->param('userid', $user->id);
-    } else if(!($context->contextlevel == CONTEXT_COURSECAT)) { //course categories contexts shouldn't be main frontpage site.
+    } else {
         $course = $SITE;
     }
 }
@@ -55,11 +58,7 @@ $PAGE->set_url($url);
 $PAGE->set_context($context);
 
 $contextname = print_context_name($context);
-$isfrontpage = false;
-if ($course) {
-    $courseid = $course->id;
-    $isfrontpage = ($course->id == SITEID);
-}
+$courseid = $course->id;
 
 // These are needed early because of tabs.php
 list($assignableroles, $assigncounts, $nameswithcounts) = get_assignable_roles($context, ROLENAME_BOTH, true);
@@ -149,12 +148,8 @@ switch ($context->contextlevel) {
         admin_externalpage_setup('assignroles', '', array('contextid' => $contextid, 'roleid' => $roleid));
         break;
     case CONTEXT_USER:
-        if ($isfrontpage) {
-            $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
-            $PAGE->set_heading($fullname);
-        } else {
-            $PAGE->set_heading($course->fullname);
-        }
+        $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
+        $PAGE->set_heading($fullname);
         $showroles = 1;
         break;
     case CONTEXT_COURSECAT: