--- loncom/interface/lonmsg.pm	2002/09/07 13:57:26	1.38
+++ loncom/interface/lonmsg.pm	2002/12/27 14:59:42	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.38 2002/09/07 13:57:26 www Exp $
+# $Id: lonmsg.pm,v 1.44 2002/12/27 14:59:42 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -119,6 +119,17 @@ sub unpackmsgid {
     return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});
 } 
 
+# ============================================================= 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);
+        if ($what{'recnewemail'}>0) { return 1; }
+    }
+    return 0;
+}
+
 # =============================== Automated message to the author of a resource
 
 sub author_res_msg {
@@ -199,9 +210,10 @@ sub user_crit_received {
      &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
                      'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
                      'User '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}.
-                     ' acknowledged receipt of message "'.
-                     $contents{'subject'}.'" dated '.$contents{'time'}.".\n\n"
-                     .'Message ID: '.$contents{'msgid'}):'no msg req');
+                     ' acknowledged receipt of message'."\n".'   "'.
+                     $contents{'subject'}.'"'."\n".'dated '.
+                     $contents{'time'}.".\n"
+                     ):'no msg req');
     $status.=' trans: '.
      &Apache::lonnet::put(
      'nohist_email',{$contents{'msgid'} => $message{$msgid}});
@@ -229,6 +241,8 @@ sub user_normal_msg_raw {
            'put:'.$domain.':'.$user.':nohist_email:'.
            &Apache::lonnet::escape($msgid).'='.
            &Apache::lonnet::escape($message),$homeserver);
+       &Apache::lonnet::put
+                         ('email_status',{'recnewemail'=>time},$domain,$user);
     } else {
        $status='no_host';
     }
@@ -450,24 +464,24 @@ ENDDISHEADER
                                         $ENV{'user.home'}))) {
         my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
 	    &Apache::lonmsg::unpackmsgid($_);
-       unless (($status eq 'deleted') || ($sendtime=~/error/)) {
-        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><input type=checkbox name="delmark_'.$_.'"></td>'.
-                  '<td>'.localtime($sendtime).'</td><td>'.
-                  $fromname.'</td><td>'.$fromdomain.'</td><td>'.
+	if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
+	    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><input type=checkbox name="delmark_'.$_.'"></td>'.
+		      '<td>'.localtime($sendtime).'</td><td>'.
+		      $fromname.'</td><td>'.$fromdomain.'</td><td>'.
 		      &Apache::lonnet::unescape($shortsubj).'</td><td>'.
                       $status.'</td></tr>');
-       }
+	}
     }
     $r->print('</table><p>'.
               '<a href="javascript:checkall()">Check All</a>&nbsp;'.
@@ -565,6 +579,50 @@ ENDUPLOAD
     $r->print('</form>');
 }
 
+# ---------------------------------------------------------------- Face to face
+
+sub facetoface {
+    my ($r,$stage)=@_;
+    unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+	return;
+    }
+    my $defdom=$ENV{'user.domain'};
+    if ($ENV{'form.recdomain'}) { $defdom=$ENV{'form.recdomain'}; }
+    my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
+    $r->print(<<"ENDTREC");
+<h2>User Records of Face-To-Face Discussions and Messages in Course</h2>
+<form method="post" action="/adm/email">
+<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">
+<input type="submit" value="Retrieve discussion and message records"></td>
+</tr>
+<tr><td>Domain:</td>
+<td>$domform</td></tr>
+</table>
+</form>
+ENDTREC
+    if (($stage ne 'query') &&
+        ($ENV{'form.recdomain'}) && ($ENV{'form.recuname'})) {
+        chomp($ENV{'form.newrecord'});
+        if ($ENV{'form.newrecord'}) {
+	    my $subject=
+               'Record ['.$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}.']';
+        }
+	$r->print(<<ENDRHEAD);
+<form method="post" action="/adm/email">
+<input name="recdomain" value="$ENV{'form.recdomain'}" type="hidden" />
+<input name="recuname" value="$ENV{'form.recuname'}" type="hidden" />
+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>
+</form>
+ENDBFORM
+    }
+}
+
 # ===================================================================== Handler
 
 sub handler {
@@ -580,8 +638,11 @@ 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','recname','recdom']);
+         'sendreply','compose','sendmail','critical','recname','recdom',
+         'recordftf']);
 
+# ------------------------------------------------------ They checked for email
+  &Apache::lonnet::put('email_status',{'recnewemail'=>0});
 # --------------------------------------------------------------- Render Output
   
   $r->print('<html><head><title>EMail and Messaging</title></head>'.
@@ -606,6 +667,8 @@ $content{'sendername'},$content{'senderd
              '"><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?markdel='.&Apache::lonnet::escape($msgid).
+             '"><b>Delete</b></a></td>'.
         '<td><a href="/adm/email"><b>Display all Messages</b></a></td>'.
              '</tr></table><p><pre>'.
              &Apache::lontexconvert::msgtexconverted($content{'message'}).
@@ -673,6 +736,8 @@ $content{'sendername'},$content{'senderd
       &disall($r);
   } elsif ($ENV{'form.compose'}) {
       &compout($r,'',$ENV{'form.compose'});
+  } elsif ($ENV{'form.recordftf'}) {
+      &facetoface($r,$ENV{'form.recordftf'});
   } elsif ($ENV{'form.sendmail'}) {
       my %content=();
       undef %content;