--- loncom/interface/lonmsg.pm	2002/07/29 22:17:05	1.36
+++ loncom/interface/lonmsg.pm	2002/09/07 13:57:26	1.38
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.36 2002/07/29 22:17:05 www Exp $
+# $Id: lonmsg.pm,v 1.38 2002/09/07 13:57:26 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -141,7 +141,7 @@ sub author_res_msg {
 
 # ================================================== Critical message to a user
 
-sub user_crit_msg {
+sub user_crit_msg_raw {
     my ($user,$domain,$subject,$message,$sendback)=@_;
 # Check if allowed missing
     my $status='';
@@ -168,6 +168,27 @@ sub user_crit_msg {
     return $status;
 }
 
+# New routine that respects "forward" and calls old routine
+
+sub user_crit_msg {
+    my ($user,$domain,$subject,$message,$sendback)=@_;
+    my $status='';
+    my %userenv = &Apache::lonnet::get('environment',['msgforward'],
+                                       $domain,$user);
+    my $msgforward=$userenv{'msgforward'};
+    if ($msgforward) {
+       foreach (split(/\,/,$msgforward)) {
+	 my ($forwuser,$forwdomain)=split(/\:/,$_);
+         $status.=
+	   &user_crit_msg_raw($forwuser,$forwdomain,$subject,$message,
+                $sendback).' ';
+       }
+    } else { 
+	$status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback);
+    }
+    return $status;
+}
+
 # =================================================== Critical message received
 
 sub user_crit_received {
@@ -195,7 +216,7 @@ sub user_crit_received {
 
 # ======================================================== Normal communication
 
-sub user_normal_msg {
+sub user_normal_msg_raw {
     my ($user,$domain,$subject,$message,$citation)=@_;
 # Check if allowed missing
     my $status='';
@@ -217,6 +238,29 @@ sub user_normal_msg {
     return $status;
 }
 
+# New routine that respects "forward" and calls old routine
+
+sub user_normal_msg {
+    my ($user,$domain,$subject,$message,$citation)=@_;
+    my $status='';
+    my %userenv = &Apache::lonnet::get('environment',['msgforward'],
+                                       $domain,$user);
+    my $msgforward=$userenv{'msgforward'};
+    if ($msgforward) {
+       foreach (split(/\,/,$msgforward)) {
+	 my ($forwuser,$forwdomain)=split(/\:/,$_);
+         $status.=
+	  &user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
+                                                             $citation).' ';
+       }
+    } else { 
+	$status=
+          &user_normal_msg_raw($user,$domain,$subject,$message,$citation);
+    }
+    return $status;
+}
+
+
 # =============================================================== Status Change
 
 sub statuschange {
@@ -314,9 +358,12 @@ sub discrit {
         my %content=&unpackagemsg($what{$_});
         next if ($content{'senderdomain'} eq '');
         $content{'message'}=~s/\n/\<br\>/g;
-        $result.='<hr>From: <b>'.$content{'sendername'}.'@'.
-            $content{'senderdomain'}.'</b> ('.$content{'time'}.
-            ')<br>Subject: '.$content{'subject'}.
+        $result.='<hr>From: <b>'.
+&Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
+$content{'sendername'}.'@'.
+            $content{'senderdomain'}.') '.$content{'time'}.
+            '<br>Subject: '.$content{'subject'}.
             '<br><blockquote>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
             '</blockquote>'.
@@ -358,7 +405,7 @@ sub comprep {
 <form action="/adm/email" method=post>
 <input type=hidden name=sendreply value="$msgid">
 Subject: <input type=text size=50 name=subject value="$subject"><p>
-<textarea name=message cols=64 rows=10 wrap=hard>
+<textarea name=message cols=84 rows=10 wrap=hard>
 $quotemsg
 </textarea><p>
 $dispcrit
@@ -457,6 +504,7 @@ sub compout {
 	   $content{'sendername'}.' at '.$content{'senderdomain'};
     }
     my $defdom=$ENV{'user.domain'};
+    if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; }
       $r->print(
                 '<form action="/adm/email"  name="compemail" method="post"'.
                 ' enctype="multipart/form-data">'."\n".
@@ -467,7 +515,7 @@ sub compout {
 
        $r->print(<<"ENDREC");
 <table>
-<tr><td>Username:</td><td><input type=text size=12 name=recuname></td></tr>
+<tr><td>Username:</td><td><input type=text size=12 name=recuname value="$ENV{'form.recname'}"></td></tr>
 <tr><td>Domain:</td>
 <td>$domform</td></tr>
 ENDREC
@@ -479,7 +527,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>
-<textarea name=message cols=60 rows=10 wrap=hard>$dismsg
+<textarea name=message cols=80 rows=10 wrap=hard>$dismsg
 </textarea><p>
 $dispcrit
 <input type=submit value="$func Mail">
@@ -532,22 +580,24 @@ sub handler {
 # --------------------------- Get query string for limited number of parameters
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['display','replyto','forward','markread','markdel','markunread',
-         'sendreply','compose','sendmail','critical']);
+         'sendreply','compose','sendmail','critical','recname','recdom']);
 
 # --------------------------------------------------------------- Render Output
   
-  $r->print('<html><head><title>EMail and Messaging</title></head>');
-  $r->print(
-   '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');
-  $r->print('<h1>EMail</h1>');
+  $r->print('<html><head><title>EMail and Messaging</title></head>'.
+            &Apache::loncommon::bodytag('EMail and Messages'));
   if ($ENV{'form.display'}) {
       my $msgid=$ENV{'form.display'};
       &statuschange($msgid,'read');
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
       my %content=&unpackagemsg($message{$msgid});
       $r->print('<b>Subject:</b> '.$content{'subject'}.
-             '<br><b>From:</b> '.$content{'sendername'}.' at '.
-                                 $content{'senderdomain'}.
+             '<br><b>From:</b> '.
+&Apache::loncommon::aboutmewrapper(
+&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
+$content{'sendername'},$content{'senderdomain'}).' ('.
+                                 $content{'sendername'}.' at '.
+                                 $content{'senderdomain'}.') '.
              '<br><b>Time:</b> '.$content{'time'}.'<p>'.
              '<table border=2><tr bgcolor="#FFFFAA"><td>Functions:</td>'.
            '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).