--- loncom/interface/lonmsg.pm	2002/12/27 16:33:36	1.45
+++ loncom/interface/lonmsg.pm	2003/02/18 15:47:40	1.49
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.45 2002/12/27 16:33:36 www Exp $
+# $Id: lonmsg.pm,v 1.49 2003/02/18 15:47:40 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,21 +47,23 @@ 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;
+    my ($subject,$message,$citation,$baseurl)=@_;
+    &Apache::lonnet::logthis("base is $baseurl");
+    $message =&HTML::Entities::encode($message);
+    $citation=&HTML::Entities::encode($citation);
+    $subject =&HTML::Entities::encode($subject);
+    #remove machine specification
+    $baseurl =~ s|^http://[^/]+/|/|;
+    $baseurl =&HTML::Entities::encode($baseurl);
     my $now=time;
     $msgcount++;
     my $partsubj=$subject;
@@ -69,8 +71,7 @@ sub packagemsg {
     my $msgid=&Apache::lonnet::escape(
            $now.':'.$partsubj.':'.$ENV{'user.name'}.':'.
            $ENV{'user.domain'}.':'.$msgcount.':'.$$);
-    return $msgid,
-           '<sendername>'.$ENV{'user.name'}.'</sendername>'.
+    my $result='<sendername>'.$ENV{'user.name'}.'</sendername>'.
            '<senderdomain>'.$ENV{'user.domain'}.'</senderdomain>'.
            '<subject>'.$subject.'</subject>'.
 	   '<time>'.localtime($now).'</time>'.
@@ -86,8 +87,14 @@ sub packagemsg {
 	   '<role>'.$ENV{'request.role'}.'</role>'.
 	   '<resource>'.$ENV{'request.filename'}.'</resource>'.
            '<msgid>'.$msgid.'</msgid>'.
-	   '<message>'.$message.'</message>'.
-	   '<citation>'.$citation.'</citation>';
+	   '<message>'.$message.'</message>';
+    if (defined($citation)) {
+	$result.='<citation>'.$citation.'</citation>';
+    }
+    if (defined($baseurl)) {
+	$result.= '<baseurl>'.$baseurl.'</baseurl>';
+    }
+    return $msgid,$result;
 }
 
 # ================================================== Unpack message into a hash
@@ -102,6 +109,8 @@ sub unpackagemsg {
 	   my $entry=$token->[1];
            my $value=$parser->get_text('/'.$entry);
            $content{$entry}=$value;
+	   &Apache::lonnet::logthis("setting $entry to $value");
+
        }
     }
     return %content;
@@ -236,14 +245,15 @@ sub user_crit_received {
 # ======================================================== Normal communication
 
 sub user_normal_msg_raw {
-    my ($user,$domain,$subject,$message,$citation)=@_;
+    my ($user,$domain,$subject,$message,$citation,$baseurl)=@_;
 # Check if allowed missing
     my $status='';
     my $msgid='undefined';
     unless (($message)&&($user)&&($domain)) { $status='empty'; };
     my $homeserver=&Apache::lonnet::homeserver($user,$domain);
     if ($homeserver ne 'no_host') {
-       ($msgid,$message)=&packagemsg($subject,$message,$citation);
+    &Apache::lonnet::logthis("baseraw is $baseurl");
+       ($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl);
        $status=&Apache::lonnet::critical(
            'put:'.$domain.':'.$user.':nohist_email:'.
            &Apache::lonnet::escape($msgid).'='.
@@ -262,7 +272,7 @@ sub user_normal_msg_raw {
 # New routine that respects "forward" and calls old routine
 
 sub user_normal_msg {
-    my ($user,$domain,$subject,$message,$citation)=@_;
+    my ($user,$domain,$subject,$message,$citation,$baseurl)=@_;
     my $status='';
     my %userenv = &Apache::lonnet::get('environment',['msgforward'],
                                        $domain,$user);
@@ -272,11 +282,11 @@ sub user_normal_msg {
 	 my ($forwuser,$forwdomain)=split(/\:/,$_);
          $status.=
 	  &user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
-                                                             $citation).' ';
+			       $citation,$baseurl).' ';
        }
     } else { 
-	$status=
-          &user_normal_msg_raw($user,$domain,$subject,$message,$citation);
+	$status=&user_normal_msg_raw($user,$domain,$subject,$message,
+				     $citation,$baseurl);
     }
     return $status;
 }
@@ -533,10 +543,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
@@ -623,7 +634,7 @@ $content{'sendername'}.'@'.
      }
     # Check to see if there were any messages.
     if ($result eq '') {
-        $r->print("<p><b>No face-to-face records or critical messages in this course.</b></p>");
+        $r->print("<p><b>No notes, face-to-face discussion records, or critical messages in this course.</b></p>");
     } else {
        $r->print($result);
     }
@@ -636,16 +647,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 Critical 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>
@@ -663,6 +683,8 @@ ENDTREC
             '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">
@@ -701,14 +723,23 @@ sub handler {
 # ------------------------------------------------------ They checked for email
   &Apache::lonnet::put('email_status',{'recnewemail'=>0});
 # --------------------------------------------------------------- Render Output
-  
-  $r->print('<html><head><title>EMail and Messaging</title></head>'.
-            &Apache::loncommon::bodytag('EMail and Messages'));
+  if (!$ENV{'form.display'}) {
+      $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'};
       &statuschange($msgid,'read');
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
       my %content=&unpackagemsg($message{$msgid});
+      $r->print('<html><head><title>EMail and Messaging</title>');
+      if (defined($content{'baseurl'})) {
+	  $r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$content{'baseurl'}\" />");
+      }
+      $r->print(&Apache::loncommon::studentbrowser_javascript().
+		'</head>'.
+		&Apache::loncommon::bodytag('EMail and Messages'));
       $r->print('<b>Subject:</b> '.$content{'subject'}.
              '<br><b>From:</b> '.
 &Apache::loncommon::aboutmewrapper(