Diff for /loncom/interface/lonmsg.pm between versions 1.102 and 1.105

version 1.102, 2004/06/02 20:40:07 version 1.105, 2004/09/09 08:00:12
Line 219  sub sendemail { Line 219  sub sendemail {
     my $msg = new Mail::Send;      my $msg = new Mail::Send;
     $msg->to($to);      $msg->to($to);
     $msg->subject('[LON-CAPA] '.$subject);      $msg->subject('[LON-CAPA] '.$subject);
       my %oldENV=%ENV;
       undef(%ENV);
     if (my $fh = $msg->open()) {      if (my $fh = $msg->open()) {
  print $fh $body;   print $fh $body;
  $fh->close;   $fh->close;
     }      }
       %ENV=%oldENV;
       undef(%oldENV);
 }  }
   
 # ==================================================== Send notification emails  # ==================================================== Send notification emails
Line 857  sub compout { Line 861  sub compout {
     if ($replying) {      if ($replying) {
  %message=&Apache::lonnet::get('nohist_email',[$replying]);   %message=&Apache::lonnet::get('nohist_email',[$replying]);
  %content=&unpackagemsg($message{$replying});   %content=&unpackagemsg($message{$replying});
  $dispcrit.='<input type="hidden" name="forwid" value="'.   $dispcrit.='<input type="hidden" name="replyid" value="'.
     $forwarding.'" />';      $replying.'" />';
  $func=&mt('Replying to');   $func=&mt('Replying to');
   
  $dissub=&mt('Reply').': '.$content{'subject'};          $dissub=&mt('Reply').': '.$content{'subject'};       
Line 945  ENDUPLOAD Line 949  ENDUPLOAD
   
 # ---------------------------------------------------- Display all face to face  # ---------------------------------------------------- Display all face to face
   
   sub retrieve_instructor_comments {
       my ($user,$domain)=@_;
       my $target=$ENV{'form.grade_target'};
       if (! $ENV{'request.course.id'}) { return; }
       if (! &Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
    return;
       }
       my %records=&Apache::lonnet::dump('nohist_email',
    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
    $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
                            '%255b'.$user.'%253a'.$domain.'%255d');
       my $result='';
       foreach (sort(keys(%records))) {
           my %content=&unpackagemsg($records{$_});
           next if ($content{'senderdomain'} eq '');
           next if ($content{'subject'} !~ /^Record/);
           # $content{'message'}=~s/\n/\<br\>/g;
           $result.='Recorded by '.
               $content{'sendername'}.'@'.$content{'senderdomain'}."\n";
           $result.=
               &Apache::lontexconvert::msgtexconverted($content{'message'})."\n";
        }
       return $result;
   }
   
 sub disfacetoface {  sub disfacetoface {
     my ($r,$user,$domain)=@_;      my ($r,$user,$domain)=@_;
     my $target=$ENV{'form.grade_target'};      my $target=$ENV{'form.grade_target'};
Line 1625  sub handler { Line 1654  sub handler {
  $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".   $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
     $content{'message'};      $content{'message'};
     }      }
       if ($ENV{'form.replyid'}) {
    my $msgid=$ENV{'form.replyid'};
    my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
    %content=&unpackagemsg($message{$msgid},1);
    &statuschange($msgid,'replied');
       }
     my %toaddr=();      my %toaddr=();
     undef %toaddr;      undef %toaddr;
     if ($ENV{'form.sendmode'} eq 'group') {      if ($ENV{'form.sendmode'} eq 'group') {

Removed from v.1.102  
changed lines
  Added in v.1.105


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