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

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

version 1.36, 2002/07/29 22:17:05 version 1.37, 2002/08/28 14:11:27
Line 314  sub discrit { Line 314  sub discrit {
         my %content=&unpackagemsg($what{$_});          my %content=&unpackagemsg($what{$_});
         next if ($content{'senderdomain'} eq '');          next if ($content{'senderdomain'} eq '');
         $content{'message'}=~s/\n/\<br\>/g;          $content{'message'}=~s/\n/\<br\>/g;
         $result.='<hr>From: <b>'.$content{'sendername'}.'@'.          $result.='<hr>From: <b>'.
             $content{'senderdomain'}.'</b> ('.$content{'time'}.  &Apache::loncommon::aboutmewrapper(
             ')<br>Subject: '.$content{'subject'}.   &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
   $content{'sendername'}.'@'.
               $content{'senderdomain'}.') '.$content{'time'}.
               '<br>Subject: '.$content{'subject'}.
             '<br><blockquote>'.              '<br><blockquote>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).                &Apache::lontexconvert::msgtexconverted($content{'message'}).
             '</blockquote>'.              '</blockquote>'.
Line 358  sub comprep { Line 361  sub comprep {
 <form action="/adm/email" method=post>  <form action="/adm/email" method=post>
 <input type=hidden name=sendreply value="$msgid">  <input type=hidden name=sendreply value="$msgid">
 Subject: <input type=text size=50 name=subject value="$subject"><p>  Subject: <input type=text size=50 name=subject value="$subject"><p>
 <textarea name=message cols=64 rows=10 wrap=hard>  <textarea name=message cols=84 rows=10 wrap=hard>
 $quotemsg  $quotemsg
 </textarea><p>  </textarea><p>
 $dispcrit  $dispcrit
Line 457  sub compout { Line 460  sub compout {
    $content{'sendername'}.' at '.$content{'senderdomain'};     $content{'sendername'}.' at '.$content{'senderdomain'};
     }      }
     my $defdom=$ENV{'user.domain'};      my $defdom=$ENV{'user.domain'};
       if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; }
       $r->print(        $r->print(
                 '<form action="/adm/email"  name="compemail" method="post"'.                  '<form action="/adm/email"  name="compemail" method="post"'.
                 ' enctype="multipart/form-data">'."\n".                  ' enctype="multipart/form-data">'."\n".
Line 467  sub compout { Line 471  sub compout {
   
        $r->print(<<"ENDREC");         $r->print(<<"ENDREC");
 <table>  <table>
 <tr><td>Username:</td><td><input type=text size=12 name=recuname></td></tr>  <tr><td>Username:</td><td><input type=text size=12 name=recuname value="$ENV{'form.recname'}"></td></tr>
 <tr><td>Domain:</td>  <tr><td>Domain:</td>
 <td>$domform</td></tr>  <td>$domform</td></tr>
 ENDREC  ENDREC
Line 479  ENDREC Line 483  ENDREC
 <input type=text size=50 name=additionalrec></td></tr>  <input type=text size=50 name=additionalrec></td></tr>
 <tr><td>Subject:</td><td><input type=text size=50 name=subject value="$dissub">  <tr><td>Subject:</td><td><input type=text size=50 name=subject value="$dissub">
 </td></tr></table>  </td></tr></table>
 <textarea name=message cols=60 rows=10 wrap=hard>$dismsg  <textarea name=message cols=80 rows=10 wrap=hard>$dismsg
 </textarea><p>  </textarea><p>
 $dispcrit  $dispcrit
 <input type=submit value="$func Mail">  <input type=submit value="$func Mail">
Line 532  sub handler { Line 536  sub handler {
 # --------------------------- Get query string for limited number of parameters  # --------------------------- Get query string for limited number of parameters
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['display','replyto','forward','markread','markdel','markunread',          ['display','replyto','forward','markread','markdel','markunread',
          'sendreply','compose','sendmail','critical']);           'sendreply','compose','sendmail','critical','recname','recdom']);
   
 # --------------------------------------------------------------- Render Output  # --------------------------------------------------------------- Render Output
       
   $r->print('<html><head><title>EMail and Messaging</title></head>');    $r->print('<html><head><title>EMail and Messaging</title></head>'.
   $r->print(              &Apache::loncommon::bodytag('EMail and Messages'));
    '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');  
   $r->print('<h1>EMail</h1>');  
   if ($ENV{'form.display'}) {    if ($ENV{'form.display'}) {
       my $msgid=$ENV{'form.display'};        my $msgid=$ENV{'form.display'};
       &statuschange($msgid,'read');        &statuschange($msgid,'read');
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);        my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
       my %content=&unpackagemsg($message{$msgid});        my %content=&unpackagemsg($message{$msgid});
       $r->print('<b>Subject:</b> '.$content{'subject'}.        $r->print('<b>Subject:</b> '.$content{'subject'}.
              '<br><b>From:</b> '.$content{'sendername'}.' at '.               '<br><b>From:</b> '.
                                  $content{'senderdomain'}.  &Apache::loncommon::aboutmewrapper(
   &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
   $content{'sendername'},$content{'senderdomain'}).' ('.
                                    $content{'sendername'}.' at '.
                                    $content{'senderdomain'}.') '.
              '<br><b>Time:</b> '.$content{'time'}.'<p>'.               '<br><b>Time:</b> '.$content{'time'}.'<p>'.
              '<table border=2><tr bgcolor="#FFFFAA"><td>Functions:</td>'.               '<table border=2><tr bgcolor="#FFFFAA"><td>Functions:</td>'.
            '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).             '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).
Removed from v.1.36  
changed lines
  Added in v.1.37

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