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

Merge branch 'message_nav' of git://github.com/andyjdavis/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2012-12-10 11:00:17 +13:00
commit fa9b53cdf8
3 changed files with 7 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lang/en/message.php
View file

@ -48,7 +48,6 @@ $string['disableall_help'] = 'Temporarily disable all notifications except those
$string['disabled'] = 'Messaging is disabled on this site'; $string['disabled'] = 'Messaging is disabled on this site';
$string['disallowed'] = 'Disallowed'; $string['disallowed'] = 'Disallowed';
$string['discussion'] = 'Discussion'; $string['discussion'] = 'Discussion';
$string['editmymessage'] = 'Messaging';
$string['emailmessages'] = 'Email messages when I am offline'; $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['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'; $string['emptysearchstring'] = 'You must search for something';

4
lib/navigationlib.php
View file

@ -3978,8 +3978,8 @@ class settings_navigation extends navigation_node {
// Messaging // Messaging
if (($currentuser && has_capability('moodle/user:editownmessageprofile', $systemcontext)) || (!isguestuser($user) && has_capability('moodle/user:editmessageprofile', $usercontext) && !is_primary_admin($user->id))) { 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); $usersetting->add(get_string('messaging', 'message'), $url, self::TYPE_SETTING);
} }
// Blogs // Blogs

36
message/edit.php
View file

@ -26,31 +26,15 @@ require_once(dirname(__FILE__) . '/../config.php');
require_once($CFG->dirroot . '/message/lib.php'); require_once($CFG->dirroot . '/message/lib.php');
$userid = optional_param('id', $USER->id, PARAM_INT); // user id $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 $disableall = optional_param('disableall', 0, PARAM_BOOL); //disable all of this user's notifications
$url = new moodle_url('/message/edit.php'); $url = new moodle_url('/message/edit.php');
$url->param('id', $userid); $url->param('id', $userid);
$url->param('course', $course);
$PAGE->set_url($url); $PAGE->set_url($url);
$PAGE->set_popup_notification_allowed(false); // We are within the messaging system so don't show message popups $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))) { require_login();
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());
}
}
if (isguestuser()) { if (isguestuser()) {
print_error('guestnoeditmessage', 'message'); print_error('guestnoeditmessage', 'message');
@ -71,10 +55,6 @@ $PAGE->requires->js_init_call('M.core_message.init_editsettings');
if ($user->id == $USER->id) { if ($user->id == $USER->id) {
//editing own message profile //editing own message profile
require_capability('moodle/user:editownmessageprofile', $systemcontext); 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 { } else {
// teachers, parents, etc. // teachers, parents, etc.
require_capability('moodle/user:editmessageprofile', $personalcontext); require_capability('moodle/user:editmessageprofile', $personalcontext);
@ -144,7 +124,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
print_error('cannotupdateusermsgpref'); 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 /// Load preferences
@ -178,15 +158,9 @@ $preferences->blocknoncontacts = get_user_preferences( 'message_blocknoncontac
//$preferences->beepnewmessage = get_user_preferences( 'message_beepnewmessage', '', $user->id); //$preferences->beepnewmessage = get_user_preferences( 'message_beepnewmessage', '', $user->id);
/// Display page header /// Display page header
$streditmymessage = get_string('editmymessage', 'message'); $strmessaging = get_string('messaging', 'message');
$strparticipants = get_string('participants'); $PAGE->set_title($strmessaging);
$PAGE->set_heading($strmessaging);
$PAGE->set_title("$course->shortname: $streditmymessage");
if ($course->id != SITEID) {
$PAGE->set_heading("$course->fullname: $streditmymessage");
} else {
$PAGE->set_heading($course->fullname);
}
// Grab the renderer // Grab the renderer
$renderer = $PAGE->get_renderer('core', 'message'); $renderer = $PAGE->get_renderer('core', 'message');