Diff for /loncom/interface/lonmsg.pm between versions 1.82 and 1.86

version 1.82, 2004/01/31 01:21:35 version 1.86, 2004/03/01 01:06:10
Line 139  sub packagemsg { Line 139  sub packagemsg {
            '<browsermathml>'.$ENV{'browser.mathml'}.'</browsermathml>'.             '<browsermathml>'.$ENV{'browser.mathml'}.'</browsermathml>'.
    '<browserraw>'.$ENV{'HTTP_USER_AGENT'}.'</browserraw>'.     '<browserraw>'.$ENV{'HTTP_USER_AGENT'}.'</browserraw>'.
    '<courseid>'.$ENV{'request.course.id'}.'</courseid>'.     '<courseid>'.$ENV{'request.course.id'}.'</courseid>'.
      '<coursesec>'.$ENV{'request.course.sec'}.'</coursesec>'.
    '<role>'.$ENV{'request.role'}.'</role>'.     '<role>'.$ENV{'request.role'}.'</role>'.
    '<resource>'.$ENV{'request.filename'}.'</resource>'.     '<resource>'.$ENV{'request.filename'}.'</resource>'.
            '<msgid>'.$msgid.'</msgid>'.             '<msgid>'.$msgid.'</msgid>'.
Line 599  $content{'sendername'}.'@'. Line 600  $content{'sendername'}.'@'.
             '<br>'.&mt('Subject').': '.$content{'subject'}.              '<br>'.&mt('Subject').': '.$content{'subject'}.
             '<br><blockquote>'.              '<br><blockquote>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).                &Apache::lontexconvert::msgtexconverted($content{'message'}).
             '</blockquote>'.              '</blockquote><small>'.
   &mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox').
               '</small><br />'.
             '<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'.              '<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'.
             '<input type=submit name="reprec_'.$_.'" '.              '<input type=submit name="reprec_'.$_.'" '.
                   'value="'.&mt('Confirm Receipt and Reply').'">';                    'value="'.&mt('Confirm Receipt and Reply').'">';
Line 865  ENDCOMP Line 868  ENDCOMP
     } else { # $broadcast is 'upload'      } else { # $broadcast is 'upload'
  $r->print(<<ENDUPLOAD);   $r->print(<<ENDUPLOAD);
 <input type=hidden name=sendmode value=upload>  <input type=hidden name=sendmode value=upload>
   <input type="hidden" name="send" value="on" />
 <h3>Generate messages from a file</h3>  <h3>Generate messages from a file</h3>
 <p>  <p>
 Subject: <input type=text size=50 name=subject>  Subject: <input type=text size=50 name=subject>
Line 1056  sub handler { Line 1060  sub handler {
  &Apache::loncommon::bodytag('EMail and Messages').   &Apache::loncommon::bodytag('EMail and Messages').
      &Apache::loncommon::help_open_faq(12).       &Apache::loncommon::help_open_faq(12).
      &Apache::loncommon::help_open_bug('Communication Tools'));       &Apache::loncommon::help_open_bug('Communication Tools'));
       $r->print('<b>'.&mt('Subject').':</b> '.$content{'subject'}.        my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
              '<br><b>'.&mt('From').':</b> '.  
         $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
                '<br /><b>'.&mt('From').':</b> '.
 &Apache::loncommon::aboutmewrapper(  &Apache::loncommon::aboutmewrapper(
 &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),  &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
 $content{'sendername'},$content{'senderdomain'}).' ('.  $content{'sendername'},$content{'senderdomain'}).' ('.
                                  $content{'sendername'}.' at '.                                   $content{'sendername'}.' at '.
                                  $content{'senderdomain'}.') '.                                   $content{'senderdomain'}.') '.
              '<br><b>'.&mt('Time').':</b> '.$content{'time'}.'<p>'.       ($content{'courseid'}?'<br /><b>'.&mt('Course').':</b> '.$courseinfo{'description'}.
   ($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):'').
                '<br /><b>'.&mt('Time').':</b> '.$content{'time'}.'<p>'.
              '<table border=2><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'.               '<table border=2><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'.
            '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).$sqs.             '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).$sqs.
              '"><b>'.&mt('Reply').'</b></a></td>'.               '"><b>'.&mt('Reply').'</b></a></td>'.
Line 1213  $content{'sendername'},$content{'senderd Line 1221  $content{'sendername'},$content{'senderd
   }    }
       }        }
       if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {        if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
     $r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
   if ($ENV{'form.displayedcrit'}) {    if ($ENV{'form.displayedcrit'}) {
       &discrit($r);        &discrit($r);
   } else {    } else {

Removed from v.1.82  
changed lines
  Added in v.1.86


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