[LON-CAPA-cvs] cvs: loncom /interface lonaboutme.pm loncommunicate.pm lonmsg.pm
www
lon-capa-cvs@mail.lon-capa.org
Fri, 27 Dec 2002 16:33:36 -0000
www Fri Dec 27 11:33:36 2002 EDT
Modified files:
/loncom/interface lonaboutme.pm loncommunicate.pm lonmsg.pm
Log:
Bug #274 Face-to-face discussion (and critical messages) recorded.
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.7 loncom/interface/lonaboutme.pm:1.8
--- loncom/interface/lonaboutme.pm:1.7 Sat Sep 14 17:01:38 2002
+++ loncom/interface/lonaboutme.pm Fri Dec 27 11:33:36 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
# "About Me" Personal Information
#
-# $Id: lonaboutme.pm,v 1.7 2002/09/14 21:01:38 albertel Exp $
+# $Id: lonaboutme.pm,v 1.8 2002/12/27 16:33:36 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -152,6 +152,11 @@
$r->print('</p>');
} else {
$r->print('<p>No personal information provided.</p>');
+ }
+ if ($ENV{'request.course.id'}) {
+ if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+ &Apache::lonmsg::disfacetoface($r,$cnum,$cdom);
+ }
}
$r->print('</body></html>');
return OK;
Index: loncom/interface/loncommunicate.pm
diff -u loncom/interface/loncommunicate.pm:1.13 loncom/interface/loncommunicate.pm:1.14
--- loncom/interface/loncommunicate.pm:1.13 Fri Dec 27 09:59:42 2002
+++ loncom/interface/loncommunicate.pm Fri Dec 27 11:33:36 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Communicate
#
-# $Id: loncommunicate.pm,v 1.13 2002/12/27 14:59:42 www Exp $
+# $Id: loncommunicate.pm,v 1.14 2002/12/27 16:33:36 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -80,7 +80,7 @@
<b><a href="/adm/email?compose=upload">Distribute messages from uploaded file to course</a></b>
</td></tr>
<tr><td bgcolor="#FFFFAA">
- <b><a href="/adm/email?recordftf=query">User records of face-to-face discusssions and messages</a></b>
+ <b><a href="/adm/email?recordftf=query">User records of face-to-face discussions and critical messages</a></b>
</td></tr>
END
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.44 loncom/interface/lonmsg.pm:1.45
--- loncom/interface/lonmsg.pm:1.44 Fri Dec 27 09:59:42 2002
+++ loncom/interface/lonmsg.pm Fri Dec 27 11:33:36 2002
@@ -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.45 2002/12/27 16:33:36 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -166,6 +166,13 @@
'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';
}
@@ -579,6 +586,49 @@
$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 face-to-face records or critical messages in this course.</b></p>");
+ } else {
+ $r->print($result);
+ }
+}
+
# ---------------------------------------------------------------- Face to face
sub facetoface {
@@ -590,7 +640,7 @@
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>
+<h2>User Records of Face-To-Face Discussions and Critical Messages in Course</h2>
<form method="post" action="/adm/email">
<input type="hidden" name="recordftf" value="retrieve" />
<table>
@@ -607,9 +657,13 @@
($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'});
}
+ &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 +672,9 @@
$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
}