--- loncom/interface/lonmsg.pm	2003/03/31 16:34:08	1.52
+++ loncom/interface/lonmsg.pm	2003/07/05 10:07:11	1.57
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.52 2003/03/31 16:34:08 www Exp $
+# $Id: lonmsg.pm,v 1.57 2003/07/05 10:07:11 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,6 +52,7 @@ use Apache::Constants qw(:common);
 use Apache::loncommon();
 use Apache::lontexconvert();
 use HTML::Entities();
+use Mail::Send;
 
 # ===================================================================== Package
 
@@ -142,6 +143,42 @@ sub unpackmsgid {
     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 {
@@ -199,6 +236,13 @@ sub user_crit_msg_raw {
     } else {
        $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(
       'Sending critical email '.$msgid.
       ', log status: '.
@@ -277,6 +321,12 @@ sub user_normal_msg_raw {
     } else {
        $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'},
                          $ENV{'user.home'},
       'Sending '.$msgid.' to '.$user.' at '.$domain.' with status: '.$status);
@@ -436,6 +486,10 @@ sub comprep {
       $quotemsg=~s/\r/\n/g;
       $quotemsg=~s/\f/\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 $dispcrit='';
       if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
@@ -449,6 +503,7 @@ sub comprep {
       $r->print(<<"ENDREPLY");
 <form action="/adm/email" method=post>
 <input type=hidden name=sendreply value="$msgid">
+To: $torepl<br />
 Subject: <input type=text size=50 name=subject value="$subject"><p>
 <textarea name=message cols=84 rows=10 wrap=hard>
 $quotemsg
@@ -566,6 +621,7 @@ sub compout {
 <td>$domform</td></tr>
 ENDREC
     }
+    my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
     if ($broadcast ne 'upload') {
        $r->print(<<"ENDCOMP");
 <tr><td>Additional Recipients<br><tt>username\@domain,username\@domain, ...
@@ -573,6 +629,7 @@ ENDREC
 <input type=text size=50 name=additionalrec></td></tr>
 <tr><td>Subject:</td><td><input type=text size=50 name=subject value="$dissub">
 </td></tr></table>
+$latexHelp
 <textarea name=message cols=80 rows=10 wrap=hard>$dismsg
 </textarea><p>
 $dispcrit
@@ -787,14 +844,14 @@ $content{'sendername'},$content{'senderd
          $r->print('Sending critical: '.
                 &user_crit_msg($content{'sendername'},
                                  $content{'senderdomain'},
-                                 $ENV{'form.subject'},
-                                 $ENV{'form.message'},
+                                 &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+                                 &Apache::lonfeedback::clear_out_html($ENV{'form.message'}),
                                  $ENV{'form.sendbck'}));
       } else {
          $r->print('Sending: '.&user_normal_msg($content{'sendername'},
                                  $content{'senderdomain'},
-                                 $ENV{'form.subject'},
-                                 $ENV{'form.message'}));
+                                 &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+                                 &Apache::lonfeedback::clear_out_html($ENV{'form.message'})));
       }
       if ($ENV{'form.displayedcrit'}) {
           &discrit($r);
@@ -878,18 +935,18 @@ $content{'sendername'},$content{'senderd
       }
     foreach (keys %toaddr) {
       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 ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
           (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
          $r->print('Sending critical: '.
                 &user_crit_msg($recuname,$recdomain,
-                                 $ENV{'form.subject'},
+               &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
                                  $msgtxt,
                                  $ENV{'form.sendbck'}));
       } else {
          $r->print('Sending: '.&user_normal_msg($recuname,$recdomain,
-                                 $ENV{'form.subject'},
+              &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
                                  $msgtxt,
                                  $content{'citation'}));
       }