loncom/interface/lonmsg.pm - diff

Return to lonmsg.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmsg.pm between versions 1.219 and 1.221

-version 1.219, 2008/12/23 19:22:13
+version 1.221, 2009/01/05 20:04:40
  Line 422  sub unpackmsgid {
  sub sendemail {
      my ($to,$subject,$body,$to_uname,$to_udom,$user_lh)=@_;
-     my %senderemails=&Apache::loncommon::getemails();
      my $senderaddress='';
-     foreach my $type ('notification','permanentemail','critnotification') {
+     my $replytoaddress='';
- 	if ($senderemails{$type}) {
+     if ($env{'form.can_reply'} eq 'N') {
- 	    $senderaddress=$senderemails{$type};
+         my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
- 	}
+         my $hostname = &Apache::lonnet::hostname($lonhost);
+         $replytoaddress = 'do-not-reply@'.$hostname;
+     } else {
+         my %senderemails;
+         my $have_sender;
+         if ($env{'form.reply_to_addr'}) {
+             my ($replytoname,$replytodom) = split(/:/,$env{'form.reply_to_addr'});
+             if (!($replytoname eq $env{'user.name'} && $replytodom eq $env{'user.domain'})) {
+                 if (&Apache::lonnet::homeserver($replytoname,$replytodom) ne 'no_host') {
+                     %senderemails =
+                         &Apache::loncommon::getemails($replytoname,$replytodom);
+                     $have_sender = 1;
+                 }
+             }
+         }
+         if (!$have_sender) {
+             %senderemails=&Apache::loncommon::getemails();
+         }
+         foreach my $type ('permanentemail','critnotification','notification') {
+             if ($senderemails{$type}) {
+                 ($senderaddress) = split(/,/,$senderemails{$type});
+                 last if ($senderaddress);
+             }
+         }
      }
      $body=
      "*** ".&mt_user($user_lh,'This is an automatic e-mail generated by the LON-CAPA system.')."\n".
      "*** ".($senderaddress?&mt_user($user_lh,'You can reply to this e-mail'):&mt_user($user_lh,'Please do not reply to this address.')."\n*** ".
- 	    &mt_user($user_lh,'A reply will not be received by the recipient!'))."\n\n".$body;
+     &mt_user($user_lh,'A reply will not be received by the recipient!'))."\n\n".$body;
      my $msg = new Mail::Send;
      $msg->to($to);
      $msg->subject('[LON-CAPA] '.$subject);
-     if ($senderaddress) { $msg->add('Reply-to',$senderaddress); $msg->add('From',$senderaddress); }
+     if ($replytoaddress) {
+         $msg->add('Reply-to',$replytoaddress);
+     }
+     if ($senderaddress) {
+         $msg->add('From',$senderaddress);
+     }
      if (my $fh = $msg->open()) {
  	print $fh $body;
  	$fh->close;
- Line 1005  sub user_lang {
+ Line 1032  sub user_lang {
          @userlangs=(@userlangs,split(/\s*(\,|\;|\:)\s*/,
                      $env{'course.'.$fromcid.'.languages'}));
      } else {
-         my %langhash = &Apache::loncommon::getlangs($toudom,$touname);
+         my %langhash = &Apache::loncommon::getlangs($touname,$toudom);
          if ($langhash{'languages'} ne '') {
              @userlangs = split(/\s*(\,|\;|\:)\s*/,$langhash{'languages'});
          } else {
              my %domdefs = &Apache::lonnet::get_domain_defaults($toudom);
              if ($domdefs{'lang_def'} ne '') {

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

Removed from v.1.219
changed lines
	Added in v.1.221