MDL-49688 navigation: First review fixes and version bump.

Part of MDL-45774.

admin/roles/assign.php

@@ -135,6 +135,11 @@
     }
 }
 
+if ($user->id != $USER->id) {
+    $PAGE->navigation->extend_for_user($user);
+    $PAGE->navbar->includesettingsbase = true;
+}
+
 $PAGE->set_pagelayout('admin');
 $PAGE->set_title($title);
 

blog/edit.php

@@ -48,8 +48,20 @@
     $id = null;
 }
 
+$entry = new stdClass();
+$entry->id = null;
+
+if ($id) {
+    if (!$entry = new blog_entry($id)) {
+        print_error('wrongentryid', 'blog');
+    }
+    $userid = $entry->userid;
+} else {
+    $userid = $USER->id;
+}
+
 $sitecontext = context_system::instance();
-$usercontext = context_user::instance($USER->id);
+$usercontext = context_user::instance($userid);
 $PAGE->set_context($usercontext);
 $blognode = $PAGE->settingsnav->find('blogadd', null);
 $blognode->make_active();
@@ -85,24 +97,15 @@
 
 // Make sure that the person trying to edit has access right.
 if ($id) {
-    if (!$entry = new blog_entry($id)) {
-        print_error('wrongentryid', 'blog');
-    }
-
     if (!blog_user_can_edit_entry($entry)) {
         print_error('notallowedtoedit', 'blog');
     }
-    $userid = $entry->userid;
     $entry->subject      = clean_text($entry->subject);
     $entry->summary      = clean_text($entry->summary, $entry->format);
-
 } else {
     if (!has_capability('moodle/blog:create', $sitecontext)) {
         print_error('noentry', 'blog'); // The capability "manageentries" is not enough for adding.
     }
-    $entry  = new stdClass();
-    $entry->id = null;
-    $userid = $USER->id;
 }
 $returnurl->param('userid', $userid);
 

blog/index.php

@@ -57,6 +57,12 @@
     }
 }
 
+// Set the userid to the entry author if we have the entry ID.
+if ($entryid and !isset($userid)) {
+    $entry = new blog_entry($entryid);
+    $userid = $entry->userid;
+}
+
 if (isset($userid)) {
     $context = context_user::instance($userid);
 } else {

course/user.php

@@ -154,7 +154,7 @@
                 // Add the user name.
                 $PAGE->navbar->add(fullname($user), $userurl, navigation_node::TYPE_SETTING);
             }
-            $gradeurl = new moodle_url('/course/user.php', array('id'=>$id, 'user'=>$user->id, 'mode'=>$mode));
+            $gradeurl = new moodle_url('/course/user.php', array('id' => $id, 'user' => $user->id, 'mode' => $mode));
             // Add the 'grades' node to the navbar.
             $navbar = $PAGE->navbar->add(get_string('grades', 'grades'), $gradeurl, navigation_node::TYPE_SETTING);
         }

lib/db/upgrade.php

@@ -4270,6 +4270,7 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2015032000.00);
     }
 
+<<<<<<< HEAD
     if ($oldversion < 2015040200.01) {
         // Force uninstall of deleted tool.
         if (!file_exists("$CFG->dirroot/$CFG->admin/tool/timezoneimport")) {
@@ -4315,7 +4316,7 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2015040800.01);
     }
 
