--- loncom/interface/lonmsg.pm	2003/10/15 18:01:10	1.67
+++ loncom/interface/lonmsg.pm	2004/01/15 03:53:12	1.78
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.67 2003/10/15 18:01:10 www Exp $
+# $Id: lonmsg.pm,v 1.78 2004/01/15 03:53:12 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,23 +25,8 @@
 #
 # http://www.lon-capa.org/
 #
-#
-# (Routines to control the menu
-#
-# (TeX Conversion Module
-#
-# 05/29/00,05/30 Gerd Kortemeyer)
-#
-# 10/05 Gerd Kortemeyer)
-#
-# 10/19,10/20,10/30,
-# 02/06/01 Gerd Kortemeyer
-# 07/27 Guy Albertelli
-# 07/27,07/28,07/30,08/03,08/06,08/08,08/09,08/10,8/13,8/15,
-# 10/1,11/5 Gerd Kortemeyer
-# YEAR=2002
-# 1/1,3/18 Gerd Kortemeyer
-#
+
+
 package Apache::lonmsg;
 
 =pod
@@ -218,9 +203,10 @@ sub sendemail {
     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;
+    if (my $fh = $msg->open('smtp',Server => 'localhost')) {
+	print $fh $body;
+	$fh->close;
+    }
 }
 
 # ==================================================== Send notification emails
@@ -283,6 +269,53 @@ sub author_res_msg {
     return 'no_host';
 }
 
+# =========================================== Retrieve author resource messages
+
+sub retrieve_author_res_msg {
+    my $url=shift;
+    $url=&Apache::lonnet::declutter($url);
+    my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//);
+    my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$domain,$author);
+    my $msgs='';
+    foreach (keys %errormsgs) {
+	if ($_=~/^\Q$url\E\_\d+$/) {
+	    my %content=&unpackagemsg($errormsgs{$_});
+	    $msgs.='<p><img src="/adm/lonMisc/bomb.gif" /><b>'.
+		$content{'time'}.'</b>: '.$content{'message'}.
+		'<br /></p>';
+	}
+    } 
+    return $msgs;     
+}
+
+
+# =============================== Delete all author messages related to one URL
+
+sub del_url_author_res_msg {
+    my $url=shift;
+    $url=&Apache::lonnet::declutter($url);
+    my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//);
+    my @delmsgs=();
+    foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) {
+	if ($_=~/^\Q$url\E\_\d+$/) {
+	    push (@delmsgs,$_);
+	}
+    }
+    return &Apache::lonnet::del('nohist_res_msgs',\@delmsgs,$domain,$author);
+}
+
+# ================= Return hash with URLs for which there is a resource message
+
+sub all_url_author_res_msg {
+    my ($author,$domain)=@_;
+    my %returnhash=();
+    foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) {
+	$_=~/^(.+)\_\d+/;
+	$returnhash{$1}=1;
+    }
+    return %returnhash;
+}
+
 # ================================================== Critical message to a user
 
 sub user_crit_msg_raw {
@@ -606,16 +639,23 @@ $content{'sendername'}.'@'.
  '<input type=checkbox name=sendbck> '.&mt('Send as critical message').' ' .
  &mt('and return receipt') . $crithelp . '<p>';
       }
+    my %lt=&Apache::lonlocal::texthash(
+				   'to' => 'To',
+				   'sb' => 'Subject',
+				   'sr' => 'Send Reply',
+				   'ca' => 'Cancel'
+				   );
       $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>
+<form action="/adm/email" method="post">
+<input type="hidden" name="sendreply" value="$msgid">
+$lt{'to'}: $torepl<br />
+$lt{'sb'}: <input type="text" size=50 name="subject" value="$subject"><p>
+<textarea name="message" cols="84" rows="10" wrap="hard">
 $quotemsg
-</textarea><p>
+</textarea></p><br />
 $dispcrit
-<input type=submit value="Send Reply">
+<input type="submit" name="send" value="$lt{'sr'}" />
+<input type="submit" name="cancel" value="$lt{'ca'}"/ >
 </form>
 ENDREPLY
 }
