--- loncom/interface/lonmsgdisplay.pm 2022/09/17 23:38:51 1.198 +++ 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.198 2022/09/17 23:38:51 raeburn Exp $ +# $Id: lonmsgdisplay.pm,v 1.203 2025/03/03 21:42:46 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -111,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); @@ -228,41 +229,39 @@ function folder_choice(targetform,caller
'.&mt('Folder Actions').' - - - - - - - - -
'.$html_lt{'fold'}.'
'."\n". - &Apache::loncommon::select_form($folder,'folder',\%formhash).' - 		'.$html_lt{'show'}.'
'."\n". +
+
+
+
'.$html_lt{'status'}.'
'."\n". - &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).' - 		- '.$html_lt{'actn'}.'
'."\n".' + \%show).' + +
+
+
+ '. ' -
- '.&mt('New Folder').'
'."\n".' + +
+
+
- + -
+
'."\n". ''. - ''. - ($folder=~/^critical/?'
':''); + ''; return $output; } @@ -300,15 +299,15 @@ sub scrollbuttons { } else { $status = $statushash{$msgstatus}; } - my $output = ''.&mt('Page:').' '; + my $output; if ($maxdis == 1) { # No buttons if only one page is displayed - $output .= '1/1'; + $output = ''.&mt('Page:').' 1/1'; } else { - $output .= + $output = ' '. ''. ''. - ' / '.$maxdis.' '. + ' / '.$maxdis.' '. ''. ''; } @@ -805,7 +804,7 @@ sub groupmail_header { $groupheader .= &Apache::lonhtmlcommon::breadcrumbs( &mt('Group messages - [_1]',$description), undef,undef,undef,undef,1); - return $groupheader; + return $groupheader.'
'; } sub groupmail_sent { @@ -1134,6 +1133,7 @@ ENDDISHEADER $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,$by_ip,$clientip,$blockdom, \%setters)); } + $r->print(''); return; } my $interdis = $env{'form.interdis'}; @@ -1151,7 +1151,7 @@ ENDDISHEADER $r->print('
'. &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_row(). - ' '); + '#'); if ($env{'form.sortedby'} eq "revdate") { $r->print(''.&mt('Date').''); } else { @@ -1230,10 +1230,10 @@ ENDDISHEADER } } my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime); - $r->print(''.(($status eq 'new')?'':''). + $r->print(''); + ' value="'.$origID.'" />'); foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) { $r->print(''.(($status eq 'new')?'':''). ''. @@ -1271,16 +1271,15 @@ ENDDISHEADER $r->print('
'.&mt('Message Actions').' - - - '."\n". - ''."\n"); + $r->print("\n".''."\n"); if (keys(%gotfolders) > 0) { $r->print(''); } - $r->print(''."\n". - '
'.&mt('Select Messages').'
+
+ '.&mt('Select Messages').'
'."\n". ' '."\n". ' -
'.&mt('Action').'
'."\n". + '."\n". + '
'.&mt('Destination folder').'
'); @@ -1311,10 +1310,9 @@ ENDDISHEADER $r->print(&Apache::loncommon::select_form('','movetofolder',\%userfolders). '		'. - '
'."\n". + $r->print('
'. + '
'."\n". '
'."\n" ); my $postedstartdis=$startdis+1; @@ -1362,13 +1360,13 @@ sub compout { } $r->print(&Apache::loncommon::start_page('Messages')); $r->print(&Apache::lonhtmlcommon::breadcrumbs('Send and display messages')); - $r->print('

'. + $r->print('

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

'. '
  • '. &mt('Note: communication is being blocked for certain IP address(es).'). '
  • '. &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain.',$showdom). - '
'); + '
'); return; } my $suffix=&Apache::lonmsg::foldersuffix($folder); @@ -1443,14 +1441,15 @@ sub compout { 'uas' => 'Upload and Send', 'atta' => 'Attachment', 'to' => 'To:', + 'msgb' => 'Message body', ); my %attachmax = ( text => &mt('(1 MB max size)'), num => 1048576, ); if (!$forwarding && !$multiforward) { - $attachrow = ''.$lt{'atta'}.' '.$attachmax{'text'} - .': ' + $attachrow = '' .'' .''; } @@ -1756,11 +1755,12 @@ $latexHelp."
\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
$latexHelp
-
$sendmode @@ -1784,11 +1784,11 @@ ENDCOMP

$lt{'gen'}

-Subject: +

-

$lt{'gmt'}:
+

+

$lt{'tff'}: ENDBLOCK @@ -1840,7 +1840,7 @@ sub recipient_input_row { &Apache::loncommon::selectstudent_link('compemail','recuname', 'recdomain'); my $output = <<"ENDREC"; -$lt{'to'} $lt{'us'}:  $lt{'do'}: $domform  $selectlink +$lt{'to'}    $selectlink ENDREC return $output; } @@ -1862,9 +1862,9 @@ sub additional_rec_row { my $exmpl = &mt('username:domain,username:domain,...'); my $output = <<"ENDADD";

$lt->{'ad'} ($exmpl) - - -
 $lt->{'to'}
 $cc
 $bcc
+  +  +  ENDADD return $output; } @@ -1894,8 +1894,8 @@ sub submit_button_row { sub msg_subject_row { my ($dissub,$lt,$subj_size,$extra) = @_; - my $output = ''.$lt->{'sb'}.': '.$extra. + my $output = ''.$extra. ''; return $output; } @@ -2503,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')) .''.$restitle.'' @@ -2702,9 +2706,10 @@ 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'}; } @@ -2753,7 +2758,8 @@ sub header { $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')). + '
'); } # ---------------------------------------------------------------- Print header @@ -3619,7 +3625,7 @@ sub handler { &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode),$msgstatus); } - $r->print(&Apache::loncommon::end_page()); + $r->print('
'.&Apache::loncommon::end_page()); return OK; } # ================================================= Main program, reset counter