Skip to content
Permalink
Browse files

Merge branch 'wip-MDL-20627-master' of git://github.com/abgreeve/moodle

  • Loading branch information...
Aparup Banerjee
Aparup Banerjee committed Nov 23, 2011
2 parents 4ea621f + e94113a commit d2b5a2caf5aa65ffc2a99034250e664a0d5786bc
Showing with 9 additions and 2 deletions.
  1. +1 −0 lang/en/moodle.php
  2. +7 −1 user/message.html
  3. +1 −1 user/messageselect.php
@@ -531,6 +531,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';
@@ -34,7 +34,13 @@
<?php
if (count($SESSION->emailto[$id])) {
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 (empty($user->email)) {
$error = get_string('emailempty');
}
@@ -95,7 +95,7 @@
foreach ($data as $k => $v) {
if (preg_match('/^(user|teacher)(\d+)$/',$k,$m)) {
if (!array_key_exists($m[2],$SESSION->emailto[$id])) {
if ($user = $DB->get_record_select('user', "id = ?", array($m[2]), 'id,firstname,lastname,idnumber,email,mailformat,lastaccess, lang')) {
if ($user = $DB->get_record_select('user', "id = ?", array($m[2]), 'id,firstname,lastname,idnumber,email,mailformat,lastaccess, lang, maildisplay')) {
$SESSION->emailto[$id][$m[2]] = $user;
$count++;
}

0 comments on commit d2b5a2c

Please sign in to comment.
You can’t perform that action at this time.