--- loncom/interface/lonmsg.pm	2001/02/06 16:51:24	1.6
+++ loncom/interface/lonmsg.pm	2001/08/06 11:41:11	1.16
@@ -12,6 +12,8 @@
 #
 # 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 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});
@@ -139,8 +143,9 @@ sub user_crit_msg {
 # =================================================== Critical message received
 
 sub user_crit_received {
-    my $message=shift;
-    my %contents=&unpackagemsg($message);
+    my $msgid=shift;
+    my %message=&Apache::lonnet::get('critical',[$msgid]);
+    my %contents=&unpackagemsg($message{$msgid});
     my $status='rec: '.
      &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
                      'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
@@ -149,19 +154,21 @@ 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{$msgid}});
     $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'}.
                          ', '.$status);
+    return $status;
 }
 
 # ======================================================== 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 +176,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 +190,147 @@ 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});
+    }
+    if (($newstatus eq 'deleted') || ($newstatus eq 'new')) {
+	&Apache::lonnet::put('email_status',{$msgid => $newstatus});
+    }
+}
+
+# ==================================================== Display Critical Message
+
+sub discrit {
+    my $r=shift;
+      $r->print('<h1><font color=red>Critical Messages</font></h1>'.
+         '<form action=/adm/email method=post>'.
+         '<input type=hidden name=confirm value=true>');
+      my %what=&Apache::lonnet::dump('critical');
+      map {
+          my %content=&unpackagemsg($what{$_});
+          $content{'message'}=~s/\n/\<br\>/g;
+	  $r->print('<hr>From: <b>'.$content{'sendername'}.'@'.
+                    $content{'senderdomain'}.'</b> ('.$content{'time'}.
+                    ')<br><blockquote>'.$content{'message'}.'</blockquote>'.
+  '<input type=submit name="rec_'.$_.'" value="Confirm Receipt">'.
+ '<input type=submit name="reprec_'.$_.'" value="Confirm Receipt and Reply">');
+      } sort keys %what;
+      $r->print(
+          '<input type=hidden name="displayedcrit" value="true"></form>');
+}
+
+# =============================================================== Compose reply
+
+sub comprep {
+    my ($r,$msgid)=@_;
+      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
+}
+
+# ======================================================== Display all messages
+
+sub disall {
+    my $r=shift;
+    $r->print('<h1>Display All Messages</h1>'.
+     '<table border=2><tr><th colspan=2>&nbsp</th><th>Date</th>'.
+     '<th>Username</th><th>Domain</th><th>Subject</th><th>Status</th></tr>');
+    map {
+        my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
+	    &Apache::lonmsg::unpackmsgid($_);
+       unless ($status eq 'deleted') {
+        if ($status eq 'new') {
+	    $r->print('<tr bgcolor="#FFBB77">');
+        } elsif ($status eq 'read') {
+	    $r->print('<tr bgcolor="#BBBB77">');
+        } elsif ($status eq 'replied') {
+	    $r->print('<tr bgcolor="#AAAA88">');
+	} else {
+	    $r->print('<tr bgcolor="#99BBBB">');
+        }
+        $r->print('<td><a href="/adm/email?display='.$_.
+                  '">Open</a></td><td><a href="/adm/email?markdel='.$_.
+                  '">Delete</a></td><td>'.localtime($sendtime).'</td><td>'.
+                  $fromname.'</td><td>'.$fromdomain.'</td><td>'.
+		      &Apache::lonnet::unescape($shortsubj).'</td><td>'.
+                      $status.'</td></tr>');
+       }
+    } sort split(/\&/,&Apache::lonnet::reply('keys:'.
+					$ENV{'user.domain'}.':'.
+                                        $ENV{'user.name'}.':nohist_email',
+                                        $ENV{'user.home'}));
+    $r->print('</table></body></html>');
+}
+
+# ============================================================== Compose output
+
+sub compout {
+    my ($r,$forwarding)=@_;
+      my $dispcrit='';
+    my $dissub='';
+    my $dismsg='';
+    my $func='Send New';
+      if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+         $dispcrit=
+	     '<input type=checkbox name=critmsg> Send as critical message<p>';
+      }
+    if ($forwarding) {
+       $dispcrit.='<input type=hidden name=forwid value="'.
+	   $forwarding.'">';
+       $func='Forward';
+      my %message=&Apache::lonnet::get('nohist_email',[$forwarding]);
+      my %content=&unpackagemsg($message{$forwarding});
+
+       $dissub='Forwarding: '.$content{'subject'};
+       $dismsg='Forwarded message from '.
+	   $content{'sendername'}.' at '.$content{'senderdomain'};
+    }
+    my $defdom=$ENV{'user.domain'};
+      $r->print(<<"ENDCOMP");
+<form action="/adm/email" method=post>
+<input type=hidden name=sendmail value=on>
+<table>
+<tr><td>Username:</td><td><input type=text size=12 name=recuname></td></tr>
+<tr><td>Domain:</td>
+<td><input type=text size=12 name=recdomain value="$defdom"></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>$dismsg
+</textarea><p>
+$dispcrit
+<input type=submit value="$func Mail">
+</form>
+ENDCOMP
+}
+
 # ===================================================================== Handler
 
 sub handler {
@@ -202,7 +350,10 @@ 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 'markread') ||
+           ($name eq 'markdel') || ($name eq 'markunread') ||
+           ($name eq 'sendreply') || ($name eq 'compose') ||
+           ($name eq 'sendmail') || ($name eq 'critical')) {
            unless ($ENV{'form.'.$name}) {
               $ENV{'form.'.$name}=$value;
 	   }
@@ -212,38 +363,113 @@ 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'}.'<p>'.
+             '<table border=2><tr bgcolor="#FFFFAA"><td>Functions:</td>'.
+           '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).
+             '"><b>Reply</b></a></td>'.
+           '<td><a href="/adm/email?forward='.&Apache::lonnet::escape($msgid).
+             '"><b>Forward</b></a></td>'.
+        '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).
+             '"><b>Mark Unread</b></a></td>'.
+        '<td><a href="/adm/email"><b>Display all Messages</b></a></td>'.
+             '</tr></table><p><pre>'.
+             $content{'message'}.'</pre><hr>'.$content{'citation'});
   } 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});
