--- loncom/interface/lonmsgdisplay.pm 2015/02/12 21:09:24 1.179
+++ loncom/interface/lonmsgdisplay.pm 2025/03/03 21:42:46 1.203
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.179 2015/02/12 21:09:24 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.203 2025/03/03 21:42:46 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;
@@ -109,6 +111,7 @@ use Apache::loncommunicate;
use Apache::lonfeedback;
use Apache::lonrss();
use Apache::lonselstudent();
+use Apache::lonenc();
use lib '/home/httpd/lib/perl/';
use LONCAPA qw(:DEFAULT :match);
@@ -120,18 +123,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 +187,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 +212,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;
}
}
@@ -221,41 +229,39 @@ function folder_choice(targetform,caller
<form method="post" action="/adm/email" name="folderlist">
<div class="LC_columnSection"><fieldset>
<legend>'.&mt('Folder Actions').'</legend>
- <table border="0" cellspacing="2" cellpadding="8">
- <tr>
- <td><b>'.$lt{'fold'}.'</b><br />'."\n".
- &Apache::loncommon::select_form($folder,'folder',\%formhash).'
- </td>
- <td><b>'.$lt{'show'}.'</b><br />'."\n".
+ <div class="LC_columnSection">
+ <div class="LC_mail_actions"><label><b>'.$html_lt{'fold'}.'</b><br />'."\n".
+ &Apache::loncommon::select_form($folder,'folder',\%formhash).'</label>
+ </div>
+ <div class="LC_mail_actions"><label><b>'.$html_lt{'show'}.'</b><br />'."\n".
&Apache::loncommon::select_form($env{'form.interdis'},'interdis',
- \%show).'
- </td>
- <td><b>'.$lt{'status'}.'</b><br />'."\n".
- &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).'
- </td>
- <td style="padding-right: 40px;">
- <b>'.$lt{'actn'}.'</b><br />'."\n".'
+ \%show).'</label>
+ </div>
+ <div class="LC_mail_actions"><label><b>'.$html_lt{'status'}.'</b><br />'."\n".
+ &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).'</label>
+ </div>
+ <div class="LC_mail_actions" style="padding-right: 1em">
+ <label><b>'.$html_lt{'actn'}.'</b><br />'."\n".'
<span class="LC_nobreak">'.
- &Apache::loncommon::select_form('view','folderaction',\%actions).
- ' <input type="button" value="'.$lt{'go'}.
+ &Apache::loncommon::select_form('view','folderaction',\%actions).'</label>'.
+ ' <input type="button" value="'.$html_lt{'go'}.
'" onclick="javascript:folder_choice(this.form,'."'change'".');" />
</span>
- </td>
- <td style="border-left: 1px solid;padding-left: 40px;">
- <b>'.&mt('New Folder').'</b><br />'."\n".'
+ </div>
+ <div class="LC_vertical_line" style="padding: 0; height: 4em; margin: 0">
+ </div>
+ <div class="LC_mail_actions" style="padding-left: 3em">
<span class="LC_nobreak">
- <input type="text" size="15" name="newfolder" value="" />
- <input type="button" value="'.$lt{'go'}.
+ <label><b>'.&mt('New Folder').'</b><br />'."\n".'
+ <input type="text" size="15" name="newfolder" value="" /></label>
+ <input type="button" value="'.$html_lt{'go'}.
'" onclick="javascript:folder_choice(this.form,'."'new'".');" />
</span>
- </td>
- </tr>
- </table>
+ </div>
</fieldset></div>
'."\n".
'<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.
- '<input type="hidden" name="renamed" value="" />'.
- ($folder=~/^critical/?'</form>':'');
+ '<input type="hidden" name="renamed" value="" />';
return $output;
}
@@ -293,15 +299,15 @@ sub scrollbuttons {
} else {
$status = $statushash{$msgstatus};
}
- my $output = '<b>'.&mt('Page:').'</b> ';
+ my $output;
if ($maxdis == 1) {
# No buttons if only one page is displayed
- $output .= '1/1';
+ $output = '<b>'.&mt('Page:').'</b> 1/1';
} else {
- $output .=
+ $output = '<b><label for="startdis">'.&mt('Page:').'</label></b> '.
'<input type="submit" name="firstview" value="|<" />'.
'<input type="submit" name="prevview" value="<" />'.
- ' <input type="text" size="5" name="startdis" value="'.$start.'" onchange="this.form.submit()" /> / '.$maxdis.' '.
+ ' <input type="text" size="5" name="startdis" id="startdis" value="'.$start.'" onchange="this.form.submit()" /> / '.$maxdis.' '.
'<input type="submit" name="nextview" value=">" />'.
'<input type="submit" name="lastview" value=">|" />';
}
@@ -768,23 +774,37 @@ 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');
- return $groupheader;
+ $groupheader .= &Apache::lonhtmlcommon::breadcrumbs(
+ &mt('Group messages - [_1]',$description),
+ undef,undef,undef,undef,1);
+ return $groupheader.'<div class="LC_landmark" role="main">';
}
sub groupmail_sent {
@@ -844,7 +864,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">';
@@ -891,7 +911,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
@@ -923,7 +943,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 {
@@ -1050,12 +1071,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">
@@ -1066,7 +1090,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;
}
}
@@ -1083,7 +1107,7 @@ sub disfolder {
}
}
if (checktotal == 0) {
- alert("$lt{'nome'}\\n$lt{'chec'}");
+ alert("$js_lt{'nome'}\\n$js_lt{'chec'}");
return;
}
document.disall.submit();
@@ -1093,7 +1117,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">');
@@ -1106,9 +1130,10 @@ 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));
}
+ $r->print('</form>');
return;
}
my $interdis = $env{'form.interdis'};
@@ -1126,7 +1151,7 @@ ENDDISHEADER
$r->print('<form method="post" name="disall" action="/adm/email">'.
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_row().
- '<th colspan="1"> </th><th>');
+ '<th colspan="1">#</th><th>');
if ($env{'form.sortedby'} eq "revdate") {
$r->print('<a href = "/adm/email?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
} else {
@@ -1205,10 +1230,10 @@ ENDDISHEADER
}
}
my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime);
- $r->print('<td align="right"><span class="LC_nobreak">'.(($status eq 'new')?'<b>':'').
+ $r->print('<td align="right"><span class="LC_nobreak"><label>'.(($status eq 'new')?'<b>':'').
$count.'.'.(($status eq 'new')?'</b>':'').' '.
'<input type="checkbox" name="delmark"'.
- ' value="'.$origID.'" /></span></td>');
+ ' value="'.$origID.'" /></label></span></td>');
foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) {
$r->print('<td>'.(($status eq 'new')?'<b>':'').
'<a href="/adm/email?display='.$origID.$sqs.'">'.
@@ -1246,16 +1271,15 @@ ENDDISHEADER
$r->print('
<div class="LC_columnSection"><fieldset>
<legend>'.&mt('Message Actions').'</legend>
-<table border="0" cellspacing="2" cellpadding="8">
- <tr>
- <td><b>'.&mt('Select Messages').'</b><br />
+<div class="LC_mail_actions">
+ <b>'.&mt('Select Messages').'</b><br />
<span class="LC_nobreak">
<input type="button" onclick="javascript:checkAll(document.disall.delmark)" value="'.&mt('Check All').'" />'."\n".
' <input type="button" onclick="javascript:uncheckAll(document.disall.delmark)" value="'.&mt('Uncheck All').'" />'."\n".
'<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />
</span>
- </td>'."\n".
- '<td><b>'.&mt('Action').'</b><br />'."\n".
+ </div>'."\n".
+ '<div class="LC_mail_actions"><label><b>'.&mt('Action').'</b><br />'."\n".
' <select name="checkedaction">'."\n");
if ($folder ne 'trash') {
@@ -1274,7 +1298,7 @@ ENDDISHEADER
$r->print(' <option value="markedmove">'.&mt('Move to Folder ->').
'</option>');
}
- $r->print("\n".'</select></td>'."\n");
+ $r->print("\n".'</select></label></div>'."\n");
if (keys(%gotfolders) > 0) {
$r->print('<td><b>'.&mt('Destination folder').'</b><br />');
@@ -1286,30 +1310,35 @@ ENDDISHEADER
$r->print(&Apache::loncommon::select_form('','movetofolder',\%userfolders).
'</td>');
}
- $r->print('<td style="vertical-align:bottom;">'.
- '<input type="button" name="go" value="'.&mt('Go').
- '" onclick="javascript:validate_checkedaction()"/></td>'."\n".
- '</tr></table>'."\n".
+ $r->print('<div class="LC_mail_actions">'.
+ '<br /><input type="button" name="go" value="'.&mt('Go').
+ '" onclick="javascript:validate_checkedaction()"/></div>'."\n".
'</fieldset></div>'."\n"
);
my $postedstartdis=$startdis+1;
$r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" /><input type="hidden" name="markedaction" value="" /></form>');
if ($numblocked > 0) {
$r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
- \%setters));
+ $by_ip,$clientip,$blockdom,\%setters));
}
}
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;
@@ -1320,6 +1349,26 @@ sub blocked_in_folder {
sub compout {
my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder,$dismode,
$multiforward)=@_;
+ my $clientip = &Apache::lonnet::get_requestor_ip($r);
+ my %setters;
+ my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
+ &Apache::loncommon::blockcheck(\%setters,'com',$clientip);
+ if ($by_ip) {
+ my $showdom = &Apache::lonnet::domain($blockdom);
+ if ($showdom eq '') {
+ $showdom = $blockdom;
+ }
+ $r->print(&Apache::loncommon::start_page('Messages'));
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Send and display messages'));
+ $r->print('<div class="LC_landmark" role="main"><p class="LC_warning">'.
+ &mt('Sending of LON-CAPA messages is blocked for your current IP address: [_1].',$clientip).'</p>'.
+ '<ul><li>'.
+ &mt('Note: communication is being blocked for certain IP address(es).').
+ '</li><li>'.
+ &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain.',$showdom).
+ '</li></ul></div>');
+ return;
+ }
my $suffix=&Apache::lonmsg::foldersuffix($folder);
my ($cdom,$cnum,$group,$refarg);
if (exists($env{'form.group'})) {
@@ -1392,13 +1441,17 @@ sub compout {
'uas' => 'Upload and Send',
'atta' => 'Attachment',
'to' => 'To:',
+ 'msgb' => 'Message body',
);
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"><label><b>'.$lt{'atta'}.'</b> '.$attachmax{'text'}
+ .': <input type="file" name="attachment" class="LC_flUpload" multiple /></label>'
+ .'<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'}.
@@ -1702,11 +1755,12 @@ $latexHelp."<br />\n".
$r->print(&reply_to_row(\%lt));
}
$r->print(&msg_subject_row($dissub,\%lt,$subj_size));
+ my $labeltext = &HTML::Entities::encode($lt{'msgb'});
$r->print(<<"ENDCOMP");
$attachrow
</table><br />
$latexHelp<br />
-<textarea name="message" id="message" cols="80" rows="15" wrap="hard" $textareaclass>$dismsg
+<textarea name="message" id="message" cols="80" rows="15" wrap="hard" $textareaclass aria-label="$labeltext">$dismsg
</textarea>
<br />
$sendmode
@@ -1730,11 +1784,11 @@ ENDCOMP
<input type="hidden" name="send" value="on" />
<h3>$lt{'gen'}</h3>
<p>
-Subject: <input type="text" size="50" name="subject" />
+<label>$lt{'sb'}: <input type="text" size="50" name="subject" /></label>
</p>
-<p>$lt{'gmt'}:<br />
+<p><label>$lt{'gmt'}:<br />
<textarea name="message" id="message" cols="60" rows="10" wrap="hard" $textareaclass>$dismsg
-</textarea></p>
+</textarea></label></p>
<p>
$lt{'tff'}:
ENDBLOCK
@@ -1786,7 +1840,7 @@ sub recipient_input_row {
&Apache::loncommon::selectstudent_link('compemail','recuname',
'recdomain');
my $output = <<"ENDREC";
-<tr><td colspan="3"><span class="LC_nobreak"><b>$lt{'to'}</b> $lt{'us'}: <input type="text" size="12" name="recuname" value="$env{'form.recname'}" /> $lt{'do'}: $domform $selectlink</span></td></tr>
+<tr><td colspan="3"><span class="LC_nobreak"><b>$lt{'to'}</b> <label>$lt{'us'}: <input type="text" size="12" name="recuname" value="$env{'form.recname'}" /></label> <label>$lt{'do'}: $domform</label> $selectlink</span></td></tr>
ENDREC
return $output;
}
@@ -1808,9 +1862,9 @@ sub additional_rec_row {
my $exmpl = &mt('username:domain,username:domain,...');
my $output = <<"ENDADD";
<tr><td colspan="3"><fieldset id="LC_additionalrecips"><legend>$lt->{'ad'} <tt>($exmpl)</tt></legend><table>
-<tr><td> </td><td>$lt->{'to'}</td><td><input type="text" size="50" name="additionalrec_to" /></td></tr>
-<tr><td> </td><td>$cc</td><td><input type="text" size="50" name="additionalrec_cc" /></td></tr>
-<tr><td> </td><td>$bcc</td><td><input type="text" size="50" name="additionalrec_bcc" /></td></tr></table></fieldset></td></tr>
+<tr><td> </td><td><label for="additionalrec_to">$lt->{'to'}</label></td><td><input type="text" size="50" name="additionalrec_to" id="additionalrec_to" /></td></tr>
+<tr><td> </td><td><label for="additionalrec_cc">$cc</label></td><td><input type="text" size="50" name="additionalrec_cc" id="additionalrec_cc" /></td></tr>
+<tr><td> </td><td><label for="additionalrec_bcc">$bcc</label></td><td><input type="text" size="50" name="additionalrec_bcc" id="additionalrec_bcc" /></td></tr></table></fieldset></td></tr>
ENDADD
return $output;
}
@@ -1840,8 +1894,8 @@ sub submit_button_row {
sub msg_subject_row {
my ($dissub,$lt,$subj_size,$extra) = @_;
- my $output = '<tr><td colspan="3"><b>'.$lt->{'sb'}.'</b>: <input type="text" size="'.
- $subj_size.'" name="subject" value="'.$dissub.'" />'.$extra.
+ my $output = '<tr><td colspan="3"><label><b>'.$lt->{'sb'}.'</b>: <input type="text" size="'.
+ $subj_size.'" name="subject" value="'.$dissub.'" /></label>'.$extra.
'</td></tr>';
return $output;
}
@@ -1953,7 +2007,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>';
}
@@ -2081,14 +2135,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;
}
@@ -2122,8 +2178,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;
@@ -2168,7 +2244,8 @@ 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(
'View recent activity'
,$content{'sendername'}
@@ -2426,12 +2503,16 @@ sub displaymessage {
$showsymb,$env{'user.domain'},$env{'user.name'});
if ($symb) {
if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
- $showsymb = &Apache::lonenc::check_encrypt($symb);
+ unless ($showsymb =~ m{^/enc/}) {
+ $showsymb = &Apache::lonenc::encrypted($showsymb);
+ }
}
$symblink = '?symb='.$showsymb;
}
if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
- $showurl = $baseurl;
+ unless ($showurl =~ m{^/enc/}) {
+ $showurl = &Apache::lonenc::encrypted($showurl);
+ }
}
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to'))
.'<a href="'.$showurl.$symblink.'">'.$restitle.'</a>'
@@ -2471,7 +2552,7 @@ sub displaymessage {
# Message
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Message'))
- .'<pre>'
+ .'<pre class="LC_wordwrap">'
.&Apache::lontexconvert::msgtexconverted($content{'message'},1)
.'</pre>'
);
@@ -2625,12 +2706,20 @@ sub displayresource {
&& (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
my $symb;
if (defined($content{'symb'})) {
- $symb = $content{'symb'};
- } else {
- $symb=&Apache::lonnet::symbread($content{'baseurl'});
+ $symb = &Apache::lonenc::check_decrypt($content{'symb'});
+ } elsif (defined($content{'baseurl'})) {
+ $symb =
+ &Apache::lonnet::symbread(&Apache::lonenc::check_decrypt($content{'baseurl'}));
}
# 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,
@@ -2656,25 +2745,31 @@ 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
- (($title?$title:'Send and display messages')));
+ (($title?$title:'Send and display messages')).
+ '<div class="LC_landmark" role="main">');
}
# ---------------------------------------------------------------- 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
@@ -2731,8 +2826,15 @@ sub sendoffmail {
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
}
- if ($env{'form.send'}) {
- if (!$env{'form.multiforward'}) {
+ my $clientip = &Apache::lonnet::get_requestor_ip($r);
+ my %setters;
+ my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
+ &Apache::loncommon::blockcheck(\%setters,'com',$clientip);
+ if ($by_ip) {
+ &printheader($r,'','Sending messages blocked from your location.');
+ return 'blocked';
+ } elsif ($env{'form.send'}) {
+ if (!$env{'form.multiforward'}) {
if ($group eq '') {
&printheader($r,'','Messages being sent.');
} else {
@@ -2762,6 +2864,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'})) {
@@ -2771,9 +2875,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;
+ }
}
}
}
@@ -2784,22 +2896,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};
+ }
}
}
}
@@ -2809,8 +2946,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};
+ }
}
}
}
@@ -2818,9 +2963,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};
+ }
}
}
}
@@ -2831,9 +2984,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;
+ }
}
}
}
@@ -2844,9 +3005,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;
+ }
}
}
}
@@ -2855,10 +3024,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;
+ }
}
}
}
@@ -2878,41 +3055,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;
@@ -2930,7 +3108,7 @@ sub sendoffmail {
$env{'form.permanent'},
\$sentmessage{$address},
$nosentstore,$recipid,
- $attachmenturl);
+ $attachmenturl,\%permresults);
} else {
$r->print(&mt('Sending').' '.$recuname.':'.$recdomain.': ');
@thismsg=
@@ -2941,13 +3119,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);
}
@@ -3043,6 +3228,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';
@@ -3068,9 +3270,24 @@ sub handler {
'sendreply','compose','sendmail','critical','recname','recdom',
'recordftf','sortedby','folder','startdis','interdis',
'showcommentbaseurl','dismode','group','subject','text','ref',
- 'msgstatus']);
+ 'msgstatus','btoken']);
$sqs='&sortedby='.$env{'form.sortedby'};
+# ----------- Check if access was from balancer to server with existing session
+
+ if ($env{'form.btoken'}) {
+ my %info = &Apache::lonnet::tmpget($env{'form.btoken'});
+ &Apache::lonnet::tmpdel($env{'form.btoken'});
+ delete($env{'form.btoken'});
+ unless ($env{'form.display'}) {
+ if (($info{'display'}) && ($info{'mailrecip'})) {
+ if (&unescape($info{'mailrecip'}) eq $env{'user.name'}.':'.$env{'user.domain'}) {
+ $env{'form.display'} = &unescape($info{'display'});
+ }
+ }
+ }
+ }
+
# ------------------------------------------------------ They checked for email
&Apache::lonnet::put('email_status',{'recnewemail'=>0});
@@ -3325,8 +3542,12 @@ sub handler {
my $count = keys(%forwardfail);
my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Could not forward [quant,_1,message].',$count),1);
foreach my $key (keys(%forwardfail)) {
- $message .= '<br />'.&mt('Could not deliver forwarded message.').'</span> '.
- &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')';
+ $message .= '<br />'.&mt('Could not deliver forwarded message.').' ';
+ if ($forwardfail{$key} eq 'blocked') {
+ $message .= &mt('Sending messages is blocked from your IP address');
+ } else {
+ $message .= &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')';
+ }
}
$message = &Apache::loncommon::confirmwrapper($message);
$r->print($message);
@@ -3404,7 +3625,7 @@ sub handler {
&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode),$msgstatus);
}
- $r->print(&Apache::loncommon::end_page());
+ $r->print('</div>'.&Apache::loncommon::end_page());
return OK;
}
# ================================================= Main program, reset counter