--- loncom/interface/lonmsg.pm	2002/12/27 14:59:42	1.44
+++ loncom/interface/lonmsg.pm	2003/02/17 17:39:53	1.48
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.44 2002/12/27 14:59:42 www Exp $
+# $Id: lonmsg.pm,v 1.48 2003/02/17 17:39:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,21 +47,19 @@ package Apache::lonmsg;
 use strict;
 use Apache::lonnet();
 use vars qw($msgcount);
-use HTML::TokeParser;
+use HTML::TokeParser();
 use Apache::Constants qw(:common);
-use Apache::loncommon;
-use Apache::lontexconvert;
+use Apache::loncommon();
+use Apache::lontexconvert();
+use HTML::Entities();
 
 # ===================================================================== Package
 
 sub packagemsg {
     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;
+    $message =&HTML::Entities::encode($message);
+    $citation=&HTML::Entities::encode($citation);
+    $subject =&HTML::Entities::encode($subject);
     my $now=time;
     $msgcount++;
     my $partsubj=$subject;
@@ -166,6 +164,13 @@ sub user_crit_msg_raw {
            'put:'.$domain.':'.$user.':critical:'.
            &Apache::lonnet::escape($msgid).'='.
            &Apache::lonnet::escape($message),$homeserver);
+       if ($ENV{'request.course.id'}) {
+          &user_normal_msg_raw(
+            $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+            $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+            'Critical ['.$user.':'.$domain.']',
+	    $message);
+       }
     } else {
        $status='no_host';
     }
@@ -526,10 +531,11 @@ sub compout {
                 '<table>');
     unless (($broadcast eq 'group') || ($broadcast eq 'upload')) {
         my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
-
+        my $selectlink=&Apache::loncommon::selectstudent_link
+	    ('compemail','recuname','recdomain');
        $r->print(<<"ENDREC");
 <table>
-<tr><td>Username:</td><td><input type=text size=12 name=recuname value="$ENV{'form.recname'}"></td></tr>
+<tr><td>Username:</td><td><input type=text size=12 name=recuname value="$ENV{'form.recname'}"></td><td rowspan="2">$selectlink</td></tr>
 <tr><td>Domain:</td>
 <td>$domform</td></tr>
 ENDREC
@@ -579,6 +585,49 @@ ENDUPLOAD
     $r->print('</form>');
 }
 
+# ---------------------------------------------------- Display all face to face
+
+sub disfacetoface {
+    my ($r,$user,$domain)=@_;
+    unless ($ENV{'request.course.id'}) { return; }
+    unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+	return;
+    }
+    my %records=&Apache::lonnet::dump('nohist_email',
+			 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+			 $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+                         '%255b'.$user.'%253a'.$domain.'%255d');
+    my $result='';
+    foreach (sort keys %records) {
+        my %content=&unpackagemsg($records{$_});
+        next if ($content{'senderdomain'} eq '');
+        $content{'message'}=~s/\n/\<br\>/g;
+        if ($content{'subject'}=~/^Record/) {
+	    $result.='<h3>Record</h3>';
+        } else {
+            $result.='<h3>Sent Message</h3>';
+            %content=&unpackagemsg($content{'message'});
+            $content{'message'}=
+                '<b>Subject: '.$content{'subject'}.'</b><br />'.
+		$content{'message'};
+        }
+        $result.='By: <b>'.
+&Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
+$content{'sendername'}.'@'.
+            $content{'senderdomain'}.') '.$content{'time'}.
+            '<br><blockquote>'.
+              &Apache::lontexconvert::msgtexconverted($content{'message'}).
+	      '</blockquote>';
+     }
+    # Check to see if there were any messages.
+    if ($result eq '') {
+        $r->print("<p><b>No notes, face-to-face discussion records, or critical messages in this course.</b></p>");
+    } else {
+       $r->print($result);
+    }
+}
+
 # ---------------------------------------------------------------- Face to face
 
 sub facetoface {
@@ -586,16 +635,25 @@ sub facetoface {
     unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
 	return;
     }
+# from query string
+    if ($ENV{'form.recname'}) { $ENV{'form.recuname'}=$ENV{'form.recname'}; }
+    if ($ENV{'form.recdom'}) { $ENV{'form.recdomain'}=$ENV{'form.recdom'}; }
+
     my $defdom=$ENV{'user.domain'};
+# already filled in
     if ($ENV{'form.recdomain'}) { $defdom=$ENV{'form.recdomain'}; }
+# generate output
     my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
+    my $stdbrws = &Apache::loncommon::selectstudent_link
+	('stdselect','recuname','recdomain');
     $r->print(<<"ENDTREC");
-<h2>User Records of Face-To-Face Discussions and Messages in Course</h2>
-<form method="post" action="/adm/email">
+<h3>User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course</h3>
+<form method="post" action="/adm/email" name="stdselect">
 <input type="hidden" name="recordftf" value="retrieve" />
 <table>
 <tr><td>Username:</td><td><input type=text size=12 name=recuname value="$ENV{'form.recuname'}"></td>
 <td rowspan="2">
+$stdbrws
 <input type="submit" value="Retrieve discussion and message records"></td>
 </tr>
 <tr><td>Domain:</td>
@@ -607,9 +665,15 @@ ENDTREC
         ($ENV{'form.recdomain'}) && ($ENV{'form.recuname'})) {
         chomp($ENV{'form.newrecord'});
         if ($ENV{'form.newrecord'}) {
-	    my $subject=
-               'Record ['.$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}.']';
+           &user_normal_msg_raw(
+            $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+            $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+            'Record ['.$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}.']',
+	    $ENV{'form.newrecord'});
         }
+        $r->print('<h3>'.&Apache::loncommon::plainname($ENV{'form.recuname'},
+				     $ENV{'form.recdomain'}).'</h3>');
+        &disfacetoface($r,$ENV{'form.recuname'},$ENV{'form.recdomain'});
 	$r->print(<<ENDRHEAD);
 <form method="post" action="/adm/email">
 <input name="recdomain" value="$ENV{'form.recdomain'}" type="hidden" />
@@ -618,6 +682,9 @@ ENDRHEAD
         $r->print(<<ENDBFORM);
 <hr />New Record (record is visible to course faculty and staff)<br />
 <textarea name="newrecord" cols="80" rows="10" wrap="hard"></textarea>
+<br />
+<input type="hidden" name="recordftf" value="post" />
+<input type="submit" value="Post this record" />
 </form>
 ENDBFORM
     }
@@ -645,7 +712,8 @@ sub handler {
   &Apache::lonnet::put('email_status',{'recnewemail'=>0});
 # --------------------------------------------------------------- Render Output
   
-  $r->print('<html><head><title>EMail and Messaging</title></head>'.
+  $r->print('<html><head><title>EMail and Messaging</title>'.
+            &Apache::loncommon::studentbrowser_javascript().'</head>'.
             &Apache::loncommon::bodytag('EMail and Messages'));
   if ($ENV{'form.display'}) {
       my $msgid=$ENV{'form.display'};