From 5e008d36ee7171562d8d335fb1e4e5293ccf2135 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Mon, 22 Oct 2012 16:46:39 +0800 Subject: [PATCH 1/2] MDL-36162 core_message: removed the unnecessary and confusing course URL parameter as well as fixing the broken breadcrumb --- lib/navigationlib.php | 2 +- message/edit.php | 34 ++++------------------------------ 2 files changed, 5 insertions(+), 31 deletions(-) diff --git a/lib/navigationlib.php b/lib/navigationlib.php index 0fd249691c8..88a2cdd2bf4 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -3978,7 +3978,7 @@ class settings_navigation extends navigation_node { // Messaging if (($currentuser && has_capability('moodle/user:editownmessageprofile', $systemcontext)) || (!isguestuser($user) && has_capability('moodle/user:editmessageprofile', $usercontext) && !is_primary_admin($user->id))) { - $url = new moodle_url('/message/edit.php', array('id'=>$user->id, 'course'=>$course->id)); + $url = new moodle_url('/message/edit.php', array('id'=>$user->id)); $usersetting->add(get_string('editmymessage', 'message'), $url, self::TYPE_SETTING); } diff --git a/message/edit.php b/message/edit.php index 2d785538530..eb6c6bd9ef0 100644 --- a/message/edit.php +++ b/message/edit.php @@ -26,31 +26,15 @@ require_once(dirname(__FILE__) . '/../config.php'); require_once($CFG->dirroot . '/message/lib.php'); $userid = optional_param('id', $USER->id, PARAM_INT); // user id -$course = optional_param('course', SITEID, PARAM_INT); // course id (defaults to Site) $disableall = optional_param('disableall', 0, PARAM_BOOL); //disable all of this user's notifications $url = new moodle_url('/message/edit.php'); $url->param('id', $userid); -$url->param('course', $course); $PAGE->set_url($url); $PAGE->set_popup_notification_allowed(false); // We are within the messaging system so don't show message popups -if (!$course = $DB->get_record('course', array('id' => $course))) { - print_error('invalidcourseid'); -} - -if ($course->id != SITEID) { - require_login($course); - -} else { - if (!isloggedin()) { - if (empty($SESSION->wantsurl)) { - $SESSION->wantsurl = $CFG->httpswwwroot.'/message/edit.php'; - } - redirect(get_login_url()); - } -} +require_login(); if (isguestuser()) { print_error('guestnoeditmessage', 'message'); @@ -71,10 +55,6 @@ $PAGE->requires->js_init_call('M.core_message.init_editsettings'); if ($user->id == $USER->id) { //editing own message profile require_capability('moodle/user:editownmessageprofile', $systemcontext); - if ($course->id != SITEID && $node = $PAGE->navigation->find($course->id, navigation_node::TYPE_COURSE)) { - $node->make_active(); - $PAGE->navbar->includesettingsbase = true; - } } else { // teachers, parents, etc. require_capability('moodle/user:editmessageprofile', $personalcontext); @@ -144,7 +124,7 @@ if (($form = data_submitted()) && confirm_sesskey()) { print_error('cannotupdateusermsgpref'); } - redirect("$CFG->wwwroot/message/edit.php?id=$user->id&course=$course->id"); + redirect("$CFG->wwwroot/message/edit.php?id=$user->id"); } /// Load preferences @@ -179,14 +159,8 @@ $preferences->blocknoncontacts = get_user_preferences( 'message_blocknoncontac /// Display page header $streditmymessage = get_string('editmymessage', 'message'); -$strparticipants = get_string('participants'); - -$PAGE->set_title("$course->shortname: $streditmymessage"); -if ($course->id != SITEID) { - $PAGE->set_heading("$course->fullname: $streditmymessage"); -} else { - $PAGE->set_heading($course->fullname); -} +$PAGE->set_title($streditmymessage); +$PAGE->set_heading($streditmymessage); // Grab the renderer $renderer = $PAGE->get_renderer('core', 'message'); From 058dadb059ff61615569e88e476299f3264197cd Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Thu, 1 Nov 2012 09:42:11 +0800 Subject: [PATCH 2/2] MDL-36162 core_message: string clean up --- lang/en/message.php | 1 - lib/navigationlib.php | 2 +- message/edit.php | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lang/en/message.php b/lang/en/message.php index 5594c8ccd57..628fdec20a8 100644 --- a/lang/en/message.php +++ b/lang/en/message.php @@ -49,7 +49,6 @@ $string['disableall_help'] = 'Temporarily disable all notifications except those $string['disabled'] = 'Messaging is disabled on this site'; $string['disallowed'] = 'Disallowed'; $string['discussion'] = 'Discussion'; -$string['editmymessage'] = 'Messaging'; $string['emailmessages'] = 'Email messages when I am offline'; $string['emailtagline'] = 'This is a copy of a message sent to you at "{$a->sitename}". Go to {$a->url} to reply.'; $string['emptysearchstring'] = 'You must search for something'; diff --git a/lib/navigationlib.php b/lib/navigationlib.php index 88a2cdd2bf4..8bddf79f847 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -3979,7 +3979,7 @@ class settings_navigation extends navigation_node { // Messaging if (($currentuser && has_capability('moodle/user:editownmessageprofile', $systemcontext)) || (!isguestuser($user) && has_capability('moodle/user:editmessageprofile', $usercontext) && !is_primary_admin($user->id))) { $url = new moodle_url('/message/edit.php', array('id'=>$user->id)); - $usersetting->add(get_string('editmymessage', 'message'), $url, self::TYPE_SETTING); + $usersetting->add(get_string('messaging', 'message'), $url, self::TYPE_SETTING); } // Blogs diff --git a/message/edit.php b/message/edit.php index eb6c6bd9ef0..89c437357f8 100644 --- a/message/edit.php +++ b/message/edit.php @@ -158,9 +158,9 @@ $preferences->blocknoncontacts = get_user_preferences( 'message_blocknoncontac //$preferences->beepnewmessage = get_user_preferences( 'message_beepnewmessage', '', $user->id); /// Display page header -$streditmymessage = get_string('editmymessage', 'message'); -$PAGE->set_title($streditmymessage); -$PAGE->set_heading($streditmymessage); +$strmessaging = get_string('messaging', 'message'); +$PAGE->set_title($strmessaging); +$PAGE->set_heading($strmessaging); // Grab the renderer $renderer = $PAGE->get_renderer('core', 'message');