-    if ($oldversion < 2015030400.02) {
+    if ($oldversion < 2015040800.02) {
         // Update the default user menu (add preferences, remove my files and my badges).
         $oldconfig = get_config('core', 'customusermenuitems');
 
@@ -4334,7 +4335,7 @@ function xmldb_main_upgrade($oldversion) {
         $newconfig = preg_replace('/(\r\n)+/', "\n", $newconfig);
         set_config('customusermenuitems', $newconfig);
 
-        upgrade_main_savepoint(true, 2015030400.02);
+        upgrade_main_savepoint(true, 2015040800.02);
     }
 
     return true;

lib/myprofilelib.php

@@ -83,7 +83,11 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user,
             if ($userauthplugin && $userauthplugin->can_edit_profile()) {
                 $url = $userauthplugin->edit_profile_url();
                 if (empty($url)) {
-                    $url = new moodle_url('/user/edit.php', array('userid' => $user->id, 'course' => $id));
+                    if (empty($course)) {
+                        $url = new moodle_url('/user/edit.php', array('userid' => $user->id));
+                    } else {
+                        $url = new moodle_url('/user/edit.php', array('userid' => $user->id, 'course' => $course->id));
+                    }
                 }
                 $node = new core_user\output\myprofile\node('administration', 'editprofile',
                         get_string('editmyprofile'), null, $url);

lib/outputrenderers.php

@@ -3960,6 +3960,7 @@ public function favicon() {
      */
     public function render_preferences_groups(preferences_groups $renderable) {
         $html = '';
+        $html .= html_writer::start_div('row-fluid');
         $html .= html_writer::start_tag('div', array('class' => 'span12 preferences-groups'));
         $i = 0;
         $open = false;
@@ -3968,7 +3969,7 @@ public function render_preferences_groups(preferences_groups $renderable) {
                 if ($open) {
                     $html .= html_writer::end_tag('div');
                 }
-                $html .= html_writer::start_tag('div', array('class' => 'row'));
+                $html .= html_writer::start_tag('div', array('class' => 'row-fluid'));
                 $open = true;
             }
             $html .= $this->render($group);
@@ -3979,6 +3980,7 @@ public function render_preferences_groups(preferences_groups $renderable) {
 
         $html .= html_writer::end_tag('ul');
         $html .= html_writer::end_tag('div');
+        $html .= html_writer::end_div();
         return $html;
     }
 
@@ -4122,11 +4124,13 @@ protected function render_context_header(context_header $contextheader) {
 
     /**
      * Wrapper for header elements.
+     *
+     * @param string $heading Heading to be used for the main header.
+     * @return string HTML to display the main header.
      */
     public function full_header($heading = null) {
         $html = html_writer::start_tag('header', array('id' => 'page-header', 'class' => 'clearfix'));
-        // This is to ensure that the logo completely overwrites the header. MDL-49536 has been created to investigate
-        // whether the logo should work this way or not.
+        // This is to ensure that the logo completely overwrites the header if set.
         if (isset($heading) && $heading == '<div class="logo"></div>') {
             $html .= $heading;
         } else {
@@ -4136,7 +4140,7 @@ public function full_header($heading = null) {
         $html .= html_writer::tag('nav', $this->navbar(), array('class' => 'breadcrumb-nav'));
         $html .= html_writer::div($this->page_heading_button(), 'breadcrumb-button');
         $html .= html_writer::end_div();
-        $html .= html_writer::tag('div', $this->course_header(), array('class' => 'course-header'));
+        $html .= html_writer::tag('div', $this->course_header(), array('id' => 'course-header'));
         $html .= html_writer::end_tag('header');
         return $html;
     }

message/index.php

@@ -198,7 +198,7 @@
 } else {
     $PAGE->set_title("{$SITE->shortname}: $strmessages");
 }
-$PAGE->set_heading(fullname($USER));
+$PAGE->set_heading(fullname($user1));
 
 // Remove the user node from the main navigation for this page.
 $usernode = $PAGE->navigation->find('users', null);

message/output/email/message_output_email.php

@@ -134,8 +134,9 @@ function config_form($preferences){
         }
 
         if (!empty($CFG->messagingallowemailoverride)) {
-            $inputattributes = array('size'=>'30', 'name'=>'email_email', 'value'=>$preferences->email_email, 'id'=>'email_email');
-            $string .= html_writer::label(get_string('email','message_email'), 'email_email');
+            $inputattributes = array('size' => '30', 'name' => 'email_email', 'value' => $preferences->email_email,
+                    'id' => 'email_email');
+            $string .= html_writer::label(get_string('email', 'message_email'), 'email_email');
             $string .= $OUTPUT->container(html_writer::empty_tag('input', $inputattributes));
 
             if (empty($preferences->email_email) && !empty($preferences->userdefaultemail)) {

mod/forum/lib.php

@@ -7831,7 +7831,7 @@ function mod_forum_myprofile_navigation(core_user\output\myprofile\tree $tree, $
     }
     $postsurl = new moodle_url('/mod/forum/user.php', array('id' => $user->id));
     if (!empty($course)) {
-        $postsurl->param('coursre', $course->id);
+        $postsurl->param('course', $course->id);
     }
     $string = $iscurrentuser ? get_string('myprofileownpost', 'mod_forum') :
             get_string('myprofileotherpost', 'mod_forum', fullname($user));
@@ -7840,7 +7840,7 @@ function mod_forum_myprofile_navigation(core_user\output\myprofile\tree $tree, $
 
     $discussionssurl = new moodle_url('/mod/forum/user.php', array('id' => $user->id, 'mode' => 'discussions'));
     if (!empty($course)) {
-        $postsurl->param('coursre', $course->id);
+        $postsurl->param('course', $course->id);
     }
     $string = $iscurrentuser ? get_string('myprofileowndis', 'mod_forum') :
             get_string('myprofileotherdis', 'mod_forum', fullname($user));

mod/forum/user.php

@@ -193,7 +193,7 @@
                         array('id' => $user->id, 'course' => $courseid)));
             } else {
                 $navbar = $PAGE->navbar->add(get_string('discussions', 'forum'), new moodle_url('/mod/forum/user.php',
-                        array('id' => $user->id, 'course' => $courseid, 'mode'=>'discussions')));
+                        array('id' => $user->id, 'course' => $courseid, 'mode' => 'discussions')));
             }
         }
     } else if ($canviewuser) {
@@ -211,7 +211,7 @@
                         array('id' => $user->id, 'course' => $courseid)));
             } else {
                 $navbar = $PAGE->navbar->add(get_string('discussions', 'forum'), new moodle_url('/mod/forum/user.php',
-                        array('id' => $user->id, 'course' => $courseid, 'mode'=>'discussions')));
+                        array('id' => $user->id, 'course' => $courseid, 'mode' => 'discussions')));
             }
         }
 