@@ -763,16 +803,23 @@ sub compout {
     my $dissub='';
     my $dismsg='';
     my $func=&mt('Send New');
-      if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+    my %lt=&Apache::lonlocal::texthash('us' => 'Username',
+				       'do' => 'Domain',
+				       'ad' => 'Additional Recipients',
+				       'sb' => 'Subject',
+				       'ca' => 'Cancel',
+				       'ma' => 'Mail');
+
+    if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
 	 my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
          $dispcrit=
- '<input type=checkbox name=critmsg> '.&mt('Send as critical message').' ' . $crithelp . 
+ '<input type="checkbox" name="critmsg"> '.&mt('Send as critical message').' ' . $crithelp . 
  '<br>'.
- '<input type=checkbox name=sendbck> '.&mt('Send as critical message').'  ' .
+ '<input type="checkbox" name="sendbck"> '.&mt('Send as critical message').'  ' .
  &mt('and return receipt') . $crithelp . '<p>';
       }
     if ($forwarding) {
-       $dispcrit.='<input type=hidden name=forwid value="'.
+       $dispcrit.='<input type="hidden" name="forwid" value="'.
 	   $forwarding.'">';
        $func=&mt('Forward');
       my %message=&Apache::lonnet::get('nohist_email',[$forwarding]);
@@ -795,24 +842,25 @@ sub compout {
 	    ('compemail','recuname','recdomain');
        $r->print(<<"ENDREC");
 <table>
-<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>$lt{'us'}:</td><td><input type="text" size="12" name="recuname" value="$ENV{'form.recname'}"></td><td rowspan="2">$selectlink</td></tr>
+<tr><td>$lt{'do'}:</td>
 <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, ...
+<tr><td>$lt{'ad'}<br /><tt>username\@domain,username\@domain, ...
 </tt></td><td>
-<input type=text size=50 name=additionalrec></td></tr>
-<tr><td>Subject:</td><td><input type=text size=50 name=subject value="$dissub">
+<input type="text" size="50" name="additionalrec"></td></tr>
+<tr><td>$lt{'sb'}:</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>
+<textarea name="message" cols="80" rows="10" wrap="hard">$dismsg
+</textarea></p><br />
 $dispcrit
-<input type=submit value="$func Mail">
+<input type="submit" name="send" value="$func $lt{'ma'}" />
+<input type="submit" name="cancel" value="$lt{'ca'}" />
 ENDCOMP
     } else { # $broadcast is 'upload'
 	$r->print(<<ENDUPLOAD);
@@ -865,15 +913,15 @@ sub disfacetoface {
         next if ($content{'senderdomain'} eq '');
         $content{'message'}=~s/\n/\<br\>/g;
         if ($content{'subject'}=~/^Record/) {
-	    $result.='<h3>Record</h3>';
+	    $result.='<h3>'.&mt('Record').'</h3>';
         } else {
-            $result.='<h3>Sent Message</h3>';
+            $result.='<h3>'.&mt('Sent Message').'</h3>';
             %content=&unpackagemsg($content{'message'});
             $content{'message'}=
                 '<b>Subject: '.$content{'subject'}.'</b><br />'.
 		$content{'message'};
         }
-        $result.='By: <b>'.
+        $result.=&mt('By').': <b>'.
 &Apache::loncommon::aboutmewrapper(
  &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
 $content{'sendername'}.'@'.
@@ -976,7 +1024,9 @@ sub handler {
   if (!$ENV{'form.display'}) {
       $r->print('<html><head><title>EMail and Messaging</title>'.
 		&Apache::loncommon::studentbrowser_javascript().'</head>'.
-		&Apache::loncommon::bodytag('EMail and Messages'));
+		&Apache::loncommon::bodytag('EMail and Messages').
+	     &Apache::loncommon::help_open_faq(12).
+	     &Apache::loncommon::help_open_bug('Communication Tools'));
   }
   if ($ENV{'form.display'}) {
       my $msgid=$ENV{'form.display'};
@@ -1003,7 +1053,9 @@ sub handler {
       }
       $r->print(&Apache::loncommon::studentbrowser_javascript().
 		'</head>'.
-		&Apache::loncommon::bodytag('EMail and Messages'));
+		&Apache::loncommon::bodytag('EMail and Messages').
+	     &Apache::loncommon::help_open_faq(12).
+	     &Apache::loncommon::help_open_bug('Communication Tools'));
       $r->print('<b>'.&mt('Subject').':</b> '.$content{'subject'}.
              '<br><b>'.&mt('From').':</b> '.
 &Apache::loncommon::aboutmewrapper(
@@ -1037,23 +1089,25 @@ $content{'sendername'},$content{'senderd
   } elsif ($ENV{'form.replyto'}) {
       &comprep($r,$ENV{'form.replyto'});
   } elsif ($ENV{'form.sendreply'}) {
-      my $msgid=$ENV{'form.sendreply'};
-      my %message=&Apache::lonnet::get('nohist_email',[$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'}))) {
-         $r->print(&mt('Sending critical').': '.
-                &user_crit_msg($content{'sendername'},
-                                 $content{'senderdomain'},
-                                 &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
-                                 &Apache::lonfeedback::clear_out_html($ENV{'form.message'}),
-                                 $ENV{'form.sendbck'}));
-      } else {
-         $r->print(&mt('Sending').': '.&user_normal_msg($content{'sendername'},
-                                 $content{'senderdomain'},
-                                 &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
-                                 &Apache::lonfeedback::clear_out_html($ENV{'form.message'})));
+      if ($ENV{'form.send'}) {
+	  my $msgid=$ENV{'form.sendreply'};
+	  my %message=&Apache::lonnet::get('nohist_email',[$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'}))) {
+	      $r->print(&mt('Sending critical message').': '.
+			&user_crit_msg($content{'sendername'},
+				       $content{'senderdomain'},
+				       &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+				       &Apache::lonfeedback::clear_out_html($ENV{'form.message'}),
+				       $ENV{'form.sendbck'}));
+	  } else {
+	      $r->print(&mt('Sending').': '.&user_normal_msg($content{'sendername'},
+							     $content{'senderdomain'},
+							     &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+							     &Apache::lonfeedback::clear_out_html($ENV{'form.message'})));
+	  }
       }
       if ($ENV{'form.displayedcrit'}) {
           &discrit($r);
@@ -1100,64 +1154,75 @@ $content{'sendername'},$content{'senderd
   } elsif ($ENV{'form.recordftf'}) {
       &facetoface($r,$ENV{'form.recordftf'});
   } elsif ($ENV{'form.sendmail'}) {
-      my %content=();
-      undef %content;
-      if ($ENV{'form.forwid'}) {
-        my $msgid=$ENV{'form.forwid'};
-        my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-        %content=&unpackagemsg($message{$msgid},1);
-        &statuschange($msgid,'forwarded');
-        $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
-	                       $content{'message'};
+      my $sendstatus='';
+      if ($ENV{'form.send'}) {
+	  my %content=();
+	  undef %content;
+	  if ($ENV{'form.forwid'}) {
+	      my $msgid=$ENV{'form.forwid'};
+	      my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+	      %content=&unpackagemsg($message{$msgid},1);
+	      &statuschange($msgid,'forwarded');
+	      $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
+		  $content{'message'};
+	  }
+	  my %toaddr=();
+	  undef %toaddr;
+	  if ($ENV{'form.sendmode'} eq 'group') {
+	      foreach (keys %ENV) {
+		  if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
+		      $toaddr{$1}='';
+		  }
+	      }
+	  } elsif ($ENV{'form.sendmode'} eq 'upload') {
+	      foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) {
+		  my ($rec,$txt)=split(/\s*\:\s*/,$_);
+		  if ($txt) {
+		      $rec=~s/\@/\:/;
+		      $toaddr{$rec}.=$txt."\n";
+		  }
+	      }
+	  } else {
+	      $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';
+	  }
+	  if ($ENV{'form.additionalrec'}) {
+	      foreach (split(/\,/,$ENV{'form.additionalrec'})) {
+		  my ($auname,$audom)=split(/\@/,$_);
+		  $toaddr{$auname.':'.$audom}='';
+	      }
+	  }
+	  foreach (keys %toaddr) {
+	      my ($recuname,$recdomain)=split(/\:/,$_);
+	      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(&mt('Sending critical message').' ...');
+                  $sendstatus.=' '.&user_crit_msg($recuname,$recdomain,
+					   &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+					   $msgtxt,
+					   $ENV{'form.sendbck'});
+	      } else {
+		  $r->print(&mt('Sending').' ...');
+                  $sendstatus.=' '.&user_normal_msg($recuname,$recdomain,
+				                         &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+							 $msgtxt,
+							 $content{'citation'});
+	      }
+	      $r->print('<br />');
+	  }
       }
-      my %toaddr=();
-      undef %toaddr;
-      if ($ENV{'form.sendmode'} eq 'group') {
-          foreach (keys %ENV) {
-	      if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
-		  $toaddr{$1}='';
-              }
-          }
-      } elsif ($ENV{'form.sendmode'} eq 'upload') {
-          foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) {
-              my ($rec,$txt)=split(/\s*\:\s*/,$_);
-              if ($txt) {
-		  $rec=~s/\@/\:/;
-                  $toaddr{$rec}.=$txt."\n";
-              }
-          }
+      if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+	  if ($ENV{'form.displayedcrit'}) {
+	      &discrit($r);
+	  } else {
+	      &disall($r);
+	  }
       } else {
-	  $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';
-      }
-      if ($ENV{'form.additionalrec'}) {
-	  foreach (split(/\,/,$ENV{'form.additionalrec'})) {
-              my ($auname,$audom)=split(/\@/,$_);
-              $toaddr{$auname.':'.$audom}='';
-          }
-      }
-    foreach (keys %toaddr) {
-      my ($recuname,$recdomain)=split(/\:/,$_);
-      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,
-               &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
-                                 $msgtxt,
-                                 $ENV{'form.sendbck'}));
-      } else {
-         $r->print('Sending: '.&user_normal_msg($recuname,$recdomain,
-              &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
-                                 $msgtxt,
-                                 $content{'citation'}));
-      }
-      $r->print('<br>');
-    }
-      if ($ENV{'form.displayedcrit'}) {
-          &discrit($r);
-      } 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 {
       &disall($r);