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

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.64 and 1.68

version 1.64, 2007/01/17 18:05:57 version 1.68, 2007/03/01 09:30:58
Line 119  use Apache::lonnet; Line 119  use Apache::lonnet;
 use HTML::TokeParser();  use HTML::TokeParser();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::loncommon();  use Apache::loncommon();
   use Apache::lonhtmlcommon();
 use Apache::lontexconvert();  use Apache::lontexconvert();
 use HTML::Entities();  use HTML::Entities();
 use Apache::lonlocal;  use Apache::lonlocal;
Line 980  ENDDISHEADER Line 981  ENDDISHEADER
         } else {           } else { 
             $r->print('<h2>'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'</h2>');              $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;   return;
     }      }
     my $interdis = $env{'form.interdis'};      my $interdis = $env{'form.interdis'};
Line 1136  ENDDISHEADER Line 1141  ENDDISHEADER
     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'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" ><input type="hidden" name="markedaction" value="" /></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);          $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
         my $finishblock = &Apache::lonlocal::locallocaltime($endblock);                                       \%setters));
         $r->print('<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));  
         $r->print(&Apache::loncommon::build_block_table($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  # ============================================================== Compose output
   
 sub compout {  sub compout {
Line 2028  sub displaymessage { Line 2040  sub displaymessage {
     if (defined($content{'baseurl'})) {      if (defined($content{'baseurl'})) {
         $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});          $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});
     }      }
       $r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}));
     $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.      $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
       ($folder ne 'sent'?'<br /><b>'.&mt('From').':</b> '.        ($folder ne 'sent'?'<br /><b>'.&mt('From').':</b> '.
       &Apache::loncommon::aboutmewrapper(        &Apache::loncommon::aboutmewrapper(
Line 2269  sub sendoffmail { Line 2282  sub sendoffmail {
     }      }
  }   }
  if ($env{'form.additionalrec'}) {   if ($env{'form.additionalrec'}) {
     foreach my $rec (split(/\,/,$env{'form.additionalrec'})) {      foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec'})) {
  my ($auname,$audom)=split(/:/,$rec);   my ($auname,$audom)=split(/:/,$rec);
  if (($auname ne "") && ($audom ne "")) {   if (($auname ne "") && ($audom ne "")) {
     $toaddr{$auname.':'.$audom}='';      $toaddr{$auname.':'.$audom}='';
Line 2716  sub handler { Line 2729  sub handler {
         my $delresult = &deletefolder($folder);          my $delresult = &deletefolder($folder);
         if ($delresult eq 'ok') {          if ($delresult eq 'ok') {
             $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />');              $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />');
               $env{'form.folder'} = '';
         } else {          } else {
             $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');              $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
             $showfolder = $folder;              $showfolder = $folder;
Removed from v.1.64  
changed lines
  Added in v.1.68

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