--- loncom/interface/lonmsgdisplay.pm 2013/09/04 14:21:30 1.169
+++ loncom/interface/lonmsgdisplay.pm 2021/11/30 15:55:37 1.194
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.169 2013/09/04 14:21:30 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.194 2021/11/30 15:55:37 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -102,6 +102,8 @@ use HTML::TokeParser();
use Apache::Constants qw(:common);
use Apache::loncommon();
use Apache::lonhtmlcommon();
+use Apache::longroup;
+use Apache::lonnavmaps;
use Apache::lontexconvert();
use HTML::Entities();
use Apache::lonlocal;
@@ -120,18 +122,23 @@ my $startdis='';
sub folderlist {
my ($folder,$msgstatus) = @_;
- my %lt = &Apache::lonlocal::texthash(
+ my %html_lt = &Apache::lonlocal::texthash(
actn => 'Action',
fold => 'Folder',
show => 'Show',
status => 'Message Status',
go => 'Go',
+
+ );
+ &html_escape(\%html_lt);
+ my %js_lt = &Apache::lonlocal::texthash(
nnff => 'New Name for Folder',
newn => 'New Name',
fmnb => 'Folder may not be renamed as it is a folder provided by the system.',
asth => 'Requested name already in use for a system-provided or user-defined folder.',
);
+ &js_escape(\%js_lt);
# set se lastvisit for the new mail check in the toplevel menu
&Apache::lonnet::appenv({'user.mailcheck.lastvisit'=>time});
@@ -179,16 +186,16 @@ function folder_choice(targetform,caller
if (targetform.folderaction.options[targetform.folderaction.selectedIndex].value == 'rename') {
for (var i=0; i<permfolders_keys.length; i++) {
if (permfolders_keys[i] == targetform.folder.value) {
- alert("'"+permfolders_vals[i]+"' -- $lt{'fmnb'}");
+ alert("'"+permfolders_vals[i]+"' -- $js_lt{'fmnb'}");
return;
}
}
- var foldername=prompt('$lt{'nnff'}','$lt{'newn'}');
+ var foldername=prompt('$js_lt{'nnff'}','$js_lt{'newn'}');
if (foldername) {
targetform.renamed.value=foldername;
for (var i=0; i<allfolders.length; i++) {
if (allfolders[i] == foldername) {
- alert("'"+foldername+"' $lt{'asth'}");
+ alert("'"+foldername+"' $js_lt{'asth'}");
return;
}
}
@@ -204,7 +211,7 @@ function folder_choice(targetform,caller
if (newname) {
for (var i=0; i<allfolders.length; i++) {
if (allfolders[i] == newname) {
- alert("'"+newname+"' -- $lt{'asth'}");
+ alert("'"+newname+"' -- $js_lt{'asth'}");
return;
}
}
@@ -223,21 +230,21 @@ function folder_choice(targetform,caller
<legend>'.&mt('Folder Actions').'</legend>
<table border="0" cellspacing="2" cellpadding="8">
<tr>
- <td><b>'.$lt{'fold'}.'</b><br />'."\n".
+ <td><b>'.$html_lt{'fold'}.'</b><br />'."\n".
&Apache::loncommon::select_form($folder,'folder',\%formhash).'
</td>
- <td><b>'.$lt{'show'}.'</b><br />'."\n".
+ <td><b>'.$html_lt{'show'}.'</b><br />'."\n".
&Apache::loncommon::select_form($env{'form.interdis'},'interdis',
\%show).'
</td>
- <td><b>'.$lt{'status'}.'</b><br />'."\n".
+ <td><b>'.$html_lt{'status'}.'</b><br />'."\n".
&Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).'
</td>
<td style="padding-right: 40px;">
- <b>'.$lt{'actn'}.'</b><br />'."\n".'
+ <b>'.$html_lt{'actn'}.'</b><br />'."\n".'
<span class="LC_nobreak">'.
&Apache::loncommon::select_form('view','folderaction',\%actions).
- ' <input type="button" value="'.$lt{'go'}.
+ ' <input type="button" value="'.$html_lt{'go'}.
'" onclick="javascript:folder_choice(this.form,'."'change'".');" />
</span>
</td>
@@ -245,7 +252,7 @@ function folder_choice(targetform,caller
<b>'.&mt('New Folder').'</b><br />'."\n".'
<span class="LC_nobreak">
<input type="text" size="15" name="newfolder" value="" />
- <input type="button" value="'.$lt{'go'}.
+ <input type="button" value="'.$html_lt{'go'}.
'" onclick="javascript:folder_choice(this.form,'."'new'".');" />
</span>
</td>
@@ -263,8 +270,8 @@ sub get_permanent_folders {
my %permfolders =
&Apache::lonlocal::texthash('' => 'INBOX',
'trash' => 'TRASH',
- 'critical' => 'Critical',
- 'sent' => 'Sent Messages',
+ 'critical' => 'CRITICAL',
+ 'sent' => 'SENT MESSAGES',
);
return %permfolders;
}
@@ -380,7 +387,7 @@ sub deletefolder {
my ($folder)=@_;
my %permfolders = &get_permanent_folders();
if (defined($permfolders{$folder})) {
- return &mt('The folder "[_1]" may not be deleted.',$folder);
+ return &mt('The folder "[_1]" may not be deleted.',$permfolders{$folder});
}
my %userfolders = &Apache::lonmsg::get_user_folders();
if (!defined($userfolders{$folder})) {
@@ -768,22 +775,36 @@ sub groupmail_header {
text=>"Groups",
title=>$brtitle});
}
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg",
- text=>"Group: $description",
- title=>"Go to group's home page"},
- {href=>"/adm/email?compose=group&group=".
- "$env{'form.group'}&$refarg",
- text=>"Send a Message in a Group",
- title=>"Compose Group Message"},);
+ my $view_permission =
+ &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
+ my $navmap=Apache::lonnavmaps::navmap->new();
+ my $grouppagelink = &Apache::longroup::get_group_link($cdom,$cnum,$group,$navmap,$view_permission,$refarg);
+ if ($grouppagelink) {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>$grouppagelink,
+ text=>&mt('Group').": $description",
+ title=>&mt("Go to group's home page"),
+ no_mt=>1,
+ },);
+ } else {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({text=>&mt('Group').": $description",
+ no_mt=>1,});
+ }
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/email?compose=group&group=".
+ "$env{'form.group'}&$refarg",
+ text=>"Send a Message in a Group",
+ title=>"Compose Group Message"},);
if ($action eq 'sending') {
&Apache::lonhtmlcommon::add_breadcrumb
({text=>"Messages being sent.",
title=>"E-mails sent"},);
}
my $groupheader = &Apache::loncommon::start_page('Group Message');
- $groupheader .= &Apache::lonhtmlcommon::breadcrumbs
- ('Group - '.$env{'form.group'}.' Email');
+ $groupheader .= &Apache::lonhtmlcommon::breadcrumbs(
+ &mt('Group messages - [_1]',$description),
+ undef,undef,undef,undef,1);
return $groupheader;
}
@@ -813,7 +834,8 @@ sub discrit {
.'<input type="hidden" name="confirm" value="true" />';
my %what=&Apache::lonnet::dump('critical');
my $result = '';
- foreach my $key (sort(keys(%what))) {
+ # Sort by date in descending order
+ foreach my $key (sort{$b <=> $a}(keys(%what))) {
my %content=&Apache::lonmsg::unpackagemsg($what{$key});
next if ($content{'senderdomain'} eq '');
my $description;
@@ -843,7 +865,7 @@ sub discrit {
.&Apache::lonhtmlcommon::row_closure(1);
}
$result .= &Apache::lonhtmlcommon::row_title(&mt('Message'),undef,'LC_evenrow_value')
- .'<pre>'.&Apache::lontexconvert::msgtexconverted($content{'message'}).'</pre>'
+ .'<pre class="LC_wordwrap">'.&Apache::lontexconvert::msgtexconverted($content{'message'}).'</pre>'
.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title('',undef,'LC_oddrow_value')
.'<div class="LC_warning">';
@@ -890,7 +912,7 @@ sub discrit {
}
sub sortedmessages {
- my ($blocked,$startblock,$endblock,$numblocked,$folder,$msgstatus) = @_;
+ my ($blocked,$startblock,$endblock,$by_ip,$numblocked,$folder,$msgstatus) = @_;
my $suffix=&Apache::lonmsg::foldersuffix($folder);
my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);
#unpack the varibles and repack into temp for sorting
@@ -922,7 +944,8 @@ sub sortedmessages {
push(@temp1,$content{'recuser'},$content{'recdomain'});
}
# Check whether message was sent during blocking period.
- if ($sendtime >= $startblock && ($sendtime <= $endblock && $endblock > 0) ) {
+ if (($by_ip) ||
+ (($sendtime >= $startblock) && ($sendtime <= $endblock && $endblock > 0))) {
$$blocked{$msgid} = 'ON';
$$numblocked ++;
} else {
@@ -1023,6 +1046,13 @@ sub disall {
&Apache::loncommon::store_settings('user','mail',\%saveable);
&Apache::loncommon::restore_settings('user','mail',\%saveable);
$folder ||= $env{'form.folder'};
+ # Always show critical messages if present
+ my @what=&Apache::lonnet::dump('critical',$env{'user.domain'},$env{'user.name'});
+ if ($what[0]) {
+ if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) {
+ $folder = 'critical';
+ }
+ }
$msgstatus ||= $env{'form.msgstatus'};
$env{'form.interdis'} ||= 20;
@@ -1042,12 +1072,15 @@ sub disfolder {
my %blocked = ();
my %setters = ();
my $numblocked = 0;
- my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');
- my %lt = &Apache::lonlocal::texthash(
+ my $clientip = &Apache::lonnet::get_requestor_ip($r);
+ my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
+ &Apache::loncommon::blockcheck(\%setters,'com',$clientip);
+ my %js_lt = &Apache::lonlocal::texthash(
sede => 'Select a destination folder to which the messages will be moved.',
nome => 'No messages have been selected to apply this action to.',
chec => 'Check the checkbox for at least one message.',
);
+ &js_escape(\%js_lt);
my $jscript = &Apache::loncommon::check_uncheck_jscript();
$r->print(<<ENDDISHEADER);
<script type="text/javascript">
@@ -1058,7 +1091,7 @@ sub disfolder {
document.disall.markedaction.value = document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value;
if (document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value == 'markedmove') {
if (document.disall.movetofolder.options[document.disall.movetofolder.selectedIndex].value == "") {
- alert("$lt{'sede'}");
+ alert("$js_lt{'sede'}");
return;
}
}
@@ -1075,7 +1108,7 @@ sub disfolder {
}
}
if (checktotal == 0) {
- alert("$lt{'nome'}\\n$lt{'chec'}");
+ alert("$js_lt{'nome'}\\n$js_lt{'chec'}");
return;
}
document.disall.submit();
@@ -1085,7 +1118,7 @@ sub disfolder {
ENDDISHEADER
my $fsqs='&folder='.$folder;
- my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
+ my @temp=&sortedmessages(\%blocked,$startblock,$endblock,$by_ip,\$numblocked,$folder,$msgstatus);
my $totalnumber=$#temp+1;
if ($totalnumber < 1) {
$r->print('<p class="LC_info">');
@@ -1098,7 +1131,7 @@ ENDDISHEADER
}
$r->print('</p>');
if ($numblocked > 0) {
- $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
+ $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,$by_ip,$clientip,$blockdom,
\%setters));
}
return;
@@ -1204,7 +1237,7 @@ ENDDISHEADER
foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) {
$r->print('<td>'.(($status eq 'new')?'<b>':'').
'<a href="/adm/email?display='.$origID.$sqs.'">'.
- $item.(($status eq 'new')?'</b>':'').'</a></td>');
+ $item.'</a>'.(($status eq 'new')?'</b>':'').'</td>');
}
# Description and Status
my $showstatus;
@@ -1254,7 +1287,7 @@ ENDDISHEADER
$r->print(' <option value="markeddel">'.&mt('Delete').'</option>'."\n");
}
if ($msgstatus ne 'read') {
- $r->print(' <option value="markedread">'.&mt('Mark Read').'</option>."\n"');
+ $r->print(' <option value="markedread">'.&mt('Mark Read').'</option>'."\n");
}
if ($msgstatus ne 'unread') {
$r->print(' <option value="markedunread">'.&mt('Mark Unread').'</option>'."\n");
@@ -1293,15 +1326,22 @@ ENDDISHEADER
}
sub blocked_in_folder {
- my ($numblocked,$startblock,$endblock,$setters) = @_;
- my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
- my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
- my $output = '<br /><br />'.
+ my ($numblocked,$startblock,$endblock,$by_ip,$clientip,$blockdom,$setters) = @_;
+ my $output;
+ if ($by_ip) {
+ $output = '<br /><br />'.
+ &mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages is blocked for your current IP address: [_2].',$numblocked,$clientip).'<br />'.
+ &mt('Note: communication is being blocked for certain IP address(es).');
+ } else {
+ my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
+ my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
+ $output = '<br /><br />'.
&mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock);
+ }
#$output .= &Apache::loncommon::build_block_table($startblock,$endblock,
# $setters);
- my ($blocked, $blocktext) = &Apache::loncommon::blocking_status("com");
+ my ($blocked, $blocktext) = &Apache::loncommon::blocking_status("com",$clientip);
$output .="<br /><br />".$blocktext;
return $output;
@@ -1386,11 +1426,14 @@ sub compout {
'to' => 'To:',
);
my %attachmax = (
- text => &mt('(128 KB max size)'),
- num => 131072,
+ text => &mt('(1 MB max size)'),
+ num => 1048576,
);
if (!$forwarding && !$multiforward) {
- $attachrow = '<tr><td colspan="3"><b>'.$lt{'atta'}.'</b> '.$attachmax{'text'}.': <input type="file" name="attachment" /></td></tr>';
+ $attachrow = '<tr><td colspan="3"><b>'.$lt{'atta'}.'</b> '.$attachmax{'text'}
+ .': <input type="file" name="attachment" class="LC_flUpload" multiple />'
+ .'<input type="hidden" id="LC_free_space" value="'.$attachmax{'num'}.'" />'
+ .'</td></tr>';
}
if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
@@ -1892,7 +1935,7 @@ sub disfacetoface {
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'},
'%255b'.$user.'%253a'.$domain.'%255d');
- my $result='<div>';
+ my $result='';
foreach my $key (sort(keys(%records))) {
my %content=&Apache::lonmsg::unpackagemsg($records{$key});
next if ($content{'senderdomain'} eq '');
@@ -1924,8 +1967,7 @@ sub disfacetoface {
} else {
%content=&Apache::lonmsg::unpackagemsg($content{'message'});
$content{'message'} =
- '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br
-'.
+ '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.
$content{'message'};
}
} else {
@@ -1946,7 +1988,7 @@ sub disfacetoface {
&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
$content{'sendername'}.':'.
$content{'senderdomain'}.') '.$content{'time'}.
- '<br /><pre>'.
+ '<br /><pre class="LC_wordwrap">'.
&Apache::lontexconvert::msgtexconverted($content{'message'}).
'</pre>';
}
@@ -1954,15 +1996,15 @@ $content{'sendername'}.':'.
if ($result eq '') {
my $lctype = &mt(lc(&Apache::loncommon::course_type()));
if ($target ne 'tex') {
- $r->print("<p><b>".&mt('No notes, face-to-face discussion records, critical messages, or broadcast messages in this [_1].',$lctype)."</b></p>");
+ $r->print("<p><b>".&mt('No notes, face-to-face discussion records, critical messages or broadcast messages in this '.$lctype.'.')."</b></p>");
} else {
- $r->print('\textbf{'.&mt('No notes, face-to-face discussion records, critical messages or broadcast messages in this [_1].',$lctype).'}\\\\');
+ $r->print('\textbf{'.&mt('No notes, face-to-face discussion records, critical messages or broadcast messages in this '.$lctype.'.').'}\\\\');
}
- } elsif ($target ne 'tex') {
- $r->print($result.'</div>');
+ } elsif ($target eq 'tex') {
+ $r->print(&Apache::lonxml::xmlparse($r,$target,$result));
} else {
- $r->print(&Apache::lonxml::xmlparse($r, 'tex', $result));
- }
+ $r->print('<div>'.$result.'</div>');
+ }
}
sub general_message {
@@ -2074,14 +2116,16 @@ sub displaymessage {
my %setters = ();
my $numblocked = 0;
my $crstype = &Apache::loncommon::course_type();
+ my $clientip = &Apache::lonnet::get_requestor_ip($r);
# info to generate "next" and "previous" buttons and check if message is blocked
- my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');
- my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
+ my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
+ &Apache::loncommon::blockcheck(\%setters,'com',$clientip);
+ my @messages=&sortedmessages(\%blocked,$startblock,$endblock,$by_ip,\$numblocked,$folder,$msgstatus);
if ( $blocked{$msgid} eq 'ON' ) {
&printheader($r,'/adm/email',&mt('Display a Message'));
#$r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.'));
- my($blocked, $blocktext) = &Apache::loncommon::blocking_status("com");
+ my($blocked, $blocktext) = &Apache::loncommon::blocking_status("com",$clientip);
$r->print("<br />".$blocktext);
return;
}
@@ -2115,8 +2159,28 @@ sub displaymessage {
my $number_of_messages = scalar(@messages); #subtract 1 for last index
+ my $head_extra;
+
+# if student's view of resource will be included
+# get <link> tag(s) for css file(s) in use, and pass to &header to include
+# in call to loncommon::start_page()
+
+ if (($env{'request.course.id'} eq $content{'courseid'}) &&
+ (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
+ my $symb;
+ if (defined($content{'symb'})) {
+ $symb = $content{'symb'};
+ } elsif (defined($content{'baseurl'})) {
+ $symb=&Apache::lonnet::symbread($content{'baseurl'});
+ }
+ if ($symb) {
+ $head_extra = &Apache::loncommon::css_links($symb);
+ }
+ }
+
# start output
- &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});
+ &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',
+ $content{'baseurl'},$head_extra);
# Prepare available functions
my @functionlist;
@@ -2161,9 +2225,10 @@ sub displaymessage {
my @actionlist;
if ($env{'user.adv'}) {
- if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
+ if (($env{'request.course.id'}) && ($from_student) &&
+ (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {
push(@actionlist,&Apache::loncommon::track_student_link(
- &mt('View recent activity')
+ 'View recent activity'
,$content{'sendername'}
,$content{'senderdomain'}
,'check'));
@@ -2464,7 +2529,7 @@ sub displaymessage {
# Message
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Message'))
- .'<pre>'
+ .'<pre class="LC_wordwrap">'
.&Apache::lontexconvert::msgtexconverted($content{'message'},1)
.'</pre>'
);
@@ -2624,6 +2689,13 @@ sub displayresource {
}
# Could not get a symb, give up
unless ($symb) { return $content{'citation'}; }
+ if ($symb =~ /ext\.tool$/) {
+ return '<h2>'.&mt('Current transactions for student (if applicable)').'</h2>'.
+ &Apache::loncommon::get_previous_attempt($symb,
+ $content{'sendername'},
+ $content{'senderdomain'},
+ $content{'courseid'});
+ }
# Have a symb, can render
return '<h2>'.&mt('Current attempts of student (if applicable)').'</h2>'.
&Apache::loncommon::get_previous_attempt($symb,
@@ -2649,11 +2721,16 @@ sub displayresource {
# ================================================================== The Header
sub header {
- my ($r,$title,$baseurl)=@_;
+ my ($r,$title,$baseurl,$head_extra)=@_;
my $extra = &Apache::loncommon::studentbrowser_javascript();
if ($baseurl) {
$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
}
+ $extra .= '<script type="text/javascript"
+ src="/res/adm/includes/file_upload.js"></script>';
+ if ($head_extra) {
+ $extra .= "\n$head_extra";
+ }
$r->print(&Apache::loncommon::start_page('Messages',
$extra));
$r->print(&Apache::lonhtmlcommon::breadcrumbs
@@ -2663,11 +2740,11 @@ sub header {
# ---------------------------------------------------------------- Print header
sub printheader {
- my ($r,$url,$desc,$title,$baseurl)=@_;
+ my ($r,$url,$desc,$title,$baseurl,$head_extra)=@_;
&Apache::lonhtmlcommon::add_breadcrumb
({href=>$url,
text=>$desc});
- &header($r,$title,$baseurl);
+ &header($r,$title,$baseurl,$head_extra);
}
# ------------------------------------------------------------ Store the comment
@@ -2691,7 +2768,7 @@ sub storedcommentlisting {
'^'.&escape(&escape($env{'form.showcommentbaseurl'})));
$r->print(&Apache::loncommon::start_page('Saved Comment Listing',undef,
{'onlybody' => 1}));
- if ((keys %msgs)[0]=~/^error\:/) {
+ if ((keys(%msgs))[0]=~/^error\:/) {
$r->print(&mt('No saved comments yet.'));
} else {
my $found=0;
@@ -2725,7 +2802,7 @@ sub sendoffmail {
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
}
if ($env{'form.send'}) {
- if (!$env{'form.multiforward'}) {
+ if (!$env{'form.multiforward'}) {
if ($group eq '') {
&printheader($r,'','Messages being sent.');
} else {
@@ -2755,6 +2832,8 @@ sub sendoffmail {
my $mode = $env{'form.sendmode'};
my (%toaddr,$tos,$cc,$bcc,$broadcast);
+ my (%willtrust,%trustchecked,%disallowed);
+ my $serverdefdom = &Apache::lonnet::default_login_domain();
if ($mode eq 'group') {
if (defined($env{'form.courserecips'})) {
@@ -2764,9 +2843,17 @@ sub sendoffmail {
foreach my $dest (@to) {
my ($user,$domain) = split(/:/, $dest);
if (($user ne '') && ($domain ne '')) {
- my $rec = $user.":".$domain;
- $toaddr{$rec} = '';
- $broadcast->{$rec} = '';
+ unless ($trustchecked{$domain}) {
+ $willtrust{$domain} = &Apache::lonnet::will_trust('msg',$serverdefdom,$domain);
+ $trustchecked{$domain} = 1;
+ }
+ if ($willtrust{$domain}) {
+ my $rec = $user.":".$domain;
+ $toaddr{$rec} = '';
+ $broadcast->{$rec} = '';
+ } else {
+ $disallowed{'to'}{$user.":".$domain} = 1;
+ }
}
}
}
@@ -2777,22 +2864,47 @@ sub sendoffmail {
if ($txt) {
$rec =~ s/^\s+//;
$rec =~ s/\s+$//;
- $toaddr{$rec}.=$txt."\n";
- $broadcast->{$rec} = '';
+ my ($recuname,$recudom) = split(/:/,$rec);
+ unless ($trustchecked{$recudom}) {
+ $willtrust{$recudom} = &Apache::lonnet::will_trust('msg',$serverdefdom,$recudom);
+ $trustchecked{$recudom} = 1;
+ }
+ if ($willtrust{$recudom}) {
+ $toaddr{$rec}.=$txt."\n";
+ $broadcast->{$rec} = '';
+ } else {
+ $disallowed{'to'}{$rec} = 1;
+ }
}
}
} else {
if (($env{'form.recuname'} ne '') && ($env{'form.recdomain'} ne '')) {
- $toaddr{$env{'form.recuname'}.':'.$env{'form.recdomain'}}='';
- $tos->{$env{'form.recuname'}.':'.$env{'form.recdomain'}}='';
+ unless ($trustchecked{$env{'form.recdomain'}}) {
+ $willtrust{$env{'form.recdomain'}} = &Apache::lonnet::will_trust('msg',$serverdefdom,$env{'form.recdomain'});
+ $trustchecked{$env{'form.recdomain'}} = 1;
+ }
+ if ($willtrust{$env{'form.recdomain'}}) {
+ $toaddr{$env{'form.recuname'}.':'.$env{'form.recdomain'}}='';
+ $tos->{$env{'form.recuname'}.':'.$env{'form.recdomain'}}='';
+ } else {
+ $disallowed{'to'}{$env{'form.recuname'}.':'.$env{'form.recdomain'}};
+ }
}
}
if ($env{'form.additionalrec_to'}) {
foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_to'})) {
my ($auname,$audom)=split(/:/,$rec);
if (($auname ne "") && ($audom ne "")) {
- $toaddr{$auname.':'.$audom}='';
- $tos->{$auname.':'.$audom}='';
+ unless ($trustchecked{$audom}) {
+ $willtrust{$audom} = &Apache::lonnet::will_trust('msg',$serverdefdom,$audom);
+ $trustchecked{$audom} = 1;
+ }
+ if ($willtrust{$audom}) {
+ $toaddr{$auname.':'.$audom}='';
+ $tos->{$auname.':'.$audom}='';
+ } else {
+ $disallowed{'to'}{$auname.':'.$audom};
+ }
}
}
}
@@ -2802,8 +2914,16 @@ sub sendoffmail {
foreach my $rec (@toreplies) {
my ($auname,$audom)=split(/:/,$rec);
if (($auname ne "") && ($audom ne "")) {
- $toaddr{$auname.':'.$audom}='';
- $tos->{$auname.':'.$audom}='';
+ unless ($trustchecked{$audom}) {
+ $willtrust{$audom} = &Apache::lonnet::will_trust('msg',$serverdefdom,$audom);
+ $trustchecked{$audom} = 1;
+ }
+ if ($willtrust{$audom}) {
+ $toaddr{$auname.':'.$audom}='';
+ $tos->{$auname.':'.$audom}='';
+ } else {
+ $disallowed{'to'}{$auname.':'.$audom};
+ }
}
}
}
@@ -2811,9 +2931,17 @@ sub sendoffmail {
foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_cc'})) {
my ($auname,$audom)=split(/:/,$rec);
if (($auname ne "") && ($audom ne "")) {
- $toaddr{$auname.':'.$audom}='';
if (!defined($tos->{$auname.':'.$audom})) {
- $cc->{$auname.':'.$audom}='';
+ unless ($trustchecked{$audom}) {
+ $willtrust{$audom} = &Apache::lonnet::will_trust('msg',$serverdefdom,$audom);
+ $trustchecked{$audom} = 1;
+ }
+ if ($willtrust{$audom}) {
+ $toaddr{$auname.':'.$audom}='';
+ $cc->{$auname.':'.$audom}='';
+ } else {
+ $disallowed{'cc'}{$auname.':'.$audom};
+ }
}
}
}
@@ -2824,9 +2952,17 @@ sub sendoffmail {
foreach my $rec (@ccreplies) {
my ($auname,$audom)=split(/:/,$rec);
if (($auname ne "") && ($audom ne "")) {
- $toaddr{$auname.':'.$audom}='';
if (!defined($tos->{$auname.':'.$audom})) {
- $cc->{$auname.':'.$audom}='';
+ unless ($trustchecked{$audom}) {
+ $willtrust{$audom} = &Apache::lonnet::will_trust('msg',$serverdefdom,$audom);
+ $trustchecked{$audom} = 1;
+ }
+ if ($willtrust{$audom}) {
+ $toaddr{$auname.':'.$audom}='';
+ $cc->{$auname.':'.$audom}='';
+ } else {
+ $disallowed{'cc'}{$auname.':'.$audom} = 1;
+ }
}
}
}
@@ -2837,9 +2973,17 @@ sub sendoffmail {
foreach my $rec (@groupreplies) {
my ($auname,$audom)=split(/:/,$rec);
if (($auname ne "") && ($audom ne "")) {
- $toaddr{$auname.':'.$audom}='';
if (!defined($tos->{$auname.':'.$audom})) {
- $broadcast->{$auname.':'.$audom}='';
+ unless ($trustchecked{$audom}) {
+ $willtrust{$audom} = &Apache::lonnet::will_trust('msg',$serverdefdom,$audom);
+ $trustchecked{$audom} = 1;
+ }
+ if ($willtrust{$audom}) {
+ $toaddr{$auname.':'.$audom}='';
+ $broadcast->{$auname.':'.$audom}='';
+ } else {
+ $disallowed{'to'}{$auname.':'.$audom} = 1;
+ }
}
}
}
@@ -2848,10 +2992,18 @@ sub sendoffmail {
foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_bcc'})) {
my ($auname,$audom)=split(/:/,$rec);
if (($auname ne "") && ($audom ne "")) {
- $toaddr{$auname.':'.$audom}='';
- if ((!defined($tos->{$auname.':'.$audom})) &&
+ if ((!defined($tos->{$auname.':'.$audom})) &&
(!defined($cc->{$auname.':'.$audom}))) {
- $bcc->{$auname.':'.$audom}='';
+ unless ($trustchecked{$audom}) {
+ $willtrust{$audom} = &Apache::lonnet::will_trust('msg',$serverdefdom,$audom);
+ $trustchecked{$audom} = 1;
+ }
+ if ($willtrust{$audom}) {
+ $toaddr{$auname.':'.$audom}='';
+ $bcc->{$auname.':'.$audom}='';
+ } else {
+ $disallowed{'bcc'}{$auname.':'.$audom} = 1;
+ }
}
}
}
@@ -2871,41 +3023,42 @@ sub sendoffmail {
} else {
$savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'});
}
- my %reciphash = (
- to => $tos,
- cc => $cc,
- bcc => $bcc,
- );
- if ($mode eq 'group') {
- if ($group eq '') {
- $reciphash{'course_broadcast'} = $broadcast;
- } else {
- if ($env{'form.groupmail'} eq 'cc') {
- $reciphash{'group_cc_broadcast'} = $broadcast;
+ my ($recipid, @recusers, @recudoms, %permresults);
+ if (keys(%toaddr) > 0) {
+ my %reciphash = (
+ to => $tos,
+ cc => $cc,
+ bcc => $bcc,
+ );
+ if ($mode eq 'group') {
+ if ($group eq '') {
+ $reciphash{'course_broadcast'} = $broadcast;
} else {
- $reciphash{'group_bcc_broadcast'} = $broadcast;
+ if ($env{'form.groupmail'} eq 'cc') {
+ $reciphash{'group_cc_broadcast'} = $broadcast;
+ } else {
+ $reciphash{'group_bcc_broadcast'} = $broadcast;
+ }
}
}
- }
- my ($recipid,$recipstatus) =
- &Apache::lonmsg::store_recipients($msgsubj,$env{'user.name'},
- $env{'user.domain'},\%reciphash);
- if ($recipstatus ne 'ok') {
- &Apache::lonnet::logthis('Failed to store To, Bcc and Cc recipients for '.$env{'user.name'}.':'.$env{'user.domain'});
- }
- if ($env{'form.attachment'}) {
- if (length($env{'form.attachment'})<131072) {
- $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback/'.$now);
- } else {
- $r->print('<p><span class="LC_warning">'.&mt('Attachment not included - exceeded permitted length').'</span><br /></p>');
- }
- } elsif ($env{'form.multiforward'}) {
- if ($env{'form.attachmenturl'} ne '') {
- $attachmenturl = $env{'form.attachmenturl'};
+ ($recipid,my $recipstatus) =
+ &Apache::lonmsg::store_recipients($msgsubj,$env{'user.name'},
+ $env{'user.domain'},\%reciphash);
+ if ($recipstatus ne 'ok') {
+ &Apache::lonnet::logthis('Failed to store To, Bcc and Cc recipients for '.$env{'user.name'}.':'.$env{'user.domain'});
+ }
+ if ($env{'form.attachment'}) {
+ if (length($env{'form.attachment'}) <= 1048576) {
+ $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback/'.$now);
+ } else {
+ $r->print('<p><span class="LC_warning">'.&mt('Attachment not included - exceeded permitted length').'</span><br /></p>');
+ }
+ } elsif ($env{'form.multiforward'}) {
+ if ($env{'form.attachmenturl'} ne '') {
+ $attachmenturl = $env{'form.attachmenturl'};
+ }
}
}
- my @recusers;
- my @recudoms;
foreach my $address (sort(keys(%toaddr))) {
my ($recuname,$recdomain)=split(/\:/,$address);
my $msgtxt = $savemsg;
@@ -2922,7 +3075,8 @@ sub sendoffmail {
$env{'form.sendbck'},
$env{'form.permanent'},
\$sentmessage{$address},
- $nosentstore,$recipid);
+ $nosentstore,$recipid,
+ $attachmenturl,\%permresults);
} else {
$r->print(&mt('Sending').' '.$recuname.':'.$recdomain.': ');
@thismsg=
@@ -2933,13 +3087,20 @@ sub sendoffmail {
$env{'form.permanent'},
\$sentmessage{$address},
undef,undef,undef,
- $nosentstore,$recipid);
+ $nosentstore,$recipid,
+ \%permresults);
}
$msg_status{$recuname.':'.$recdomain}=join(' ',@thismsg);
if ($msg_status{$recuname.':'.$recdomain} =~ /(ok|con_delayed)/) {
$numsent++;
push(@recusers,$recuname);
push(@recudoms,$recdomain);
+ if ($1 eq 'ok') {
+ $r->print('ok ');
+ }
+ if ($permresults{$recuname.':'.$recdomain}) {
+ $r->print(' (email) ');
+ }
}
$sendstatus.=' '.join(' ',@thismsg);
}
@@ -3035,6 +3196,23 @@ sub sendoffmail {
$r->print($message);
}
}
+ if (keys(%disallowed)) {
+ if ((ref($disallowed{'to'}) eq 'HASH') && (keys(%{$disallowed{'to'}}) > 0)) {
+ $r->print(&mt("The following recipients were excluded because the user's domain does not accept messages from server's domain:").'<ul><li>'.
+ join("</li><li>\n",sort(keys(%{$disallowed{'to'}}))).
+ '</li><ul><br />');
+ }
+ if (ref($disallowed{'cc'}) eq 'HASH') {
+ $r->print(&mt("The following CCs were excluded because the user's domain does not accept messages from server's domain:").'<ul><li>'.
+ join("</li><li>\n",sort(keys(%{$disallowed{'cc'}}))).
+ '</li><ul><br />');
+ }
+ if (ref($disallowed{'bcc'}) eq 'HASH') {
+ $r->print(&mt("The following BCCs were excluded because the user's domain does not accept messages from server's domain:").'<ul><li>'.
+ join("</li><li>\n",sort(keys(%{$disallowed{'bcc'}}))).
+ '</li><ul><br />');
+ }
+ }
} else {
&printheader($r,'','Messages cancelled.');
return 'cancelled';