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

Diff for /loncom/interface/lonmsg.pm between versions 1.29 and 1.62

version 1.29, 2002/03/18 18:38:04 version 1.62, 2003/08/15 17:57:57
Line 44 Line 44
 #  #
 package Apache::lonmsg;  package Apache::lonmsg;
   
   =pod
   
   =head1 NAME
   
   Apache::lonmsg: supports internal messaging
   
   =head1 SYNOPSIS
   
   lonmsg provides routines for sending messages, receiving messages, and
   a handler to allow users to read, send, and delete messages.
   
   =head1 OVERVIEW
   
   =head2 Messaging Overview
   
   X<messages>LON-CAPA provides an internal messaging system similar to
   email, but customized for LON-CAPA's usage. LON-CAPA implements its
   own messaging system, rather then building on top of email, because of
   the features LON-CAPA messages can offer that conventional e-mail can
   not:
   
   =over 4
   
   =item * B<Critical messages>: A message the recipient B<must>
   acknowlegde receipt of before they are allowed to continue using the
   system, preventing a user from claiming they never got a message
   
   =item * B<Receipts>: LON-CAPA can reliably send reciepts informing the
   sender that it has been read; again, useful for preventing students
   from claiming they did not see a message. (While conventional e-mail
   has some reciept support, it's sporadic, e-mail client-specific, and
   generally the receiver can opt to not send one, making it useless in
   this case.)
   
   =item * B<Context>: LON-CAPA knows about the sender, such as where
   they are in a course. When a student mails an instructor asking for
   help on the problem, the instructor receives not just the student's
   question, but all submissions the student has made up to that point,
   the user's rendering of the problem, and the complete view the student
   saw of the resource, including discussion up to that point. Finally,
   the instructor is reading all of this inside of LON-CAPA, not their
   email program, so they have full access to LON-CAPA's grading
   interface, or other features they may wish to use in response to the
   student's query.
   
   =back
   
   Users can ask LON-CAPA to forward messages to conventional e-mail
   addresses on their B<PREF> screen, but generally, LON-CAPA messages
   are much more useful then traditional email can be made to be, even
   with HTML support.
   
   Right now, this document will cover just how to send a message, since
   it is likely you will not need to programmatically read messages,
   since lonmsg already implements that functionality.
   
   =head1 FUNCTIONS
   
   =over 4
   
   =cut
   
 use strict;  use strict;
 use Apache::lonnet();  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();
   use HTML::Entities();
   use Mail::Send;
   
 # ===================================================================== Package  # ===================================================================== Package
   
 sub packagemsg {  sub packagemsg {
     my ($subject,$message,$citation)=@_;      my ($subject,$message,$citation,$baseurl,$attachmenturl)=@_;
     $message=~s/\</\&lt\;/g;      $message =&HTML::Entities::encode($message);
     $message=~s/\>/\&gt\;/g;      $citation=&HTML::Entities::encode($citation);
     $citation=~s/\</\&lt\;/g;      $subject =&HTML::Entities::encode($subject);
     $citation=~s/\>/\&gt\;/g;      #remove machine specification
     $subject=~s/\</\&lt\;/g;      $baseurl =~ s|^http://[^/]+/|/|;
     $subject=~s/\>/\&gt\;/g;      $baseurl =&HTML::Entities::encode($baseurl);
       #remove machine specification
       $attachmenturl =~ s|^http://[^/]+/|/|;
       $attachmenturl =&HTML::Entities::encode($attachmenturl);
   
     my $now=time;      my $now=time;
     $msgcount++;      $msgcount++;
     my $partsubj=$subject;      my $partsubj=$subject;
Line 67  sub packagemsg { Line 137  sub packagemsg {
     my $msgid=&Apache::lonnet::escape(      my $msgid=&Apache::lonnet::escape(
            $now.':'.$partsubj.':'.$ENV{'user.name'}.':'.             $now.':'.$partsubj.':'.$ENV{'user.name'}.':'.
            $ENV{'user.domain'}.':'.$msgcount.':'.$$);             $ENV{'user.domain'}.':'.$msgcount.':'.$$);
     return $msgid,      my $result='<sendername>'.$ENV{'user.name'}.'</sendername>'.
            '<sendername>'.$ENV{'user.name'}.'</sendername>'.  
            '<senderdomain>'.$ENV{'user.domain'}.'</senderdomain>'.             '<senderdomain>'.$ENV{'user.domain'}.'</senderdomain>'.
            '<subject>'.$subject.'</subject>'.             '<subject>'.$subject.'</subject>'.
    '<time>'.localtime($now).'</time>'.     '<time>'.localtime($now).'</time>'.
Line 84  sub packagemsg { Line 153  sub packagemsg {
    '<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>'.
    '<message>'.$message.'</message>'.     '<message>'.$message.'</message>';
    '<citation>'.$citation.'</citation>';      if (defined($citation)) {
    $result.='<citation>'.$citation.'</citation>';
       }
       if (defined($baseurl)) {
    $result.= '<baseurl>'.$baseurl.'</baseurl>';
       }
       if (defined($attachmenturl)) {
    $result.= '<attachmenturl>'.$attachmenturl.'</attachmenturl>';
       }
       return $msgid,$result;
 }  }
   
 # ================================================== Unpack message into a hash  # ================================================== Unpack message into a hash
   
 sub unpackagemsg {  sub unpackagemsg {
     my $message=shift;      my ($message,$notoken)=@_;
     my %content=();      my %content=();
     my $parser=HTML::TokeParser->new(\$message);      my $parser=HTML::TokeParser->new(\$message);
     my $token;      my $token;
Line 102  sub unpackagemsg { Line 180  sub unpackagemsg {
            $content{$entry}=$value;             $content{$entry}=$value;
        }         }
     }      }
       if ($content{'attachmenturl'}) {
          my ($fname,$ft)=($content{'attachmenturl'}=~/\/(\w+)\.(\w+)$/);
          if ($notoken) {
      $content{'message'}.='<p>Attachment: <tt>'.$fname.'.'.$ft.'</tt>';
          } else {
      $content{'message'}.='<p>Attachment: <a href="'.
          &Apache::lonnet::tokenwrapper($content{'attachmenturl'}).
          '"><tt>'.$fname.'.'.$ft.'</tt></a>';
          }
       }
     return %content;      return %content;
 }  }
   
Line 117  sub unpackmsgid { Line 205  sub unpackmsgid {
     return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});      return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});
 }   } 
   
   
   sub sendemail {
       my ($to,$subject,$body)=@_;
       $body=
       "*** This is an automatic message generated by the LON-CAPA system.\n".
       "*** Please do not reply to this address.\n\n".$body;
       my $msg = new Mail::Send;
       $msg->to($to);
       $msg->subject('[LON-CAPA] '.$subject);
       my $fh = $msg->open('smtp',Server => 'localhost');
       print $fh $body;
       $fh->close;
   }
   
   # ==================================================== Send notification emails
   
   sub sendnotification {
       my ($to,$touname,$toudom,$subj,$crit)=@_;
       my $sender=$ENV{'environment.firstname'}.' '.$ENV{'environment.lastname'};
       my $critical=($crit?' critical':'');
       my $url='http://'.
         $Apache::lonnet::hostname{&Apache::lonnet::homeserver($touname,$toudom)}.
         '/adm/email?username='.$touname.'&domain='.$toudom;
       my $body=(<<ENDMSG);
   You received a$critical message from $sender in LON-CAPA. The subject is
   
    $subj
   
   Use
   
    $url
   
   to access this message.
   ENDMSG
       &sendemail($to,'New'.$critical.' message from '.$sender,$body);
   }
   # ============================================================= Check for email
   
   sub newmail {
       if ((time-$ENV{'user.mailcheck.time'})>300) {
           my %what=&Apache::lonnet::get('email_status',['recnewemail']);
           &Apache::lonnet::appenv('user.mailcheck.time'=>time);
           if ($what{'recnewemail'}>0) { return 1; }
       }
       return 0;
   }
   
 # =============================== Automated message to the author of a resource  # =============================== Automated message to the author of a resource
   
   =pod
   
   =item * B<author_res_msg($filename, $message)>: Sends message $message to the owner
       of the resource with the URI $filename.
   
   =cut
   
 sub author_res_msg {  sub author_res_msg {
     my ($filename,$message)=@_;      my ($filename,$message)=@_;
     unless ($message) { return 'empty'; }      unless ($message) { return 'empty'; }
Line 139  sub author_res_msg { Line 281  sub author_res_msg {
   
 # ================================================== Critical message to a user  # ================================================== Critical message to a user
   
 sub user_crit_msg {  sub user_crit_msg_raw {
     my ($user,$domain,$subject,$message,$sendback)=@_;      my ($user,$domain,$subject,$message,$sendback)=@_;
 # Check if allowed missing  # Check if allowed missing
     my $status='';      my $status='';
Line 153  sub user_crit_msg { Line 295  sub user_crit_msg {
            'put:'.$domain.':'.$user.':critical:'.             'put:'.$domain.':'.$user.':critical:'.
            &Apache::lonnet::escape($msgid).'='.             &Apache::lonnet::escape($msgid).'='.
            &Apache::lonnet::escape($message),$homeserver);             &Apache::lonnet::escape($message),$homeserver);
          if ($ENV{'request.course.id'}) {
             &user_normal_msg_raw(
               $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
               $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
               'Critical ['.$user.':'.$domain.']',
       $message);
          }
     } else {      } else {
        $status='no_host';         $status='no_host';
     }      }
   # Notifications
       my %userenv = &Apache::lonnet::get('environment',['critnotification'],
                                          $domain,$user);
       if ($userenv{'critnotification'}) {
         &sendnotification($userenv{'critnotification'},$user,$domain,$subject,1);
       }
   # Log this
     &Apache::lonnet::logthis(      &Apache::lonnet::logthis(
       'Sending critical email '.$msgid.        'Sending critical email '.$msgid.
       ', log status: '.        ', log status: '.
Line 166  sub user_crit_msg { Line 322  sub user_crit_msg {
     return $status;      return $status;
 }  }
   
   # New routine that respects "forward" and calls old routine
   
   =pod
   
   =item * B<user_crit_msg($user, $domain, $subject, $message, $sendback)>: Sends
       a critical message $message to the $user at $domain. If $sendback is true,
       a reciept will be sent to the current user when $user recieves the message.
   
   =cut
   
   sub user_crit_msg {
       my ($user,$domain,$subject,$message,$sendback)=@_;
       my $status='';
       my %userenv = &Apache::lonnet::get('environment',['msgforward'],
                                          $domain,$user);
       my $msgforward=$userenv{'msgforward'};
       if ($msgforward) {
          foreach (split(/\,/,$msgforward)) {
    my ($forwuser,$forwdomain)=split(/\:/,$_);
            $status.=
      &user_crit_msg_raw($forwuser,$forwdomain,$subject,$message,
                   $sendback).' ';
          }
       } else { 
    $status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback);
       }
       return $status;
   }
   
 # =================================================== Critical message received  # =================================================== Critical message received
   
 sub user_crit_received {  sub user_crit_received {
     my $msgid=shift;      my $msgid=shift;
     my %message=&Apache::lonnet::get('critical',[$msgid]);      my %message=&Apache::lonnet::get('critical',[$msgid]);
     my %contents=&unpackagemsg($message{$msgid});      my %contents=&unpackagemsg($message{$msgid},1);
     my $status='rec: '.($contents{'sendback'}?      my $status='rec: '.($contents{'sendback'}?
      &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},       &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
                      'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},                       'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
                      'User '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}.                       'User '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}.
                      ' acknowledged receipt of message "'.                       ' acknowledged receipt of message'."\n".'   "'.
                      $contents{'subject'}.'" dated '.$contents{'time'}.".\n\n"                       $contents{'subject'}.'"'."\n".'dated '.
                      .'Message ID: '.$contents{'msgid'}):'no msg req');                       $contents{'time'}.".\n"
                        ):'no msg req');
     $status.=' trans: '.      $status.=' trans: '.
      &Apache::lonnet::put(       &Apache::lonnet::put(
      'nohist_email',{$contents{'msgid'} => $message{$msgid}});       'nohist_email',{$contents{'msgid'} => $message{$msgid}});
Line 193  sub user_crit_received { Line 379  sub user_crit_received {
   
 # ======================================================== Normal communication  # ======================================================== Normal communication
   
 sub user_normal_msg {  sub user_normal_msg_raw {
     my ($user,$domain,$subject,$message,$citation)=@_;      my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_;
 # Check if allowed missing  # Check if allowed missing
     my $status='';      my $status='';
     my $msgid='undefined';      my $msgid='undefined';
     unless (($message)&&($user)&&($domain)) { $status='empty'; };      unless (($message)&&($user)&&($domain)) { $status='empty'; };
     my $homeserver=&Apache::lonnet::homeserver($user,$domain);      my $homeserver=&Apache::lonnet::homeserver($user,$domain);
     if ($homeserver ne 'no_host') {      if ($homeserver ne 'no_host') {
        ($msgid,$message)=&packagemsg($subject,$message,$citation);         ($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl,
                                        $attachmenturl);
        $status=&Apache::lonnet::critical(         $status=&Apache::lonnet::critical(
            'put:'.$domain.':'.$user.':nohist_email:'.             'put:'.$domain.':'.$user.':nohist_email:'.
            &Apache::lonnet::escape($msgid).'='.             &Apache::lonnet::escape($msgid).'='.
            &Apache::lonnet::escape($message),$homeserver);             &Apache::lonnet::escape($message),$homeserver);
          &Apache::lonnet::put
                            ('email_status',{'recnewemail'=>time},$domain,$user);
     } else {      } else {
        $status='no_host';         $status='no_host';
     }      }
   # Notifications
       my %userenv = &Apache::lonnet::get('environment',['notification'],
                                          $domain,$user);
       if ($userenv{'notification'}) {
    &sendnotification($userenv{'notification'},$user,$domain,$subject,0);
       }
     &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},      &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
                          $ENV{'user.home'},                           $ENV{'user.home'},
       'Sending '.$msgid.' to '.$user.' at '.$domain.' with status: '.$status);        'Sending '.$msgid.' to '.$user.' at '.$domain.' with status: '.$status);
     return $status;      return $status;
 }  }
   
   # New routine that respects "forward" and calls old routine
   
   =pod
   
   =item * B<user_normal_msg($user, $domain, $subject, $message,
       $citation, $baseurl, $attachmenturl)>: Sends a message to the
       $user at $domain, with subject $subject and message $message.
   
   =cut
   
   sub user_normal_msg {
       my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_;
       my $status='';
       my %userenv = &Apache::lonnet::get('environment',['msgforward'],
                                          $domain,$user);
       my $msgforward=$userenv{'msgforward'};
       if ($msgforward) {
          foreach (split(/\,/,$msgforward)) {
    my ($forwuser,$forwdomain)=split(/\:/,$_);
            $status.=
     &user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
          $citation,$baseurl,$attachmenturl).' ';
          }
       } else { 
    $status=&user_normal_msg_raw($user,$domain,$subject,$message,
        $citation,$baseurl,$attachmenturl);
       }
       return $status;
   }
   
   
 # =============================================================== Status Change  # =============================================================== Status Change
   
 sub statuschange {  sub statuschange {
Line 277  sub discourse { Line 503  sub discourse {
 <input type=button onClick="uncheckall()" value="Check for None">  <input type=button onClick="uncheckall()" value="Check for None">
 <p>  <p>
 ENDDISHEADER  ENDDISHEADER
       my %coursepersonnel=
          &Apache::lonnet::get_course_adv_roles();
       foreach my $role (sort keys %coursepersonnel) {
          foreach (split(/\,/,$coursepersonnel{$role})) {
      my ($puname,$pudom)=split(/\:/,$_);
      $r->print(
                '<br /><input type="checkbox" name="send_to_&&&&&&_'.
                $puname.':'.$pudom.'" /> '.
        &Apache::loncommon::plainname($puname,
                             $pudom).' ('.$_.'), <i>'.$role.'</i>');
    }
       }
   
     foreach (sort keys %courselist) {      foreach (sort keys %courselist) {
         my ($end,$start)=split(/\:/,$courselist{$_});          my ($end,$start)=split(/\:/,$courselist{$_});
         my $active=1;          my $active=1;
Line 303  ENDDISHEADER Line 542  ENDDISHEADER
   
 sub discrit {  sub discrit {
     my $r=shift;      my $r=shift;
       $r->print('<h1><font color=red>Critical Messages</font></h1>'.      my $header = '<h1><font color=red>Critical Messages</font></h1>'.
          '<form action=/adm/email method=post>'.          '<form action=/adm/email method=post>'.
          '<input type=hidden name=confirm value=true>');          '<input type=hidden name=confirm value=true>';
       my %what=&Apache::lonnet::dump('critical');      my %what=&Apache::lonnet::dump('critical');
       foreach (sort keys %what) {      my $result = '';
           my %content=&unpackagemsg($what{$_});      foreach (sort keys %what) {
           $content{'message'}=~s/\n/\<br\>/g;          my %content=&unpackagemsg($what{$_});
   $r->print('<hr>From: <b>'.$content{'sendername'}.'@'.          next if ($content{'senderdomain'} eq '');
                     $content{'senderdomain'}.'</b> ('.$content{'time'}.          $content{'message'}=~s/\n/\<br\>/g;
                     ')<br><blockquote>'.$content{'message'}.'</blockquote>'.          $result.='<hr>From: <b>'.
   '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.  &Apache::loncommon::aboutmewrapper(
  '<input type=submit name="reprec_'.$_.'" value="Confirm Receipt and Reply">');   &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
       }  $content{'sendername'}.'@'.
       $r->print(              $content{'senderdomain'}.') '.$content{'time'}.
           '<input type=hidden name="displayedcrit" value="true"></form>');              '<br>Subject: '.$content{'subject'}.
               '<br><blockquote>'.
                 &Apache::lontexconvert::msgtexconverted($content{'message'}).
               '</blockquote>'.
               '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.
               '<input type=submit name="reprec_'.$_.'" '.
                     'value="Confirm Receipt and Reply">';
       }
       # Check to see if there were any messages.
       if ($result eq '') {
           $result = "<h2>You have no critical messages.</h2>".
       '<a href="/adm/roles">Select a course</a>';
       } else {
           $r->print($header);
       }
       $r->print($result);
       $r->print('<input type=hidden name="displayedcrit" value="true"></form>');
 }  }
   
 # =============================================================== Compose reply  # =============================================================== Compose reply
Line 325  sub discrit { Line 580  sub discrit {
 sub comprep {  sub comprep {
     my ($r,$msgid)=@_;      my ($r,$msgid)=@_;
       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},1);
       my $quotemsg='> '.$content{'message'};        my $quotemsg='> '.$content{'message'};
       $quotemsg=~s/\r/\n/g;        $quotemsg=~s/\r/\n/g;
       $quotemsg=~s/\f/\n/g;        $quotemsg=~s/\f/\n/g;
       $quotemsg=~s/\n+/\n\> /g;        $quotemsg=~s/\n+/\n\> /g;
         my $torepl=&Apache::loncommon::aboutmewrapper(
    &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('.
   $content{'sendername'}.'@'.
               $content{'senderdomain'}.')';
       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>
 <input type=hidden name=sendreply value="$msgid">  <input type=hidden name=sendreply value="$msgid">
   To: $torepl<br />
 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 376  sub disall { Line 638  sub disall {
     }      }
 </script>  </script>
 ENDDISHEADER  ENDDISHEADER
    $r->print(     $r->print('<h1>Display All Messages</h1><form method=post name=disall '.
  '<h1>Display All Messages</h1><form method=post name=disall '.               'action="/adm/email">'.
  'action="/adm/email">'.       '<table border=2><tr><th colspan=2>&nbsp</th><th>');
      '<table border=2><tr><th colspan=2>&nbsp</th><th>Date</th>'.      if ($ENV{'form.sortedby'} eq "revdate") {
      '<th>Username</th><th>Domain</th><th>Subject</th><th>Status</th></tr>');   $r->print('<a href = "?sortedby=date">Date</a></th>');
     foreach (sort split(/\&/,&Apache::lonnet::reply('keys:'.      } else {
  $ENV{'user.domain'}.':'.         $r->print('<a href = "?sortedby=revdate">Date</a></th>');
                                         $ENV{'user.name'}.':nohist_email',      }
                                         $ENV{'user.home'}))) {      $r->print('<th>');
         my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=      if ($ENV{'form.sortedby'} eq "revuser") {
    $r->print('<a href = "?sortedby=user">Username</a>');
       } else {
    $r->print('<a href = "?sortedby=revuser">Username</a>');
       }
       $r->print('</th><th>');
       if ($ENV{'form.sortedby'} eq "revdomain") {
    $r->print('<a href = "?sortedby=domain">Domain</a>');
       } else {
    $r->print('<a href = "?sortedby=revdomain">Domain</a>');
       }
       $r->print('</th><th>');
       if ($ENV{'form.sortedby'} eq "revsubject") {
    $r->print('<a href = "?sortedby=subject">Subject</a>');
       } else {
       $r->print('<a href = "?sortedby=revsubject">Subject</a>');
       }
       $r->print('</th><th>');
       if ($ENV{'form.sortedby'} eq "revstatus") {
    $r->print('<a href = "?sortedby=status">Status</th>');
       } else {
         $r->print('<a href = "?sortedby=revstatus">Status</th>');
       }
       $r->print('</tr>');
   my @messages = split(/\&/,&Apache::lonnet::reply('keys:'.$ENV{'user.domain'}.':'.$ENV{'user.name'}.':nohist_email',$ENV{'user.home'}));
   #unpack the varibles and repack into temp for sorting
   my @temp;
   foreach (@messages)
   {
    my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
     &Apache::lonmsg::unpackmsgid($_);      &Apache::lonmsg::unpackmsgid($_);
        unless ($status eq 'deleted') {  my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status);
         if ($status eq 'new') {   push @temp ,\@temp1;
     $r->print('<tr bgcolor="#FFBB77">');  }
         } elsif ($status eq 'read') {  #default sort
     $r->print('<tr bgcolor="#BBBB77">');   @temp = sort  {$a->[0] <=> $b->[0]} @temp;    
         } elsif ($status eq 'replied') {  if ($ENV{'form.sortedby'} eq "date"){
     $r->print('<tr bgcolor="#AAAA88">');          @temp = sort  {$a->[0] <=> $b->[0]} @temp;    
  } else {  }
     $r->print('<tr bgcolor="#99BBBB">');  if ($ENV{'form.sortedby'} eq "revdate"){
         }      @temp = sort  {$b->[0] <=> $a->[0]} @temp; 
         $r->print('<td><a href="/adm/email?display='.$_.  }
                   '">Open</a></td><td><a href="/adm/email?markdel='.$_.  if ($ENV{'form.sortedby'} eq "user"){
                 '">Delete</a><input type=checkbox name="delmark_'.$_.'"></td>'.   @temp = sort  {lc($a->[2]) cmp lc($b->[2])} @temp;
                   '<td>'.localtime($sendtime).'</td><td>'.  }
                   $fromname.'</td><td>'.$fromdomain.'</td><td>'.  if ($ENV{'form.sortedby'} eq "revuser"){
    @temp = sort  {lc($b->[2]) cmp lc($a->[2])} @temp;
   }
   if ($ENV{'form.sortedby'} eq "domain"){
           @temp = sort  {$a->[3] cmp $b->[3]} @temp;
   }
   if ($ENV{'form.sortedby'} eq "revdomain"){
           @temp = sort  {$b->[3] cmp $a->[3]} @temp;
   }
   if ($ENV{'form.sortedby'} eq "subject"){
           @temp = sort  {lc($a->[1]) cmp lc($b->[1])} @temp;
   }
   if ($ENV{'form.sortedby'} eq "revsubject"){
           @temp = sort  {lc($b->[1]) cmp lc($a->[1])} @temp;
   }
   if ($ENV{'form.sortedby'} eq "status"){
           @temp = sort  {$a->[4] cmp $b->[4]} @temp;
   }
   if ($ENV{'form.sortedby'} eq "revstatus"){
           @temp = sort  {$b->[4] cmp $a->[4]} @temp;
   }
    foreach (@temp){
       my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)= @$_;
    if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
       if ($status eq 'new') {
    $r->print('<tr bgcolor="#FFBB77">');
       } elsif ($status eq 'read') {
    $r->print('<tr bgcolor="#BBBB77">');
       } elsif ($status eq 'replied') {
    $r->print('<tr bgcolor="#AAAA88">'); 
   
       } else {
    $r->print('<tr bgcolor="#99BBBB">');
       }
       $r->print('<td><a href="/adm/email?display='.$_.
         '">Open</a></td><td><a href="/adm/email?markdel='.$_.
         '">Delete</a><input type=checkbox name="delmark_'.$_.'"></td>'.
         '<td>'.localtime($sendtime).'</td><td>'.
         $fromname.'</td><td>'.$fromdomain.'</td><td>'.
       &Apache::lonnet::unescape($shortsubj).'</td><td>'.        &Apache::lonnet::unescape($shortsubj).'</td><td>'.
                       $status.'</td></tr>');                        $status.'</td></tr>');
        }   }
     }   }   
     $r->print('</table><p>'.   $r->print('</table><p>'.
               '<a href="javascript:checkall()">Check All</a>&nbsp;'.                '<a href="javascript:checkall()">Check All</a>&nbsp;'.
               '<a href="javascript:uncheckall()">Uncheck All</a><p>'.                '<a href="javascript:uncheckall()">Uncheck All</a><p>'.
               '<input type=submit name="markeddel" value="Delete Checked">'.                '<input type=submit name="markeddel" value="Delete Checked">'.
Line 422  sub compout { Line 751  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 439  sub compout { Line 770  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">'.                  ' enctype="multipart/form-data">'."\n".
                 '<input type=hidden name=sendmail value=on><table>');                  '<input type="hidden" name="sendmail" value="on">'."\n".
                   '<table>');
     unless (($broadcast eq 'group') || ($broadcast eq 'upload')) {      unless (($broadcast eq 'group') || ($broadcast eq 'upload')) {
           my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
           my $selectlink=&Apache::loncommon::selectstudent_link
       ('compemail','recuname','recdomain');
        $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><td rowspan="2">$selectlink</td></tr>
 <tr><td>Domain:</td>  <tr><td>Domain:</td>
 <td><input type=text size=12 name=recdomain value="$defdom"></td></tr>  <td>$domform</td></tr>
 ENDREC  ENDREC
     }      }
     unless ($broadcast eq 'upload') {      my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
       if ($broadcast ne 'upload') {
        $r->print(<<"ENDCOMP");         $r->print(<<"ENDCOMP");
 <tr><td>Additional Recipients<br><tt>username\@domain,username\@domain, ...  <tr><td>Additional Recipients<br><tt>username\@domain,username\@domain, ...
 </tt></td><td>  </tt></td><td>
 <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  $latexHelp
   <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">
 ENDCOMP  ENDCOMP
     }      } else { # $broadcast is 'upload'
     if ($broadcast eq 'upload') {  
  $r->print(<<ENDUPLOAD);   $r->print(<<ENDUPLOAD);
 <input type=hidden name=sendmode value=upload>  <input type=hidden name=sendmode value=upload>
 <h3>Generate messages from a file</h3>  <h3>Generate messages from a file</h3>
   <p>
 Subject: <input type=text size=50 name=subject>  Subject: <input type=text size=50 name=subject>
   </p>
   <p>General message text<br />
   <textarea name=message cols=60 rows=10 wrap=hard>$dismsg
   </textarea></p>
   <p>
   The file format for the uploaded portion of the message is:
 <pre>  <pre>
 username1\@domain1: text  username1\@domain1: text
 username2\@domain2: text  username2\@domain2: text
 username1\@domain1: text  username3\@domain1: text
 </pre>  </pre>
   </p>
   <p>
 The messages will be assembled from all lines with the respective   The messages will be assembled from all lines with the respective 
 <tt>username\@domain</tt>, and appended to the general message text.<p>  <tt>username\@domain</tt>, and appended to the general message text.</p>
   <p>
 <input type=file name=upfile size=20><p>  <input type=file name=upfile size=20><p>
 General message text:<p>  
 <textarea name=message cols=60 rows=10 wrap=hard>$dismsg  
 </textarea><p>  
 $dispcrit  $dispcrit
 <input type=submit value="Upload and send">  <input type=submit value="Upload and send">
 ENDUPLOAD  ENDUPLOAD
Line 490  ENDUPLOAD Line 834  ENDUPLOAD
     $r->print('</form>');      $r->print('</form>');
 }  }
   
   # ---------------------------------------------------- Display all face to face
   
   sub disfacetoface {
       my ($r,$user,$domain)=@_;
       unless ($ENV{'request.course.id'}) { return; }
       unless (&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 '');
           $content{'message'}=~s/\n/\<br\>/g;
           if ($content{'subject'}=~/^Record/) {
       $result.='<h3>Record</h3>';
           } else {
               $result.='<h3>Sent Message</h3>';
               %content=&unpackagemsg($content{'message'});
               $content{'message'}=
                   '<b>Subject: '.$content{'subject'}.'</b><br />'.
    $content{'message'};
           }
           $result.='By: <b>'.
   &Apache::loncommon::aboutmewrapper(
    &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
   $content{'sendername'}.'@'.
               $content{'senderdomain'}.') '.$content{'time'}.
               '<br><blockquote>'.
                 &Apache::lontexconvert::msgtexconverted($content{'message'}).
         '</blockquote>';
        }
       # Check to see if there were any messages.
       if ($result eq '') {
           $r->print("<p><b>No notes, face-to-face discussion records, or critical messages in this course.</b></p>");
       } else {
          $r->print($result);
       }
   }
   
   # ---------------------------------------------------------------- Face to face
   
   sub facetoface {
       my ($r,$stage)=@_;
       unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
    return;
       }
   # from query string
       if ($ENV{'form.recname'}) { $ENV{'form.recuname'}=$ENV{'form.recname'}; }
       if ($ENV{'form.recdom'}) { $ENV{'form.recdomain'}=$ENV{'form.recdom'}; }
   
       my $defdom=$ENV{'user.domain'};
   # already filled in
       if ($ENV{'form.recdomain'}) { $defdom=$ENV{'form.recdomain'}; }
   # generate output
       my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
       my $stdbrws = &Apache::loncommon::selectstudent_link
    ('stdselect','recuname','recdomain');
       $r->print(<<"ENDTREC");
   <h3>User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course</h3>
   <form method="post" action="/adm/email" name="stdselect">
   <input type="hidden" name="recordftf" value="retrieve" />
   <table>
   <tr><td>Username:</td><td><input type=text size=12 name=recuname value="$ENV{'form.recuname'}"></td>
   <td rowspan="2">
   $stdbrws
   <input type="submit" value="Retrieve discussion and message records"></td>
   </tr>
   <tr><td>Domain:</td>
   <td>$domform</td></tr>
   </table>
   </form>
   ENDTREC
       if (($stage ne 'query') &&
           ($ENV{'form.recdomain'}) && ($ENV{'form.recuname'})) {
           chomp($ENV{'form.newrecord'});
           if ($ENV{'form.newrecord'}) {
              &user_normal_msg_raw(
               $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
               $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
               'Record ['.$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}.']',
       $ENV{'form.newrecord'});
           }
           $r->print('<h3>'.&Apache::loncommon::plainname($ENV{'form.recuname'},
        $ENV{'form.recdomain'}).'</h3>');
           &disfacetoface($r,$ENV{'form.recuname'},$ENV{'form.recdomain'});
    $r->print(<<ENDRHEAD);
   <form method="post" action="/adm/email">
   <input name="recdomain" value="$ENV{'form.recdomain'}" type="hidden" />
   <input name="recuname" value="$ENV{'form.recuname'}" type="hidden" />
   ENDRHEAD
           $r->print(<<ENDBFORM);
   <hr />New Record (record is visible to course faculty and staff)<br />
   <textarea name="newrecord" cols="80" rows="10" wrap="hard"></textarea>
   <br />
   <input type="hidden" name="recordftf" value="post" />
   <input type="submit" value="Post this record" />
   </form>
   ENDBFORM
       }
   }
   
 # ===================================================================== Handler  # ===================================================================== Handler
   
 sub handler {  sub handler {
Line 503  sub handler { Line 952  sub handler {
   return OK if $r->header_only;    return OK if $r->header_only;
   
 # --------------------------- Get query string for limited number of parameters  # --------------------------- Get query string for limited number of parameters
       &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
           ['display','replyto','forward','markread','markdel','markunread',
            'sendreply','compose','sendmail','critical','recname','recdom',
            'recordftf','sortedby']);
   
     foreach (split(/&/,$ENV{'QUERY_STRING'})) {  # ------------------------------------------------------ They checked for email
        my ($name, $value) = split(/=/,$_);    &Apache::lonnet::put('email_status',{'recnewemail'=>0});
        $value =~ tr/+/ /;  
        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;  
        if (($name eq 'display') || ($name eq 'replyto') ||   
            ($name eq 'forward') || ($name eq 'markread') ||  
            ($name eq 'markdel') || ($name eq 'markunread') ||  
            ($name eq 'sendreply') || ($name eq 'compose') ||  
            ($name eq 'sendmail') || ($name eq 'critical')) {  
            unless ($ENV{'form.'.$name}) {  
               $ENV{'form.'.$name}=$value;  
    }  
        }  
     }  
   
 # --------------------------------------------------------------- Render Output  # --------------------------------------------------------------- Render Output
       if (!$ENV{'form.display'}) {
   $r->print('<html><head><title>EMail and Messaging</title></head>');        $r->print('<html><head><title>EMail and Messaging</title>'.
   $r->print(   &Apache::loncommon::studentbrowser_javascript().'</head>'.
    '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');   &Apache::loncommon::bodytag('EMail and Messages'));
   $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('<html><head><title>EMail and Messaging</title>');
         if (defined($content{'baseurl'})) {
     $r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$content{'baseurl'}\" />");
         }
         $r->print(&Apache::loncommon::studentbrowser_javascript().
    '</head>'.
    &Apache::loncommon::bodytag('EMail and Messages'));
       $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).
Line 541  sub handler { Line 992  sub handler {
              '"><b>Forward</b></a></td>'.               '"><b>Forward</b></a></td>'.
         '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).          '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).
              '"><b>Mark Unread</b></a></td>'.               '"><b>Mark Unread</b></a></td>'.
           '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).
                '"><b>Delete</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'}) {
       my $msgid=$ENV{'form.sendreply'};        my $msgid=$ENV{'form.sendreply'};
       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},1);
       &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('Sending critical: '.           $r->print('Sending critical: '.
                 &user_crit_msg($content{'sendername'},                  &user_crit_msg($content{'sendername'},
                                  $content{'senderdomain'},                                   $content{'senderdomain'},
                                  $ENV{'form.subject'},                                   &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
                                  $ENV{'form.message'},                                   &Apache::lonfeedback::clear_out_html($ENV{'form.message'}),
                                  $ENV{'form.sendbck'}));                                   $ENV{'form.sendbck'}));
       } else {        } else {
          $r->print('Sending: '.&user_normal_msg($content{'sendername'},           $r->print('Sending: '.&user_normal_msg($content{'sendername'},
                                  $content{'senderdomain'},                                   $content{'senderdomain'},
                                  $ENV{'form.subject'},                                   &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
                                  $ENV{'form.message'}));                                   &Apache::lonfeedback::clear_out_html($ENV{'form.message'})));
       }        }
       if ($ENV{'form.displayedcrit'}) {        if ($ENV{'form.displayedcrit'}) {
           &discrit($r);            &discrit($r);
Line 607  sub handler { Line 1061  sub handler {
       &disall($r);        &disall($r);
   } elsif ($ENV{'form.compose'}) {    } elsif ($ENV{'form.compose'}) {
       &compout($r,'',$ENV{'form.compose'});        &compout($r,'',$ENV{'form.compose'});
     } elsif ($ENV{'form.recordftf'}) {
         &facetoface($r,$ENV{'form.recordftf'});
   } elsif ($ENV{'form.sendmail'}) {    } elsif ($ENV{'form.sendmail'}) {
       my %content=();        my %content=();
       undef %content;        undef %content;
       if ($ENV{'form.forwid'}) {        if ($ENV{'form.forwid'}) {
         my $msgid=$ENV{'form.forwid'};          my $msgid=$ENV{'form.forwid'};
         my %message=&Apache::lonnet::get('nohist_email',[$msgid]);          my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
         %content=&unpackagemsg($message{$msgid});          %content=&unpackagemsg($message{$msgid},1);
         &statuschange($msgid,'forwarded');          &statuschange($msgid,'forwarded');
         $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".          $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
                        $content{'message'};                         $content{'message'};
Line 645  sub handler { Line 1101  sub handler {
       }        }
     foreach (keys %toaddr) {      foreach (keys %toaddr) {
       my ($recuname,$recdomain)=split(/\:/,$_);        my ($recuname,$recdomain)=split(/\:/,$_);
       my $msgtxt=$ENV{'form.message'};        my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
       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('Sending critical: '.
                 &user_crit_msg($recuname,$recdomain,                  &user_crit_msg($recuname,$recdomain,
                                  $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('Sending: '.&user_normal_msg($recuname,$recdomain,
                                  $ENV{'form.subject'},                &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
                                  $msgtxt,                                   $msgtxt,
                                  $content{'citation'}));                                   $content{'citation'}));
       }        }
Line 680  BEGIN { Line 1136  BEGIN {
     $msgcount=0;      $msgcount=0;
 }  }
   
 1;  =pod
   
   =back
   
   =cut
   
   1; 
   
 __END__  __END__
   
   
Removed from v.1.29  
changed lines
  Added in v.1.62

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