--- loncom/interface/lonmsg.pm	2001/02/06 16:51:24	1.6
+++ loncom/interface/lonmsg.pm	2001/07/28 04:16:29	1.11
@@ -12,6 +12,8 @@
 #
 # 10/19,10/20,10/30,
 # 02/06/01 Gerd Kortemeyer
+# 07/27 Guy Albertelli
+# 07/27 Gerd Kortemeyer
 
 package Apache::lonmsg;
 
@@ -24,9 +26,11 @@ use Apache::Constants qw(:common);
 # ===================================================================== Package
 
 sub packagemsg {
-    my ($subject,$message)=@_;
+    my ($subject,$message,$citation)=@_;
     $message=~s/\</\&lt\;/g;
     $message=~s/\>/\&gt\;/g;
+    $citation=~s/\</\&lt\;/g;
+    $citation=~s/\>/\&gt\;/g;
     $subject=~s/\</\&lt\;/g;
     $subject=~s/\>/\&gt\;/g;
     my $now=time;
@@ -54,7 +58,8 @@ sub packagemsg {
 	   '<role>'.$ENV{'request.role'}.'</role>'.
 	   '<resource>'.$ENV{'request.filename'}.'</resource>'.
            '<msgid>'.$msgid.'</msgid>'.
-	   '<message>'.$message.'</message>';
+	   '<message>'.$message.'</message>'.
+	   '<citation>'.$citation.'</citation>';
 }
 
 # ================================================== Unpack message into a hash
@@ -77,11 +82,10 @@ sub unpackagemsg {
 # ======================================================= Get info out of msgid
 
 sub unpackmsgid {
-    my $msgid=shift;
+    my $msgid=&Apache::lonnet::unescape(shift);
     my ($sendtime,$shortsubj,$fromname,$fromdomain)=split(/\:/,
-                     &Apache::lonnet::unescape(
-                          &Apache::lonnet::unescape($_)));
-    my %status=&Apache::lonnet::get('email_status',$msgid);
+                          &Apache::lonnet::unescape($msgid));
+    my %status=&Apache::lonnet::get('email_status',[$msgid]);
     if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; }
     unless ($status{$msgid}) { $status{$msgid}='new'; }
     return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});
@@ -149,9 +153,9 @@ sub user_crit_received {
                      $contents{'subject'}.'" dated '.$contents{'time'}.".\n\n"
                      .'Message ID: '.$contents{'msgid'});
     $status.=' trans: '.
-     &Apache::lonnet::put('nohist_email',$contents{'msgid'} => $message);
+     &Apache::lonnet::put('nohist_email',{$contents{'msgid'} => $message});
     $status.=' del: '.
-     &Apache::lonnet::del('critical',$contents{'msgid'});
+     &Apache::lonnet::del('critical',[$contents{'msgid'}]);
     &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
                          $ENV{'user.home'},'Received critical message '.
                          $contents{'msgid'}.
