--- loncom/interface/lonmsgdisplay.pm 2011/05/12 21:56:13 1.157 +++ loncom/interface/lonmsgdisplay.pm 2023/09/15 22:32:46 1.200 @@ -1,7 +1,7 @@ -# $textareaclass The LearningOnline Network with CAPA +# The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.157 2011/05/12 21:56:13 raeburn Exp $ +# $Id: lonmsgdisplay.pm,v 1.200 2023/09/15 22:32: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,21 +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', - thfm => 'The folder may not be renamed', - fmnb => 'folder may not be renamed as it is a folder provided by the system.', - asth => 'as this name is already in use for a system-provided or user-defined folder.', - the => 'The', - tnfm => 'The new folder may not be named', + 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}); @@ -182,16 +187,16 @@ function folder_choice(targetform,caller if (targetform.folderaction.options[targetform.folderaction.selectedIndex].value == 'rename') { for (var i=0; i - - - - -
'.$lt{'fold'}.'
'."\n". + 		'.$html_lt{'fold'}.'
'."\n". &Apache::loncommon::select_form($folder,'folder',\%formhash).' 		'.$lt{'show'}.'
'."\n". + 		'.$html_lt{'show'}.'
'."\n". &Apache::loncommon::select_form($env{'form.interdis'},'interdis', \%show).' 		'.$lt{'status'}.'
'."\n". + 		'.$html_lt{'status'}.'
'."\n". &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).' 		'.$lt{'actn'}.'
'."\n".' + 		+ '.$html_lt{'actn'}.'
'."\n".' '. &Apache::loncommon::select_form('view','folderaction',\%actions). - ' 		'.&mt('New Folder').'
'."\n".' + 		+ '.&mt('New Folder').'
'."\n".' -
+ '."\n". ''. ''. @@ -261,8 +271,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; } @@ -378,7 +388,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})) { @@ -543,7 +553,7 @@ sub discourse { $result .= '
' .$bcc_curr_hdr .'' - .'
'; + .''; $result .= $tmptext.'

'; if (ref($statushash) eq 'HASH') { $statushash->{'active'} = 1; @@ -564,7 +574,7 @@ sub discourse { $result .= '
' .$bcc_prev_hdr .'' - .'
'; + .''; $result .= $tmptext.'

'; if (ref($statushash) eq 'HASH') { $statushash->{'previous'} = 1; @@ -587,7 +597,7 @@ sub discourse { $result .= '
' .$bcc_future_hdr .'' - .'
'; + .''; $result .= $tmptext.'
'; if (ref($statushash) eq 'HASH') { $statushash->{'future'} = 1; @@ -662,7 +672,7 @@ sub disgroup { } $r->print('
'. ''.$lt{$status}.''. - '
'. + ''. ''. ''. @@ -766,22 +776,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; } @@ -811,7 +835,8 @@ sub discrit { .''; 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; @@ -841,7 +866,7 @@ sub discrit { .&Apache::lonhtmlcommon::row_closure(1); } $result .= &Apache::lonhtmlcommon::row_title(&mt('Message'),undef,'LC_evenrow_value') - .'
'.&Apache::lontexconvert::msgtexconverted($content{'message'}).'
' + .'
'.&Apache::lontexconvert::msgtexconverted($content{'message'}).'
' .&Apache::lonhtmlcommon::row_closure() .&Apache::lonhtmlcommon::row_title('',undef,'LC_oddrow_value') .'
'; @@ -877,8 +902,9 @@ sub discrit { '

'. &mt('You have no critical messages.'). '

'. - ''.&mt('Select a course').'
'. - ''.&mt('Communicate').''; + &Apache::lonhtmlcommon::actionbox( + [''.&mt('Select a course').'', + ''.&mt('Communicate').'']); } else { $r->print($header); } @@ -887,7 +913,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 @@ -919,7 +945,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 { @@ -1020,6 +1047,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; @@ -1039,12 +1073,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(< @@ -1055,7 +1092,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; } } @@ -1072,7 +1109,7 @@ sub disfolder { } } if (checktotal == 0) { - alert("$lt{'nome'}\\n$lt{'chec'}"); + alert("$js_lt{'nome'}\\n$js_lt{'chec'}"); return; } document.disall.submit(); @@ -1082,7 +1119,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('

'); @@ -1095,7 +1132,7 @@ ENDDISHEADER } $r->print('

