--- loncom/interface/lonmsg.pm	2003/03/17 17:02:38	1.50
+++ loncom/interface/lonmsg.pm	2003/06/20 14:55:01	1.55
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.50 2003/03/17 17:02:38 albertel Exp $
+# $Id: lonmsg.pm,v 1.55 2003/06/20 14:55:01 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,17 +52,22 @@ use Apache::Constants qw(:common);
 use Apache::loncommon();
 use Apache::lontexconvert();
 use HTML::Entities();
+use Mail::Send;
 
 # ===================================================================== Package
 
 sub packagemsg {
-    my ($subject,$message,$citation,$baseurl)=@_;
+    my ($subject,$message,$citation,$baseurl,$attachmenturl)=@_;
     $message =&HTML::Entities::encode($message);
     $citation=&HTML::Entities::encode($citation);
     $subject =&HTML::Entities::encode($subject);
     #remove machine specification
     $baseurl =~ s|^http://[^/]+/|/|;
     $baseurl =&HTML::Entities::encode($baseurl);
+    #remove machine specification
+    $attachmenturl =~ s|^http://[^/]+/|/|;
+    $attachmenturl =&HTML::Entities::encode($attachmenturl);
+
     my $now=time;
     $msgcount++;
     my $partsubj=$subject;
@@ -93,13 +98,16 @@ sub packagemsg {
     if (defined($baseurl)) {
 	$result.= '<baseurl>'.$baseurl.'</baseurl>';
     }
+    if (defined($attachmenturl)) {
+	$result.= '<attachmenturl>'.$attachmenturl.'</attachmenturl>';
+    }
     return $msgid,$result;
 }
 
 # ================================================== Unpack message into a hash
 
 sub unpackagemsg {
-    my $message=shift;
+    my ($message,$notoken)=@_;
     my %content=();
     my $parser=HTML::TokeParser->new(\$message);
     my $token;
@@ -110,6 +118,16 @@ sub unpackagemsg {
            $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;
 }
 
@@ -125,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 {
@@ -182,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: '.
@@ -218,7 +279,7 @@ sub user_crit_msg {
 sub user_crit_received {
     my $msgid=shift;
     my %message=&Apache::lonnet::get('critical',[$msgid]);
-    my %contents=&unpackagemsg($message{$msgid});
+    my %contents=&unpackagemsg($message{$msgid},1);
     my $status='rec: '.($contents{'sendback'}?
      &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
                      'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
@@ -242,14 +303,15 @@ sub user_crit_received {
 # ======================================================== Normal communication
 
 sub user_normal_msg_raw {
-    my ($user,$domain,$subject,$message,$citation,$baseurl)=@_;
+    my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_;
 # Check if allowed missing
     my $status='';
     my $msgid='undefined';
     unless (($message)&&($user)&&($domain)) { $status='empty'; };
     my $homeserver=&Apache::lonnet::homeserver($user,$domain);
     if ($homeserver ne 'no_host') {
-       ($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl);
+       ($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl,
+                                     $attachmenturl);
        $status=&Apache::lonnet::critical(
            'put:'.$domain.':'.$user.':nohist_email:'.
            &Apache::lonnet::escape($msgid).'='.
@@ -259,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);
@@ -268,7 +336,7 @@ sub user_normal_msg_raw {
 # New routine that respects "forward" and calls old routine
 
 sub user_normal_msg {
-    my ($user,$domain,$subject,$message,$citation,$baseurl)=@_;
+    my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_;
     my $status='';
     my %userenv = &Apache::lonnet::get('environment',['msgforward'],
                                        $domain,$user);
@@ -278,11 +346,11 @@ sub user_normal_msg {
 	 my ($forwuser,$forwdomain)=split(/\:/,$_);
          $status.=
 	  &user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
-			       $citation,$baseurl).' ';
+			       $citation,$baseurl,$attachmenturl).' ';
        }
     } else { 
 	$status=&user_normal_msg_raw($user,$domain,$subject,$message,
-				     $citation,$baseurl);
+				     $citation,$baseurl,$attachmenturl);
     }
     return $status;
 }
@@ -413,7 +481,7 @@ $content{'sendername'}.'@'.
 sub comprep {
     my ($r,$msgid)=@_;
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-      my %content=&unpackagemsg($message{$msgid});
+      my %content=&unpackagemsg($message{$msgid},1);
       my $quotemsg='> '.$content{'message'};
       $quotemsg=~s/\r/\n/g;
       $quotemsg=~s/\f/\n/g;
@@ -548,6 +616,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, ...
@@ -555,6 +624,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
@@ -762,7 +832,7 @@ $content{'sendername'},$content{'senderd
   } elsif ($ENV{'form.sendreply'}) {
       my $msgid=$ENV{'form.sendreply'};
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-      my %content=&unpackagemsg($message{$msgid});
+      my %content=&unpackagemsg($message{$msgid},1);
       &statuschange($msgid,'replied');
       if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
           (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
@@ -828,7 +898,7 @@ $content{'sendername'},$content{'senderd
       if ($ENV{'form.forwid'}) {
         my $msgid=$ENV{'form.forwid'};
         my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-        %content=&unpackagemsg($message{$msgid});
+        %content=&unpackagemsg($message{$msgid},1);
         &statuschange($msgid,'forwarded');
         $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
 	                       $content{'message'};