@@ -161,7 +165,7 @@ sub user_crit_received {
 # ======================================================== Normal communication
 
 sub user_normal_msg {
-    my ($user,$domain,$subject,$message)=@_;
+    my ($user,$domain,$subject,$message,$citation)=@_;
 # Check if allowed missing
     my $status='';
     my $msgid='undefined';
@@ -169,7 +173,7 @@ sub user_normal_msg {
     my $homeserver=&Apache::lonnet::homeserver($user,$domain);
     if ($homeserver ne 'no_host') {
        my $msgid;
-       ($msgid,$message)=&packagemsg($subject,$message);
+       ($msgid,$message)=&packagemsg($subject,$message,$citation);
        $status=&Apache::lonnet::critical(
            'put:'.$domain.':'.$user.':nohist_email:'.
            &Apache::lonnet::escape($msgid).'='.
@@ -183,6 +187,18 @@ sub user_normal_msg {
     return $status;
 }
 
+# =============================================================== Status Change
+
+sub statuschange {
+    my ($msgid,$newstatus)=@_;
+    my %status=&Apache::lonnet::get('email_status',[$msgid]);
+    if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; }
+    unless ($status{$msgid}) { $status{$msgid}='new'; }
+    unless (($status{$msgid} eq 'replied') || 
+            ($status{$msgid} eq 'forwarded')) {
+	&Apache::lonnet::put('email_status',{$msgid => $newstatus});
+    }
+}
 # ===================================================================== Handler
 
 sub handler {
@@ -202,7 +218,8 @@ sub handler {
        $value =~ tr/+/ /;
        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
        if (($name eq 'display') || ($name eq 'replyto') || 
-           ($name eq 'forward') || ($name eq 'mark')) {
+           ($name eq 'forward') || ($name eq 'mark') ||
+           ($name eq 'sendreply') || ($name eq 'compose')) {
            unless ($ENV{'form.'.$name}) {
               $ENV{'form.'.$name}=$value;
 	   }
@@ -212,12 +229,74 @@ sub handler {
 # --------------------------------------------------------------- Render Output
   
   $r->print('<html><head><title>EMail and Messaging</title></head>');
-  $r->print('<body bgcolor="#FFFFFF">');
+  $r->print(
+   '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');
   $r->print('<h1>EMail</h1>');
   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>Time:</b> '.$content{'time'}.'<hr>Functions: '.
+             '<a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).
+             '"><b>Reply</b></a><hr><pre>'.
+             $content{'message'}.'</pre><hr>'.$content{'citation'});
   } elsif ($ENV{'form.replyto'}) {
+      my $msgid=$ENV{'form.replyto'};
+      my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+      my %content=&unpackagemsg($message{$msgid});
+      my $quotemsg='> '.$content{'message'};
+      $quotemsg=~s/\r/\n/g;
+      $quotemsg=~s/\f/\n/g;
+      $quotemsg=~s/\n+/\n\> /g;
+      my $subject='Re: '.$content{'subject'};
+      my $dispcrit='';
+      if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+         $dispcrit=
+	     '<input type=checkbox name=critmsg> Send as critical message<p>';
+      }
+      $r->print(<<"ENDREPLY");
+<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=60 rows=10>
+$quotemsg
+</textarea><p>
+$dispcrit
+<input type=submit value="Send Reply">
+</form>
+ENDREPLY
+  } elsif ($ENV{'form.sendreply'}) {
+      my $msgid=$ENV{'form.sendreply'};
+      my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+      my %content=&unpackagemsg($message{$msgid});
+      &statuschange($msgid,'replied');
+      $r->print('Sending: '.&user_normal_msg($content{'sendername'},
+                                 $content{'senderdomain'},
+                                 $ENV{'form.subject'},
+                                 $ENV{'form.message'}));
   } elsif ($ENV{'form.forward'}) {
   } elsif ($ENV{'form.mark'}) {
+  } elsif ($ENV{'form.compose'}) {
+      my $dispcrit='';
+      if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+         $dispcrit=
+	     '<input type=checkbox name=critmsg> Send as critical message<p>';
+      }
+      $r->print(<<"ENDCOMP");
+<form action="/adm/email" method=post>
+<input type=hidden name=sendmail value=on>
+Subject: <input type=text size=50 name=subject value=""><p>
+<textarea name=message cols=60 rows=10>
+</textarea><p>
+$dispcrit
+<input type=submit value="Send Mail">
+</form>
+ENDCOMP
+  } elsif ($ENV{'form.sendmail'}) {
   } else {
     $r->print('<table border=2><tr><th>&nbsp</th><th>Date</th>'.
      '<th>Username</th><th>Domain</th><th>Subject</th><th>Status</th></tr>');
@@ -229,7 +308,7 @@ sub handler {
         } elsif ($status eq 'read') {
 	    $r->print('<tr bgcolor="#BBBB77">');
         } elsif ($status eq 'replied') {
-	    $r->print('<tr bgcolor="#BBBB99">');
+	    $r->print('<tr bgcolor="#AAAA88">');
 	} else {
 	    $r->print('<tr bgcolor="#99BBBB">');
         }