@@ -384,7 +384,7 @@
                 array('id' => $user->id, 'course' => $courseid)));
     } else {
         $navbar = $PAGE->navbar->add(get_string('discussions', 'forum'), new moodle_url('/mod/forum/user.php',
-                array('id' => $user->id, 'course' => $courseid, 'mode'=>'discussions')));
+                array('id' => $user->id, 'course' => $courseid, 'mode' => 'discussions')));
     }
 }
 

my/index.php

@@ -93,9 +93,6 @@
         }
     }
 }
-$mycoursenode = $PAGE->navigation->get('mycourses');
-$mycoursenode->collapse = true;
-$mycoursenode->make_inactive();
 
 // Toggle the editing state and switches
 if ($PAGE->user_allowed_editing()) {

user/edit.php

@@ -194,7 +194,8 @@
             $a->oldemail = $usernew->email = $user->email;
 
             $emailchangedhtml = $OUTPUT->box(get_string('auth_changingemailaddress', 'auth', $a), 'generalbox', 'notice');
-            $emailchangedhtml .= $OUTPUT->continue_button("$CFG->wwwroot/user/preferences.php?userid=$user->id&course=$course->id");
+            $emailchangedhtml .=
+                    $OUTPUT->continue_button("$CFG->wwwroot/user/preferences.php?userid=$user->id&course=$course->id");
             $emailchanged = true;
         }
     }

user/editadvanced.php

@@ -338,7 +338,7 @@
     $PAGE->set_heading($userfullname);
 
     echo $OUTPUT->header();
-    echo $OUTPUT->heading($userfullname);
+    echo $OUTPUT->heading($streditmyprofile);
 }
 
 // Finally display THE form.

user/editlib.php

@@ -96,10 +96,7 @@ function useredit_setup_preference_page($userid, $courseid) {
     } else {
         // Teachers, parents, etc.
         require_capability('moodle/user:editprofile', $personalcontext);
-        // No editing of guest user account.
-        if (isguestuser($user->id)) {
-            print_error('guestnoeditprofileother');
-        }
+
         // No editing of primary admin!
         if (is_siteadmin($user) and !is_siteadmin($USER)) {  // Only admins may edit other admins.
             print_error('useradmineditadmin');

user/editor.php

@@ -56,6 +56,8 @@
 $streditmyeditor = get_string('editorpreferences');
 $userfullname     = fullname($user, true);
 
+$PAGE->navbar->includesettingsbase = true;
+
 $PAGE->set_title("$course->shortname: $streditmyeditor");
 $PAGE->set_heading($userfullname);
 

user/forum.php

@@ -57,6 +57,8 @@
 $streditmyforum = get_string('forumpreferences');
 $userfullname     = fullname($user, true);
 
+$PAGE->navbar->includesettingsbase = true;
+
 $PAGE->set_title("$course->shortname: $streditmyforum");
 $PAGE->set_heading($userfullname);
 

user/forum_form.php

@@ -15,7 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Form to edit a users forum preferences. These are stored as columns in the user table, which
+ * Form to edit a users forum preferences.
+ *
+ * These are stored as columns in the user table, which
  * is why they are in /user and not /mod/forum.
  *
  * @copyright 1999 Martin Dougiamas  http://dougiamas.com

user/language.php

@@ -60,11 +60,13 @@
 $streditmylanguage = get_string('preferredlanguage');
 $userfullname     = fullname($user, true);
 
+$PAGE->navbar->includesettingsbase = true;
+
 $PAGE->set_title("$course->shortname: $streditmylanguage");
 $PAGE->set_heading($userfullname);
 
 echo $OUTPUT->header();
-echo $OUTPUT->heading($userfullname);
+echo $OUTPUT->heading($streditmylanguage);
 
 // Finally display THE form.
 $languageform->display();

user/tests/fixtures/myprofile_fixtures.php

@@ -36,6 +36,9 @@
 class phpunit_fixture_myprofile_category extends \core_user\output\myprofile\category {
     /**
      * Make protected method public for testing.
+     *
+     * @param node $node
+     * @return node Nodes after the specified node.
      */
     public function find_nodes_after($node) {
         return parent::find_nodes_after($node);
@@ -51,10 +54,18 @@ public function validate_after_order() {
 
 /**
  * Class phpunit_fixture_myprofile_tree
+ *
+ * @package   core_user
+ * @category  test
+ * @copyright 2015 onwards Ankit Agarwal
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class phpunit_fixture_myprofile_tree extends \core_user\output\myprofile\tree {
     /**
      * Make protected method public for testing.
+     *
+     * @param category $cat Category object
+     * @return array An array of category objects.
      */
     public function find_categories_after($cat) {
         return parent::find_categories_after($cat);

user/view.php

@@ -190,7 +190,7 @@
 echo $OUTPUT->header();
 
 echo '<div class="userprofile">';
-$headerinfo = array('heading' => fullname($user) ,'user' => $user, 'usercontext' => $usercontext);
+$headerinfo = array('heading' => fullname($user), 'user' => $user, 'usercontext' => $usercontext);
 echo $OUTPUT->context_header($headerinfo, 2);
 
 if ($user->deleted) {