'); 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; @@ -1201,7 +1238,7 @@ ENDDISHEADER foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) { $r->print(''.(($status eq 'new')?'':''). ''. - $item.(($status eq 'new')?'':'').''); + $item.''.(($status eq 'new')?'':'').''); } # Description and Status my $showstatus; @@ -1232,17 +1269,17 @@ ENDDISHEADER # Bottom Functions - $r->print(' + $r->print(' +
+'.&mt('Message Actions').' +
- '."\n". ''."\n"); if (keys(%gotfolders) > 0) { - $r->print(''); } - $r->print(''."\n". - '
-
- '.&mt('Select').' +
'.&mt('Select Messages').'
'."\n". ' '."\n". ' - 		'.&mt('Action').'
'."\n". ' 		'.&mt('Destination folder').'
'); + $r->print('		'.&mt('Destination folder').'
'); my %userfolders; foreach my $key (keys(%gotfolders)) { $userfolders{$key} = $key; @@ -1275,28 +1312,36 @@ ENDDISHEADER $r->print(&Apache::loncommon::select_form('','movetofolder',\%userfolders). '		'. + $r->print(''. '
'); + ''."\n". + '
'."\n" + ); my $postedstartdis=$startdis+1; $r->print(''); 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 = '

'. + my ($numblocked,$startblock,$endblock,$by_ip,$clientip,$blockdom,$setters) = @_; + my $output; + if ($by_ip) { + $output = '

'. + &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).'
'. + &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 = '

'. &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 .="

".$blocktext; return $output; @@ -1307,6 +1352,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('

'. + &mt('Sending of LON-CAPA messages is blocked for your current IP address: [_1].',$clientip).'

'. + ''); + return; + } my $suffix=&Apache::lonmsg::foldersuffix($folder); my ($cdom,$cnum,$group,$refarg); if (exists($env{'form.group'})) { @@ -1381,11 +1446,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 = ''.$lt{'atta'}.' '.$attachmax{'text'}.': '; + $attachrow = ''.$lt{'atta'}.' '.$attachmax{'text'} + .': ' + .'' + .''; } if (&Apache::lonnet::allowed('srm',$env{'request.course.id'}) || &Apache::lonnet::allowed('srm',$env{'request.course.id'}. @@ -1462,9 +1530,12 @@ function courseRecipients() { document.compemail.groupmail.value = document.$formname.groupmail[document.$formname.groupmail.selectedIndex].value; |; } + #typeof(...forminput.length) returns 'undefined' if only one entry exists $broadcast_js .= qq| if (typeof(document.$formname.selectedusers_forminput.length)=="undefined") { - document.compemail.courserecips.value += '_&&&_'+document.$formname.selectedusers_forminput.value; + if (document.$formname.selectedusers_forminput.checked) { + document.compemail.courserecips.value += '_&&&_'+document.$formname.selectedusers_forminput.value; + } } else { for (var i=0; iprint(&additional_rec_row(\%lt)); $r->print(''. &mt('Unless you choose otherwise:').''); + &mt("The subject in each forwarded message will be [_1]'Forwarding:'[_2] followed by the original subject.",'','').'
  • '. + &mt("The message itself will begin with a first line: [_1]'Forwarded message from'[_2] followed by the original sender's name.",'','').'
    • '); $func1='Forward'; # do not translate here! $dissub = &mt('Forwarding').': '; $subj_size = '10'; @@ -1730,7 +1801,7 @@ ENDBLOCK '

    -'.&mt('The messages will be assembled from all lines with the respective'."\n".'username:domain, and appended to the general message text.')); +'.&mt('The messages will be assembled from all lines with the respective [_1][_2]username:domain[_3], and appended to the general message text.','
    ','','')); $r->print(<

    @@ -1884,7 +1955,7 @@ sub disfacetoface { $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}, '%255b'.$user.'%253a'.$domain.'%255d'); - my $result='

    '; + my $result=''; foreach my $key (sort(keys(%records))) { my %content=&Apache::lonmsg::unpackagemsg($records{$key}); next if ($content{'senderdomain'} eq ''); @@ -1916,8 +1987,7 @@ sub disfacetoface { } else { %content=&Apache::lonmsg::unpackagemsg($content{'message'}); $content{'message'} = - ''.&mt('Subject').': '.$content{'subject'}.'
    '.&mt('Subject').': '.$content{'subject'}.'
    '. $content{'message'}; } } else { @@ -1938,7 +2008,7 @@ sub disfacetoface { &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('. $content{'sendername'}.':'. $content{'senderdomain'}.') '.$content{'time'}. - '
    '.
+            '
    '.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
 	      '
    ';
      }
