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

Diff for /loncom/interface/lonmsg.pm between versions 1.69 and 1.70

version 1.69, 2003/10/15 21:10:24 version 1.70, 2003/10/18 16:33:44
Line 1060  $content{'sendername'},$content{'senderd Line 1060  $content{'sendername'},$content{'senderd
   &statuschange($msgid,'replied');    &statuschange($msgid,'replied');
   if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) &&     if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
       (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {        (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
       $r->print(&mt('Sending critical').': '.        $r->print(&mt('Sending critical message').': '.
  &user_crit_msg($content{'sendername'},   &user_crit_msg($content{'sendername'},
        $content{'senderdomain'},         $content{'senderdomain'},
        &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),         &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
Line 1118  $content{'sendername'},$content{'senderd Line 1118  $content{'sendername'},$content{'senderd
   } elsif ($ENV{'form.recordftf'}) {    } elsif ($ENV{'form.recordftf'}) {
       &facetoface($r,$ENV{'form.recordftf'});        &facetoface($r,$ENV{'form.recordftf'});
   } elsif ($ENV{'form.sendmail'}) {    } elsif ($ENV{'form.sendmail'}) {
         my $sendstatus='';
       if ($ENV{'form.send'}) {        if ($ENV{'form.send'}) {
   my %content=();    my %content=();
   undef %content;    undef %content;
Line 1160  $content{'sendername'},$content{'senderd Line 1161  $content{'sendername'},$content{'senderd
       if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; }            if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; }    
       if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) &&         if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
   (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {    (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
   $r->print('Sending critical: '.    $r->print(&mt('Sending critical message').' ...');
     &user_crit_msg($recuname,$recdomain,                    $sendstatus.=' '.&user_crit_msg($recuname,$recdomain,
    &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),     &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
    $msgtxt,     $msgtxt,
    $ENV{'form.sendbck'}));     $ENV{'form.sendbck'});
       } else {        } else {
   $r->print('Sending: '.&user_normal_msg($recuname,$recdomain,    $r->print(&mt('Sending').' ...');
  &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),                    $sendstatus.=' '.&user_normal_msg($recuname,$recdomain,
                            &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
  $msgtxt,   $msgtxt,
  $content{'citation'}));   $content{'citation'});
       }        }
       $r->print('<br />');        $r->print('<br />');
   }    }
       }        }
       if ($ENV{'form.displayedcrit'}) {        if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
           &discrit($r);    if ($ENV{'form.displayedcrit'}) {
         &discrit($r);
     } else {
         &disall($r);
     }
       } else {        } else {
   &disall($r);    $r->print(
     '<h2><font color="red">'.&mt('Could not deliver message').'</font></h2>'.
     &mt('Please use the browser "Back" button and correct the recipient addresses')
       );
       }        }
   } else {    } else {
       &disall($r);        &disall($r);
Removed from v.1.69  
changed lines
  Added in v.1.70

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