loncom/interface/lonmsgdisplay.pm - diff

Return to lonmsgdisplay.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.35.2.5 and 1.94

-version 1.35.2.5, 2006/08/29 00:28:51
+version 1.94, 2008/10/23 10:15:37
  Line 33  package Apache::lonmsgdisplay;
  =head1 NAME
- Apache::lonmsg: supports internal messaging
+ Apache::lonmsgdisplay: supports internal messaging
  =head1 SYNOPSIS
- lonmsg provides routines for sending messages, receiving messages, and
+ lonmsgdisplay provides a handler to allow users to read, send,
- a handler to allow users to read, send, and delete messages.
+ and delete messages, and to create and delete message folders,
+ and to move messages between folders.
  =head1 OVERVIEW
- Line 74  email program, so they have full access
+ Line 75  email program, so they have full access
  interface, or other features they may wish to use in response to the
  student's query.
- =item * B<Blocking>: LON-CAPA can block display of e-mails that are
+ =item * B<Blocking>: LON-CAPA can block selected communication
- sent to a student during an online exam. A course coordinator or
+ features for students during an online exam. A course coordinator or
  instructor can set an open and close date/time for scheduled online
  exams in a course. If a user uses the LON-CAPA internal messaging
  system to display e-mails during the scheduled blocking event,
- Line 93  addresses on their B<PREF> screen, but g
+ Line 94  addresses on their B<PREF> screen, but g
  are much more useful than traditional email can be made to be, even
  with HTML support.
- Right now, this document will cover just how to send a message, since
- it is likely you will not need to programmatically read messages,
- since lonmsg already implements that functionality.
- The routines used to package messages and unpackage messages are not
- only used by lonmsg when creating/extracting messages for LON-CAPA's
- internal messaging system, but also by lonnotify.pm which is available
- for use by Domain Coordinators to broadcast standard e-mail to specified
- users in their domain.  The XML packaging used in the two cases is very
- similar.  The differences are the use of <recuser>$uname</recuser> and
- <recdomain>$udom</recdomain> in stored internal messages, compared
- with <recipient username="$uname:$udom">$email</recipient> in stored
- Domain Coordinator e-mail for the storage of information about
- recipients of the message/e-mail.
- =head1 FUNCTIONS
- =over 4
  =cut
  use strict;
- Line 119  use Apache::lonnet;
+ Line 101  use Apache::lonnet;
  use HTML::TokeParser();
  use Apache::Constants qw(:common);
  use Apache::loncommon();
+ use Apache::lonhtmlcommon();
  use Apache::lontexconvert();
  use HTML::Entities();
  use Apache::lonlocal;
- Line 132  use LONCAPA;
+ Line 115  use LONCAPA;
  # Querystring component with sorting type
  my $sqs;
  my $startdis;
- my $interdis;
  # ============================================================ List all folders
  sub folderlist {
-     my $folder=shift;
+     my ($folder,$msgstatus) = @_;
-     my @allfolders=&Apache::lonnet::getkeys('email_folders');
+     my %lt = &Apache::lonlocal::texthash(
-     if ($allfolders[0]=~/^error:/) { @allfolders=(); }
+                 actn => 'Action',
-     return '<form method="post" action="/adm/email">'.
+                 fold => 'Folder',
- 	&mt('Folder').': '.
+                 show => 'Show',
- 	&Apache::loncommon::select_form($folder,'folder',
+                 status => 'Message Status',
- 			     ('' => &mt('INBOX'),'trash' => &mt('TRASH'),
+                 go   => 'Go',
- 			      'new' => &mt('New Messages Only'),
+                 nnff => 'New Name for Folder',
-                               'critical' => &mt('Critical'),
+                 newn => 'New Name',
- 			      'sent' => &mt('Sent Messages'),
+                 thfm => 'The folder may not be renamed',
- 			      map { $_ => $_ } @allfolders)).
+                 fmnb => 'folder may not be renamed as it is a folder provided by the system.',
- 			      ' '.&mt('Show').
+                 asth => 'as this name is already in use for a system-provided or user-defined folder.',
- 			      '<select name="interdis">'.
+                 the => 'The',
- 			      join("\n",map { '<option value="'.$_.'"'.
+                 tnfm => 'The new folder may not be named',
- 	 ($_==$interdis?' selected="selected"':'').'>'.$_.'</option>' }
- 				   (10,20,50,100,200)).'</select>'.
+     );
-    '<input type="submit" value="'.&mt('View Folder').'" /><br />'.
+     my %actions = &Apache::lonlocal::texthash(
+                                 view => 'View Folder',
+                                 rename => 'Rename Folder',
+                                 delete => 'Delete Folder',
+     );
+     $actions{'select_form_order'} = ['view','rename','delete'];
+     my %statushash = &get_msgstatus_types();
+     $statushash{'select_form_order'} = ['','new','read','replied','forwarded'];
+     my %permfolders = &get_permanent_folders();
+     my $permlist = join("','",sort(keys(%permfolders)));
+     my ($permlistkeys,$permlistvals);
+     foreach my $key (sort(keys(%permfolders))) {
+         $permlistvals .= $permfolders{$key}."','";
+         $permlistkeys .= $key."','";
+     }
+     $permlistvals =~ s/','$//;
+     $permlistkeys =~ s/','$//;
+     my %gotfolders = &Apache::lonmsg::get_user_folders();
+     my %userfolders;
+     foreach my $key (keys(%gotfolders)) {
+         $key =~ s/(['"])/\$1/g; #' stupid emacs
+         $userfolders{$key} = $key;
+     }
+     my @userorder = sort(keys(%userfolders));
+     my %formhash = (%permfolders,%userfolders);
+     my $folderlist = join("','",@userorder);
+     $folderlist .= "','".$permlistvals;
+     $formhash{'select_form_order'} = ['','critical',@userorder,'sent','trash'];
+     my $output = qq|<script type="text/javascript">
+ function folder_choice(targetform,caller) {
+     var permfolders_keys = new Array('$permlistkeys');
+     var permfolders_vals = new Array('$permlistvals');
+     var allfolders = new Array('$folderlist');
+     if (caller == 'change') {
+         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("$lt{'the'} '"+permfolders_vals[i]+"' $lt{'fmnb'}");
+                     return;
+                 }
+             }
+             var foldername=prompt('$lt{'nnff'}','$lt{'newn'}');
+             if (foldername) {
+                 targetform.renamed.value=foldername;
+                 for (var i=0; i<allfolders.length; i++) {
+                     if (allfolders[i] == foldername) {
+                         alert("$lt{'thfm'} '"+foldername+"' $lt{'asth'}");
+                         return;
+                     }
+                 }
+                 targetform.submit();
+             }
+         }
+         else {
+             targetform.submit();
+         }
+     }
+     if (caller == 'new') {
+         var newname=targetform.newfolder.value;
+         if (newname) {
+             for (var i=0; i<allfolders.length; i++) {
+                 if (allfolders[i] == newname) {
+                     alert("$lt{'tnfm'} '"+newname+"' $lt{'asth'}");
+                     return;
+                 }
+             }
+             targetform.submit();
+         }
+     }
+ }
+ </script>|;
+     my %show = ('select_form_order' => [10,20,50,100,200],
+ 		map {$_=>$_} (10,20,50,100,200));
+     $output .= '
+ <form method="post" action="/adm/email" name="folderlist">
+ <table border="0" cellspacing="2" cellpadding="2">
+  <tr>
+   <td align="left">
+    <table border="0" cellspacing="2" cellpadding="2">
+     <tr>
+      <td align="center"><b>'.$lt{'fold'}.'</b><br />'."\n".
+          &Apache::loncommon::select_form($folder,'folder',%formhash).'
+      </td>
+      <td align="center"><b>'.$lt{'show'}.'</b><br />'."\n".
+          &Apache::loncommon::select_form($env{'form.interdis'},'interdis',
+ 					 %show).'
+      </td>
+      <td align="center"><b>'.$lt{'status'}.'</b><br />'."\n".
+        &Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).'
+      </td>
+      <td align="center"><b>'.$lt{'actn'}.'</b><br />'.
+          &Apache::loncommon::select_form('view','folderaction',%actions).'
+      </td><td><br />'.
+     '<input type="button" value="'.$lt{'go'}.'" onClick="javascript:folder_choice(this.form,'."'change'".');" />
+      </td>
+     </tr>
+    </table>
+   </td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+   <td align="right">
+    <table><tr><td><br />
+     <input type="button" value="'.&mt('Make New Folder').
+     '" onClick="javascript:folder_choice(this.form,'."'new'".');" /></td>'.
+     '<td align="center"><b>'.&mt('New Folder').'</b><br />'.
+     '<input type="text" size="15" name="newfolder" value="" />
+     </td></tr></table>
+   </td>
+  </tr>
+ </table>'."\n".
      '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.