@@ -1946,15 +2016,15 @@ $content{'sendername'}.':'.
     if ($result eq '') {
         my $lctype = &mt(lc(&Apache::loncommon::course_type()));
 	if ($target ne 'tex') { 
-	    $r->print("
    ".&mt('No notes, face-to-face discussion records, critical messages, or broadcast messages in this [_1].',$lctype)."
    ");
+	    $r->print("
    ".&mt('No notes, face-to-face discussion records, critical messages or broadcast messages in this '.$lctype.'.')."
    ");
 	} 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.'
    '); + } elsif ($target eq 'tex') { + $r->print(&Apache::lonxml::xmlparse($r,$target,$result)); } else { - $r->print(&Apache::lonxml::xmlparse($r, 'tex', $result)); - } + $r->print('
    '.$result.'
    '); + } } sub general_message { @@ -2038,7 +2108,7 @@ sub facetoface { .&mt('Discussion and message records for [_1] ([_2])' ,$aboutmelink ,$env{'form.recuname'}.':'.$env{'form.recdomain'}) - .'

    ' + .'

    ' ); &disfacetoface($r,$env{'form.recuname'},$env{'form.recdomain'}); $r->print(<print('Not allowed'); - return; - } - my $usertype; - my $crstype = &Apache::loncommon::course_type(); - if ($crstype eq 'Community') { - $usertype = 'members'; - } else { - $usertype = 'students'; - } - my $lctype = lc($crstype); - my %lt=&Apache::lonlocal::texthash( - 'comb' => 'Communication Blocking', - 'cbds' => 'Communication blocking during scheduled exams', - 'desc' => "You can use communication blocking to prevent $usertype enrolled in this $lctype from displaying LON-CAPA messages sent by other $usertype during an online exam. As blocking of communication could potentially interrupt legitimate communication between $usertype who are also both enrolled in a different LON-CAPA course or community, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.", - 'mecb' => 'Modify existing communication blocking periods', - 'ncbc' => 'No communication blocks currently saved', - 'stor' => 'Save', - ); - - my %ltext = &Apache::lonlocal::texthash( - 'dura' => 'Duration', - 'setb' => 'Set by', - 'even' => 'Event', - 'blck' => 'Blocked?', - 'actn' => 'Action', - 'star' => 'Start', - 'endd' => 'End' - ); - - &printheader($r,'/adm/email?block=display',$lt{'comb'}); - $r->print('

    '.$lt{'cbds'}.'

    '); - - if ($action eq 'store') { - &blockstore($r); - } - - $r->print($lt{'desc'}.'

    -
    - '); - - $r->print('

    '.$lt{'mecb'}.'

    '); - my %records = (); - my $blockcount = 0; - my $parmcount = 0; - &get_blockdates(\%records,\$blockcount); - if ($blockcount > 0) { - $parmcount = &display_blocker_status($r,\%records,\%ltext); - } else { - $r->print($lt{'ncbc'}.'

    '); - } - &display_addblocker_table($r,$parmcount,\%ltext); - my $end_page=&Apache::loncommon::end_page(); - $r->print(<<"END"); -
    - - -
    -$end_page -END - return; -} - -sub blockstore { - my $r = shift; - my %lt=&Apache::lonlocal::texthash( - 'tfcm' => 'The following changes were made', - 'ncwm' => 'No changes were made.' - ); - my %adds = (); - my %removals = (); - my %cancels = (); - my $modtotal = 0; - my $canceltotal = 0; - my $addtotal = 0; - my %blocking = (); - $r->print('

    '.$lt{'head'}.'

    '); - foreach my $envkey (keys(%env)) { - if ($envkey =~ m/^form\.modify_(\d+)$/) { - $adds{$1} = $1; - $removals{$1} = $1; - $modtotal ++; - } elsif ($envkey =~ m/^form\.cancel_(\d+)$/) { - $cancels{$1} = $1; - unless ( defined($removals{$1}) ) { - $removals{$1} = $1; - $canceltotal ++; - } - } elsif ($envkey =~ m/^form\.add_(\d+)$/) { - $adds{$1} = $1; - $addtotal ++; - } - } - - foreach my $key (keys(%removals)) { - my $hashkey = $env{'form.key_'.$key}; - &Apache::lonnet::del('comm_block',["$hashkey"], - $env{'course.'.$env{'request.course.id'}.'.domain'}, - $env{'course.'.$env{'request.course.id'}.'.num'} - ); - } - foreach my $key (keys(%adds)) { - unless ( defined($cancels{$key}) ) { - my ($newstart,$newend) = &get_dates_from_form($key); - my $newkey = $newstart.'____'.$newend; - my $blocktypes = &get_block_choices($key); - $blocking{$newkey} = { - setter => $env{'user.name'}.':'.$env{'user.domain'}, - event => &escape($env{'form.title_'.$key}), - blocks => $blocktypes, - }; - } - } - if ($addtotal + $modtotal > 0) { - &Apache::lonnet::put('comm_block',\%blocking, - $env{'course.'.$env{'request.course.id'}.'.domain'}, - $env{'course.'.$env{'request.course.id'}.'.num'} - ); - } - my $chgestotal = $canceltotal + $modtotal + $addtotal; - if ($chgestotal > 0) { - $r->print($lt{'tfcm'}.'
      '); - if ($canceltotal > 0) { - $r->print('
    • '.&mt('[quant,_1,communication blocking period was,communication blocking periods were] removed.',$canceltotal).'
      • '); - } - if ($modtotal > 0) { - $r->print('
    • '.&mt('[quant,_1,communication blocking period was,communication blocking periods were] modified.',$modtotal).'
      • '); - } - if ($addtotal > 0) { - $r->print('
    • '.&mt('[quant,_1,communication blocking period was,communication blocking periods were] added.',$addtotal).'
      • '); - } - $r->print('
    '); - } else { - $r->print($lt{'ncwm'}); - } - $r->print('
    '); - return; -} - -sub get_dates_from_form { - my $item = shift; - my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate_'.$item); - my $enddate = &Apache::lonhtmlcommon::get_date_from_form('enddate_'.$item); - return ($startdate,$enddate); -} - -sub get_blockdates { - my ($records,$blockcount) = @_; - $$blockcount = 0; - %{$records} = &Apache::lonnet::dump('comm_block', - $env{'course.'.$env{'request.course.id'}.'.domain'}, - $env{'course.'.$env{'request.course.id'}.'.num'} - ); - $$blockcount = keys(%{$records}); - - if ((keys(%{$records}))[0] =~ /^error: 2 /) { - $records = {}; - $$blockcount = 0; - } -} - -sub get_block_choices { - my $item = shift; - my $blocklist; - my ($typeorder,$types) = &blocktype_text(); - foreach my $type (@{$typeorder}) { - if ($env{'form.'.$type.'_'.$item}) { - $blocklist->{$type} = 'on'; - } else { - $blocklist->{$type} = 'off'; - } - } - return $blocklist; -} - -sub display_blocker_status { - my ($r,$records,$ltext) = @_; - my $parmcount = 0; - - my %lt = &Apache::lonlocal::texthash( - 'modi' => 'Modify', - 'canc' => 'Cancel', - ); - my ($typeorder,$types) = &blocktype_text(); - $r->print(&Apache::loncommon::start_data_table()); - $r->print(<<"END"); - - $ltext->{'dura'} - $ltext->{'setb'} - $ltext->{'even'} - $ltext->{'blck'} - $ltext->{'actn'} - -END - foreach my $record (sort(keys(%{$records}))) { - my $onchange = 'onFocus="javascript:window.document.forms['. - "'blockform'].elements['modify_".$parmcount."'].". - 'checked=true;"'; - my ($start,$end) = split(/____/,$record); - my $startform = &Apache::lonhtmlcommon::date_setter('blockform','startdate_'.$parmcount,$start,$onchange); - my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange); - - my ($setuname,$setudom,$title,$blocks) = - &Apache::loncommon::parse_block_record($$records{$record}); - $title = &HTML::Entities::encode($title,'"<>&'); - my $settername = - &Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($setuname,$setudom), - $setuname,$setudom); - $r->print(&Apache::loncommon::start_data_table_row()); - $r->print(<<"END"); - $ltext->{'star'}: $startform
    $ltext->{'endd'}:  $endform - $settername - - -END - foreach my $block (@{$typeorder}) { - my $blockstatus = ''; - if ($blocks->{$block} eq 'on') { - $blockstatus = 'checked="checked"'; - } - $r->print('
    '); - } - $r->print(<<"END"); - -
    - -END - $r->print(&Apache::loncommon::end_data_table_row()); - $parmcount++; - } - $r->print(<<"END"); - -
    -
    -END - return $parmcount; -} - -sub display_addblocker_table { - my ($r,$parmcount,$ltext) = @_; - my $start = time; - my $end = $start + (60 * 60 * 2); #Default is an exam of 2 hours duration. - my $onchange = 'onFocus="javascript:window.document.forms['. - "'blockform'].elements['add_".$parmcount."'].". - 'checked=true;"'; - my $startform = &Apache::lonhtmlcommon::date_setter('blockform','startdate_'.$parmcount,$start,$onchange); - my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange); - my %lt = &Apache::lonlocal::texthash( - 'addb' => 'Add block', - 'exam' => 'e.g., Exam 1', - 'addn' => 'Add new communication blocking periods' - ); - my ($typeorder,$types) = &blocktype_text(); - $r->print(<<"END"); -

    $lt{'addn'}

    -END - $r->print(&Apache::loncommon::start_data_table()); - $r->print(<<"END"); - - $ltext->{'dura'} - $ltext->{'even'} $lt{'exam'} - $ltext->{'blck'} - $ltext->{'actn'} - -END - $r->print(&Apache::loncommon::start_data_table_row()); - $r->print(<<"END"); - $ltext->{'star'}: $startform
    $ltext->{'endd'}:  $endform - - -END - foreach my $block (@{$typeorder}) { - $r->print('
    '); - } - $r->print(<<"END"); - - -END - $r->print(&Apache::loncommon::end_data_table_row()); - $r->print(&Apache::loncommon::end_data_table()); - return; -} - -sub blocktype_text { - my %types = &Apache::lonlocal::texthash( - 'com' => 'Messaging', - 'chat' => 'Chat Room', - 'boards' => 'Discussion', - 'port' => 'Portfolio', - 'groups' => 'Groups', - 'blogs' => 'Blogs', - ); - my $typeorder = ['com','chat','boards','port','groups','blogs']; - return ($typeorder,\%types); -} - # ----------------------------------------------------------- Display a message sub displaymessage { @@ -2377,15 +2136,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.')); - #&build_block_table($r,$startblock,$endblock,\%setters); - my($blocked, $blocktext) = &Apache::loncommon::blocking_status("com"); + my($blocked, $blocktext) = &Apache::loncommon::blocking_status("com",$clientip); $r->print("
    ".$blocktext); return; } @@ -2419,8 +2179,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 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; @@ -2438,19 +2218,22 @@ sub displaymessage { push(@functionlist,'' .&mt('Delete') .''); - push(@functionlist,'' - .&mt('Back to Folder Display') - .''); + +# Prepare available navigation + my @navigationlist; if ($counter > 0){ - push(@functionlist,'' + push(@navigationlist,'' .&mt('Previous') .''); } if ($counter < $number_of_messages - 1){ - push(@functionlist,'' + push(@navigationlist,'' .&mt('Next') .''); } + push(@navigationlist,'' + .&mt('Back to Folder Display') + .''); # Prepare available actions my $symb; @@ -2459,12 +2242,13 @@ sub displaymessage { } elsif (defined($content{'baseurl'})) { $symb=&Apache::lonnet::symbread($content{'baseurl'}); } - my @actionlist; + 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')); @@ -2487,7 +2271,7 @@ sub displaymessage { } } -# Print functionlist and actionlist in page header +# Print functionlist, navigationlist, and actionlist in page header my $functions='
    '; # Functionlist @@ -2497,10 +2281,18 @@ sub displaymessage { } $functions .= &Apache::lonhtmlcommon::end_funclist(); + # Navigationlist + $functions.=&Apache::lonhtmlcommon::start_funclist( + &mt('Navigation')); + foreach my $item (@navigationlist) { + $functions.=&Apache::lonhtmlcommon::add_item_funclist($item); + } + $functions .= &Apache::lonhtmlcommon::end_funclist(); + # Actionlist if (@actionlist) { - my $legendtext=&mt('Currently available actions (will open extra window)'); - $functions.=&Apache::lonhtmlcommon::start_funclist($legendtext); + $functions.=&Apache::lonhtmlcommon::start_funclist( + &mt('Currently available actions (will open extra window)')); foreach my $item (@actionlist) { $functions.=&Apache::lonhtmlcommon::add_item_funclist($item); } @@ -2712,12 +2504,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')) .''.$restitle.'' @@ -2757,7 +2553,7 @@ sub displaymessage { # Message $r->print(&Apache::lonhtmlcommon::row_title(&mt('Message')) - .'
    '
+             .'
    '
 	     .&Apache::lontexconvert::msgtexconverted($content{'message'},1)
 	     .'
    '
     );
@@ -2911,12 +2707,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 '
    '.&mt('Current transactions for student (if applicable)').'
    '.
+            &Apache::loncommon::get_previous_attempt($symb,
+                                                     $content{'sendername'},
+                                                     $content{'senderdomain'},
+                                                     $content{'courseid'});
+        }
 # Have a symb, can render
 	return '
    '.&mt('Current attempts of student (if applicable)').'
    '.
 	    &Apache::loncommon::get_previous_attempt($symb,
@@ -2942,11 +2746,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 .= "";
     }
