--- loncom/interface/lonmsg.pm	2007/05/02 19:56:34	1.202
+++ loncom/interface/lonmsg.pm	2008/12/21 04:21:53	1.214.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.202 2007/05/02 19:56:34 raeburn Exp $
+# $Id: lonmsg.pm,v 1.214.2.2 2008/12/21 04:21:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -83,10 +83,10 @@ sub packagemsg {
     $citation=&HTML::Entities::encode($citation,'<>&"');
     $subject =&HTML::Entities::encode($subject,'<>&"');
     #remove machine specification
-    $baseurl =~ s|^http://[^/]+/|/|;
+    $baseurl =~ s|^https?\://[^/]+/|/|;
     $baseurl =&HTML::Entities::encode($baseurl,'<>&"');
     #remove machine specification
-    $attachmenturl =~ s|^http://[^/]+/|/|;
+    $attachmenturl =~ s|^https\://[^/]+/|/|;
     $attachmenturl =&HTML::Entities::encode($attachmenturl,'<>&"');
     my $course_context = &get_course_context();
     my $now=time;
@@ -120,6 +120,9 @@ sub packagemsg {
 	   '<role>'.$env{'request.role'}.'</role>'.
 	   '<resource>'.$env{'request.filename'}.'</resource>'.
            '<msgid>'.$msgid.'</msgid>';
+    if (defined($env{'form.group'})) {
+        $result .= '<group>'.$env{'form.group'}.'</group>';
+    }
     if (ref($recuser) eq 'ARRAY') {
         for (my $i=0; $i<@{$recuser}; $i++) {
             if ($type eq 'dcmail') {
@@ -163,14 +166,33 @@ sub packagemsg {
     if (defined($recipid)) {
         $result.= '<recipid>'.$recipid.'</recipid>';
     }
+    if ($env{'form.can_reply'} eq 'N') {
+        $result .= '<noreplies>1</noreplies>';
+    }
+    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') {
+                $result .= '<replytoaddr>'.$env{'form.reply_to_addr'}.'</replytoaddr>';
+            }
+        }
+    }
     return ($msgid,$result);
 }
 
 sub get_course_context {
     my $course_context;
+    my $msgkey;
     if (defined($env{'form.replyid'})) {
+        $msgkey = $env{'form.replyid'};
+    } elsif (defined($env{'form.forwid'})) {
+        $msgkey = $env{'form.forwid'}
+    } elsif (defined($env{'form.multiforwid'})) {
+        $msgkey = $env{'form.multiforwid'};
+    }
+    if ($msgkey ne '') {
         my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$origcid)=
-                   split(/\:/,&unescape($env{'form.replyid'}));
+                   split(/\:/,&unescape($msgkey));
         $course_context = $origcid;
     }
     foreach my $key (keys(%env)) {
@@ -190,7 +212,7 @@ sub get_course_context {
 # ================================================== Unpack message into a hash
 
 sub unpackagemsg {
-    my ($message,$notoken)=@_;
+    my ($message,$notoken,$noattachmentlink)=@_;
     my %content=();
     my $parser=HTML::TokeParser->new(\$message);
     my $token;
@@ -210,7 +232,7 @@ sub unpackagemsg {
        }
     }
     if (!exists($content{'recuser'})) { $content{'recuser'} = []; }
-    if ($content{'attachmenturl'}) {
+    if (($content{'attachmenturl'}) && (!$noattachmentlink)) {
        my ($fname)=($content{'attachmenturl'}=~m|/([^/]+)$|);
        if ($notoken) {
 	   $content{'message'}.='<p>'.&mt('Attachment').': <tt>'.$fname.'</tt>';
@@ -260,7 +282,7 @@ sub unpackmsgid {
 
 
 sub sendemail {
-    my ($to,$subject,$body)=@_;
+    my ($to,$subject,$body,$to_uname,$to_udom,$user_lh)=@_;
     my %senderemails=&Apache::loncommon::getemails();
     my $senderaddress='';
     foreach my $type ('notification','permanentemail','critnotification') {
@@ -269,9 +291,9 @@ sub sendemail {
 	}
     }
     $body=
-    "*** ".&mt('This is an automatic message generated by the LON-CAPA system.')."\n".
-    "*** ".($senderaddress?&mt('You can reply to this message'):&mt('Please do not reply to this address.')."\n*** ".
-	    &mt('A reply will not be received by the recipient!'))."\n\n".$body;
+    "*** ".&mt_user($user_lh,'This is an automatic message generated by the LON-CAPA system.')."\n".
+    "*** ".($senderaddress?&mt_user($user_lh,'You can reply to this message'):&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;
     my $msg = new Mail::Send;
     $msg->to($to);
     $msg->subject('[LON-CAPA] '.$subject);
@@ -288,20 +310,23 @@ sub sendnotification {
     my ($to,$touname,$toudom,$subj,$crit,$text,$msgid)=@_;
     my $sender=$env{'environment.firstname'}.' '.$env{'environment.lastname'};
     unless ($sender=~/\w/) { 
-	$sender=$env{'user.name'}.'@'.$env{'user.domain'};
+	$sender=$env{'user.name'}.':'.$env{'user.domain'};
     }
     my $critical=($crit?' critical':'');
+
     $text=~s/\&lt\;/\</gs;
     $text=~s/\&gt\;/\>/gs;
-    $text=~s/\<\/*[^\>]+\>//gs;
-    my $url='http://'.
-	&Apache::lonnet::hostname(&Apache::lonnet::homeserver($touname,$toudom)).
-      '/adm/email?username='.$touname.'&domain='.$toudom;
+    my $homeserver = &Apache::lonnet::homeserver($touname,$toudom);
+    my $protocol = $Apache::lonnet::protocol{$homeserver};
+    $protocol = 'http' if ($protocol ne 'https');
+    my $url = $protocol.'://'.&Apache::lonnet::hostname($homeserver).
+              '/adm/email?username='.$touname.'&domain='.$toudom;
     my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,
         $symb,$error) = &Apache::lonmsg::unpackmsgid($msgid);
-    my $coursetext;
+    my ($coursetext,$body,$bodybegin,$bodysubj,$bodyend);
+    my $user_lh = &user_lang($touname,$toudom,$fromcid);
     if ($fromcid ne '') {
-        $coursetext = "\n".&mt('Course').': ';
+        $coursetext = "\n".&mt_user($user_lh,'Course').': ';
         if ($env{'course.'.$fromcid.'.description'} ne '') {
             $coursetext .= $env{'course.'.$fromcid.'.description'};
         } else {
@@ -312,29 +337,70 @@ sub sendnotification {
         }
         $coursetext .= "\n\n";
     }
-    my $body = $coursetext. 
-               &mt('You received a'.$critical.' message from [_1] in LON-CAPA.',$sender).' '.&mt('The subject is 
+    my @recipients = split(/,/,$to);
+    $bodybegin = $coursetext. 
+               &mt_user($user_lh,
+                         'You received a'.$critical.' message from [_1] in LON-CAPA.',$sender).' ';
+    $bodysubj = &mt_user($user_lh,'The subject is 
 
  [_1]
 
 ',$subj)."\n".
-'=== '.&mt('Excerpt')." ============================================================
-$text
+'=== '.&mt_user($user_lh,'Excerpt')." ============================================================
+";
+    $bodyend = "
 ========================================================================
 
-".&mt('Use 
+".&mt_user($user_lh,'Use 
 
  [_1]
 
 to access the full message.',$url);
-    &sendemail($to,'New'.$critical.' message from '.$sender,$body);
+    my %userenv = &Apache::lonnet::get('environment',['notifywithhtml'],$toudom,$touname);
+    my $subject = &mt_user($user_lh,"'New' $critical message from ").$sender;
+ 
+    my ($blocked,$blocktext);
+    if (!$crit) {
+        my %setters;
+        my ($startblock,$endblock) = 
+            &Apache::loncommon::blockcheck(\%setters,'com',$touname,$toudom);
+        if ($startblock && $endblock) {
+            $blocked = 1;
+            my $showstart = &Apache::lonlocal::locallocaltime($startblock);
+            my $showend = &Apache::lonlocal::locallocaltime($endblock);
+            $blocktext = &mt_user($user_lh,'LON-CAPA messages sent to you between [_1] and [_2] will be inaccessible until the end of this time period, because you are a student in a course with an active communications block.',$showstart,$showend);
+        }
+    }
+    if ($userenv{'notifywithhtml'} ne '') {
+        my @htmlexcerpt = split(/,/,$userenv{'notifywithhtml'});
+        foreach my $addr (@recipients) {
+            if ($blocked) {
+                $body = $bodybegin."\n".$blocktext."\n".$bodyend;
+            } else {
+                my $sendtext = $text;
+                if (!grep/^\Q$addr\E/,@htmlexcerpt) {
+                    $sendtext =~ s/\<\/*[^\>]+\>//gs;
+                }
+                $body = $bodybegin.$bodysubj.$sendtext.$bodyend;
+            }
+            &sendemail($addr,$subject,$body,$touname,$toudom,$user_lh);
+        }
+    } else {
+        if ($blocked) {
+            $body = $bodybegin."\n".$blocktext."\n".$bodyend;
+        } else {
+            $text =~ s/\<\/*[^\>]+\>//gs;
+            $body = $bodybegin.$bodysubj.$text.$bodyend;
+        }
+        &sendemail($to,$subject,$body,$touname,$toudom,$user_lh);
+    }
 }
 # ============================================================= 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);
+        &Apache::lonnet::appenv({'user.mailcheck.time'=>time});
         if ($what{'recnewemail'}>0) { return 1; }
     }
     return 0;
@@ -448,7 +514,7 @@ sub store_instructor_comment {
 
 sub user_crit_msg_raw {
     my ($user,$domain,$subject,$message,$sendback,$toperm,$sentmessage,
-        $nosentstore,$recipid)=@_;
+        $nosentstore,$recipid,$attachmenturl)=@_;
 # Check if allowed missing
     my ($status,$packed_message);
     my $msgid='undefined';
@@ -457,20 +523,18 @@ sub user_crit_msg_raw {
     my $homeserver=&Apache::lonnet::homeserver($user,$domain);
     if ($homeserver ne 'no_host') {
        ($msgid,$packed_message)=&packagemsg($subject,$message,undef,undef,
-                                  undef,undef,undef,undef,undef,undef,undef,
-                                  undef,$recipid);
+                                  $attachmenturl,undef,undef,undef,undef,undef,
+                                  undef,undef,$recipid);
        if ($sendback) { $packed_message.='<sendback>true</sendback>'; }
-       $status=&Apache::lonnet::critical(
-           'put:'.$domain.':'.$user.':critical:'.
-           &escape($msgid).'='.
-           &escape($packed_message),$homeserver);
+       $status=&Apache::lonnet::cput('critical', {$msgid => $packed_message},
+				     $domain,$user);
         if (defined($sentmessage)) {
             $$sentmessage = $packed_message;
         }
         if (!$nosentstore) {
             (undef,my $packed_message_no_citation) =
-            &packagemsg($subject,$message,undef,undef,undef,$user,$domain,
-                        $msgid);
+            &packagemsg($subject,$message,undef,undef,$attachmenturl,$user,
+                        $domain,$msgid);
             if ($status eq 'ok' || $status eq 'con_delayed') {
                 &store_sent_mail($msgid,$packed_message_no_citation);
             }
@@ -504,7 +568,7 @@ sub user_crit_msg_raw {
 
 =pod
 
-=item * B<user_crit_msg($user, $domain, $subject, $message, $sendback, $nosentstore,$recipid)>: 
+=item * B<user_crit_msg($user, $domain, $subject, $message, $sendback, $nosentstore,$recipid,$attachmenturl)>: 
     Sends a critical message $message to the $user at $domain.  If $sendback
     is true,  a receipt will be sent to the current user when $user receives 
     the message.
@@ -521,7 +585,7 @@ sub user_crit_msg_raw {
 
 sub user_crit_msg {
     my ($user,$domain,$subject,$message,$sendback,$toperm,$sentmessage,
-        $nosentstore,$recipid)=@_;
+        $nosentstore,$recipid,$attachmenturl)=@_;
     my @status;
     my %userenv = &Apache::lonnet::get('environment',['msgforward'],
                                        $domain,$user);
@@ -532,12 +596,13 @@ sub user_crit_msg {
          push(@status,
 	      &user_crit_msg_raw($forwuser,$forwdomain,$subject,$message,
 				 $sendback,$toperm,$sentmessage,$nosentstore,
-                                 $recipid));
+                                 $recipid,$attachmenturl));
        }
     } else { 
 	push(@status,
 	     &user_crit_msg_raw($user,$domain,$subject,$message,$sendback,
-				$toperm,$sentmessage,$nosentstore,$recipid));
+				$toperm,$sentmessage,$nosentstore,$recipid,
+                                $attachmenturl));
     }
     if (wantarray) {
 	return @status;
@@ -551,14 +616,24 @@ sub user_crit_received {
     my $msgid=shift;
     my %message=&Apache::lonnet::get('critical',[$msgid]);
     my %contents=&unpackagemsg($message{$msgid},1);
+    my $destname = $contents{'sendername'};
+    my $destdom = $contents{'senderdomain'};
+    if ($contents{'replytoaddr'}) {
+        my ($repname,$repdom) = split(/:/,$contents{'replytoaddr'});
+        if (&Apache::lonnet::homeserver($repname,$repdom) ne 'no_host') {
+            $destname = $repname;
+            $destdom = $repdom;    
+        }
+    }
     my $status='rec: '.($contents{'sendback'}?
-     &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
-                     &mt('Receipt').': '.$env{'user.name'}.' '.&mt('at').' '.$env{'user.domain'}.', '.$contents{'subject'},
-                     &mt('User').' '.$env{'user.name'}.' '.&mt('at').' '.$env{'user.domain'}.
-                     ' acknowledged receipt of message'."\n".'   "'.
-                     $contents{'subject'}.'"'."\n".&mt('dated').' '.
-                     $contents{'time'}.".\n"
-                     ):'no msg req');
+     &user_normal_msg($destname,$destdom,&mt('Receipt').': '.$env{'user.name'}.
+                      ' '.&mt('at').' '.$env{'user.domain'}.', '.
+                      $contents{'subject'},&mt('User').' '.$env{'user.name'}.
+                      ' '.&mt('at').' '.$env{'user.domain'}.
+                      ' acknowledged receipt of message'."\n".'   "'.
+                      $contents{'subject'}.'"'."\n".&mt('dated').' '.
+                      $contents{'time'}.".\n"
+                      ):'no msg req');
     $status.=' trans: '.
      &Apache::lonnet::put(
      'nohist_email',{$contents{'msgid'} => $message{$msgid}});
@@ -590,10 +665,9 @@ sub user_normal_msg_raw {
                                      undef,$crsmsgid,$symb,$error,$recipid);
 
 # Store in user folder
-       $status=&Apache::lonnet::critical(
-           'put:'.$domain.':'.$user.':nohist_email:'.
-           &escape($msgid).'='.
-           &escape($packed_message),$homeserver);
+       $status=
+	   &Apache::lonnet::cput('nohist_email',{$msgid => $packed_message},
+				 $domain,$user);
 # Save new message received time
        &Apache::lonnet::put
                          ('email_status',{'recnewemail'=>time},$domain,$user);
@@ -613,16 +687,16 @@ sub user_normal_msg_raw {
 	   $$sentmessage = $packed_message;
        }
 # Notifications
-       my %userenv = &Apache::lonnet::get('environment',['notification',
-							 'permanentemail'],
-					  $domain,$user);
+       my %userenv = &Apache::loncommon::getemails($user,$domain);
        if ($userenv{'notification'}) {
 	   &sendnotification($userenv{'notification'},$user,$domain,$subject,0,
 			     $text,$msgid);
        }
        if ($toperm && $userenv{'permanentemail'}) {
-	   &sendnotification($userenv{'permanentemail'},$user,$domain,$subject,0,
-			     $text,$msgid);
+           if ((!$userenv{'notification'}) || ($userenv{'notification'} ne $userenv{'permanentemail'})) {
+	       &sendnotification($userenv{'permanentemail'},$user,$domain,$subject,0,
+	  		         $text,$msgid);
+           }
        }
        &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
 			    $env{'user.home'},
@@ -681,43 +755,45 @@ sub user_normal_msg {
 }
 
 sub process_sent_mail {
-    my ($msgsubj,$subj_prefix,$numsent,$stamp,$msgname,$msgdom,$msgcount,$context,$pid,$savemsg,$recusers,$recudoms,$baseurl,$attachmenturl,$symb,$error,$senderuname,$senderdom,$senderhome) = @_;
+    my ($msgsubj,$subj_prefix,$numsent,$stamp,$msgname,$msgdom,$msgcount,$context,$pid,$savemsg,$recusers,$recudoms,$baseurl,$attachmenturl,$symb,$error,$senderuname,$senderdom,$recipid) = @_;
     my $sentsubj;
     if ($numsent > 1) {
         $sentsubj = $subj_prefix.' ('.$numsent.' sent) '.$msgsubj;
+    } else {
+        if ($subj_prefix) {
+            $sentsubj = $subj_prefix.' ';
+        }
+        $sentsubj .= $msgsubj;
     }
     $sentsubj = &HTML::Entities::encode($sentsubj,'<>&"');
     my $sentmsgid = 
         &buildmsgid($stamp,$sentsubj,$msgname,$msgdom,$msgcount,$context,$pid);
     (undef,my $sentmessage) =
         &packagemsg($msgsubj,$savemsg,undef,$baseurl,$attachmenturl,$recusers,
-                    $recudoms,$sentmsgid,undef,undef,$symb,$error);
+                    $recudoms,$sentmsgid,undef,undef,$symb,$error,$recipid);
     my $status = &store_sent_mail($sentmsgid,$sentmessage,$senderuname,
-                                  $senderdom,$senderhome);
+                                  $senderdom);
     return $status;
 }
 
 sub store_sent_mail {
-    my ($msgid,$message,$senderuname,$senderdom,$senderhome) = @_;
+    my ($msgid,$message,$senderuname,$senderdom) = @_;
     if ($senderuname eq '') {
         $senderuname = $env{'user.name'};
     }
     if ($senderdom eq '') {
         $senderdom = $env{'user.domain'};
     }
-    if ($senderhome eq '') {
-        $senderhome = $env{'user.home'};
-    }
-    my $status =' '.&Apache::lonnet::critical(
-               'put:'.$senderdom.':'.$senderuname.':nohist_email_sent:'.
-               &escape($msgid).'='.&escape($message),$senderhome);
+    my $status =' '.&Apache::lonnet::cput('nohist_email_sent',
+					  {$msgid => $message},
+					  $senderdom,$senderuname);
     return $status;
 }
 
 sub store_recipients {
     my ($subject,$sendername,$senderdom,$reciphash) = @_;
     my $context = &get_course_context();
-    my $now = time;
+    my $now = time();
     my $msgcount = &get_uniq();
     my $recipid =
         &buildmsgid($now,$subject,$sendername,$senderdom,$msgcount,$context,$$);
@@ -855,6 +931,28 @@ sub decide_receiver {
     return ($typestyle,%to);
 }
 
+sub user_lang {
+    my ($touname,$toudom,$fromcid) = @_;
+    my @userlangs;
+    if (($fromcid ne '') && ($env{'course.'.$fromcid.'.languages'} ne '')) {
+        @userlangs=(@userlangs,split(/\s*(\,|\;|\:)\s*/,
+                    $env{'course.'.$fromcid.'.languages'}));
+    } else {
+        my %langhash = &Apache::lonnet::get('environment',['languages'],$toudom,$touname);
+        if ($langhash{'languages'} ne '') {
+            @userlangs = split(/\s*(\,|\;|\:)\s*/,$langhash{'languages'});  
+        } else {
+            my %domdefs = &Apache::lonnet::get_domain_defaults($toudom);
+            if ($domdefs{'lang_def'} ne '') {
+                @userlangs = ($domdefs{'lang_def'});
+            }
+        }
+    }
+    my @languages=&Apache::lonlocal::get_genlanguages(@userlangs);
+    my $user_lh = Apache::localize->get_handle(@languages);
+    return $user_lh;
+}
+
 =pod
 
 =back