- 			      ($folder=~/^(new|critical)/?'</form>':'');
+     '<input type="hidden" name="renamed" value="" />'.
+         ($folder=~/^critical/?'</form>':'');
+     return $output;
+ }
+ sub get_permanent_folders {
+     my %permfolders =
+ 	&Apache::lonlocal::texthash(''         => 'INBOX',
+ 				    'trash'    => 'TRASH',
+ 				    'critical' => 'Critical',
+ 				    'sent'     => 'Sent Messages',
+ 				    );
+     return %permfolders;
+ }
+ sub get_msgstatus_types {
+     my %statushash = &Apache::lonlocal::texthash(
+                                 '' => 'Any',
+                                 new => 'Unread',
+                                 read => 'Read',
+                                 replied => 'Replied to',
+                                 forwarded => 'Forwarded',
+     );
+     return %statushash;
  }
  sub scrollbuttons {
-     my ($start,$maxdis,$first,$finish,$total)=@_;
+     my ($start,$maxdis,$first,$finish,$total,$msgstatus)=@_;
      unless ($total>0) { return ''; }
      $start++; $maxdis++;$first++;$finish++;
+     my %statushash = &get_msgstatus_types();
+     my $status;
+     if ($msgstatus eq '') {
+         $status = &mt('All');
+     } else {
+         $status = $statushash{$msgstatus};
+     }
      return
-    &mt('Page').': '.
+    '<b>'.&mt('Page').'</b>: '.
     '<input type="submit" name="firstview" value="'.&mt('First').'" />'.
     '<input type="submit" name="prevview" value="'.&mt('Previous').'" />'.
     '<input type="text" size="5" name="startdis" value="'.$start.'" onChange="this.form.submit()" /> of '.$maxdis.
     '<input type="submit" name="nextview" value="'.&mt('Next').'" />'.
     '<input type="submit" name="lastview" value="'.&mt('Last').'" /><br />'.
-    &mt('Showing messages [_1] through [_2] of [_3]',$first,$finish,$total).'</form>';
+    &mt('<b>[_1] messages</b>: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).'</form>';
  }
  # =============================================================== Status Change
- Line 195  sub statuschange {
+ Line 323  sub statuschange {
  # ============================================================= Make new folder
  sub makefolder {
-     my ($newfolder)=@_;
+     my ($newfolder) = @_;
-     if (($newfolder eq 'sent')
+     my %permfolders = &get_permanent_folders();
-      || ($newfolder eq 'critical')
+     my %userfolders = &Apache::lonmsg::get_user_folders();
-      || ($newfolder eq 'trash')
+     my ($outcome,$warning);
-      || ($newfolder eq 'new')) { return; }
+     if (defined($userfolders{$newfolder})) {
-     &Apache::lonnet::put('email_folders',{$newfolder => time});
+         return &mt('The folder name: "[_1]" is already in use for an existing folder.',$newfolder);
+     }
+     foreach my $perm (keys(%permfolders)) {
+         if ($permfolders{$perm} eq $newfolder) {
+             return &mt('The folder name: "[_1]" is already used for one of the folders automatically generated by the system.',$newfolder);
+         }
+     }
+     if (&get_msgfolder_lock() eq 'ok') {
+         my %counter_hash = &Apache::lonnet::get('email_folders',["\0".'idcount']);
+         my $lastcount = $counter_hash{"\0".'idcount'};
+         my $folder_id = $lastcount + 1;
+         while (defined($userfolders{$folder_id})) {
+             $folder_id ++;
+         }
+         my %folderinfo = ( id      => $folder_id,
+                            created => time, );
+         $outcome =
+ 	    &Apache::lonnet::put('email_folders',{$newfolder => \%folderinfo,
+ 						  "\0".'idcount' => $folder_id});
+         my $releaseresult = &release_msgfolder_lock();
+         if ($releaseresult ne 'ok') {
+             $warning = $releaseresult;
+         }
+     } else {
+         $outcome =
+ 	    &mt('Error - could not obtain lock on email folders record.');
+     }
+     return ($outcome,$warning);
+ }
+ # ============================================================= Delete folder
+ sub deletefolder {
+     my ($folder)=@_;
+     my %permfolders = &get_permanent_folders();
+     if (defined($permfolders{$folder})) {
+         return &mt('The folder "[_1]" may not be deleted',$folder);
+     }
+     my %userfolders = &Apache::lonmsg::get_user_folders();
+     if (!defined($userfolders{$folder})) {
+         return &mt('The folder "[_1]" does not exist so deletion is not required.',
+                    $folder);
+     }
+     # check folder is empty;
+     my $suffix=&Apache::lonmsg::foldersuffix($folder);
+     my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);
+     if (@messages > 0) {
+         return &mt('The folder "[_1]" contains messages so it may not be deleted.',$folder).
+                '<br />'.
+                &mt('Delete or move the messages to a different folder first.');
+     }
+     my $delresult = &Apache::lonnet::del('email_folders',[$folder]);
+     return $delresult;
+ }
+ sub renamefolder {
+     my ($folder) = @_;
+     my $newname = $env{'form.renamed'};
+     my %permfolders = &get_permanent_folders();
+     if ($env{'form.renamed'} eq '') {
+         return &mt('The folder "[_1]" may not be renamed to "[_2]" as the new name you requested is an invalid name.',$folder,$newname);
+     }
+     if (defined($permfolders{$folder})) {
+         return &mt('The folder "[_1]" may not be renamed as it is a folder provided by the system.',$folder);
+     }
+     if (defined($permfolders{$newname})) {
+         return &mt('The folder "[_1]" may not be renamed to "[_2]" as the new name you requested is reserved for folders provided automatically by the system.',$folder,$newname);
+     }
+     my %userfolders = &Apache::lonmsg::get_user_folders();
+     if (defined($userfolders{$newname})) {
+         return &mt('The folder "[_1]" may not be renamed to "[_2]" because the new name you requested is already being used for an existing folder.',$folder,$newname);
+     }
+     if (!defined($userfolders{$folder})) {
+         return &mt('The folder "[_1]" could not be renamed to "[_2]" because the folder does not exist.',$folder,$newname);
+     }
+     my %folderinfo;
+     if (ref($userfolders{$folder}) eq 'HASH') {
+         %folderinfo = %{$userfolders{$folder}};
+     } else {
+         %folderinfo = ( id      => $folder,
+                         created => $userfolders{$folder},);
+     }
+     my $outcome =
+      &Apache::lonnet::put('email_folders',{$newname => \%folderinfo});
+     if ($outcome eq 'ok') {
+         $outcome = &Apache::lonnet::del('email_folders',[$folder]);
+     }
+     return $outcome;
+ }
+ sub get_msgfolder_lock {
+     # get lock for mail folder counter.
+     my $lockhash = { "\0".'lock_counter' => time, };
+     my $tries = 0;
+     my $gotlock = &Apache::lonnet::newput('email_folders',$lockhash);
+     while (($gotlock ne 'ok') && $tries <3) {
+         $tries ++;
+         sleep(1);
+         $gotlock = &Apache::lonnet::newput('email_folders',$lockhash);
+     }
+     return $gotlock;
+ }
+ sub release_msgfolder_lock {
+     #  remove lock
+     my @del_lock = ("\0".'lock_counter');
+     my $dellockoutcome=&Apache::lonnet::del('email_folders',\@del_lock);
+     if ($dellockoutcome ne 'ok') {
+         return ('<br />'.&mt('Warning: failed to release lock for counter').'<br />');
+     } else {
+         return 'ok';
+     }
  }
  # ======================================================== Move between folders
  sub movemsg {
- Line 273  sub discourse {
+ Line 513  sub discourse {
      $result .= '<input type="hidden" name="sendmode" value="group" />'."\n";
-     $result .= &Apache::lonselstudent::render_student_list($current_members,
+     my $tmptext;
- 							   "compemail",
+     if ($tmptext = &Apache::lonselstudent::render_student_list($current_members,
- 							   "current",
+                                                                "compemail",
- 							   \%defaultUsers,
+                                                                "current",
-,"selectedusers",1);
+                                                                \%defaultUsers,
+,"selectedusers",1)
-     $result .= &Apache::lonselstudent::render_student_list($expired_members,
+        ) {
- 							   "compemail",
+        $result .= '<h2>'.&mt('Course members with current access').'</h2>';
- 							   "expired",
+        $result .= $tmptext;
- 							   \%defaultUsers,
+     }
-, "selectedusers",0);
+     if ($tmptext = &Apache::lonselstudent::render_student_list($expired_members,
-     $result .= &Apache::lonselstudent::render_student_list($future_members,
+                                                                "compemail",
- 							   "compemail",
+                                                                "expired",
- 							   "future",
+                                                                \%defaultUsers,
- 							   \%defaultUsers,
+, "selectedusers",0)
-, "selectedusers", 0);
+        ) {
+        $result .= '<h2>'.&mt('Course members with expired access').'</h2>';
+        $result .= $tmptext;
+     }
+     if ($tmptext = &Apache::lonselstudent::render_student_list($future_members,
+                                                                "compemail",
+                                                                "future",
+                                                                \%defaultUsers,
+, "selectedusers", 0)
+        ) {
+        $result .= '<h2>'.&mt('Course members with future access').'</h2>';
+        $result .= $tmptext;
+     }
      return $result;
  }
- Line 315  sub disgroup {
+ Line 567  sub disgroup {
                        'recipients to select.');
          return $result;
      } else {
-         $result = &mt('Select message recipients from the group members listed below.<br />');
+         $result = &mt('Select message recipients from the group members listed below.').'<br />';
          my %Sortby = (
                           active   => {},
                           previous => {},
- Line 350  sub disgroup {
+ Line 602  sub disgroup {
                      $result.='<td valign="top">'.
                               '<fieldset><legend><b>'.$lt{$status}.
                               '</b></legend><nobr>'.
-                              '<input type="button" value="check all" '.
+                              '<input type="button" value="'.&mt('Check All').'" '.
                               'onclick="javascript:toggleAll('."'".$status."','check'".')" />'.
                               '&nbsp;&nbsp;'.
-                              '<input type="button" value="uncheck all" '.
+                              '<input type="button" value="'.&mt('Uncheck All').'" '.
                               'onclick="javascript:toggleAll('."'".$status."','uncheck'".')" />'.
                               '</nobr></fieldset><br />'.
                               &Apache::loncommon::start_data_table().
- Line 481  sub groupmail_sent {
+ Line 733  sub groupmail_sent {
  sub discrit {
      my $r=shift;
-     my $header = '<h1><font color="red">'.&mt('Critical Messages').'</font></h1>'.
+     my $header = '<h1>'.&mt('Critical Messages').'</h1>'
-         '<form action="/adm/email" method="POST">'.
+                 .'<div class="LC_warning">'
-         '<input type="hidden" name="confirm" value="true" />';
+                 .&mt('Access to other pages will be prevented until you have moved all critical messages to your inbox.')
+                 .'</div><br />'
+                 .'<form action="/adm/email" method="POST">'
+                 .'<input type="hidden" name="confirm" value="true" />';
      my %what=&Apache::lonnet::dump('critical');
      my $result = '';
-     foreach (sort keys %what) {
+     foreach my $key (sort(keys(%what))) {
-         my %content=&Apache::lonmsg::unpackagemsg($what{$_});
+         my %content=&Apache::lonmsg::unpackagemsg($what{$key});
          next if ($content{'senderdomain'} eq '');
-         $result.='<hr />'.&mt('From').': <b>'.
+         $result .= &Apache::lonhtmlcommon::start_pick_box()
- &Apache::loncommon::aboutmewrapper(
+                   .&Apache::lonhtmlcommon::row_title(&mt('From'),undef,'LC_oddrow_value')
-  &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
+                   .'<b>'.&Apache::loncommon::aboutmewrapper(
- $content{'sendername'}.':'.
+                    &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b>'
-             $content{'senderdomain'}.') '.$content{'time'}.
+                   .' ('.$content{'sendername'}.':'.$content{'senderdomain'}.')'
-             '<br />'.&mt('Subject').': '.$content{'subject'}.
+                   .&Apache::lonhtmlcommon::row_closure(1)
-             '<br /><pre>'.
+                   .&Apache::lonhtmlcommon::row_title(&mt('Date'),undef,'LC_evenrow_value')
-               &Apache::lontexconvert::msgtexconverted($content{'message'}).
+                   .$content{'time'}
-             '</pre><small>'.
+                   .&Apache::lonhtmlcommon::row_closure(1)
- &mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox').
+                   .&Apache::lonhtmlcommon::row_title(&mt('Subject'),undef,'LC_oddrow_value')
-             '</small><br />'.
+                   .$content{'subject'}
-             '<input type="submit" name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'" />'.
+                   .&Apache::lonhtmlcommon::row_closure(1)
-             '<input type="submit" name="reprec_'.$_.'" '.
+                   .&Apache::lonhtmlcommon::row_title(&mt('Message'),undef,'LC_evenrow_value')
-                   'value="'.&mt('Confirm Receipt and Reply').'" />';
+                   .'<pre>'.&Apache::lontexconvert::msgtexconverted($content{'message'}).'</pre>'
+                   .&Apache::lonhtmlcommon::row_closure()
+                   .&Apache::lonhtmlcommon::row_title('',undef,'LC_oddrow_value')
+                   .'<div class="LC_warning">';
+         my ($rec_button,$reprec_button);
+         $rec_button = &mt('Move to Inbox');
+         if (!$content{'noreplies'}) {
+             $reprec_button = &mt('Move to Inbox/Compose reply');
+         }
+         if ($content{'sendback'}) {
+             $rec_button = &mt('Confirm Receipt');
+             if (!$content{'noreplies'}) {
+                 $reprec_button = &mt('Confirm Receipt and Reply');
+             }
+             $result .= &mt('You have to confirm that you have received this message before you can view other pages. After confirmation, this message will be moved to your regular inbox');
+         } else {
+             $result .= &mt('Access to other pages will be prevented until you have moved the message to your inbox.');
+         }
+         $result .= '</div>'
+                   .&Apache::lonhtmlcommon::row_closure(1)
+                   .&Apache::lonhtmlcommon::row_title('',undef,'LC_evenrow_value')
+                   .'<input type="submit" name="rec_'.$key.'" value="'.$rec_button.'" />';
+         if (!$content{'noreplies'}) {
+             $result .= '<input type="submit" name="reprec_'.$key.'" '
+                       .'value="'.$reprec_button.'" />'
+         }
+         $result .= &Apache::lonhtmlcommon::row_closure(1)
+                   .&Apache::lonhtmlcommon::end_pick_box()
+                   .'<br />';
      }
      # Check to see if there were any messages.
      if ($result eq '') {
- Line 517  $content{'sendername'}.':'.
+ Line 800  $content{'sendername'}.':'.
  }
  sub sortedmessages {
-     my ($blocked,$startblock,$endblock,$numblocked,$folder) = @_;
+     my ($blocked,$startblock,$endblock,$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
- Line 534  sub sortedmessages {
+ Line 817  sub sortedmessages {
      foreach my $msgid (@messages) {
  	my $esc_msgid=&escape($msgid);
- 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)=
+ 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,$processid,$symb,$error) =
  	    &Apache::lonmsg::unpackmsgid($esc_msgid,$folder,undef,
  					 \%status_cache);
+         next if ($msgstatus ne '' && $msgstatus ne $status);
          my $description = &get_course_desc($fromcid,\%descriptions);
  	my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,
  		     $esc_msgid,$description);
- Line 623  sub get_course_desc {
+ Line 907  sub get_course_desc {
              if (defined($env{'course.'.$fromcid.'.description'})) {
                  $description = $env{'course.'.$fromcid.'.description'};
              } else {
-                 my %courseinfo=&Apache::lonnet::coursedescription($fromcid);                $description = $courseinfo{'description'};
+                 my %courseinfo=&Apache::lonnet::coursedescription($fromcid);
                  $description = $courseinfo{'description'};
              }
              $$descriptions{$fromcid} = $description;
- Line 632  sub get_course_desc {
+ Line 916  sub get_course_desc {
      }
  }
- # ======================================================== Display new messages
- sub disnew {
-     my $r=shift;
-     my %lt=&Apache::lonlocal::texthash(
- 				       'nm' => 'New Messages',
- 				       'su' => 'Subject',
-                                        'co' => 'Course',
- 				       'da' => 'Date',
- 				       'us' => 'Username',
- 				       'op' => 'Open',
- 				       'do' => 'Domain'
- 				       );
-     my @msgids = sort(&Apache::lonnet::getkeys('nohist_email'));
-     my @newmsgs;
-     my %setters = ();
-     my $startblock = 0;
-     my $endblock = 0;
-     my %blocked = ();
-     my $numblocked = 0;
-     # Check for blocking of display because of scheduled online exams.
-     &blockcheck(\%setters,\$startblock,\$endblock);
-     my %status_cache =
- 	&Apache::lonnet::get('email_status',\@msgids);
-     my %descriptions;
-     foreach (@msgids) {
- 	my $msgid=&escape($_);
-         my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
- 	    &Apache::lonmsg::unpackmsgid($msgid,undef,undef,\%status_cache);
-         if (defined($sendtime) && $sendtime!~/error/) {
-             my $description = &get_course_desc($fromcid,\%descriptions);
-             my $numsendtime = $sendtime;
-             $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
-             if ($status eq 'new') {
-                 if ($numsendtime >= $startblock && ($numsendtime <= $endblock && $endblock > 0) ) {
-                     $blocked{$_} = 'ON';
-                     $numblocked ++;
-                 } else {
-                     push @newmsgs, {
-                         msgid    => $msgid,
-                         sendtime => $sendtime,
-                         shortsub => $shortsubj,
-                         from     => $fromname,
-                         fromdom  => $fromdom,
-                         course   => $description
-                         }
-                 }
-             }
-         }
-     }
-     if ($#newmsgs >= 0) {
-         $r->print(<<TABLEHEAD);
- <h2>$lt{'nm'}</h2>
- <table class="LC_mail_list"><tr><th>&nbsp</th>
- <th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th><th>$lt{'co'}</th></tr>
- TABLEHEAD
-         foreach my $msg (@newmsgs) {
-             $r->print(<<"ENDLINK");
- <tr class="LC_mail_new">
- <td><a href="/adm/email?dismode=new&display=$msg->{'msgid'}">$lt{'op'}</a></td>
- ENDLINK
-             foreach ('sendtime','from','fromdom','shortsub','course') {
-                 $r->print("<td>$msg->{$_}</td>");
-             }
-             $r->print("</td></tr>");
-         }
-         $r->print('</table>');
-     } elsif ($numblocked == 0) {
-         $r->print("<h3>".&mt('You have no unread messages')."</h3>");
-     }
-     if ($numblocked > 0) {
-         my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
-         my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
-         if ($numblocked == 1) {
-             $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread message').".</h3>");
-             $r->print(&mt('This message is not viewable because').' ');
-         } else {
-             $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread messages').".</h3>");
-             $r->print(&mt('These').' '.$numblocked.' '.&mt('messages are not viewable because '));
-         }
-         $r->print(
- &mt('display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams').'.');
-         &build_block_table($r,$startblock,$endblock,\%setters);
-     }
- }
  # ======================================================== Display all messages
  sub disall {
-     my ($r,$folder)=@_;
+     my ($r,$folder,$msgstatus)=@_;
-     $r->print(&folderlist($folder));
+     my %saveable = ('msgstatus' => 'scalar',
-     if ($folder eq 'new') {
+ 		    'sortedby'  => 'scalar',
- 	&disnew($r);
+ 		    'interdis'  => 'scalar',
-     } elsif ($folder eq 'critical') {
+ 		    );
+     &Apache::loncommon::store_settings('user','mail',\%saveable);
+     &Apache::loncommon::restore_settings('user','mail',\%saveable);
+     $folder    ||= $env{'form.folder'};
+     $msgstatus ||= $env{'form.msgstatus'};
+     $env{'form.interdis'} ||= 20;
+     $r->print(&folderlist($folder,$msgstatus));
+     if ($folder eq 'critical') {
  	&discrit($r);
      } else {
- 	&disfolder($r,$folder);
+ 	&disfolder($r,$folder,$msgstatus);
      }
  }
  # ============================================================ Display a folder
  sub disfolder {
-     my ($r,$folder)=@_;
+     my ($r,$folder,$msgstatus)=@_;
+     my %statushash = &get_msgstatus_types();
      my %blocked = ();
      my %setters = ();
-     my $startblock;
-     my $endblock;
      my $numblocked = 0;
-     &blockcheck(\%setters,\$startblock,\$endblock);
+     my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');
+     my %lt = &Apache::lonlocal::texthash(
+                       sede => 'Select a destination folder to which the messages will be moved.',
+                       nome => 'No messages have been selected to apply ths action to.',
+                       chec => 'Check the checkbox for at least one message.',
+     );
+     my $jscript = &Apache::loncommon::check_uncheck_jscript();
      $r->print(<<ENDDISHEADER);
  <script type="text/javascript">
-     function checkall() {
+     $jscript
- 	for (i=0; i<document.forms.disall.elements.length; i++) {
-             if
-           (document.forms.disall.elements[i].name.indexOf('delmark_')==0) {
- 	      document.forms.disall.elements[i].checked=true;
-             }
-         }
-     }
-     function uncheckall() {
+     function validate_checkedaction() {
- 	for (i=0; i<document.forms.disall.elements.length; i++) {
+         document.disall.markedaction.value = document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value;
-             if
+         if (document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value == 'markedmove') {
-           (document.forms.disall.elements[i].name.indexof('delmark_')==0) {
+             if (document.disall.movetofolder.options[document.disall.movetofolder.selectedIndex].value == "") {
- 	      document.forms.disall.elements[i].checked=false;
+                 alert("$lt{'sede'}");
+                 return;
+             }
+         }
+         var checktotal = 0;
+         if (document.forms.disall.delmark.length > 0) {
+             for (var i=0; i<document.forms.disall.delmark.length; i++) {
+                 if (document.forms.disall.delmark[i].checked) {
+                     checktotal ++;
+                 }
+             }
+         } else {
+             if (document.forms.disall.delmark.checked) {
+                 checktotal ++;
              }
+         }
+         if (checktotal == 0) {
+             alert("$lt{'nome'}\\n$lt{'chec'}");
+             return;
          }
+         document.disall.submit();
      }
  </script>
  ENDDISHEADER
      my $fsqs='&folder='.$folder;
-     my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
+     my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
      my $totalnumber=$#temp+1;
-     unless ($totalnumber>0) {
+     if ($totalnumber < 1) {
- 	$r->print('<h2>'.&mt('Empty Folder').'</h2>');
+         if ($msgstatus eq '') {
+ 	    $r->print('<h2>'.&mt('Empty Folder').'</h2>');
+         } elsif ($msgstatus eq 'replied') {
+             $r->print('<h2>'.&mt('You have not replied to any messages in this folder.').'</h2>');
+         } else {
+             $r->print('<h2>'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'</h2>');
+         }
+         if ($numblocked > 0) {
+             $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
+                                          \%setters));
+         }
  	return;
      }
-     unless ($interdis) {
+     my $interdis = $env{'form.interdis'};
- 	$interdis=20;
-     }
      my $number=int($totalnumber/$interdis);
+     if ($totalnumber%$interdis == 0) {
+ 	$number--;
+     }
      if (($startdis<0) || ($startdis>$number)) { $startdis=$number; }
      my $firstdis=$interdis*$startdis;
      if ($firstdis>$#temp) { $firstdis=$#temp-$interdis+1; }
      my $lastdis=$firstdis+$interdis-1;
      if ($lastdis>$#temp) { $lastdis=$#temp; }
-     $r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber));
+     $r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber,$msgstatus));
      $r->print('<form method="post" name="disall" action="/adm/email">'.
- 	      '<table class="LC_mail_list"><tr><th colspan="3">&nbsp</th><th>');
+ 	      '<table class="LC_mail_list"><tr><th colspan="1">&nbsp;</th><th>');
      if ($env{'form.sortedby'} eq "revdate") {
  	$r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
      } else {
- Line 838  ENDDISHEADER
+ Line 1072  ENDDISHEADER
  	    }
  	    my ($dis_name,$dis_domain) = ($fromname,$fromdomain);
  	    if ($folder eq 'sent') {
- 		if (defined($recv_name) && !defined($recv_domain)) {
+                 if (defined($recv_name) && defined($recv_domain)) {
- 		    $dis_name   = join('<br />',@{$recv_name});
+ 		    if (ref($recv_name) eq 'ARRAY' &&
- 		    $dis_domain = join('<br />',@{$recv_domain});
+                         ref($recv_domain) eq 'ARRAY') {
+ 		        $dis_name   = join('<br />',@{$recv_name});
+ 		        $dis_domain = join('<br />',@{$recv_domain});
+                     }
  		} else {
  		    my $msg_id  = &unescape($origID);
  		    my %message = &Apache::lonnet::get('nohist_email'.$suffix,
  						       [$msg_id]);
  		    my %content = &Apache::lonmsg::unpackagemsg($message{$msg_id});
- 		    $dis_name   = join('<br />',@{$content{'recuser'}});
+                     if (ref($content{'recuser'}) eq 'ARRAY') {
- 		    $dis_domain = join('<br />',@{$content{'recdomain'}});
+ 		        $dis_name   = join('<br />',@{$content{'recuser'}});
+                     }
+                     if (ref($content{'recdomain'}) eq 'ARRAY') {
+ 		        $dis_domain = join('<br />',@{$content{'recdomain'}});
+                     }
  		}
  	    }
- 	    $r->print('<td><input type="checkbox" name="delmark_'.$origID.'" /></td><td><a href="/adm/email?display='.$origID.$sqs.
+             my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime);
- 		      '">'.&mt('Open').'</a></td><td>'.
+             my $count = $n +1;
- 		      ($folder ne 'trash'?'<a href="/adm/email?markdel='.$origID.$sqs.
+ 	    $r->print('<td align="right"><nobr>'.(($status eq 'new')?'<b>':'').
- 		      '">'.&mt('Delete'):'&nbsp').'</a></td>'.
+                       $count.'.'.(($status eq 'new')?'</b>':'').'&nbsp;'.
- 		      '<td>'.&Apache::lonlocal::locallocaltime($sendtime).'</td><td>'.
+                       '<input type="checkbox" name="delmark"'.
- 		      $dis_name.'</td><td>'.$dis_domain.'</td><td>'.
+                       ' value="'.$origID.'" /></nobr></td>');
- 		      $shortsubj.'</td><td>'.
+             foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) {
-                       $description.'</td><td>'.$status.'</td></tr>'."\n");
+                 $r->print('<td>'.(($status eq 'new')?'<b>':'').
+                           '<a href="/adm/email?display='.$origID.$sqs.'">'.
+                           $item.(($status eq 'new')?'</b>':'').'</td>');
+             }
+             my $showstatus;
+             my %statushash = &get_msgstatus_types();
+             if ($status eq '') {
+                 $showstatus = '';
+             } else {
+                 $showstatus = $statushash{$status};
+             }
+ 	    $r->print('<td>'.(($status eq 'new')?'<b>':'').$description.
+                       (($status eq 'new')?'</b>':'').'</td><td>'.
+                       (($status eq 'new')?'<b>':'').$showstatus.
+                       (($status eq 'new')?'</b>':'').'</td></tr>'."\n");
  	} elsif ($status eq 'deleted') {
  # purge
  	    my ($result,$msg) =
- Line 865  ENDDISHEADER
+ Line 1120  ENDDISHEADER
  	}
      }
-     $r->print("</table>\n<p>".
+     $r->print("</table>\n");
-   '<a href="javascript:checkall()">'.&mt('Check All').'</a>&nbsp;'.
+     $r->print('<table border="0" cellspacing="2" cellpadding="2">
-   '<a href="javascript:uncheckall()">'.&mt('Uncheck All').'</a></p>'.
+  <tr>
-   '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />');
+   <td>'.
+   '<input type="button" onclick="javascript:checkAll(document.disall.delmark)" value="'.&mt('Check All').'" /><br />'."\n".
+   '<input type="button" onclick="javascript:uncheckAll(document.disall.delmark)" value="'.&mt('Uncheck All').'" />'."\n".
+   '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" /></td><td>&nbsp;</td>'."\n".
+   '<td align="center"><b>'.&mt('Action').'</b><br />'."\n".
+   '  <select name="checkedaction">'."\n");
      if ($folder ne 'trash') {
- 	$r->print(
+         $r->print('    <option value="markeddel">'.&mt('Delete').'</option>'."\n");
- 	      '<p><input type="submit" name="markeddel" value="'.&mt('Delete Checked').'" /></p>');
      }
-     $r->print('<p><input type="submit" name="markedmove" value="'.&mt('Move Checked to Folder').'" />');
+     if ($msgstatus ne 'read') {
-     my @allfolders=&Apache::lonnet::getkeys('email_folders');
+         $r->print('    <option value="markedread">'.&mt('Mark Read').'</option>."\n"');
-     if ($allfolders[0]=~/^error:/) { @allfolders=(); }
+     }
-     $r->print(
+     if ($msgstatus ne 'unread') {
- 	&Apache::loncommon::select_form('','movetofolder',
+         $r->print('    <option value="markedunread">'.&mt('Mark Unread').'</option>'."\n");
- 			     ( map { $_ => $_ } @allfolders))
+     }
- 	      );
+     $r->print('   <option value="markedforward">'.&mt('Forward').'</option>'."\n");
+     my %gotfolders = &Apache::lonmsg::get_user_folders();
+     if (keys(%gotfolders) > 0) {
+         $r->print('   <option value="markedmove">'.&mt('Move to Folder ->').
+                   '</option>');
+     }
+     $r->print("\n".'</select></td>'."\n");
+     if (keys(%gotfolders) > 0) {
+         $r->print('<td align="center"><b>'.&mt('Destination folder').'<b><br />');
+ 	my %userfolders;
+         foreach my $key (keys(%gotfolders)) {
+             $userfolders{$key} = $key;
+         }
+         $userfolders{''} = "";
+         $r->print(&Apache::loncommon::select_form('','movetofolder',%userfolders).
+                   '</td>');
+     }
+     $r->print('<td>&nbsp;</td><td>&nbsp;&nbsp;'.
+               '<input type="button" name="go" value="'.&mt('Go').
+               '" onclick="javascript:validate_checkedaction()"/></td>'."\n".
+               '</tr></table>');
      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'}.'" /></form>');
+     $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) {
-         my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
+         $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
-         my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
+                                      \%setters));
-         $r->print('<br /><br />'.
-                   $numblocked.' '.&mt('message(s) is/are not viewable because display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams.'));
-         &build_block_table($r,$startblock,$endblock,\%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 />'.
+                   &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);
+     return $output;
+ }
  # ============================================================== Compose output
  sub compout {
-     my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder,$dismode)=@_;
+     my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder,$dismode,
+         $multiforward)=@_;
      my $suffix=&Apache::lonmsg::foldersuffix($folder);
      my ($cdom,$cnum,$group,$refarg);
      if (exists($env{'form.group'})) {
- Line 924  sub compout {
+ Line 1215  sub compout {
      } elsif ($replycrit) {
  	$r->print('<h3>'.&mt('Replying to a Critical Message').'</h3>');
  	$replying=$replycrit;
+     } elsif ($multiforward) {
+         &Apache::lonhtmlcommon::add_breadcrumb
+         ({href=>"/adm/email?folder=".&escape($folder),
+           text=>"Display All Messages"});
+         &printheader($r,'/adm/email?compose=multiforward',
+              'Forwarding Multiple Messages');
+         if ($multiforward > 1) {
+             $r->print(&mt('Each of the <b>[quant,_1,message]</b> you checked'
+                          .' will be forwarded to the recipient(s) you select below.',$multiforward)
+                     .'<br />');
+         } else {
+             $r->print(&mt('The message you checked will be forwarded to the recipient(s) you select below.').'<br />');
+         }
      } else {
  	&printheader($r,'/adm/email?compose=upload',
  	     'Distribute from Uploaded File');
- Line 933  sub compout {
+ Line 1238  sub compout {
      my $dissub='';
      my $dismsg='';
      my $disbase='';
-     my $func=&mt('Send New');
+     my $attachrow;
-     my %lt=&Apache::lonlocal::texthash('us' => 'Username',
+     my $func1='Send'; # do not translate here!
- 				       'do' => 'Domain',
+     my %func2=( # do not translate here!
- 				       'ad' => 'Additional Recipients',
+                'ma'  => 'Message',
- 				       'sb' => 'Subject',
+                'msg' => 'Messages',
- 				       'ca' => 'Cancel',
+               );
- 				       'ma' => 'Mail');
+     my %lt=&Apache::lonlocal::texthash('us'  => 'Username',
+ 				       'do'  => 'Domain',
+ 				       'ad'  => 'Additional Recipients',
+                                        'rt'  => 'Reply to',
+                                        'ar'  => 'Allow replies',
+ 				       'sb'  => 'Subject',
+ 				       'ca'  => 'Cancel',
+                                        'gen' => 'Generate messages from a file',
+                                        'gmt' => 'General message text',
+                                        'tff' => 'The file format for the uploaded portion of the message is',
+                                        'uas' => 'Upload and Send',
+                                        'atta' => 'Attachment',
+                                       );
+     my %attachmax = (
+                      text => &mt('(128 KB max size)'),
+                      num  => 131072,
+                     );
+     if (!$forwarding && !$multiforward) {
+         $attachrow = '<br />'.$lt{'atta'}.' '.$attachmax{'text'}.': <input type="file" name="attachment" />';
+     }
      if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
  	|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
  				    '/'.$env{'request.course.sec'})) {
- Line 954  sub compout {
+ Line 1277  sub compout {
  &mt('Send copy to permanent email address (if known)').'</label></p>'.
  '<p><label><input type="checkbox" name="rsspost" /> '.
  		  &mt('Include in course RSS newsfeed').'</label></p>';
-      }
+     }
+     if ($broadcast ne 'group') {
+         if (&Apache::lonnet::allowed('dff',$env{'request.course.id'}) ||
+             &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
+                                      '/'.$env{'request.course.sec'})) {
+             $dispcrit.='<p><label>'.
+                        '<input type="checkbox" name="courserecord" value="1" /> '.
+                        &mt("Include in course's 'User records' for recipient(s)").
+                        '</label></p>';
+         }
+     }
      my %message;
      my %content;
      my $defdom=$env{'user.domain'};
- Line 963  sub compout {
+ Line 1298  sub compout {
  	%content=&Apache::lonmsg::unpackagemsg($message{$forwarding},$folder);
  	$dispcrit.='<input type="hidden" name="forwid" value="'.
  	    $forwarding.'" />';
- 	$func=&mt('Forward');
+ 	$func1='Forward'; # do not translate here!
  	$dissub=&mt('Forwarding').': '.$content{'subject'};
  	$dismsg=&mt('Forwarded message from').' '.
- Line 977  sub compout {
+ Line 1312  sub compout {
  	%content=&Apache::lonmsg::unpackagemsg($message{$replying},$folder);
  	$dispcrit.='<input type="hidden" name="replyid" value="'.
  	    $replying.'" />';
- 	$func=&mt('Send Reply to');
+ 	$func1='Send Reply to'; # do not translate here!
  	$dissub=&mt('Reply').': '.$content{'subject'};
  	$dismsg='> '.$content{'message'};
- Line 987  sub compout {
+ Line 1322  sub compout {
  	if ($content{'baseurl'}) {
  	    $disbase='<input type="hidden" name="baseurl" value="'.&escape($content{'baseurl'}).'" />';
  	    if ($env{'user.adv'}) {
- 		$disbase.='<label><input type="checkbox" name="storebasecomment" />'.&mt('Store message for re-use').
+ 		$disbase.='<label><input type="checkbox" name="storebasecomment" />'.&mt('Save message for re-use').
  		    '</label> <a href="/adm/email?showcommentbaseurl='.
  		    &escape($content{'baseurl'}).'" target="comments">'.
  		    &mt('Show re-usable messages').'</a><br />';
  	    }
  	}
+         my $jscript = &Apache::loncommon::check_uncheck_jscript();
+         $r->print(<<"ENDREPSCRIPT");
+ <script type="text/javascript">
+ $jscript
+ </script>
+ ENDREPSCRIPT
      }
      my $citation=&displayresource(%content);
      my ($can_grp_broadcast,$viewgrps,$editgrps);
- Line 1024  sub compout {
+ Line 1365  sub compout {
      }
      if (($broadcast ne 'group') && ($broadcast ne 'upload')) {
  	if ($replying) {
- 	    $r->print('<tr><td colspan="2">'.&mt('Replying to').' '.
+             if ($content{'noreplies'}) {
- 		      &Apache::loncommon::aboutmewrapper(
+                 $r->print('<tr><td>'.&mt('This message was designated by the sender not to allow replies.').'</td></tr></table></form>');
+                 return;
+             }
+             $r->print('<tr><td colspan="2">'.&mt('Replying to').' ');
+             if ($content{'replytoaddr'}) {
+                 my ($replytoname,$replytodom) = split(/:/,$content{'replytoaddr'});
+                 if ($replytoname ne '' && $replytodom ne '') {
+                     $r->print(&Apache::loncommon::plainname($replytoname,
+                                  $replytodom).' ('.$replytoname.':'.
+                                  $replytodom.')');
+                     $r->print('<input type="hidden" name="recuname" value="'.
+                           $replytoname.'" />'.
+                           '<input type="hidden" name="recdomain" value="'.
+                           $replytodom.'" /></td></tr>');
+                 } else {
+                     $r->print(&mt('The sender did not designate a reply to address for this message.').'</td></tr></table>');
+                     return;
+                 }
+             } else {
+ 	        $r->print(&Apache::loncommon::aboutmewrapper(
  							 &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('.
  		      $content{'sendername'}.':'.
- 		      $content{'senderdomain'}.')'.
+ 		      $content{'senderdomain'}.')');
- 		      '<input type="hidden" name="recuname" value="'.$content{'sendername'}.'" />'.
+                 $r->print('<input type="hidden" name="recuname" value="'.
- 		      '<input type="hidden" name="recdomain" value="'.$content{'senderdomain'}.'" />'.
+ 		          $content{'sendername'}.'" />'.
- 		      '</td></tr>');
+ 		          '<input type="hidden" name="recdomain" value="'.
+                           $content{'senderdomain'}.'" /></td></tr>');
+             }
+             if ($content{'recipid'}) {
+                 my @ccs = &retrieve_cc_recips('replying',%content);
+                 if (@ccs > 0) {
+                     my $replyall = qq|
+  <span class="LC_nobreak">
+       <input type="button" value="check all"
+         onclick="javascript:checkAll(document.compemail.replying_cc)" />
+         &nbsp;&nbsp;
+       <input type="button" value="uncheck all"
+         onclick="javascript:uncheckAll(document.compemail.replying_cc)" />
+  </span>
+ |;
+                     my $cclist = join(' ',@ccs);
+                     $r->print('<tr><td>'.&mt('Reply to other recipients').':<br />'.$replyall.'</td><td>'.$cclist.'</td></tr>');
+                 }
+             }
  	} else {
              $r->print(&recipient_input_row($defdom,%lt));
          }
      }
      my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
-     if ($broadcast ne 'upload') {
+     my $subj_size;
-        $r->print(<<"ENDCOMP");
+     if ($multiforward) {
- <tr><td>$lt{'ad'}<br /><tt>username\@domain,username\@domain, ...
+         $r->print(&additional_rec_row(\%lt));
- </tt></td><td>
+         $r->print('<tr><td colspan="2">'.
- <input type="text" size="50" name="additionalrec" /></td></tr>
+                   &mt('Unless you choose otherwise:').'<ul><li>'.
- <tr><td>$lt{'sb'}:</td><td><input type="text" size="50" name="subject" value="$dissub" />
+         &mt("The subject in each forwarded message will be <i>'Forwarding:'</i> followed by the original subject.").'</li><li>'.
- </td></tr></table>
+         &mt("The message itself will begin with a first line: <i>'Forwarded message from'</i> followed by the original sender's name.").'</li></ul></td></tr>');
+         $func1='Forward'; # do not translate here!
+         $dissub = &mt('Forwarding').': ';
+         $subj_size = '10';
+         my $extra = '&lt;'.&mt('original subject').'&gt;&nbsp;&nbsp;&nbsp;'.
+                     '<input type="radio" name="showorigsubj" value="1" checked="checked" />'.&mt('Yes').'&nbsp;<input type="radio" name="showorigsubj" value="0" />'.&mt('No');
+         $dismsg = &mt('Forwarded message from ').' ';
+         my $sender = &mt("sender's name");
+         $r->print(&msg_subject_row($dissub,\%lt,$subj_size,$extra));
+         $r->print('<tr><td>'.&mt('Message begins with:').'</td><td><input type="text" name="msgheader" value="'.$dismsg.'" />&nbsp;'.$sender.'&nbsp;&nbsp;&nbsp;<input type="radio" name="showorigsender" value="1" checked="checked" />'.&mt('Yes').'&nbsp;<input type="radio" name="showorigsender" value="0" />'.&mt('No').'<input type="hidden" name="multiforward" value="'.$multiforward.'" /></td></tr>
+ </table>
+ <br />'.
+ $latexHelp.
+ &mt("Any new text to display before the text of the original messages:").'<br />
+ <textarea name="message" id="message" cols="80" rows="5" wrap="hard">
+ </textarea></p><br />');
+         my @to_forward = &Apache::loncommon::get_env_multiple('form.delmark');
+         foreach my $msg (@to_forward) {
+             $r->print('<input type="hidden" name="delmark" value="'.$msg.'" />');
+         }
+         $r->print(&submit_button_row($folder,$dismode,&mt($func1.' '.$func2{'msg'}),
+                                      \%lt));
+     } elsif ($broadcast ne 'upload') {
+         $subj_size = '50';
+         $r->print(&additional_rec_row(\%lt));
+         if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
+             || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+                                         '/'.$env{'request.course.sec'})) {
+             $r->print(&reply_to_row(\%lt));
+         }
+         $r->print(&msg_subject_row($dissub,\%lt,$subj_size));
+         $r->print(<<"ENDCOMP");
+ </table>
  $latexHelp
  <textarea name="message" id="message" cols="80" rows="15" wrap="hard">$dismsg
- </textarea></p><br />
+ </textarea>
+ $attachrow
+ </p>
+ <br />
  $dispcrit
  $disbase
- <input type="hidden" name="folder" value="$folder" />
- <input type="hidden" name="dismode" value="$dismode" />
- <input type="submit" name="send" value="$func $lt{'ma'}" />
- <input type="submit" name="cancel" value="$lt{'ca'}" /><hr />
- $citation
  ENDCOMP
+         $r->print(&submit_button_row($folder,$dismode,&mt($func1.' '.$func2{'ma'}),
+                                      \%lt));
+         $r->print($citation);
          if (exists($env{'form.ref'})) {
              $r->print('<input type="hidden" name="ref" value="'.
                        $env{'form.ref'}.'" />');
- Line 1064  ENDCOMP
+ Line 1476  ENDCOMP
                        $env{'form.group'}.'" />');
          }
      } else { # $broadcast is 'upload'
- 	$r->print(<<ENDUPLOAD);
+ 	$r->print(<<ENDBLOCK);
  <input type="hidden" name="sendmode" value="upload" />
  <input type="hidden" name="send" value="on" />
- <h3>Generate messages from a file</h3>
+ <h3>$lt{'gen'}</h3>
  <p>
  Subject: <input type="text" size="50" name="subject" />
  </p>
- <p>General message text<br />
+ <p>$lt{'gmt'}:<br />
  <textarea name="message" id="message" cols="60" rows="10" wrap="hard">$dismsg
  </textarea></p>
  <p>
- The file format for the uploaded portion of the message is:
+ $lt{'tff'}:
- <pre>
+ ENDBLOCK
- username1\@domain1: text
+        $r->print('
- username2\@domain2: text
+ <pre>'."\n".
- username3\@domain1: text
+ &mt('username1:domain1: text')."\n".
- </pre>
+ &mt('username2:domain2: text')."\n".
+ &mt('username3:domain1: text')."\n".
+ '</pre>
  </p>
  <p>
- The messages will be assembled from all lines with the respective
+ '.&mt('The messages will be assembled from all lines with the respective'."\n".'<tt>username:domain</tt>, and appended to the general message text.'));
- <tt>username\@domain</tt>, and appended to the general message text.</p>
+         $r->print(<<ENDUPLOAD);
+ </p>
  <p>
  <input type="file" name="upfile" size="40" /></p><p>
  $dispcrit
- <input type="submit" value="Upload and Send" /></p>
+ <input type="submit" value="$lt{'uas'}" /></p>
  ENDUPLOAD
      }
      if ($broadcast eq 'group') {
- Line 1114  sub recipient_input_row {
+ Line 1529  sub recipient_input_row {
        &Apache::loncommon::selectstudent_link('compemail','recuname',
                                               'recdomain');
      my $output = <<"ENDREC";
- <tr><td>$lt{'us'}:</td><td><input type="text" size="12" name="recuname" value="$env{'form.recname'}" /></td><td rowspan="2">$selectlink</td></tr>
+ <tr><td colspan="2"><span class="LC_nobreak">$lt{'us'}:&nbsp;<input type="text" size="12" name="recuname" value="$env{'form.recname'}" />&nbsp;$lt{'do'}:&nbsp;$domform&nbsp;&nbsp;$selectlink</span></td></tr>
- <tr><td>$lt{'do'}:</td>
- <td>$domform</td></tr>
  ENDREC
      return $output;
  }
+ sub reply_to_row {
+     my ($lt) = @_;
+     my $radioyes = &mt('Yes');
+     my $radiono = &mt('No');
+     my $output = <<"ENDREP";
+ <tr><td colspan="2"><span class="LC_nobreak">$lt->{'ar'}:<label><input type="radio" name="can_reply" value="Y" checked="checked" />$radioyes</label>&nbsp;&nbsp;<label><input type="radio" name="can_reply" value="N" />$radiono</label></span>&nbsp;&nbsp;&nbsp;&nbsp;<span class="LC_nobreak">$lt->{'rt'}:&nbsp;<input type="text" size="25" name="reply_to_addr" value="$env{'user.name'}:$env{'user.domain'}" /></span></td></tr>
+ ENDREP
+     return $output;
+ }
+ sub additional_rec_row {
+     my ($lt) = @_;
+     my $cc = &mt('Cc:');
+     my $bcc = &mt('Bcc:');
+     my $exmpl = &mt('username:domain,username:domain,...');
+     my $output = <<"ENDADD";
+ <tr><td>$lt->{'ad'} :<br /><tt>($exmpl)
+ </tt></td><td>&nbsp;<span class="LC_nobreak">$cc
+ <input type="text" size="50" name="additionalrec_cc" /></span><br />
+ <span class="LC_nobreak">$bcc <input type="text" size="50" name="additionalrec_bcc" /></span></td></tr>
+ ENDADD
+     return $output;
+ }
+ sub submit_button_row {
+     my ($folder,$dismode,$sendtext,$lt) = @_;
+     my $output = qq|
+ <input type="hidden" name="folder" value="$folder" />
+ <input type="hidden" name="dismode" value="$dismode" />
+ <input type="submit" name="send" value="$sendtext" />
+ <input type="submit" name="cancel" value="$lt->{'ca'}" /><hr />
+ |;
+     return $output;
+ }
+ sub msg_subject_row {
+     my ($dissub,$lt,$subj_size,$extra) = @_;
+     my $output = '<tr><td colspan="2">'.$lt->{'sb'}.':&nbsp;<input type="text" size="'.
+                  $subj_size.'" name="subject" value="'.$dissub.'" />'.$extra.
+                  '</td></tr>';
+     return $output;
+ }
  sub retrieve_instructor_comments {
      my ($user,$domain)=@_;
      my $target=$env{'form.grade_target'};
      if (! $env{'request.course.id'}) { return; }
-     if (! &Apache::lonnet::allowed('srm',$env{'request.course.id'})
+     if (! &Apache::lonnet::allowed('dff',$env{'request.course.id'})
- 	&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+ 	&& ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
  				      '/'.$env{'request.course.sec'})) {
  	return;
      }
- Line 1135  sub retrieve_instructor_comments {
+ Line 1591  sub retrieve_instructor_comments {
  			 $env{'course.'.$env{'request.course.id'}.'.num'},
                           '%255b'.$user.'%253a'.$domain.'%255d');
      my $result='';
-     foreach (sort(keys(%records))) {
+     foreach my $key (sort(keys(%records))) {
-         my %content=&Apache::lonmsg::unpackagemsg($records{$_});
+         my %content=&Apache::lonmsg::unpackagemsg($records{$key});
          next if ($content{'senderdomain'} eq '');
          next if ($content{'subject'} !~ /^Record/);
  	# &Apache::lonfeedback::newline_to_br(\$content{'message'});
- Line 1152  sub disfacetoface {
+ Line 1608  sub disfacetoface {
      my ($r,$user,$domain)=@_;
      my $target=$env{'form.grade_target'};
      unless ($env{'request.course.id'}) { return; }
-     if  (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
+     if  (!&Apache::lonnet::allowed('dff',$env{'request.course.id'})
- 	 && ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+ 	 && ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
  				       '/'.$env{'request.course.sec'})) {
- 	$r->print('Not allowed');
+ 	$r->print(&mt('Not allowed'));
  	return;
      }
      my %records=&Apache::lonnet::dump('nohist_email',
- Line 1163  sub disfacetoface {
+ Line 1619  sub disfacetoface {
  			 $env{'course.'.$env{'request.course.id'}.'.num'},
                           '%255b'.$user.'%253a'.$domain.'%255d');
      my $result='';
-     foreach (sort keys %records) {
+     foreach my $key (sort(keys(%records))) {
-         my %content=&Apache::lonmsg::unpackagemsg($records{$_});
+         my %content=&Apache::lonmsg::unpackagemsg($records{$key});
          next if ($content{'senderdomain'} eq '');
  	&Apache::lonfeedback::newline_to_br(\$content{'message'});
          if ($content{'subject'}=~/^Record/) {
- Line 1182  sub disfacetoface {
+ Line 1638  sub disfacetoface {
                      '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.
                      $content{'message'};
                  }
              }
+         } elsif ($content{'subject'}=~/^Archive/) {
+             $result.='<h3>'.&mt('Archived Message').'</h3>';
+             if (defined($content{'coursemsgid'})) {
+                 my $crsmsgid = &escape($content{'coursemsgid'});
+                 my $archive_message = &general_message($crsmsgid);
+                 $content{'message'} = '<b>'.&mt('Subject').': '.$content{'message'}.'</b><br />'.$archive_message;
+             } else {
+                 %content=&Apache::lonmsg::unpackagemsg($content{'message'});
+                 $content{'message'} =
+                 '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br
+ '.
+                 $content{'message'};
+             }
          } else {
              $result.='<h3>'.&mt('Critical Message').'</h3>';
              if (defined($content{'coursemsgid'})) {
- Line 1234  sub general_message {
+ Line 1703  sub general_message {
  sub facetoface {
      my ($r,$stage)=@_;
-     if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
+     if (!&Apache::lonnet::allowed('dff',$env{'request.course.id'})
- 	&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+ 	&& ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
  				      '/'.$env{'request.course.sec'})) {
- 	$r->print('Not allowed');
+ 	$r->print(&mt('Not allowed'));
  	return;
      }
      my $crstype = &Apache::loncommon::course_type();
- Line 1245  sub facetoface {
+ Line 1714  sub facetoface {
                                          : 'faculty and staff';
      &printheader($r,
  		 '/adm/email?recordftf=query',
- 		 "User Notes, Face-to-Face, Critical Messages, Broadcast Messages");
+ 		 "User Notes, Face-to-Face, Critical Messages, Broadcast Messages, Archived Messages");
  # from query string
      if ($env{'form.recname'}) { $env{'form.recuname'}=$env{'form.recname'}; }
- Line 1260  sub facetoface {
+ Line 1729  sub facetoface {
  	('stdselect','recuname','recdomain');
      my %lt=&Apache::lonlocal::texthash('user' => 'Username',
  				       'dom' => 'Domain',
- 				       'head' => "User Notes, Records of Face-To-Face Discussions, Critical Messages, and Broadcast Messages in $crstype",
+ 				       'head' => "User Notes, Records of Face-To-Face Discussions, Critical Messages, Broadcast Messages and Archived Messages in $crstype",
  				       'subm' => 'Retrieve discussion and message records',
  				       'newr' => 'New Record (record is visible to '.lc($crstype).' '.$leaders.')',
  				       'post' => 'Post this Record');
- Line 1311  ENDBFORM
+ Line 1780  ENDBFORM
  sub examblock {
      my ($r,$action) = @_;
      unless ($env{'request.course.id'}) { return;}
-     if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
+     if (!&Apache::lonnet::allowed('dcm',$env{'request.course.id'})
- 	&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+ 	&& ! &Apache::lonnet::allowed('dcm',$env{'request.course.id'}.
  				      '/'.$env{'request.course.sec'})) {
  	$r->print('Not allowed');
  	return;
- Line 1324  sub examblock {
+ Line 1793  sub examblock {
              'cbds' => 'Communication blocking during scheduled exams',
              'desc' => "You can use communication blocking to prevent $usertype enrolled in this course 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, 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 stored'
+              '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'
- Line 1362  sub examblock {
+ Line 1833  sub examblock {
      $r->print(<<"END");
  <br />
  <input type="hidden" name="blocktotal" value="$blockcount" />
- <input type ="submit" value="Save Changes" />
+ <input type ="submit" value="$lt{'stor'}" />
  </form>
  $end_page
  END
- Line 1373  sub blockstore {
+ Line 1844  sub blockstore {
      my $r = shift;
      my %lt=&Apache::lonlocal::texthash(
              'tfcm' => 'The following changes were made',
-             'cbps' => 'communication blocking period(s)',
-             'werm' => 'was/were removed',
-             'wemo' => 'was/were modified',
-             'wead' => 'was/were added',
              'ncwm' => 'No changes were made.'
      );
      my %adds = ();
- Line 1387  sub blockstore {
+ Line 1854  sub blockstore {
      my $addtotal = 0;
      my %blocking = ();
      $r->print('<h3>'.$lt{'head'}.'</h3>');
-     foreach (keys %env) {
+     foreach my $envkey (keys(%env)) {
-         if ($_ =~ m/^form\.modify_(\w+)$/) {
+         if ($envkey =~ m/^form\.modify_(\d+)$/) {
              $adds{$1} = $1;
              $removals{$1} = $1;
              $modtotal ++;
-         } elsif ($_ =~ m/^form\.cancel_(\d+)$/) {
+         } elsif ($envkey =~ m/^form\.cancel_(\d+)$/) {
              $cancels{$1} = $1;
              unless ( defined($removals{$1}) ) {
                  $removals{$1} = $1;
                  $canceltotal ++;
              }
-         } elsif ($_ =~ m/^form\.add_(\d+)$/) {
+         } elsif ($envkey =~ m/^form\.add_(\d+)$/) {
              $adds{$1} = $1;
              $addtotal ++;
          }
      }
-     foreach (keys %removals) {
+     foreach my $key (keys(%removals)) {
-         my $hashkey = $env{'form.key_'.$_};
+         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 (keys %adds) {
+     foreach my $key (keys(%adds)) {
-         unless ( defined($cancels{$_}) ) {
+         unless ( defined($cancels{$key}) ) {
-             my ($newstart,$newend) = &get_dates_from_form($_);
+             my ($newstart,$newend) = &get_dates_from_form($key);
              my $newkey = $newstart.'____'.$newend;
-             $blocking{$newkey} = $env{'user.name'}.':'.$env{'user.domain'}.':'.$env{'form.title_'.$_};
+             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) {
- Line 1428  sub blockstore {
+ Line 1900  sub blockstore {
      if ($chgestotal > 0) {
          $r->print($lt{'tfcm'}.'<ul>');
          if ($canceltotal > 0) {
-             $r->print('<li>'.$canceltotal.' '.$lt{'cbps'},' '.$lt{'werm'}.'</li>');
+             $r->print('<li>'.&mt('[quant,_1,communication blocking period was,communication blocking periods were] removed.',$canceltotal).'</li>');
          }
          if ($modtotal > 0) {
-             $r->print('<li>'.$modtotal.' '.$lt{'cbps'},' '.$lt{'wemo'}.'</li>');
+             $r->print('<li>'.&mt('[quant,_1,communication blocking period was,communication blocking periods were] modified.',$modtotal).'</li>');
          }
          if ($addtotal > 0) {
-             $r->print('<li>'.$addtotal.' '.$lt{'cbps'},' '.$lt{'wead'}.'</li>');
+             $r->print('<li>'.&mt('[quant,_1,communication blocking period was,communication blocking periods were] added.',$addtotal).'</li>');
          }
          $r->print('</ul>');
      } else {
- Line 1466  sub get_blockdates {
+ Line 1938  sub get_blockdates {
      }
  }
+ 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;
- Line 1474  sub display_blocker_status {
+ Line 1960  sub display_blocker_status {
          'modi' => 'Modify',
          'canc' => 'Cancel',
      );
+     my ($typeorder,$types) = &blocktype_text();
      $r->print(&Apache::loncommon::start_data_table());
      $r->print(<<"END");
    <tr>
-     <th>$$ltext{'dura'}</th>
+     <th>$ltext->{'dura'}</th>
-     <th>$$ltext{'setb'}</th>
+     <th>$ltext->{'setb'}</th>
-     <th>$$ltext{'even'}</th>
+     <th>$ltext->{'even'}</th>
-     <th>$$ltext{'actn'}?</th>
+     <th>$ltext->{'blck'}</th>
+     <th>$ltext->{'actn'}?</th>
    </tr>
  END
      foreach my $record (sort(keys(%{$records}))) {
- Line 1491  END
+ Line 1979  END
          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) =
+ 	my ($setuname,$setudom,$title,$blocks) =
- 	    &parse_block_record($$records{$record});
+ 	    &Apache::loncommon::parse_block_record($$records{$record});
  	$title = &HTML::Entities::encode($title,'"<>&');
-         my $settername = &Apache::loncommon::plainname($setuname,$setudom);
+         my $settername =
+            &Apache::loncommon::aboutmewrapper(
+                            &Apache::loncommon::plainname($setuname,$setudom),
+                            $setuname,$setudom);
          $r->print(&Apache::loncommon::start_data_table_row());
          $r->print(<<"END");
-         <td>$$ltext{'star'}:&nbsp;$startform<br/>$$ltext{'endd'}:&nbsp;&nbsp;$endform</td>
+         <td>$ltext->{'star'}:&nbsp;$startform<br/>$ltext->{'endd'}:&nbsp;&nbsp;$endform</td>
          <td>$settername</td>
          <td><input type="text" name="title_$parmcount" size="15" value="$title" /><input type="hidden" name="key_$parmcount" value="$record" /></td>
+         <td>
+ END
+         foreach my $block (@{$typeorder}) {
+             my $blockstatus = '';
+             if ($blocks->{$block} eq 'on') {
+                 $blockstatus = 'checked="true"';
+             }
+             $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label><br />');
+         }
+         $r->print(<<"END");
+         </td>
          <td><label>$lt{'modi'}?&nbsp;<input type="checkbox" name="modify_$parmcount" /></label><br /><label>$lt{'canc'}?&nbsp;&nbsp;<input type="checkbox" name="cancel_$parmcount" /></label>
  END
          $r->print(&Apache::loncommon::end_data_table_row());
- Line 1513  END
+ Line 2015  END
      return $parmcount;
  }
- sub parse_block_record {
-     my ($record) = @_;
-     my ($setuname,$setudom,$title);
-     my @data = split(/:/,$record,3);
-     if (scalar(@data) eq 2) {
- 	$title = $data[1];
- 	($setuname,$setudom) = split(/@/,$data[0]);
-     } else {
- 	($setuname,$setudom,$title) = @data;
-     }
-     return ($setuname,$setudom,$title);
- }
  sub display_addblocker_table {
      my ($r,$parmcount,$ltext) = @_;
      my $start = time;
- Line 1540  sub display_addblocker_table {
+ Line 2029  sub display_addblocker_table {
          'exam' => 'e.g., Exam 1',
          'addn' => 'Add new communication blocking periods'
      );
+     my ($typeorder,$types) = &blocktype_text();
      $r->print(<<"END");
  <h4>$lt{'addn'}</h4>
  END
      $r->print(&Apache::loncommon::start_data_table());
      $r->print(<<"END");
     <tr>
-      <th>$$ltext{'dura'}</th>
+      <th>$ltext->{'dura'}</th>
-      <th>$$ltext{'even'} $lt{'exam'}</th>
+      <th>$ltext->{'even'} $lt{'exam'}</th>
-      <th>$$ltext{'actn'}?</th>
+      <th>$ltext->{'blck'}</th>
+      <th>$ltext->{'actn'}?</th>
     </tr>
  END
-    $r->print(&Apache::loncommon::start_data_table_row());
+     $r->print(&Apache::loncommon::start_data_table_row());
      $r->print(<<"END");
-      <td>$$ltext{'star'}:&nbsp;$startform<br />$$ltext{'endd'}:&nbsp;&nbsp;$endform</td>
+      <td>$ltext->{'star'}:&nbsp;$startform<br />$ltext->{'endd'}:&nbsp;&nbsp;$endform</td>
       <td><input type="text" name="title_$parmcount" size="15" value="" /></td>
+      <td>
+ END
+     foreach my $block (@{$typeorder}) {
+         $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label><br />');
+      }
+      $r->print(<<"END");
+      </td>
       <td><label>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1" /></label></td>
  END
      $r->print(&Apache::loncommon::end_data_table_row());
- Line 1562  END
+ Line 2060  END
      return;
  }
- sub blockcheck {
+ sub blocktype_text {
-     my ($setters,$startblock,$endblock) = @_;
+     my %types = &Apache::lonlocal::texthash(
-     # Retrieve active student roles and active course coordinator/instructor roles
+         'com' => 'Messaging',
-     my %live_courses =
+         'chat' => 'Chat',
- 	map { $_ => 1} &Apache::loncommon::findallcourses();
+         'boards' => 'Discussion',
-     # FIXME should really probe for apriv, but ::allowed can only probe the
+         'port' => 'Portfolio',
-     #       currently active role
+         'groups' => 'Groups',
-     my %staff_of =
+         'blogs' => 'Blogs',
- 	map { $_ => 1} &Apache::loncommon::findallcourses(['cc','in']);
-     # Retrieve blocking times and identity of blocker for active courses
-     # for students.
-     return if (!%live_courses);
-     foreach my $course (keys(%live_courses)) {
- 	my $cdom = $env{'course.'.$course.'.domain'};
- 	my $cnum = $env{'course.'.$course.'.num'};
- 	# if they are a staff member and are currently not playing student
- 	next if ( $staff_of{$course}
- 		  && ($env{'request.role'} !~ m{^st\./$cdom/$cnum}));
- 	$setters->{$course} = {};
- 	$setters->{$course}{'staff'} = [];
- 	$setters->{$course}{'times'} = [];
- 	my %records = &Apache::lonnet::dump('comm_block',$cdom,$cnum);
- 	foreach my $record (keys %records) {
- 	    my ($start,$end) = ($record =~ m/^(\d+)____(\d+)$/);
- 	    if ($start <= time && $end >= time) {
- 		my ($staff_name,$staff_dom,$title) =
- 		    &parse_block_record($records{$record});
- 		push(@{$$setters{$course}{'staff'}}, [$staff_name,$staff_dom]);
- 		push(@{$$setters{$course}{'times'}}, [$start,$end]);
- 		if ( ($$startblock == 0) || ($$startblock > $1) ) {
- 		    $$startblock = $1;
- 		}
- 		if ( ($$endblock == 0) || ($$endblock < $2) ) {
- 		    $$endblock = $2;
- 		}
- 	    }
- 	}
-     }
- }
- sub build_block_table {
-     my ($r,$startblock,$endblock,$setters) = @_;
-     my %lt = &Apache::lonlocal::texthash(
-         'cacb' => 'Currently active communication blocks',
-         'cour' => 'Course',
-         'dura' => 'Duration',
-         'blse' => 'Block set by'
      );
-     $r->print(<<"END");
+     my $typeorder = ['com','chat','boards','port','groups','blogs'];
- <br /><br />$lt{'cacb'}:<br /><br />
+     return ($typeorder,\%types);
- END
-     $r->print(&Apache::loncommon::start_data_table());
-     $r->print(<<"END");
- <tr>
-  <th>$lt{'cour'}</th>
-  <th>$lt{'dura'}</th>
-  <th>$lt{'blse'}</th>
- </tr>
- END
-     foreach my $course (keys(%{$setters})) {
-         my %courseinfo=&Apache::lonnet::coursedescription($course);
-         for (my $i=0; $i<@{$$setters{$course}{staff}}; $i++) {
-             my ($uname,$udom) = @{$$setters{$course}{staff}[$i]};
-             my $fullname = &Apache::loncommon::plainname($uname,$udom);
-             my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};
-             $openblock = &Apache::lonlocal::locallocaltime($openblock);
-             $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
-             $r->print(&Apache::loncommon::start_data_table_row().
- 		      '<td>'.$courseinfo{'description'}.'</td>'.
-                       '<td>'.$openblock.' to '.$closeblock.'</td>'.
-                       '<td>'.$fullname.' ('.$uname.':'.$udom.
-                       ')</td>'.
- 		       &Apache::loncommon::end_data_table_row());
-         }
-     }
-     $r->print(&Apache::loncommon::end_data_table());
  }
  # ----------------------------------------------------------- Display a message
  sub displaymessage {
-     my ($r,$msgid,$folder)=@_;
+     my ($r,$msgid,$folder,$msgstatus)=@_;
      my $suffix=&Apache::lonmsg::foldersuffix($folder);
      my %blocked = ();
      my %setters = ();
-     my $startblock = 0;
-     my $endblock = 0;
      my $numblocked = 0;
      my $crstype = &Apache::loncommon::course_type();
  # info to generate "next" and "previous" buttons and check if message is blocked
-     &blockcheck(\%setters,\$startblock,\$endblock);
+     my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');
-     my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
+     my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$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);
          return;
      }
-     &statuschange($msgid,'read',$folder);
+     if ($msgstatus eq '') {
+         &statuschange($msgid,'read',$folder);
+     }
      my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
      my %content=&Apache::lonmsg::unpackagemsg($message{$msgid});
      my $counter=0;
-     $r->print('<pre>');
      my $escmsgid=&escape($msgid);
      foreach (@messages) {
  	if ($_->[5] eq $escmsgid){
- Line 1678  sub displaymessage {
+ Line 2105  sub displaymessage {
  	}
  	$counter++;
      }
-     $r->print('</pre>');
+     my $see_anonymous;
+     my $from_student = 0;
+     if ($env{'request.course.id'} eq $content{'courseid'}) {
+ 	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ 	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ 	my $username = $content{'sendername'}.':'.$content{'senderdomain'};
+ 	my %classlist_entry =
+ 	    &Apache::lonnet::get('classlist',[$username],$cdom,$cnum);
+ 	if (exists($classlist_entry{$username})) {
+ 	    $from_student = 1;
+ 	    $see_anonymous = &Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
+ 	}
+     }
      my $number_of_messages = scalar(@messages); #subtract 1 for last index
  # start output
      &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});
      my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
  # Functions
-     $r->print('<table border="2" width="100%"><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'.
+     $r->print('<table border="2" width="100%"><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>');
- 	      '<td><a href="/adm/email?replyto='.&escape($msgid).$sqs.
+     if (!$content{'noreplies'}) {
- 	      '"><b>'.&mt('Reply').'</b></a></td>'.
+         $r->print('<td><a href="/adm/email?replyto='.&escape($msgid).$sqs.
- 	      '<td><a href="/adm/email?forward='.&escape($msgid).$sqs.
+ 	          '"><b>'.&mt('Reply').'</b></a></td>');
+     }
+     $r->print('<td><a href="/adm/email?forward='.&escape($msgid).$sqs.
  	      '"><b>'.&mt('Forward').'</b></a></td>'.
  	      '<td><a href="/adm/email?markunread='.&escape($msgid).$sqs.
  	      '"><b>'.&mt('Mark Unread').'</b></a></td>'.
  	      '<td><a href="/adm/email?markdel='.&escape($msgid).$sqs.
  	      '"><b>'.&mt('Delete').'</b></a></td>'.
  	      '<td><a href="/adm/email?'.$sqs.
- 	      ($env{'form.dismode'} eq 'new'?'&folder=new':'').
  	      '"><b>'.&mt('Back to Folder Display').'</b></a></td>');
      if ($counter > 0){
  	$r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
- Line 1705  sub displaymessage {
+ Line 2148  sub displaymessage {
  		  '"><b>'.&mt('Next').'</b></a></td>');
      }
      $r->print('</tr></table>');
+     my $symb;
+     if (defined($content{'symb'})) {
+         $symb = $content{'symb'};
+     } elsif (defined($content{'baseurl'})) {
+         $symb=&Apache::lonnet::symbread($content{'baseurl'});
+     }
      if ($env{'user.adv'}) {
- 	$r->print('<table border="2" width="100%"><tr bgcolor="#FFAAAA"><td>'.&mt('Currently available actions (will open extra window)').':</td>');
+         my $actionlist='';
- 	my $symb=&Apache::lonnet::symbread($content{'baseurl'});
  	if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
- 		$r->print('<td><b>'.&Apache::loncommon::track_student_link(&mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check').'</b></td>');
+ 		$actionlist.='<td><b>'
- 	    }
+                             .&Apache::loncommon::track_student_link(
+                                  &mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check')
+                             .'</b></td>';
+ 	}
  	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) && $symb) {
- 	    $r->print('<td><b>'.&Apache::loncommon::pprmlink(&mt('Set/Change parameters'),$content{'sendername'},$content{'senderdomain'},$symb,'check').'</b></td>');
+ 	    $actionlist.='<td><b>'
+                         .&Apache::loncommon::pprmlink(
+                              &mt('Set/Change parameters'),$content{'sendername'},$content{'senderdomain'},$symb,'check')
+                         .'</b></td>';
  	}
  	if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}) && $symb) {
- 	    $r->print('<td><b>'.&Apache::loncommon::pgrdlink(&mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check').'</b></td>');
+ 	    $actionlist.='<td><b>'
- 	}
+                        .&Apache::loncommon::pgrdlink(
- 	$r->print('</tr></table>');
+                             &mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check')
-     }
+                        .'</b></td>';
-     my $tolist;
+ 	}
-     my @recipients = ();
+         if ($actionlist) {
-     for (my $i=0; $i<@{$content{'recuser'}}; $i++) {
+             $r->print('<table border="2" width="100%">'
-         $recipients[$i] =  &Apache::loncommon::aboutmewrapper(
+                      .'<tr bgcolor="#FFAAAA"><td>'
-            &Apache::loncommon::plainname($content{'recuser'}[$i],
+                      .&mt('Currently available actions (will open extra window):')
+                      .'</td>'
+                      .$actionlist
+                      .'</tr></table>');
+         }
+     }
+     my ($tolist,$cclist);
+     my (@recipients,@ccs);
+     if (ref($content{'recuser'}) eq 'ARRAY') {
+         for (my $i=0; $i<@{$content{'recuser'}}; $i++) {
+             $recipients[$i] =  &Apache::loncommon::aboutmewrapper(
+                &Apache::loncommon::plainname($content{'recuser'}[$i],
                                        $content{'recdomain'}[$i]),
-               $content{'recuser'}[$i],$content{'recdomain'}[$i]).
+                   $content{'recuser'}[$i],$content{'recdomain'}[$i]).
-        ' ('.$content{'recuser'}[$i].' at '.$content{'recdomain'}[$i].') ';
+            ' ('.$content{'recuser'}[$i].' '.&mt('at').' '.$content{'recdomain'}[$i].') ';
+         }
      }
      $tolist = join(', ',@recipients);
-     $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
+     if ($content{'recipid'}) {
- 	      ($folder ne 'sent'?'<br /><b>'.&mt('From').':</b> '.
+         @ccs = &retrieve_cc_recips('display',%content);
- 	      &Apache::loncommon::aboutmewrapper(
+         $cclist = join(', ',@ccs);
- 						 &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
+     }
- 						 $content{'sendername'},$content{'senderdomain'}).' ('.
+     my ($restitle,$baseurl,$refers_to);
- 	      $content{'sendername'}.' at '.
+     if (defined($content{'resource_title'})) {
- 	      $content{'senderdomain'}.') ':'<br /><b>'.&mt('To').':</b> '.
+         $restitle = $content{'resource_title'};
-               $tolist).
+     } else {
- 	      ($content{'courseid'}?'<br /><b>'.&mt($crstype).':</b> '.$courseinfo{'description'}.
+         if (defined($content{'baseurl'})) {
- 	       ($content{'coursesec'}?' ('.&mt('Section').': '.$content{'coursesec'}.')':''):'').
+             $restitle = &Apache::lonnet::gettitle($content{'baseurl'});
- 	      '<br /><b>'.&mt('Time').':</b> '.$content{'time'}.
+         }
- 	      ($content{'baseurl'}?'<br /><b>'.&mt('Refers to').':</b> <a href="'.$content{'baseurl'}.'">'.
+     }
- 	       $content{'baseurl'}.' ('.&Apache::lonnet::gettitle($content{'baseurl'}).')</a>':'').
+     if (defined($content{'baseurl'})) {
- 	      '<p><pre>'.
+         $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});
- 	      &Apache::lontexconvert::msgtexconverted($content{'message'},1).
+     }
- 	      '</pre><hr />'.&displayresource(%content).'</p>');
+     if ($from_student && $see_anonymous ) {
-     return;
+ 	$r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}));
+     }
+     # Display LON-CAPA Message (Start)
+     # Subject
+     $r->print('<br />'
+              .&Apache::lonhtmlcommon::start_pick_box()
+              .&Apache::lonhtmlcommon::row_title(&mt('Subject'))
+              .$content{'subject'}
+              .&Apache::lonhtmlcommon::row_closure()
+     );
+     if ($folder eq 'sent') {
+         # To
+         $r->print(&Apache::lonhtmlcommon::row_title(&mt('To'))
+                  .$tolist
+                  .&Apache::lonhtmlcommon::row_closure()
+         );
+         if ($content{'replytoaddr'}) {
+             my ($replytoname,$replytodom) = split(/:/,$content{'replytoaddr'});
+             if ($replytoname ne '' && $replytodom ne '') {
+                 $r->print(&Apache::lonhtmlcommon::row_title(&mt('Reply To'))
+                          .&mt('[_1] at [_2]',$replytoname,$replytodom)
+                          .&Apache::lonhtmlcommon::row_closure()
+                 );
+             }
+         }
+     } else {
+         # From, Reply
+         $r->print(&Apache::lonhtmlcommon::row_title(&mt('From'))
+                  .&Apache::loncommon::aboutmewrapper(
+                      &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
+                                                  $content{'sendername'},$content{'senderdomain'})
+         );
+         if ($content{'noreplies'}) {
+             $r->print(' ('.&mt('No replies to sender').')'
+                      .&Apache::lonhtmlcommon::row_closure()
+             );
+         } else {
+             if ($content{'replytoaddr'}) {
+                 my ($replytoname,$replytodom) = split(/:/,$content{'replytoaddr'});
+                 if ($replytoname ne '' && $replytodom ne '') {
+                     $r->print(&Apache::lonhtmlcommon::row_closure()
+                              .&Apache::lonhtmlcommon::row_title(&mt('Reply To'))
+                              .&mt('[_1] at [_2]',$replytoname,$replytodom)
+                              .&Apache::lonhtmlcommon::row_closure()
+                     );
+                 } else {
+                     $r->print(&Apache::lonhtmlcommon::row_closure());
+                 }
+             } else {
+                 $r->print(' ('.&mt('[_1] at [_2]',$content{'sendername'},$content{'senderdomain'}).') '
+                          .&Apache::lonhtmlcommon::row_closure()
+                 );
+             }
+             if ($cclist) {
+                 $r->print(&Apache::lonhtmlcommon::row_title(&mt('Cc'))
+                          .$cclist
+                          .&Apache::lonhtmlcommon::row_closure()
+                     );
+             }
+         }
+     }
+     # Course
+     if ($content{'courseid'}) {
+         $r->print(&Apache::lonhtmlcommon::row_title(&mt($crstype))
+                  .$courseinfo{'description'}
+         );
+         if ($content{'coursesec'}) {
+             $r->print(' ('.&mt('Section').': '.$content{'coursesec'}.')');
+         }
+         $r->print(&Apache::lonhtmlcommon::row_closure());
+     }
+     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Time'))
+              .$content{'time'}
+              .&Apache::lonhtmlcommon::row_closure()
+     );
+     # Refers to
+     if ($baseurl) {
+         if (defined($content{'courseid'}) && defined($env{'request.course.id'})) {
+             if ($content{'courseid'} eq $env{'request.course.id'}) {
+                 my $symblink;
+                 my $showsymb = &Apache::lonenc::check_decrypt($symb);
+                 my $showurl = &Apache::lonenc::check_decrypt($baseurl);
+                 my $encrypturl = &Apache::lonnet::EXT('resource.0.encrypturl',
+                               $showsymb,$env{'user.domain'},$env{'user.name'});
+                 if ($symb) {
+                     if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
+                         $showsymb = &Apache::lonenc::check_encrypt($symb);
+                     }
+                     $symblink = '?symb='.$showsymb;
+                 }
+                 if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
+                     $showurl = $baseurl;
+                 }
+                 $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to'))
+                          .'<a href="'.$showurl.$symblink.'">'.$restitle.'</a>'
+                          .&Apache::lonhtmlcommon::row_closure()
+                 );
+                 $refers_to = 1;
+             }
+         }
+         if (!$refers_to) {
+             if ($baseurl =~ m-^/enc/-) {
+                 if (defined($content{'courseid'})) {
+                     if (!$env{'request.course.id'}) {
+                         my $unencurl =
+                            &Apache::lonenc::unencrypted($baseurl,
+                                                         $content{'courseid'});
+                         if ($unencurl ne '') {
+                             if (&Apache::lonnet::allowed('bre',$unencurl)) {
+                                 $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to'))
+                                          .'<a href="'.$unencurl.'">'.$restitle.'</a>'
+                                          .&Apache::lonhtmlcommon::row_closure()
+                                 );
+                             }
+                         }
+                     }
+                 }
+             } else {
+                 if (&Apache::lonnet::allowed('bre',$baseurl)) {
+                     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to'))
+                              .'<a href="'.$baseurl.'">'.$restitle.'</a>'
+                              .&Apache::lonhtmlcommon::row_closure()
+                     );
+                 }
+             }
+         }
+     }
+     # Message
+     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Message'))
+              .'<pre>'
+ 	     .&Apache::lontexconvert::msgtexconverted($content{'message'},1)
+ 	     .'</pre>'
+     );
+     if (&displayresource(%content)) {
+         $r->print(&Apache::lonhtmlcommon::row_closure()
+                  .&Apache::lonhtmlcommon::row_title(&mt('Resource Details'))
+                  .&displayresource(%content)
+         );
+     }
+     $r->print(&Apache::lonhtmlcommon::row_closure(1).
+               &Apache::lonhtmlcommon::end_pick_box());
+     # Display LON-CAPA Message (End)
+     return;
+ }
+ sub retrieve_cc_recips {
+     my ($context,%content) = @_;
+     my %reciphash =
+          &Apache::lonnet::get('nohist_emailrecip',[$content{'recipid'}],
+                               $content{'senderdomain'},$content{'sendername'});
+     my $recipinfo = $reciphash{$content{'recipid'}};
+     my @ccs;
+     if (ref($recipinfo) eq 'HASH') {
+         if (ref($recipinfo->{'cc'}) eq 'HASH') {
+             foreach my $cc (sort(keys(%{$recipinfo->{'cc'}}))) {
+                 my ($ccname,$ccdom) = split(/:/,$cc);
+                 if (!(($ccname eq $env{'user.name'}) &&
+                      ($ccdom eq $env{'user.domain'}))) {
+                     my $showcc ='<span class="LC_nobreak">';
+                     if ($context eq 'replying') {
+                         $showcc = '<label><input type="checkbox" name="replying_cc" value="'.$cc.'" />';
+                     }
+                     $showcc .= &Apache::loncommon::aboutmewrapper(
+                                        &Apache::loncommon::plainname($ccname,
+                                          $ccdom),$ccname,$ccdom);
+ 		    if ($context eq 'replying') {
+ 			$showcc .='</label>';
+ 		    }
+ 		    $showcc .= '</span>';
+ 		    push(@ccs,$showcc);
+                 }
+             }
+         }
+     }
+     return @ccs;
  }
  # =========================================================== Show the citation
- Line 1758  sub displayresource {
+ Line 2404  sub displayresource {
  #
      if (($env{'request.course.id'} eq $content{'courseid'})
       && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
- 	my $symb=&Apache::lonnet::symbread($content{'baseurl'});
+         my $symb;
+         if (defined($content{'symb'})) {
+             $symb = $content{'symb'};
+         } else {
+ 	    $symb=&Apache::lonnet::symbread($content{'baseurl'});
+         }
  # Could not get a symb, give up
  	unless ($symb) { return $content{'citation'}; }
  # Have a symb, can render
- Line 1790  sub header {
+ Line 2441  sub header {
      my $extra = &Apache::loncommon::studentbrowser_javascript();
      if ($baseurl) {
- 	$extra .= "<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />";
+ 	$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
      }
      $r->print(&Apache::loncommon::start_page('Communication and Messages',
   					$extra));
- Line 1814  sub storecomment {
+ Line 2465  sub storecomment {
      my ($r)=@_;
      my $msgtxt=&Apache::lonfeedback::clear_out_html($env{'form.message'});
      my $cleanmsgtxt='';
-     foreach (split(/[\n\r]/,$msgtxt)) {
+     foreach my $line (split(/[\n\r]/,$msgtxt)) {
- 	unless ($_=~/^\s*(\>|\&gt\;)/) {
+ 	unless ($line=~/^\s*(\>|\&gt\;)/) {
- 	    $cleanmsgtxt.=$_."\n";
+ 	    $cleanmsgtxt.=$line."\n";
  	}
      }
      my $key=&escape($env{'form.baseurl'}).'___'.time;
- Line 1827  sub storedcommentlisting {
+ Line 2478  sub storedcommentlisting {
      my ($r)=@_;
      my %msgs=&Apache::lonnet::dump('nohist_stored_comments',undef,undef,
         '^'.&escape(&escape($env{'form.showcommentbaseurl'})));
-     $r->print(&Apache::loncommon::start_page('Stored Comment Listing',undef,
+     $r->print(&Apache::loncommon::start_page('Saved Comment Listing',undef,
  					     {'onlybody' => 1}));
      if ((keys %msgs)[0]=~/^error\:/) {
- 	$r->print(&mt('No stored comments yet.'));
+ 	$r->print(&mt('No saved comments yet.'));
      } else {
  	my $found=0;
- 	foreach (sort keys %msgs) {
+ 	foreach my $key (sort(keys(%msgs))) {
- 	    $r->print("\n".$msgs{$_}."<hr />");
+ 	    $r->print("\n".$msgs{$key}."<hr />");
  	    $found=1;
  	}
  	unless ($found) {
- 	    $r->print(&mt('No stored comments yet for this resource.'));
+ 	    $r->print(&mt('No saved comments yet for this resource.'));
  	}
      }
  }
- Line 1849  sub sendoffmail {
+ Line 2500  sub sendoffmail {
      my ($r,$folder)=@_;
      my $suffix=&Apache::lonmsg::foldersuffix($folder);
      my $sendstatus='';
-     my %specialmsg_status;
+     my %msg_status;
-     my $numspecial = 0;
+     my $numsent = 0;
+     my $nosentstore = 1;
+     my $attachmenturl;
+     my $now = time;
      my ($cdom,$cnum,$group);
      if (exists($env{'form.group'})) {
          $group = $env{'form.group'};
- Line 1860  sub sendoffmail {
+ Line 2514  sub sendoffmail {
          $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
      }
      if ($env{'form.send'}) {
-         if ($group eq '') {
+         if (!$env{'form.multiforward'}) {
- 	    &printheader($r,'','Messages being sent.');
+             if ($group eq '') {
-         } else {
+ 	        &printheader($r,'','Messages being sent.');
-             $r->print(&groupmail_header('sending',$group));
+             } else {
+                 $r->print(&groupmail_header('sending',$group));
+             }
          }
  	$r->rflush();
  	my %content=();
- Line 1871  sub sendoffmail {
+ Line 2527  sub sendoffmail {
  	if ($env{'form.forwid'}) {
  	    my $msgid=$env{'form.forwid'};
  	    my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
- 	    %content=&Apache::lonmsg::unpackagemsg($message{$msgid},1);
+ 	    %content=&Apache::lonmsg::unpackagemsg($message{$msgid},1,1);
  	    &statuschange($msgid,'forwarded',$folder);
- 	    $env{'form.message'}.="\n\n-- Forwarded message --\n\n".
+             if ($content{'attachmenturl'} ne '') {
- 		$content{'message'};
+                 $attachmenturl = $content{'attachmenturl'};
+             }
+ 	    $env{'form.message'} .= "\n\n-- Forwarded message --\n\n".
+ 		                    $content{'message'};
  	}
  	if ($env{'form.replyid'}) {
  	    my $msgid=$env{'form.replyid'};
- Line 1887  sub sendoffmail {
+ Line 2546  sub sendoffmail {
  	    &Apache::loncommon::get_env_multiple('form.selectedusers_forminput');
  	my $mode = $env{'form.sendmode'};
- 	my %toaddr;
+ 	my (%toaddr,$cc,$bcc);
  	if (@to) {
  	    foreach my $dest (@to) {
  		my ($user,$domain) = split(/:/, $dest);
- Line 1905  sub sendoffmail {
+ Line 2564  sub sendoffmail {
  	 	}
  	    }
  	} elsif ($env{'form.sendmode'} eq 'upload') {
+             $nosentstore = 0;
  	    foreach my $line (split(/[\n\r\f]+/,$env{'form.upfile'})) {
- 		my ($rec,$txt)=split(/\s*\:\s*/,$line);
+                 my ($rec,$txt) = ($line =~ /^([^:]+:[^:]+):(.*)$/);
  		if ($txt) {
- 		    $rec=~s/\@/\:/;
+                     $rec =~ s/^\s+//;
+                     $rec =~ s/\s+$//;
  		    $toaddr{$rec}.=$txt."\n";
  		}
  	    }
  	} else {
  	    if (($env{'form.recuname'} ne '') && ($env{'form.recdomain'} ne '')) {
  		$toaddr{$env{'form.recuname'}.':'.$env{'form.recdomain'}}='';
+                 $cc->{$env{'form.recuname'}.':'.$env{'form.recdomain'}}='';
  	    }
  	}
- 	if ($env{'form.additionalrec'}) {
+ 	if ($env{'form.additionalrec_cc'}) {
- 	    foreach (split(/\,/,$env{'form.additionalrec'})) {
+ 	    foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_cc'})) {
- 		my ($auname,$audom)=split(/\@/,$_);
+ 		my ($auname,$audom)=split(/:/,$rec);
  		if (($auname ne "") && ($audom ne "")) {
- 		    $toaddr{$auname.':'.$audom}='';
+                     $toaddr{$auname.':'.$audom}='';
+ 		    $cc->{$auname.':'.$audom}='';
  		}
  	    }
  	}
+         if ($env{'form.additionalrec_bcc'}) {
+             foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec_bcc'})) {
+                 my ($auname,$audom)=split(/:/,$rec);
+                 if (($auname ne "") && ($audom ne "")) {
+                     $toaddr{$auname.':'.$audom}='';
+                     $bcc->{$auname.':'.$audom}='';
+                 }
+             }
+         }
+         if ($env{'form.replying_cc'}) {
+             my @ccreplies =
+                 &Apache::loncommon::get_env_multiple('form.replying_cc');
+             foreach my $rec (@ccreplies) {
+                 my ($auname,$audom)=split(/:/,$rec);
+                 if (($auname ne "") && ($audom ne "")) {
+                     $toaddr{$auname.':'.$audom}='';
+                     $cc->{$auname.':'.$audom}='';
+                 }
+             }
+         }
          my $savemsg;
          my $msgtype;
          my %sentmessage;
- Line 1941  sub sendoffmail {
+ Line 2623  sub sendoffmail {
          } else {
              $savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'});
          }
+         my %reciphash = (
+                            cc => $cc,
+                            bcc => $bcc,
+                         );
+         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 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'};
+             }
+         }
+         my @recusers;
+         my @recudoms;
  	foreach my $address (sort(keys(%toaddr))) {
  	    my ($recuname,$recdomain)=split(/\:/,$address);
              my $msgtxt = $savemsg;
- 	    if ($toaddr{$address}) { $msgtxt.='<hr />'.$toaddr{$address}; }
+             if ($toaddr{$address}) {
+ 	        $msgtxt.='<hr />'.$toaddr{$address};
+             }
  	    my @thismsg;
- 	    if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) &&
+ 	    if ($msgtype eq 'critical') {
- 		(&Apache::lonnet::allowed('srm',$env{'request.course.id'})
+ 		$r->print(&mt('Sending critical message').' '.
- 		 || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+                               $recuname.':'.$recdomain.': ');
- 					     '/'.$env{'request.course.sec'}))) {
- 		$r->print(&mt('Sending critical message').' '.$recuname.':'.$recdomain.': ');
  		@thismsg=
  		    &Apache::lonmsg::user_crit_msg($recuname,$recdomain,
  						   $msgsubj,$msgtxt,
  						   $env{'form.sendbck'},
  						   $env{'form.permanent'},
- 						   \$sentmessage{$address});
+ 						   \$sentmessage{$address},
+                                                    $nosentstore,$recipid);
  	    } else {
  		$r->print(&mt('Sending').' '.$recuname.':'.$recdomain.': ');
  		@thismsg=
  		    &Apache::lonmsg::user_normal_msg($recuname,$recdomain,
  						     $msgsubj,$msgtxt,
  						     $content{'citation'},
- 						     undef,undef,
+ 						     undef,$attachmenturl,
  						     $env{'form.permanent'},
- 						     \$sentmessage{$address});
+ 						     \$sentmessage{$address},
+                                                      undef,undef,undef,
+                                                      $nosentstore,$recipid);
              }
- 	    if (($env{'request.course.id'}) && (($msgtype eq 'critical') ||
+ 	    $msg_status{$recuname.':'.$recdomain}=join(' ',@thismsg);
-                                          ($env{'form.sendmode'} eq 'group'))) {
+ 	    if ($msg_status{$recuname.':'.$recdomain} =~ /(ok|con_delayed)/) {
- 	        $specialmsg_status{$recuname.':'.$recdomain} =
+ 	        $numsent++;
- 		    join(' ',@thismsg);
+                 push(@recusers,$recuname);
- 		foreach my $result (@thismsg) {
+                 push(@recudoms,$recdomain);
- 		    if ($result eq 'ok') {
- 			$numspecial++;
- 		    }
- 		}
  	    }
  	    $sendstatus.=' '.join(' ',@thismsg);
  	}
-         if (($env{'request.course.id'}) && (($env{'form.sendmode'} eq 'group')
+         my $subj_prefix;
-                                               || ($msgtype eq 'critical'))) {
+         if ($numsent > 0) {
-             my $subj_prefix;
+             if (($env{'request.course.id'}) &&
-             if ($msgtype eq 'critical') {
+                 (($env{'form.sendmode'} eq 'group') ||
-                 $subj_prefix = 'Critical.';
+                  ($env{'form.courserecord'}) ||
-             } else {
+                  ($msgtype eq 'critical'))) {
-                 $subj_prefix = 'Broadcast.';
+                 if ($msgtype eq 'critical') {
-             }
+                     $subj_prefix = 'Critical.';
-             my ($specialmsgid,$specialresult);
+                 } elsif ($env{'form.sendmode'} eq 'group') {
-             my $course_str = &escape('['.$cnum.':'.$cdom.']');
+                     $subj_prefix = 'Broadcast.';
+                 } else {
+                     $subj_prefix = 'Archive';
+                 }
+                 my ($specialmsgid,$specialresult);
+                 my $course_str = &escape('['.$cnum.':'.$cdom.']');
-             if ($numspecial) {
+                 $specialresult =
-                 $specialresult = &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,$subj_prefix.
+                     &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,
-                     ' '.$course_str,$savemsg,undef,undef,undef,
+                         $subj_prefix.' '.$course_str,$savemsg,undef,undef,
-                     undef,undef,\$specialmsgid);
+                         $attachmenturl,undef,undef,\$specialmsgid,undef,undef,undef,
+                         undef,undef,1);
                  $specialmsgid = &unescape($specialmsgid);
-             }
+                 if ($specialresult eq 'ok') {
-             if ($specialresult eq 'ok') {
+                     my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) =
-                 my $record_sent;
+ 		        split(/\:/,&unescape($specialmsgid));
-                 my @recusers;
-                 my @recudoms;
+                     foreach my $recipient (sort(keys(%toaddr))) {
-                 my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) =
+                         if ($msg_status{$recipient} =~ /\s*(ok|con_delayed)\s*/) {
- 		    split(/\:/,&unescape($specialmsgid));
+                             my $usersubj = $subj_prefix.'['.$recipient.']';
+                             my $usermsgid =
-                 foreach my $recipient (sort(keys(%toaddr))) {
+ 			        &Apache::lonmsg::buildmsgid($stamp,$usersubj,
-                     if ($specialmsg_status{$recipient} eq 'ok') {
+ 							    $msgname,$msgdom,
-                         my $usersubj = $subj_prefix.'['.$recipient.']';
+ 							    $msgcount,$context,
-                         my $usermsgid =
+ 							    $pid);
- 			    &Apache::lonmsg::buildmsgid($stamp,$usersubj,
+                             &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,
- 							$msgname,$msgdom,
+                                 $subj_prefix.' ['.$recipient.']',$msgsubj,
- 							$msgcount,$context,
+                                 undef,undef,$attachmenturl,undef,$usermsgid,undef,
- 							$pid);
+                                 undef,$specialmsgid,undef,undef,undef,1);
-                         &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,$subj_prefix.
+                         }
-                                              ' ['.$recipient.']',$msgsubj,undef,
-                         undef,undef,undef,$usermsgid,undef,undef,$specialmsgid);
-                         my ($uname,$udom) = split(/:/,$recipient);
-                         push(@recusers,$uname);
-                         push(@recudoms,$udom);
                      }
-                 }
+                     if (($env{'form.sendmode'} ne 'upload') && (@recusers > 0)) {
-                 if (@recusers) {
+                         &Apache::lonmsg::process_sent_mail($msgsubj,
-                     my $specialmessage;
+                            $subj_prefix,$numsent,$stamp,$msgname,$msgdom,
-                     my $sentsubj =
+                            $msgcount,$context,$pid,$savemsg,\@recusers,
- 			$subj_prefix.' ('.$numspecial.' sent) '.$msgsubj;
+                            \@recudoms,undef,$attachmenturl);
-                     $sentsubj = &HTML::Entities::encode($sentsubj,'<>&"');
+                     }
-                     my $sentmsgid =
+                 } else {
- 			&Apache::lonmsg::buildmsgid($stamp,$sentsubj,$msgname,
+                     &Apache::lonnet::logthis('Failed to create record of critical, broadcast or archived message in '.$env{'course.'.$env{'request.course.id'}.'.num'}.' '&mt('at').' '.$env{'course.'.$env{'request.course.id'}.'.domain'}.' - no msgid generated');
- 						    $msgdom,$msgcount,$context,
- 						    $pid);
-                     ($specialmsgid,$specialmessage) = &Apache::lonmsg::packagemsg($msgsubj,$savemsg,
-                             undef,undef,undef,\@recusers,\@recudoms,$sentmsgid);
-                     $record_sent = &Apache::lonmsg::store_sent_mail($specialmsgid,$specialmessage);
                  }
              } else {
-                 &Apache::lonnet::logthis('Failed to create record of critical message or broadcast in '.$env{'course.'.$env{'request.course.id'}.'.num'}.' at '.$env{'course.'.$env{'request.course.id'}.'.domain'}.' - no msgid generated');
+                 my $stamp = time;
+                 my $msgcount = &Apache::lonmsg::get_uniq();
+                 my $context = &Apache::lonmsg::get_course_context();
+                 &Apache::lonmsg::process_sent_mail($msgsubj,$subj_prefix,
+                        $numsent,$stamp,$env{'user.name'},
+                        $env{'user.domain'},$msgcount,$context,
+                        $$,$savemsg,\@recusers,\@recudoms,undef,$attachmenturl);
              }
          }
-     } else {
+         if (!$env{'form.multiforward'}) {
- 	&printheader($r,'','No messages sent.');
+             if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
-     }
+ 	        $r->print('<br /><span class="LC_success">'.&mt('Completed.').
-     if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+                           '</span>');
- 	$r->print('<br /><span class="LC_success">'.&mt('Completed.').'</span>');
+ 	        if ($env{'form.displayedcrit'}) {
- 	if ($env{'form.displayedcrit'}) {
+ 	            &discrit($r);
- 	    &discrit($r);
+                 }
+                 if ($group ne '') {
+                     $r->print(&groupmail_sent($group,$cdom,$cnum));
+ 	        } else {
+ 	            &Apache::loncommunicate::menu($r);
+ 	        }
+             } else {
+ 	        $r->print('<p><span class="LC_error">'.&mt('Could not deliver message').'</span> '.
+ 		          &mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus).'</p>');
+             }
          }
-         if ($group ne '') {
-             $r->print(&groupmail_sent($group,$cdom,$cnum));
- 	} else {
- 	    &Apache::loncommunicate::menu($r);
- 	}
-     } else {
- 	$r->print('<p><span class="LC_error">'.&mt('Could not deliver message').'</span> '.
- 		  &mt('Please use the browser "Back" button and correct the recipient addresses '."($sendstatus)").'</p>');
      }
+     return $sendstatus;
  }
  # ===================================================================== Handler
- Line 2073  sub handler {
+ Line 2780  sub handler {
          ['display','replyto','forward','markread','markdel','markunread',
           'sendreply','compose','sendmail','critical','recname','recdom',
           'recordftf','sortedby','block','folder','startdis','interdis',
- 	 'showcommentbaseurl','dismode','group','subject','text','ref']);
+ 	 'showcommentbaseurl','dismode','group','subject','text','ref',
+          'msgstatus']);
      $sqs='&sortedby='.$env{'form.sortedby'};
  # ------------------------------------------------------ They checked for email
- Line 2103  sub handler {
+ Line 2811  sub handler {
      unless ($dismode) {
  	$dismode='';
      } else {
- 	$sqs.='&dismode='.&escape($dismode);
+ 	$sqs.='&amp;dismode='.&escape($dismode);
      }
  # --------------------------------------------------------------------- Display
+     my $msgstatus = $env{'form.msgstatus'};
      $startdis=$env{'form.startdis'};
-     $startdis--;
+     if ($startdis ne '') {
+         $startdis--;
+     }
      unless ($startdis) { $startdis=0; }
-     $interdis=$env{'form.interdis'};
-     unless ($interdis) { $interdis=20; }
-     $sqs.='&interdis='.$interdis;
      if ($env{'form.firstview'}) {
  	$startdis=0;
      }
- Line 2134  sub handler {
+ Line 2840  sub handler {
  # --------------------------------------------------------------- Render Output
      if ($env{'form.display'}) {
- 	&displaymessage($r,$env{'form.display'},$folder);
+ 	&displaymessage($r,$env{'form.display'},$folder,$msgstatus);
      } elsif ($env{'form.replyto'}) {
  	&compout($r,'',$env{'form.replyto'},undef,undef,$folder,$dismode);
      } elsif ($env{'form.confirm'}) {
  	&printheader($r,'','Confirmed Receipt');
  	my $replying = 0;
- 	foreach (keys %env) {
+ 	foreach my $envkey (keys(%env)) {
- 	    if ($_=~/^form\.rec\_(.*)$/) {
+ 	    if ($envkey=~/^form\.(rep)?rec\_(.*)$/) {
- 		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
+                 my $repchk = $1;
- 			  &Apache::lonmsg::user_crit_received($1).'<br>');
+        		my $msgid = $2;
- 	    }
+ 		$r->print('<b>'.&mt('Confirming Receipt').':</b> ');
- 	    if ($_=~/^form\.reprec\_(.*)$/) {
+ 		my $result = &Apache::lonmsg::user_crit_received($msgid);
- 		my $msgid=$1;
+                 if ($result =~ /trans:\s+ok/) {
- 		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
+                     &statuschange($msgid,'read');
- 			  &Apache::lonmsg::user_crit_received($msgid).'<br>');
+                 }
- 		&compout($r,'','','',$msgid);
+                 $r->print($result.'<br />');
- 		$replying = 1;
+                 if ($repchk eq 'rep') {
+ 		    &compout($r,'','','',$msgid);
+ 		    $replying = 1;
+                 }
  	    }
  	}
  	if (!$replying) {
- Line 2171  sub handler {
+ Line 2880  sub handler {
  		      '<p class="LC_error">'.$msg."</p>\n");
  	}
  	&Apache::loncommunicate::menu($r);
- 	&disall($r,($folder?$folder:$dismode));
+ 	&disall($r,($folder?$folder:$dismode),$msgstatus);
-     } elsif ($env{'form.markedmove'}) {
+     } elsif ($env{'form.markedaction'} eq 'markedforward') {
- 	my ($total,$failed,@failed_msg)=(0,0);
+         my $total = 0;
- 	foreach my $key (keys(%env)) {
+         my @to_forward = &Apache::loncommon::get_env_multiple('form.delmark');
- 	    if ($key=~/^form\.delmark_(.*)$/) {
+         foreach my $msgid (@to_forward) {
- 		my ($result,$msg) =
+             &statuschange(&unescape($msgid),'forwarded',$folder);
- 		    &movemsg(&unescape($1),$folder,
+             $total ++;
- 			     $env{'form.movetofolder'});
+         }
- 		if ($result) {
+         if ($total > 0) {
+             &compout($r,undef,undef,undef,undef,$folder,$dismode,$total);
+         }
+     } elsif ($env{'form.markedaction'} eq 'markedread') {
+         my $total = 0;
+         my @to_markread = &Apache::loncommon::get_env_multiple('form.delmark');
+         foreach my $msgid (@to_markread) {
+             &statuschange(&unescape($msgid),'read',$folder);
+             $total ++;
+         }
+         &printheader($r,'','Marked Messages Read');
+         $r->print(&mt('Marked [_1] message(s) read',$total).'<p>');
+         &Apache::loncommunicate::menu($r);
+         &disall($r,($folder?$folder:$dismode),$msgstatus);
+     } elsif ($env{'form.markedaction'} eq 'markedunread') {
+         my $total = 0;
+         my @to_markunread = &Apache::loncommon::get_env_multiple('form.delmark');
+         foreach my $msgid (@to_markunread) {
+             &statuschange(&unescape($msgid),'new',$folder);
+             $total ++;
+         }
+         &printheader($r,'','Marked Messages Unread');
+         $r->print(&mt('Marked [_1] message(s) unread',$total).'<p>');
+         &Apache::loncommunicate::menu($r);
+         &disall($r,($folder?$folder:$dismode),$msgstatus);
+     } elsif ($env{'form.markedaction'} eq 'markedmove') {
+         my $destfolder = $env{'form.movetofolder'};
+         my %gotfolders = &Apache::lonmsg::get_user_folders();
+         &printheader($r,'','Moved Messages');
+         if (!defined($gotfolders{$destfolder})) {
+             $r->print(&mt('Destination folder [_1] is not a valid folder',
+                       $destfolder));
+         } else {
+ 	    my ($total,$failed,@failed_msg)=(0,0);
+             my @to_move = &Apache::loncommon::get_env_multiple('form.delmark');
+             foreach my $msgid (@to_move) {
+ 	        my ($result,$msg) = &movemsg(&unescape($msgid),$folder,
+ 			                     $env{'form.movetofolder'});
+ 	        if ($result) {
  		    $total++;
- 		} else {
+ 	        } else {
  		    $failed++;
  		    push(@failed_msg,$msg);
- 		}
+ 	        }
  	    }
- 	}
+ 	    if ($failed) {
- 	&printheader($r,'','Moved Messages');
+ 	        $r->print('<p class="LC_error">
- 	if ($failed) {
- 	    $r->print('<p class="LC_error">
                            '.&mt('Failed to move [_1] message(s)',$failed).
  		      '</p>');
- 	    $r->print('<p class="LC_error">'.
+ 	        $r->print('<p class="LC_error">'.
- 		      join("</p>\n<p class=\"LC_error\">",@failed_msg).
+ 	   	          join("</p>\n<p class=\"LC_error\">",@failed_msg).
- 		      "</p>\n");
+ 		          "</p>\n");
- 	}
+ 	    }
- 	$r->print(&mt('Moved [_1] message(s)',$total).'<p>');
+ 	    $r->print(&mt('Moved [_1] message(s)',$total).'<p>');
+         }
  	&Apache::loncommunicate::menu($r);
- 	&disall($r,($folder?$folder:$dismode));
+ 	&disall($r,($folder?$folder:$dismode),$msgstatus);
-     } elsif ($env{'form.markeddel'}) {
+     } elsif ($env{'form.markedaction'} eq 'markeddel') {
  	my ($total,$failed,@failed_msg)=(0,0);
- 	foreach my $key (keys(%env)) {
+         my @to_delete = &Apache::loncommon::get_env_multiple('form.delmark');
- 	    if ($key=~/^form\.delmark_(.*)$/) {
+         foreach my $msgid (@to_delete) {
- 		my ($result,$msg) =
+ 	    my ($result,$msg) = &statuschange(&unescape($msgid),'deleted',
- 		    &statuschange(&unescape($1),'deleted',
+ 				              $folder);
- 				  $folder);
+ 	    if ($result) {
- 		if ($result) {
+ 	        $total++;
- 		    $total++;
+ 	    } else {
- 		} else {
+ 	        $failed++;
- 		    $failed++;
+ 		push(@failed_msg,$msg);
- 		    push(@failed_msg,$msg);
- 		}
  	    }
  	}
  	&printheader($r,'','Deleted Messages');
- Line 2225  sub handler {
+ Line 2969  sub handler {
  	}
  	$r->print(&mt('Deleted [_1] message(s)',$total).'<p>');
  	&Apache::loncommunicate::menu($r);
- 	&disall($r,($folder?$folder:$dismode));
+ 	&disall($r,($folder?$folder:$dismode),$msgstatus);
      } elsif ($env{'form.markunread'}) {
  	&printheader($r,'','Marked Message as Unread');
  	&statuschange($env{'form.markunread'},'new');
  	&Apache::loncommunicate::menu($r);
- 	&disall($r,($folder?$folder:$dismode));
+ 	&disall($r,($folder?$folder:$dismode),$msgstatus);
      } elsif ($env{'form.compose'}) {
  	&compout($r,'','',$env{'form.compose'});
      } elsif ($env{'form.recordftf'}) {
- Line 2238  sub handler {
+ Line 2982  sub handler {
      } elsif ($env{'form.block'}) {
          &examblock($r,$env{'form.block'});
      } elsif ($env{'form.sendmail'}) {
- 	&sendoffmail($r,$folder);
+         if ($env{'form.multiforward'}) {
+             &printheader($r,'','Messages being sent.');
+             my $fixed_subj = $env{'form.subject'};
+             my $suffix=&Apache::lonmsg::foldersuffix($folder);
+             my (%sendresult,%forwardok,%forwardfail,$fwdcount);
+             my @to_forward = &Apache::loncommon::get_env_multiple('form.delmark');
+             foreach my $item (@to_forward) {
+                 my $msgid=&unescape($item);
+                 my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
+                 my %content=&Apache::lonmsg::unpackagemsg($message{$msgid},1,1);
+                 if ($env{'form.showorigsubj'}) {
+                     $env{'form.subject'} = $fixed_subj.$content{'subject'};
+                 } else {
+                     $env{'form.subject'} = '';
+                 }
+                 my $uname = $content{'sendername'};
+                 my $udom = $content{'senderdomain'};
+                 &statuschange($msgid,'forwarded',$folder);
+                 if ($env{'form.showorigsender'}) {
+                     $env{'form.message'} = $env{'form.msgheader'}.' '.
+                         &Apache::loncommon::plainname($uname,$udom).' ('.
+                                            $uname.':'.$udom.')';
+                 }
+                 $env{'form.message'}.="\n\n-- Forwarded message --\n\n".
+                                       $content{'message'};
+                 $env{'form.attachmenturl'} = $content{'attachmenturl'};
+                 $env{'form.multiforwid'} = $item;
+                 $fwdcount ++;
+                 $r->print($fwdcount.': ');
+                 $sendresult{$msgid} = &sendoffmail($r,$folder);
+                 $r->print('<br />');
+             }
+             foreach my $key (keys(%sendresult)) {
+                 if ($sendresult{$key} =~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+                     $forwardok{$key} = $sendresult{$key};
+                 } else {
+                     $forwardfail{$key} = $sendresult{$key};
+                 }
+             }
+             if (keys(%forwardok) > 0) {
+                 my $count = keys(%forwardok);
+                 $r->print('<br /><span class="LC_success">'.
+                           &mt('[quant,_1,message] forwarded.',$count).
+                           '</span>');
+             }
+             if (keys(%forwardfail) > 0) {
+                 my $count = keys(%forwardfail);
+                 $r->print('<p><span class="LC_error">'.
+                           &mt('Could not forward [quant,_1,message].',$count).
+                           '</span> ');
+                 foreach my $key (keys(%forwardfail)) {
+                     $r->print(&mt('Could not deliver forwarded message.').'</span> '.
+                               &mt('The recipient addresses may need to be corrected').' ('.$forwardfail{$key}.').<br /><br />');
+                 }
+             }
+             &Apache::loncommunicate::menu($r);
+         } else {
+ 	    &sendoffmail($r,$folder);
+         }
  	if ($env{'form.storebasecomment'}) {
  	    &storecomment($r);
          }
- Line 2250  sub handler {
+ Line 3052  sub handler {
  				      $env{'form.message'},'/adm/communicate','public');
  	}
  	if ((!exists($env{'form.group'})) && (!$env{'form.displayedcrit'})) {
- 	    &disall($r,($folder?$folder:$dismode));
+ 	    &disall($r,($folder?$folder:$dismode),$msgstatus);
  	}
      } elsif ($env{'form.newfolder'}) {
  	&printheader($r,'','New Folder');
- 	&makefolder($env{'form.newfolder'});
+         my $showfolder = $env{'form.newfolder'};
- 	&Apache::loncommunicate::menu($r);
+ 	my ($makeresult,$warning) = &makefolder($env{'form.newfolder'});
- 	&disall($r,$env{'form.newfolder'});
+         if ($makeresult eq 'ok') {
+             $r->print(&mt('Mail folder "[_1]" created.',$showfolder).'<br />');
+         } else {
+             $r->print(&mt('Creation failed.').' '.$makeresult.'<br />'.
+                       $warning);
+             $showfolder = $folder;
+         }
+         &Apache::loncommunicate::menu($r);
+ 	&disall($r,$showfolder,$msgstatus);
      } elsif ($env{'form.showcommentbaseurl'}) {
  	&storedcommentlisting($r);
+     } elsif ($env{'form.folderaction'} eq 'delete') {
+         &printheader($r,'','Deleted Folder');
+         my $showfolder = '';
+         my $delresult = &deletefolder($folder);
+         if ($delresult eq 'ok') {
+             $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />');
+             $env{'form.folder'} = '';
+         } else {
+             $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
+             $showfolder = $folder;
+         }
+         &Apache::loncommunicate::menu($r);
+         &disall($r,$showfolder,$msgstatus);
+     } elsif ($env{'form.folderaction'} eq 'rename') {
+         &printheader($r,'','Renamed Folder');
+         my $showfolder = $env{'form.renamed'};
+         my $renresult = &renamefolder($folder);
+         if ($renresult eq 'ok') {
+             $r->print(&mt('Mail folder "[_1]" renamed "[_2]".',$folder,$showfolder).'<br />');
+         } else {
+             $r->print(&mt('Renaming failed.').' '.$renresult.'<br />');
+             $showfolder = $folder;
+         }
+         &Apache::loncommunicate::menu($r);
+         &disall($r,$showfolder,$msgstatus);
      } else {
  	&printheader($r,'','Display All Messages');
  	&Apache::loncommunicate::menu($r);
- 	&disall($r,($folder?$folder:$dismode));
+ 	&disall($r,($folder?$folder:$dismode),$msgstatus);
      }
      $r->print(&Apache::loncommon::end_page());
      return OK;
- Line 2271  sub handler {
+ Line 3106  sub handler {
  =pod
- =back
  =cut
 ;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.35.2.5
changed lines
	Added in v.1.94