+      &statuschange($msgid,'replied');
+      if (($ENV{'form.critmsg'}) && 
+          (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+         $r->print('Sending critical: '.
+                &user_crit_msg($content{'sendername'},
+                                 $content{'senderdomain'},
+                                 $ENV{'form.subject'},
+                                 $ENV{'form.message'}));
+      } else {
+         $r->print('Sending: '.&user_normal_msg($content{'sendername'},
+                                 $content{'senderdomain'},
+                                 $ENV{'form.subject'},
+                                 $ENV{'form.message'}));
+      }
+      if ($ENV{'form.displayedcrit'}) {
+          &discrit($r);
+      } else {
+	  &disall($r);
+      }
+  } elsif ($ENV{'form.confirm'}) {
+      map {
+          if ($_=~/^form\.rec\_(.*)$/) {
+	      $r->print('<b>Confirming Receipt:</b> '.
+                        &user_crit_received($1).'<br>');
+          }
+          if ($_=~/^form\.reprec\_(.*)$/) {
+              my $msgid=$1;
+	      $r->print('<b>Confirming Receipt:</b> '.
+                        &user_crit_received($msgid).'<br>');
+              &comprep($r,$msgid);
+          }
+      } keys %ENV;
+      &discrit($r);
+  } elsif ($ENV{'form.critical'}) {
+      &discrit($r);
   } elsif ($ENV{'form.forward'}) {
-  } elsif ($ENV{'form.mark'}) {
+      &compout($r,$ENV{'form.forward'});
+  } elsif ($ENV{'form.markread'}) {
+  } elsif ($ENV{'form.markdel'}) {
+      &statuschange($ENV{'form.markdel'},'deleted');
+      &disall($r);
+  } elsif ($ENV{'form.markunread'}) {
+      &statuschange($ENV{'form.markunread'},'new');
+      &disall($r);
+  } elsif ($ENV{'form.compose'}) {
+      &compout($r);
+  } 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});
+        &statuschange($msgid,'forwarded');
+        $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
+	                       $content{'message'};
+      }
+      if (($ENV{'form.critmsg'}) && 
+          (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+         $r->print('Sending critical: '.
+                &user_crit_msg($ENV{'form.recuname'},
+                                 $ENV{'form.recdomain'},
+                                 $ENV{'form.subject'},
+                                 $ENV{'form.message'},
+                                 $content{'citation'}));
+      } else {
+         $r->print('Sending: '.&user_normal_msg($ENV{'form.recuname'},
+                                 $ENV{'form.recdomain'},
+                                 $ENV{'form.subject'},
+                                 $ENV{'form.message'},
+                                 $content{'citation'}));
+      }
+      if ($ENV{'form.displayedcrit'}) {
+          &discrit($r);
+      } else {
+	  &disall($r);
+      }
   } 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>');
-    map {
-        my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
-	    &Apache::lonmsg::unpackmsgid($_);
-        if ($status eq 'new') {
-	    $r->print('<tr bgcolor="#FFBB77">');
-        } elsif ($status eq 'read') {
-	    $r->print('<tr bgcolor="#BBBB77">');
-        } elsif ($status eq 'replied') {
-	    $r->print('<tr bgcolor="#BBBB99">');
-	} else {
-	    $r->print('<tr bgcolor="#99BBBB">');
-        }
-        $r->print('<td><a href="/adm/email?display='.$_.
-                  '">Open</a></td><td>'.localtime($sendtime).'</td><td>'.
-                  $fromname.'</td><td>'.$fromdomain.'</td><td>'.
-		      &Apache::lonnet::unescape($shortsubj).'</td><td>'.
-                      $status.'</td></tr>');
-    } sort split(/\&/,&Apache::lonnet::reply('keys:'.
-					$ENV{'user.domain'}.':'.
-                                        $ENV{'user.name'}.':nohist_email',
-                                        $ENV{'user.home'}));
-    $r->print('</table></body></html>');
-
+      &disall($r);
   }
   $r->print('</body></html>');
   return OK;