Diff for /loncom/interface/lonmsg.pm between versions 1.34 and 1.36

version 1.34, 2002/06/26 20:41:55 version 1.36, 2002/07/29 22:17:05
Line 49  use Apache::lonnet(); Line 49  use Apache::lonnet();
 use vars qw($msgcount);  use vars qw($msgcount);
 use HTML::TokeParser;  use HTML::TokeParser;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
   use Apache::loncommon;
   use Apache::lontexconvert;
   
 # ===================================================================== Package  # ===================================================================== Package
   
Line 315  sub discrit { Line 317  sub discrit {
         $result.='<hr>From: <b>'.$content{'sendername'}.'@'.          $result.='<hr>From: <b>'.$content{'sendername'}.'@'.
             $content{'senderdomain'}.'</b> ('.$content{'time'}.              $content{'senderdomain'}.'</b> ('.$content{'time'}.
             ')<br>Subject: '.$content{'subject'}.              ')<br>Subject: '.$content{'subject'}.
             '<br><blockquote>'.$content{'message'}.'</blockquote>'.              '<br><blockquote>'.
                 &Apache::lontexconvert::msgtexconverted($content{'message'}).
               '</blockquote>'.
             '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.              '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.
             '<input type=submit name="reprec_'.$_.'" '.              '<input type=submit name="reprec_'.$_.'" '.
                   'value="Confirm Receipt and Reply">';                    'value="Confirm Receipt and Reply">';
Line 343  sub comprep { Line 347  sub comprep {
       my $subject='Re: '.$content{'subject'};        my $subject='Re: '.$content{'subject'};
       my $dispcrit='';        my $dispcrit='';
       if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {        if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
    my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
          $dispcrit=           $dispcrit=
  '<input type=checkbox name=critmsg> Send as critical message<br>'.   '<input type=checkbox name=critmsg> Send as critical message ' . $crithelp . 
  '<input type=checkbox name=sendbck> Send as critical message'.   '<br>'.
  ' and return receipt<p>';   '<input type=checkbox name=sendbck> Send as critical message ' .
    ' and return receipt' . $crithelp . '<p>';
       }        }
       $r->print(<<"ENDREPLY");        $r->print(<<"ENDREPLY");
 <form action="/adm/email" method=post>  <form action="/adm/email" method=post>
Line 432  sub compout { Line 438  sub compout {
     my $dismsg='';      my $dismsg='';
     my $func='Send New';      my $func='Send New';
       if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {        if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
    my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
          $dispcrit=           $dispcrit=
  '<input type=checkbox name=critmsg> Send as critical message<br>'.   '<input type=checkbox name=critmsg> Send as critical message ' . $crithelp . 
  '<input type=checkbox name=sendbck> Send as critical message'.   '<br>'.
  ' and return receipt<p>';   '<input type=checkbox name=sendbck> Send as critical message ' .
    ' and return receipt' . $crithelp . '<p>';
       }        }
     if ($forwarding) {      if ($forwarding) {
        $dispcrit.='<input type=hidden name=forwid value="'.         $dispcrit.='<input type=hidden name=forwid value="'.
Line 550  sub handler { Line 558  sub handler {
              '"><b>Mark Unread</b></a></td>'.               '"><b>Mark Unread</b></a></td>'.
         '<td><a href="/adm/email"><b>Display all Messages</b></a></td>'.          '<td><a href="/adm/email"><b>Display all Messages</b></a></td>'.
              '</tr></table><p><pre>'.               '</tr></table><p><pre>'.
              $content{'message'}.'</pre><hr>'.$content{'citation'});               &Apache::lontexconvert::msgtexconverted($content{'message'}).
                '</pre><hr>'.$content{'citation'});
   } elsif ($ENV{'form.replyto'}) {    } elsif ($ENV{'form.replyto'}) {
       &comprep($r,$ENV{'form.replyto'});        &comprep($r,$ENV{'form.replyto'});
   } elsif ($ENV{'form.sendreply'}) {    } elsif ($ENV{'form.sendreply'}) {

Removed from v.1.34  
changed lines
  Added in v.1.36


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