+    $extra .= '';
+    if ($head_extra) {
+        $extra .= "\n$head_extra";
+    }
     $r->print(&Apache::loncommon::start_page('Messages',
  					$extra));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs
@@ -2956,11 +2765,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
@@ -2984,7 +2793,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;
@@ -3017,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 {
@@ -3048,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'})) {
@@ -3057,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; 
+                        }
                     }
                 }
             }
@@ -3070,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};
+                    }
                 }
             }
         }
@@ -3095,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};
+                    } 
                 }
             }
         }
@@ -3104,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};
+                        }
                     }
 		}
 	    }
@@ -3117,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;
+                        }
                     }
                 }
             }
@@ -3130,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;
+                        }
                     }
                 }
             }
@@ -3141,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;
+                        }
                     }
                 }
             }
@@ -3164,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('
    '.&mt('Attachment not included - exceeded permitted length').'
    ');
-            }
-        } 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('
    '.&mt('Attachment not included - exceeded permitted length').'
    ');
+                }
+            } 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;
@@ -3215,7 +3107,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=
@@ -3226,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);
 	}
@@ -3328,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:").'
    • '.
+                          join("
    • \n",sort(keys(%{$disallowed{'to'}}))).
+                          '

        • ');
+            }
+            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:").'
        • '.
