Skip to content
Browse files

Merge branch 'wip-MDL-20627-MOODLE_19_STABLE' of git://github.com/abg…

…reeve/moodle into MOODLE_19_STABLE
  • Loading branch information...
2 parents 51c6d45 + 8f83cfb commit fdcc0f46cc228cc7bb9c566ffe65c385b651cb9f @stronk7 stronk7 committed Dec 1, 2011
Showing with 9 additions and 2 deletions.
  1. +1 −0 lang/en_utf8/moodle.php
  2. +7 −1 user/message.html
  3. +1 −1 user/messageselect.php
View
1 lang/en_utf8/moodle.php
@@ -503,6 +503,7 @@
$string['emaildisableclick'] = 'Click here to disable all email from being sent to this address';
$string['emaildisplay'] = 'Email display';
$string['emaildisplaycourse'] = 'Allow only other course members to see my email address';
+$string['emaildisplayhidden'] = 'Email hidden';
$string['emaildisplayno'] = 'Hide my email address from everyone';
$string['emaildisplayyes'] = 'Allow everyone to see my email address';
$string['emailenable'] = 'This email address is enabled';
View
8 user/message.html
@@ -56,7 +56,13 @@
$course->teacher = get_string('defaultcourseteacher');
}
foreach ($SESSION->emailto[$id] as $user) {
- echo '<tr><td>'.fullname($user,true).'</td><td>'.$user->email.'</td><td>';
+ echo '<tr><td>'.fullname($user,true).'</td>';
+ // Check to see if we should be showing the email address.
+ if ($user->maildisplay == 0 ) { // 0 = don't display my email to anyone.
+ echo '<td>' . get_string('emaildisplayhidden') . '</td><td>';
+ } else {
+ echo '<td>'.$user->email.'</td><td>';
+ }
if ($user->teacher) {
echo '<img src="'.$CFG->pixpath.'/t/user.gif" alt="'.$course->teacher.'" title="'.$course->teacher.'"/>';
}
View
2 user/messageselect.php
@@ -46,7 +46,7 @@
foreach ($_POST as $k => $v) {
if (preg_match('/^(user|teacher)(\d+)$/',$k,$m)) {
if (!array_key_exists($m[2],$SESSION->emailto[$id])) {
- if ($user = get_record_select('user','id = '.$m[2],'id,firstname,lastname,idnumber,email,emailstop,mailformat,lastaccess')) {
+ if ($user = get_record_select('user','id = '.$m[2],'id,firstname,lastname,idnumber,email,emailstop,mailformat,lastaccess,maildisplay')) {
$SESSION->emailto[$id][$m[2]] = $user;
$SESSION->emailto[$id][$m[2]]->teacher = ($m[1] == 'teacher');
$count++;

0 comments on commit fdcc0f4

Please sign in to comment.
Something went wrong with that request. Please try again.