[BACK]Return to lonmsgdisplay.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.52 and 1.53

version 1.52, 2006/12/17 15:52:37 version 1.53, 2006/12/18 00:16:27
Line 137  my $interdis; Line 137  my $interdis;
 # ============================================================ List all folders  # ============================================================ List all folders
   
 sub folderlist {  sub folderlist {
     my $folder=shift;      my ($folder,$msgstatus) = @_;
     my %lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
                 actn => 'Action',                  actn => 'Action',
                 fold => 'Folder',                  fold => 'Folder',
                 show => 'Show',                  show => 'Show',
                   status => 'Message Status',
                 go   => 'Go',                  go   => 'Go',
                 nnff => 'New Name for Folder',                  nnff => 'New Name for Folder',
                 newn => 'New Name',                  newn => 'New Name',
Line 160  sub folderlist { Line 161  sub folderlist {
     );      );
     $actions{'select_form_order'} = ['view','rename','delete'];      $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 %permfolders = &get_permanent_folders();
     my $permlist = join("','",sort(keys(%permfolders)));      my $permlist = join("','",sort(keys(%permfolders)));
     my ($permlistkeys,$permlistvals);      my ($permlistkeys,$permlistvals);
Line 181  sub folderlist { Line 186  sub folderlist {
     my $folderlist = join("','",@userorder);      my $folderlist = join("','",@userorder);
     $folderlist .= "','".$permlistvals;      $folderlist .= "','".$permlistvals;
   
     $formhash{'select_form_order'} = ['','critical','new',@userorder,'sent','trash'];      $formhash{'select_form_order'} = ['','critical',@userorder,'sent','trash'];
     my $output = qq|<script type="text/javascript">      my $output = qq|<script type="text/javascript">
 function folder_choice(targetform,caller) {  function folder_choice(targetform,caller) {
     var permfolders_keys = new Array('$permlistkeys');      var permfolders_keys = new Array('$permlistkeys');
Line 242  function folder_choice(targetform,caller Line 247  function folder_choice(targetform,caller
  }   }
        (10,20,50,100,200)).'</select>         (10,20,50,100,200)).'</select>
      </td>       </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 />'.       <td align="center"><b>'.$lt{'actn'}.'</b><br />'.
          &Apache::loncommon::select_form('view','folderaction',%actions).'           &Apache::loncommon::select_form('view','folderaction',%actions).'
      </td><td><br />'.       </td><td><br />'.
Line 262  function folder_choice(targetform,caller Line 270  function folder_choice(targetform,caller
 </table>'."\n".  </table>'."\n".
     '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.      '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.
     '<input type="hidden" name="renamed" value="" />'.      '<input type="hidden" name="renamed" value="" />'.
         ($folder=~/^(new|critical)/?'</form>':'');          ($folder=~/^critical/?'</form>':'');
     return $output;      return $output;
 }  }
   
Line 270  sub get_permanent_folders { Line 278  sub get_permanent_folders {
     my %permfolders =       my %permfolders = 
  &Apache::lonlocal::texthash(''         => 'INBOX',   &Apache::lonlocal::texthash(''         => 'INBOX',
     'trash'    => 'TRASH',      'trash'    => 'TRASH',
     'new'      => 'New Messages Only',  
     'critical' => 'Critical',      'critical' => 'Critical',
     'sent'     => 'Sent Messages',      'sent'     => 'Sent Messages',
     );      );
     return %permfolders;      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 {  sub scrollbuttons {
     my ($start,$maxdis,$first,$finish,$total)=@_;      my ($start,$maxdis,$first,$finish,$total,$msgstatus)=@_;
     unless ($total>0) { return ''; }      unless ($total>0) { return ''; }
     $start++; $maxdis++;$first++;$finish++;      $start++; $maxdis++;$first++;$finish++;
   
       my %statushash = &get_msgstatus_types();
       my $status;
       if ($msgstatus eq '') {
           $status = &mt('All');
       } else {
           $status = $statushash{$msgstatus};
       }
     return      return
    &mt('Page').': '.      '<b>'.&mt('Page').'</b>: '. 
    '<input type="submit" name="firstview" value="'.&mt('First').'" />'.     '<input type="submit" name="firstview" value="'.&mt('First').'" />'.
    '<input type="submit" name="prevview" value="'.&mt('Previous').'" />'.     '<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="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="nextview" value="'.&mt('Next').'" />'.
    '<input type="submit" name="lastview" value="'.&mt('Last').'" /><br />'.     '<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  # =============================================================== Status Change
   
Line 745  $content{'sendername'}.':'. Line 771  $content{'sendername'}.':'.
 }  }
   
 sub sortedmessages {  sub sortedmessages {
     my ($blocked,$startblock,$endblock,$numblocked,$folder) = @_;      my ($blocked,$startblock,$endblock,$numblocked,$folder,$msgstatus) = @_;
     my $suffix=&Apache::lonmsg::foldersuffix($folder);      my $suffix=&Apache::lonmsg::foldersuffix($folder);
     my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);      my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);
   
Line 766  sub sortedmessages { Line 792  sub sortedmessages {
  my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)=   my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)=
     &Apache::lonmsg::unpackmsgid($esc_msgid,$folder,undef,      &Apache::lonmsg::unpackmsgid($esc_msgid,$folder,undef,
  \%status_cache);   \%status_cache);
           next if ($msgstatus ne '' && $msgstatus ne $status);
         my $description = &get_course_desc($fromcid,\%descriptions);          my $description = &get_course_desc($fromcid,\%descriptions);
  my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,   my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,
      $esc_msgid,$description);       $esc_msgid,$description);
Line 861  sub get_course_desc { Line 888  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 %blocked = ();  
     my $numblocked = 0;  
     # Check for blocking of display because of scheduled online exams.  
     my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');  
     my %status_cache =   
  &Apache::lonnet::get('email_status',\@msgids);  
     my %descriptions;  
     foreach my $id (@msgids) {  
  my $msgid=&escape($id);  
         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{$id} = '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&amp;display=$msg->{'msgid'}">$lt{'op'}</a></td>  
 ENDLINK  
             foreach my $item ('sendtime','from','fromdom','shortsub','course') {  
                 $r->print("<td>$msg->{$item}</td>");  
             }  
             $r->print("</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);  
         $r->print('<h3>'.&mt('You have [quant,_1,blocked unread message,blocked unread messages].',$numblocked).'</h3>'."\n".  
                  &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).'<br />'."\n".  
                  &Apache::loncommon::build_block_table($startblock,$endblock,  
                                                        \%setters));  
     }  
 }  
   
   
 # ======================================================== Display all messages  # ======================================================== Display all messages
   
 sub disall {  sub disall {
     my ($r,$folder)=@_;      my ($r,$folder,$msgstatus)=@_;
     $r->print(&folderlist($folder));      $r->print(&folderlist($folder,$msgstatus));
     if ($folder eq 'new') {      if ($folder eq 'critical') {
  &disnew($r);  
     } elsif ($folder eq 'critical') {  
  &discrit($r);   &discrit($r);
     } else {      } else {
  &disfolder($r,$folder);   &disfolder($r,$folder,$msgstatus);
     }      }
 }  }
   
 # ============================================================ Display a folder  # ============================================================ Display a folder
   
 sub disfolder {  sub disfolder {
     my ($r,$folder)=@_;      my ($r,$folder,$msgstatus)=@_;
       my %statushash = &get_msgstatus_types();
     my %blocked = ();      my %blocked = ();
     my %setters = ();      my %setters = ();
     my $numblocked = 0;      my $numblocked = 0;
     my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');      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.',  
       );
     $r->print(<<ENDDISHEADER);      $r->print(<<ENDDISHEADER);
 <script type="text/javascript">  <script type="text/javascript">
     function checkall() {      function checkall() {
  for (i=0; i<document.forms.disall.elements.length; i++) {   for (i=0; i<document.forms.disall.delmark.length; i++) {
             if       document.forms.disall.delmark[i].checked=true;
           (document.forms.disall.elements[i].name.indexOf('delmark_')==0) {  
       document.forms.disall.elements[i].checked=true;  
             }  
         }          }
     }      }
   
     function uncheckall() {      function uncheckall() {
  for (i=0; i<document.forms.disall.elements.length; i++) {   for (i=0; i<document.forms.disall.delmark.length; i++) {
             if       document.forms.disall.delmark[i].checked=false;
           (document.forms.disall.elements[i].name.indexof('delmark_')==0) {          }
       document.forms.disall.elements[i].checked=false;      }
       function checkfoldermove() {
           if (document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value == 'markedmove') {
               if (document.disall.movetofolder.options[document.disall.movetofolder.selectedIndex].value == "") {
                   alert("$lt{'sede'}");
                   return;
             }              }
         }          }
           return; 
     }      }
   
       function validate_checkedaction() {
           document.disall.markedaction.value = document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value;
           if (document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value == 'markedmove') {
               if (document.disall.movetofolder.options[document.disall.movetofolder.selectedIndex].value == "") {
                   alert("$lt{'sede'}");
                   return;
               } 
           }
           var checktotal = 0;
           for (var i=0; i<document.forms.disall.delmark.length; i++) {
               if (document.forms.disall.delmark[i].checked) {
                   checktotal ++;
               }
           }
           if (checktotal == 0) {
               alert("$lt{'nome'}\\n$lt{'chec'}");
               return;
           }
           document.disall.submit();
       }
   
 </script>  </script>
 ENDDISHEADER  ENDDISHEADER
       my %gotfolders = &Apache::lonmsg::get_user_folders();
       my %userfolders;
     my $fsqs='&folder='.$folder;      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;      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 [_1] messages in this folder',lc($statushash{$msgstatus})).'</h2>');
           }
  return;   return;
     }      }
     unless ($interdis) {      unless ($interdis) {
  $interdis=20;   $interdis=20;
     }      }
     my $number=int($totalnumber/$interdis);      my $number=int($totalnumber/$interdis);
       if ($interdis) {
           if ($totalnumber%$interdis == 0) {
               $number--; 
           }
       }
   
     if (($startdis<0) || ($startdis>$number)) { $startdis=$number; }      if (($startdis<0) || ($startdis>$number)) { $startdis=$number; }
     my $firstdis=$interdis*$startdis;      my $firstdis=$interdis*$startdis;
     if ($firstdis>$#temp) { $firstdis=$#temp-$interdis+1; }      if ($firstdis>$#temp) { $firstdis=$#temp-$interdis+1; }
     my $lastdis=$firstdis+$interdis-1;      my $lastdis=$firstdis+$interdis-1;
     if ($lastdis>$#temp) { $lastdis=$#temp; }      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">'.      $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") {      if ($env{'form.sortedby'} eq "revdate") {
  $r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');   $r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
     } else {      } else {
Line 1069  ENDDISHEADER Line 1059  ENDDISHEADER
     $dis_domain = join('<br />',@{$content{'recdomain'}});      $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') {   } elsif ($status eq 'deleted') {
 # purge  # purge
     my ($result,$msg) =       my ($result,$msg) = 
Line 1084  ENDDISHEADER Line 1088  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()" value="'.&mt('Check All').'" /><br />'."\n".
     '<input type="button" onclick="javascript:uncheckall()" 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" onchange="javascript:checkfoldermove()">'."\n");
   
     if ($folder ne 'trash') {      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 %gotfolders = &Apache::lonmsg::get_user_folders();          $r->print('    <option value="markedread">'.&mt('Mark Read').'</option>."\n"');
     my %userfolders;      }
       if ($msgstatus ne 'unread') {
           $r->print('    <option value="markedunread">'.&mt('Mark Unread').'</option>'."\n");
       }
       $r->print('   <option value="markedforward">'.&mt('Forward').'</option>'."\n");
       if (keys(%gotfolders) > 0) {
           $r->print('   <option value="markedmove">'.&mt('Move to Folder ->').
                     '</option>');
       }
       $r->print("\n".'</select></td>'."\n");
     foreach my $key (keys(%gotfolders)) {      foreach my $key (keys(%gotfolders)) {
         $userfolders{$key} = $key;          $userfolders{$key} = $key;
     }      }
     $r->print(      if (keys(%gotfolders) > 0) {
  &Apache::loncommon::select_form('','movetofolder',          $r->print('<td align="center"><b>'.&mt('Destination folder').'<b><br />');
                 %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;      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) {      if ($numblocked > 0) {
         my $beginblock = &Apache::lonlocal::locallocaltime($startblock);          my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
         my $finishblock = &Apache::lonlocal::locallocaltime($endblock);          my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
Line 1116  ENDDISHEADER Line 1144  ENDDISHEADER
 # ============================================================== Compose output  # ============================================================== Compose output
   
 sub compout {  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 $suffix=&Apache::lonmsg::foldersuffix($folder);
     my ($cdom,$cnum,$group,$refarg);      my ($cdom,$cnum,$group,$refarg);
     if (exists($env{'form.group'})) {      if (exists($env{'form.group'})) {
Line 1146  sub compout { Line 1175  sub compout {
     } elsif ($replycrit) {      } elsif ($replycrit) {
  $r->print('<h3>'.&mt('Replying to a Critical Message').'</h3>');   $r->print('<h3>'.&mt('Replying to a Critical Message').'</h3>');
  $replying=$replycrit;   $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');
           $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 {      } else {
  &printheader($r,'/adm/email?compose=upload',   &printheader($r,'/adm/email?compose=upload',
      'Distribute from Uploaded File');       'Distribute from Uploaded File');
Line 1162  sub compout { Line 1198  sub compout {
        'sb'  => 'Subject',         'sb'  => 'Subject',
        'ca'  => 'Cancel',         'ca'  => 'Cancel',
        'ma'  => 'Mail',         'ma'  => 'Mail',
                                          'msg' => 'Messages',
                                        'gen' => 'Generate messages from a file',                                         'gen' => 'Generate messages from a file',
                                        'gmt' => 'General message text',                                         'gmt' => 'General message text',
                                        'tff' => 'The file format for the uploaded portion of the message is',                                         'tff' => 'The file format for the uploaded portion of the message is',
Line 1263  sub compout { Line 1300  sub compout {
         }          }
     }      }
     my $latexHelp = Apache::loncommon::helpLatexCheatsheet();      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>');
           $func=&mt('Forward');
           $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,$func.' '.$lt{'msg'},
                                        \%lt));
       } elsif ($broadcast ne 'upload') {
           $subj_size = '50';
           $r->print(&additional_rec_row(\%lt));
           $r->print(&msg_subject_row($dissub,\%lt,$subj_size));
           $r->print(<<"ENDCOMP");
   </table>
 $latexHelp  $latexHelp
 <textarea name="message" id="message" cols="80" rows="15" wrap="hard">$dismsg  <textarea name="message" id="message" cols="80" rows="15" wrap="hard">$dismsg
 </textarea></p><br />  </textarea></p><br />
 $dispcrit  $dispcrit
 $disbase  $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  ENDCOMP
           $r->print(&submit_button_row($folder,$dismode,$func.' '.$lt{'ma'},
                                        \%lt));
           $r->print($citation);
         if (exists($env{'form.ref'})) {          if (exists($env{'form.ref'})) {
             $r->print('<input type="hidden" name="ref" value="'.              $r->print('<input type="hidden" name="ref" value="'.
                       $env{'form.ref'}.'" />');                        $env{'form.ref'}.'" />');
Line 1350  ENDREC Line 1412  ENDREC
     return $output;      return $output;
 }  }
   
   sub additional_rec_row {
       my ($lt) = @_;
       my $output = <<"ENDADD";
   <tr><td>$lt->{'ad'}:<br /><tt>username:domain,username:domain, ...
   </tt></td><td>
   <input type="text" size="50" name="additionalrec" /></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>'.$lt->{'sb'}.':</td><td><input type="text" size="'.
                    $subj_size.'" name="subject" value="'.$dissub.'" />'.$extra.
                    '</td></tr>';
       return $output;
   }
   
 sub retrieve_instructor_comments {  sub retrieve_instructor_comments {
     my ($user,$domain)=@_;      my ($user,$domain)=@_;
     my $target=$env{'form.grade_target'};      my $target=$env{'form.grade_target'};
Line 1836  sub blocktype_text { Line 1927  sub blocktype_text {
 # ----------------------------------------------------------- Display a message  # ----------------------------------------------------------- Display a message
   
 sub displaymessage {  sub displaymessage {
     my ($r,$msgid,$folder)=@_;      my ($r,$msgid,$folder,$msgstatus)=@_;
     my $suffix=&Apache::lonmsg::foldersuffix($folder);      my $suffix=&Apache::lonmsg::foldersuffix($folder);
     my %blocked = ();      my %blocked = ();
     my %setters = ();      my %setters = ();
Line 1845  sub displaymessage { Line 1936  sub displaymessage {
   
 # info to generate "next" and "previous" buttons and check if message is blocked  # info to generate "next" and "previous" buttons and check if message is blocked
     my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');      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' ) {      if ( $blocked{$msgid} eq 'ON' ) {
         &printheader($r,'/adm/email',&mt('Display a Message'));          &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.'));          $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.'));
Line 1881  sub displaymessage { Line 1972  sub displaymessage {
       '<td><a href="/adm/email?markdel='.&escape($msgid).$sqs.        '<td><a href="/adm/email?markdel='.&escape($msgid).$sqs.
       '"><b>'.&mt('Delete').'</b></a></td>'.        '"><b>'.&mt('Delete').'</b></a></td>'.
       '<td><a href="/adm/email?'.$sqs.        '<td><a href="/adm/email?'.$sqs.
       ($env{'form.dismode'} eq 'new'?'&folder=new':'').  
       '"><b>'.&mt('Back to Folder Display').'</b></a></td>');        '"><b>'.&mt('Back to Folder Display').'</b></a></td>');
     if ($counter > 0){      if ($counter > 0){
  $r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.   $r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
Line 2047  sub sendoffmail { Line 2137  sub sendoffmail {
         $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};          $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     }      }
     if ($env{'form.send'}) {      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();   $r->rflush();
  my %content=();   my %content=();
Line 2228  sub sendoffmail { Line 2320  sub sendoffmail {
     } else {      } else {
  &printheader($r,'','No messages sent.');    &printheader($r,'','No messages sent.'); 
     }      }
     if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {      if (!$env{'form.multiforward'}) { 
  $r->print('<br /><span class="LC_success">'.&mt('Completed.').'</span>');          if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
  if ($env{'form.displayedcrit'}) {      $r->print('<br /><span class="LC_success">'.&mt('Completed.').
     &discrit($r);                        '</span>');
         }      if ($env{'form.displayedcrit'}) {
         if ($group ne '') {          &discrit($r);
             $r->print(&groupmail_sent($group,$cdom,$cnum));               }
  } else {              if ($group ne '') {
     &Apache::loncommunicate::menu($r);                  $r->print(&groupmail_sent($group,$cdom,$cnum)); 
  }      } else {
     } else {          &Apache::loncommunicate::menu($r);
  $r->print('<p><span class="LC_error">'.&mt('Could not deliver message').'</span> '.      }
           } 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>');    &mt('Please use the browser "Back" button and correct the recipient addresses '."($sendstatus)").'</p>');
           }
     }      }
       return $sendstatus;
 }  }
   
 # ===================================================================== Handler  # ===================================================================== Handler
Line 2261  sub handler { Line 2357  sub handler {
         ['display','replyto','forward','markread','markdel','markunread',          ['display','replyto','forward','markread','markdel','markunread',
          'sendreply','compose','sendmail','critical','recname','recdom',           'sendreply','compose','sendmail','critical','recname','recdom',
          'recordftf','sortedby','block','folder','startdis','interdis',           'recordftf','sortedby','block','folder','startdis','interdis',
  'showcommentbaseurl','dismode','group','subject','text','ref']);   'showcommentbaseurl','dismode','group','subject','text','ref',
            'msgstatus']);
     $sqs='&sortedby='.$env{'form.sortedby'};      $sqs='&sortedby='.$env{'form.sortedby'};
   
 # ------------------------------------------------------ They checked for email  # ------------------------------------------------------ They checked for email
Line 2295  sub handler { Line 2392  sub handler {
     }      }
   
 # --------------------------------------------------------------------- Display  # --------------------------------------------------------------------- Display
       my $msgstatus = $env{'form.msgstatus'};
     $startdis=$env{'form.startdis'};      $startdis=$env{'form.startdis'};
     $startdis--;      if ($startdis ne '') {
           $startdis--;
       }
     unless ($startdis) { $startdis=0; }      unless ($startdis) { $startdis=0; }
   
     $interdis=$env{'form.interdis'};      $interdis=$env{'form.interdis'};
Line 2322  sub handler { Line 2421  sub handler {
 # --------------------------------------------------------------- Render Output  # --------------------------------------------------------------- Render Output
   
     if ($env{'form.display'}) {      if ($env{'form.display'}) {
  &displaymessage($r,$env{'form.display'},$folder);   &displaymessage($r,$env{'form.display'},$folder,$msgstatus);
     } elsif ($env{'form.replyto'}) {      } elsif ($env{'form.replyto'}) {
  &compout($r,'',$env{'form.replyto'},undef,undef,$folder,$dismode);   &compout($r,'',$env{'form.replyto'},undef,undef,$folder,$dismode);
     } elsif ($env{'form.confirm'}) {      } elsif ($env{'form.confirm'}) {
Line 2359  sub handler { Line 2458  sub handler {
       '<p class="LC_error">'.$msg."</p>\n");        '<p class="LC_error">'.$msg."</p>\n");
  }   }
  &Apache::loncommunicate::menu($r);   &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++;      $total++;
  } else {          } else {
     $failed++;      $failed++;
     push(@failed_msg,$msg);      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).                            '.&mt('Failed to move [_1] message(s)',$failed).
       '</p>');        '</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);   &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);   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');   &printheader($r,'','Deleted Messages');
Line 2413  sub handler { Line 2547  sub handler {
  }   }
  $r->print(&mt('Deleted [_1] message(s)',$total).'<p>');   $r->print(&mt('Deleted [_1] message(s)',$total).'<p>');
  &Apache::loncommunicate::menu($r);   &Apache::loncommunicate::menu($r);
  &disall($r,($folder?$folder:$dismode));   &disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markunread'}) {      } elsif ($env{'form.markunread'}) {
  &printheader($r,'','Marked Message as Unread');   &printheader($r,'','Marked Message as Unread');
  &statuschange($env{'form.markunread'},'new');   &statuschange($env{'form.markunread'},'new');
  &Apache::loncommunicate::menu($r);   &Apache::loncommunicate::menu($r);
  &disall($r,($folder?$folder:$dismode));   &disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.compose'}) {      } elsif ($env{'form.compose'}) {
  &compout($r,'','',$env{'form.compose'});   &compout($r,'','',$env{'form.compose'});
     } elsif ($env{'form.recordftf'}) {      } elsif ($env{'form.recordftf'}) {
Line 2426  sub handler { Line 2560  sub handler {
     } elsif ($env{'form.block'}) {      } elsif ($env{'form.block'}) {
         &examblock($r,$env{'form.block'});          &examblock($r,$env{'form.block'});
     } elsif ($env{'form.sendmail'}) {      } 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);
                   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'};
                   $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'}) {   if ($env{'form.storebasecomment'}) {
     &storecomment($r);      &storecomment($r);
         }          }
Line 2438  sub handler { Line 2628  sub handler {
       $env{'form.message'},'/adm/communicate','public');        $env{'form.message'},'/adm/communicate','public');
  }   }
  if ((!exists($env{'form.group'})) && (!$env{'form.displayedcrit'})) {   if ((!exists($env{'form.group'})) && (!$env{'form.displayedcrit'})) {
     &disall($r,($folder?$folder:$dismode));      &disall($r,($folder?$folder:$dismode),$msgstatus);
  }   }
     } elsif ($env{'form.newfolder'}) {      } elsif ($env{'form.newfolder'}) {
  &printheader($r,'','New Folder');   &printheader($r,'','New Folder');
Line 2452  sub handler { Line 2642  sub handler {
             $showfolder = $folder;              $showfolder = $folder;
         }          }
         &Apache::loncommunicate::menu($r);          &Apache::loncommunicate::menu($r);
  &disall($r,$showfolder);   &disall($r,$showfolder,$msgstatus);
     } elsif ($env{'form.showcommentbaseurl'}) {      } elsif ($env{'form.showcommentbaseurl'}) {
  &storedcommentlisting($r);   &storedcommentlisting($r);
     } elsif ($env{'form.folderaction'} eq 'delete') {      } elsif ($env{'form.folderaction'} eq 'delete') {
Line 2466  sub handler { Line 2656  sub handler {
             $showfolder = $folder;              $showfolder = $folder;
         }          }
         &Apache::loncommunicate::menu($r);          &Apache::loncommunicate::menu($r);
         &disall($r,$showfolder);          &disall($r,$showfolder,$msgstatus);
     } elsif ($env{'form.folderaction'} eq 'rename') {      } elsif ($env{'form.folderaction'} eq 'rename') {
         &printheader($r,'','Renamed Folder');          &printheader($r,'','Renamed Folder');
         my $showfolder = $env{'form.renamed'};          my $showfolder = $env{'form.renamed'};
Line 2478  sub handler { Line 2668  sub handler {
             $showfolder = $folder;              $showfolder = $folder;
         }          }
         &Apache::loncommunicate::menu($r);          &Apache::loncommunicate::menu($r);
         &disall($r,$showfolder);          &disall($r,$showfolder,$msgstatus);
     } else {      } else {
  &printheader($r,'','Display All Messages');   &printheader($r,'','Display All Messages');
  &Apache::loncommunicate::menu($r);   &Apache::loncommunicate::menu($r);
  &disall($r,($folder?$folder:$dismode));   &disall($r,($folder?$folder:$dismode),$msgstatus);
     }      }
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
     return OK;      return OK;
Removed from v.1.52  
changed lines
  Added in v.1.53

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