+                          join("
        • \n",sort(keys(%{$disallowed{'cc'}}))).
+                          '

            • ');
+            }
+            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:").'
            • '.
+                          join("
            • \n",sort(keys(%{$disallowed{'bcc'}}))).
+                          '

                • ');
+            }
+        }
     } else {
         &printheader($r,'','Messages cancelled.');
         return 'cancelled';
@@ -3351,16 +3268,29 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['display','replyto','forward','markread','markdel','markunread',
          'sendreply','compose','sendmail','critical','recname','recdom',
-         'recordftf','sortedby','block','folder','startdis','interdis',
+         'recordftf','sortedby','folder','startdis','interdis',
 	 'showcommentbaseurl','dismode','group','subject','text','ref',
-         'msgstatus']);
+         'msgstatus','btoken']);
     $sqs='&sortedby='.$env{'form.sortedby'};
 
-# ------------------------------------------------------ They checked for email
-    unless ($env{'form.block'}) {
-        &Apache::lonnet::put('email_status',{'recnewemail'=>0});
+# ----------- 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});
+
 # ----------------------------------------------------------------- Breadcrumbs
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -3562,8 +3492,6 @@ sub handler {
 	&compout($r,'','',$env{'form.compose'});
     } elsif ($env{'form.recordftf'}) {
 	&facetoface($r,$env{'form.recordftf'});
-    } elsif ($env{'form.block'}) {
-        &examblock($r,$env{'form.block'});
     } elsif ($env{'form.sendmail'}) {
         if ($env{'form.multiforward'}) {
             &printheader($r,'','Messages being sent.');
@@ -3614,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 .= '
                '.&mt('Could not deliver forwarded message.').' '.
-                                &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.')';
+                    $message .= '
                '.&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);