Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'MDL-28568_noncontact_warning_23' of git://github.com/an…

…dyjdavis/moodle into MOODLE_23_STABLE
  • Loading branch information...
commit eec3d1869d29ae8d727168a3bfbbe4546a0cef6c 2 parents 4689599 + 36e22a8
@samhemelryk samhemelryk authored
View
3  lang/en/message.php
@@ -82,6 +82,7 @@
$string['messagehistoryfull'] = 'All messages';
$string['messages'] = 'Messages';
$string['messaging'] = 'Messaging';
+$string['messagingblockednoncontact'] = '{$a} will not be able to reply as you have blocked non-contacts';
$string['messagingdisabled'] = 'Messaging is disabled on this site, emails will be sent instead';
$string['mycontacts'] = 'My contacts';
$string['newonlymsg'] = 'Show only new';
@@ -140,5 +141,5 @@
$string['unreadnewnotification'] = 'New notification';
$string['unreadnewnotifications'] = 'New notifications ({$a})';
$string['userisblockingyou'] = 'This user has blocked you from sending messages to them';
-$string['userisblockingyounoncontact'] = 'This user is only accepting messages from people listed as contacts, and you are not currently on the list.';
+$string['userisblockingyounoncontact'] = '{$a} only accepts messages from their contacts.';
$string['userssearchresults'] = 'Users found: {$a}';
View
15 message/index.php
@@ -153,7 +153,7 @@
if (!empty($userpreferences['message_blocknoncontacts'])) { // User is blocking non-contacts
if (empty($contact)) { // We are not a contact!
- $messageerror = get_string('userisblockingyounoncontact', 'message');
+ $messageerror = get_string('userisblockingyounoncontact', 'message', fullname($user2));
}
}
@@ -287,8 +287,19 @@
if ($currentuser && has_capability('moodle/site:sendmessage', $context)) {
echo html_writer::start_tag('div', array('class' => 'mdl-align messagesend'));
if (!empty($messageerror)) {
- echo $OUTPUT->heading($messageerror, 3);
+ echo html_writer::tag('span', $messageerror, array('id' => 'messagewarning'));
} else {
+ // Display a warning if the current user is blocking non-contacts and is about to message to a non-contact
+ // Otherwise they may wonder why they never get a reply
+ $blocknoncontacts = get_user_preferences('message_blocknoncontacts', '', $user1->id);
+ if (!empty($blocknoncontacts)) {
+ $contact = $DB->get_record('message_contacts', array('userid' => $user1->id, 'contactid' => $user2->id));
+ if (empty($contact)) {
+ $msg = get_string('messagingblockednoncontact', 'message', fullname($user2));
+ echo html_writer::tag('span', $msg, array('id' => 'messagewarning'));
+ }
+ }
+
$mform = new send_form();
$defaultmessage = new stdClass;
$defaultmessage->id = $user2->id;
View
1  theme/standard/style/core.css
@@ -453,3 +453,4 @@ table#tag-management-list {margin: 10px auto;width: 80%;}
#page-message-edit table.generaltable th.c0 {text-align: left;}
#page-message-edit table.generaltable td.c0 {text-align: right;}
#page-message-edit table.generaltable td.disallowed {text-align: center;vertical-align:middle;}
+#messagewarning {font-style:italic;}
Please sign in to comment.
Something went wrong with that request. Please try again.