--- loncom/interface/lonmsg.pm 2001/12/19 17:17:46 1.26
+++ loncom/interface/lonmsg.pm 2004/01/15 03:53:12 1.78
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.26 2001/12/19 17:17:46 albertel Exp $
+# $Id: lonmsg.pm,v 1.78 2004/01/15 03:53:12 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,52 +25,111 @@
#
# http://www.lon-capa.org/
#
-#
-# (Routines to control the menu
-#
-# (TeX Conversion Module
-#
-# 05/29/00,05/30 Gerd Kortemeyer)
-#
-# 10/05 Gerd Kortemeyer)
-#
-# 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,08/08,08/09,08/10,8/13,8/15,
-# 10/1,11/5 Gerd Kortemeyer
+
package Apache::lonmsg;
+=pod
+
+=head1 NAME
+
+Apache::lonmsg: supports internal messaging
+
+=head1 SYNOPSIS
+
+lonmsg provides routines for sending messages, receiving messages, and
+a handler to allow users to read, send, and delete messages.
+
+=head1 OVERVIEW
+
+=head2 Messaging Overview
+
+X<messages>LON-CAPA provides an internal messaging system similar to
+email, but customized for LON-CAPA's usage. LON-CAPA implements its
+own messaging system, rather then building on top of email, because of
+the features LON-CAPA messages can offer that conventional e-mail can
+not:
+
+=over 4
+
+=item * B<Critical messages>: A message the recipient B<must>
+acknowlegde receipt of before they are allowed to continue using the
+system, preventing a user from claiming they never got a message
+
+=item * B<Receipts>: LON-CAPA can reliably send reciepts informing the
+sender that it has been read; again, useful for preventing students
+from claiming they did not see a message. (While conventional e-mail
+has some reciept support, it's sporadic, e-mail client-specific, and
+generally the receiver can opt to not send one, making it useless in
+this case.)
+
+=item * B<Context>: LON-CAPA knows about the sender, such as where
+they are in a course. When a student mails an instructor asking for
+help on the problem, the instructor receives not just the student's
+question, but all submissions the student has made up to that point,
+the user's rendering of the problem, and the complete view the student
+saw of the resource, including discussion up to that point. Finally,
+the instructor is reading all of this inside of LON-CAPA, not their
+email program, so they have full access to LON-CAPA's grading
+interface, or other features they may wish to use in response to the
+student's query.
+
+=back
+
+Users can ask LON-CAPA to forward messages to conventional e-mail
+addresses on their B<PREF> screen, but generally, LON-CAPA messages
+are much more useful then traditional email can be made to be, even
+with HTML support.
+
+Right now, this document will cover just how to send a message, since
+it is likely you will not need to programmatically read messages,
+since lonmsg already implements that functionality.
+
+=head1 FUNCTIONS
+
+=over 4
+
+=cut
+
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 HTML::Entities();
+use Mail::Send;
+use Apache::lonlocal;
+
+# Querystring component with sorting type
+my $sqs;
# ===================================================================== Package
sub packagemsg {
- my ($subject,$message,$citation)=@_;
- $message=~s/\</\<\;/g;
- $message=~s/\>/\>\;/g;
- $citation=~s/\</\<\;/g;
- $citation=~s/\>/\>\;/g;
- $subject=~s/\</\<\;/g;
- $subject=~s/\>/\>\;/g;
+ my ($subject,$message,$citation,$baseurl,$attachmenturl)=@_;
+ $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);
+ #remove machine specification
+ $attachmenturl =~ s|^http://[^/]+/|/|;
+ $attachmenturl =&HTML::Entities::encode($attachmenturl);
+
my $now=time;
$msgcount++;
my $partsubj=$subject;
$partsubj=&Apache::lonnet::escape($partsubj);
- $partsubj=substr($partsubj,0,50);
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>'.
+ '<time>'.&Apache::lonlocal::locallocaltime($now).'</time>'.
'<servername>'.$ENV{'SERVER_NAME'}.'</servername>'.
'<host>'.$ENV{'HTTP_HOST'}.'</host>'.
'<client>'.$ENV{'REMOTE_ADDR'}.'</client>'.
@@ -83,14 +142,23 @@ 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>';
+ }
+ if (defined($attachmenturl)) {
+ $result.= '<attachmenturl>'.$attachmenturl.'</attachmenturl>';
+ }
+ return $msgid,$result;
}
# ================================================== Unpack message into a hash
sub unpackagemsg {
- my $message=shift;
+ my ($message,$notoken)=@_;
my %content=();
my $parser=HTML::TokeParser->new(\$message);
my $token;
@@ -101,6 +169,16 @@ sub unpackagemsg {
$content{$entry}=$value;
}
}
+ if ($content{'attachmenturl'}) {
+ my ($fname,$ft)=($content{'attachmenturl'}=~/\/(\w+)\.(\w+)$/);
+ if ($notoken) {
+ $content{'message'}.='<p>'.&mt('Attachment').': <tt>'.$fname.'.'.$ft.'</tt>';
+ } else {
+ $content{'message'}.='<p>'.&mt('Attachment').': <a href="'.
+ &Apache::lonnet::tokenwrapper($content{'attachmenturl'}).
+ '"><tt>'.$fname.'.'.$ft.'</tt></a>';
+ }
+ }
return %content;
}
@@ -116,8 +194,63 @@ sub unpackmsgid {
return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});
}
+
+sub sendemail {
+ my ($to,$subject,$body)=@_;
+ $body=
+ "*** ".&mt('This is an automatic message generated by the LON-CAPA system.')."\n".
+ "*** ".&mt('Please do not reply to this address.')."\n\n".$body;
+ my $msg = new Mail::Send;
+ $msg->to($to);
+ $msg->subject('[LON-CAPA] '.$subject);
+ if (my $fh = $msg->open('smtp',Server => 'localhost')) {
+ print $fh $body;
+ $fh->close;
+ }
+}
+
+# ==================================================== Send notification emails
+
+sub sendnotification {
+ my ($to,$touname,$toudom,$subj,$crit)=@_;
+ my $sender=$ENV{'environment.firstname'}.' '.$ENV{'environment.lastname'};
+ my $critical=($crit?' critical':'');
+ my $url='http://'.
+ $Apache::lonnet::hostname{&Apache::lonnet::homeserver($touname,$toudom)}.
+ '/adm/email?username='.$touname.'&domain='.$toudom;
+ my $body=(<<ENDMSG);
+You received a$critical message from $sender in LON-CAPA. The subject is
+
+ $subj
+
+Use
+
+ $url
+
+to access this message.
+ENDMSG
+ &sendemail($to,'New'.$critical.' message from '.$sender,$body);
+}
+# ============================================================= 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
+=pod
+
+=item * B<author_res_msg($filename, $message)>: Sends message $message to the owner
+ of the resource with the URI $filename.
+
+=cut
+
sub author_res_msg {
my ($filename,$message)=@_;
unless ($message) { return 'empty'; }
@@ -136,9 +269,56 @@ sub author_res_msg {
return 'no_host';
}
+# =========================================== Retrieve author resource messages
+
+sub retrieve_author_res_msg {
+ my $url=shift;
+ $url=&Apache::lonnet::declutter($url);
+ my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//);
+ my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$domain,$author);
+ my $msgs='';
+ foreach (keys %errormsgs) {
+ if ($_=~/^\Q$url\E\_\d+$/) {
+ my %content=&unpackagemsg($errormsgs{$_});
+ $msgs.='<p><img src="/adm/lonMisc/bomb.gif" /><b>'.
+ $content{'time'}.'</b>: '.$content{'message'}.
+ '<br /></p>';
+ }
+ }
+ return $msgs;
+}
+
+
+# =============================== Delete all author messages related to one URL
+
+sub del_url_author_res_msg {
+ my $url=shift;
+ $url=&Apache::lonnet::declutter($url);
+ my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//);
+ my @delmsgs=();
+ foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) {
+ if ($_=~/^\Q$url\E\_\d+$/) {
+ push (@delmsgs,$_);
+ }
+ }
+ return &Apache::lonnet::del('nohist_res_msgs',\@delmsgs,$domain,$author);
+}
+
+# ================= Return hash with URLs for which there is a resource message
+
+sub all_url_author_res_msg {
+ my ($author,$domain)=@_;
+ my %returnhash=();
+ foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) {
+ $_=~/^(.+)\_\d+/;
+ $returnhash{$1}=1;
+ }
+ return %returnhash;
+}
+
# ================================================== Critical message to a user
-sub user_crit_msg {
+sub user_crit_msg_raw {
my ($user,$domain,$subject,$message,$sendback)=@_;
# Check if allowed missing
my $status='';
@@ -152,9 +332,23 @@ sub user_crit_msg {
'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';
}
+# Notifications
+ my %userenv = &Apache::lonnet::get('environment',['critnotification'],
+ $domain,$user);
+ if ($userenv{'critnotification'}) {
+ &sendnotification($userenv{'critnotification'},$user,$domain,$subject,1);
+ }
+# Log this
&Apache::lonnet::logthis(
'Sending critical email '.$msgid.
', log status: '.
@@ -165,19 +359,49 @@ sub user_crit_msg {
return $status;
}
+# New routine that respects "forward" and calls old routine
+
+=pod
+
+=item * B<user_crit_msg($user, $domain, $subject, $message, $sendback)>: Sends
+ a critical message $message to the $user at $domain. If $sendback is true,
+ a reciept will be sent to the current user when $user recieves the message.
+
+=cut
+
+sub user_crit_msg {
+ my ($user,$domain,$subject,$message,$sendback)=@_;
+ my $status='';
+ my %userenv = &Apache::lonnet::get('environment',['msgforward'],
+ $domain,$user);
+ my $msgforward=$userenv{'msgforward'};
+ if ($msgforward) {
+ foreach (split(/\,/,$msgforward)) {
+ my ($forwuser,$forwdomain)=split(/\:/,$_);
+ $status.=
+ &user_crit_msg_raw($forwuser,$forwdomain,$subject,$message,
+ $sendback).' ';
+ }
+ } else {
+ $status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback);
+ }
+ return $status;
+}
+
# =================================================== Critical message received
sub user_crit_received {
my $msgid=shift;
my %message=&Apache::lonnet::get('critical',[$msgid]);
- my %contents=&unpackagemsg($message{$msgid});
+ my %contents=&unpackagemsg($message{$msgid},1);
my $status='rec: '.($contents{'sendback'}?
&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');
+ &mt('Receipt').': '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
+ &mt('User').' '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.
+ ' acknowledged receipt of message'."\n".' "'.
+ $contents{'subject'}.'"'."\n".&mt('dated').' '.
+ $contents{'time'}.".\n"
+ ):'no msg req');
$status.=' trans: '.
&Apache::lonnet::put(
'nohist_email',{$contents{'msgid'} => $message{$msgid}});
@@ -192,28 +416,68 @@ sub user_crit_received {
# ======================================================== Normal communication
-sub user_normal_msg {
- my ($user,$domain,$subject,$message,$citation)=@_;
+sub user_normal_msg_raw {
+ my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_;
# 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);
+ ($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl,
+ $attachmenturl);
$status=&Apache::lonnet::critical(
'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';
}
+# Notifications
+ my %userenv = &Apache::lonnet::get('environment',['notification'],
+ $domain,$user);
+ if ($userenv{'notification'}) {
+ &sendnotification($userenv{'notification'},$user,$domain,$subject,0);
+ }
&Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
$ENV{'user.home'},
'Sending '.$msgid.' to '.$user.' at '.$domain.' with status: '.$status);
return $status;
}
+# New routine that respects "forward" and calls old routine
+
+=pod
+
+=item * B<user_normal_msg($user, $domain, $subject, $message,
+ $citation, $baseurl, $attachmenturl)>: Sends a message to the
+ $user at $domain, with subject $subject and message $message.
+
+=cut
+
+sub user_normal_msg {
+ my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_;
+ my $status='';
+ my %userenv = &Apache::lonnet::get('environment',['msgforward'],
+ $domain,$user);
+ my $msgforward=$userenv{'msgforward'};
+ if ($msgforward) {
+ foreach (split(/\,/,$msgforward)) {
+ my ($forwuser,$forwdomain)=split(/\:/,$_);
+ $status.=
+ &user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
+ $citation,$baseurl,$attachmenturl).' ';
+ }
+ } else {
+ $status=&user_normal_msg_raw($user,$domain,$subject,$message,
+ $citation,$baseurl,$attachmenturl);
+ }
+ return $status;
+}
+
+
# =============================================================== Status Change
sub statuschange {
@@ -239,6 +503,9 @@ sub discourse {
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
my $now=time;
+ my %lt=&Apache::lonlocal::texthash('cfa' => 'Check for All',
+ 'cfs' => 'Check for Section/Group',
+ 'cfn' => 'Check for None');
$r->print(<<ENDDISHEADER);
<input type=hidden name=sendmode value=group>
<script>
@@ -270,13 +537,26 @@ sub discourse {
}
}
</script>
-<input type=button onClick="checkall()" value="Check for All">
-<input type=button onClick="checksec()" value="Check for Section/Group">
+<input type=button onClick="checkall()" value="$lt{'cfa'}">
+<input type=button onClick="checksec()" value="$lt{'cfs'}">
<input type=text size=5 name=chksec>
-<input type=button onClick="uncheckall()" value="Check for None">
+<input type=button onClick="uncheckall()" value="$lt{'cfn'}">
<p>
ENDDISHEADER
- map {
+ my %coursepersonnel=
+ &Apache::lonnet::get_course_adv_roles();
+ foreach my $role (sort keys %coursepersonnel) {
+ foreach (split(/\,/,$coursepersonnel{$role})) {
+ my ($puname,$pudom)=split(/\:/,$_);
+ $r->print(
+ '<br /><input type="checkbox" name="send_to_&&&&&&_'.
+ $puname.':'.$pudom.'" /> '.
+ &Apache::loncommon::plainname($puname,
+ $pudom).' ('.$_.'), <i>'.$role.'</i>');
+ }
+ }
+
+ foreach (sort keys %courselist) {
my ($end,$start)=split(/\:/,$courselist{$_});
my $active=1;
if (($end) && ($now>$end)) { $active=0; }
@@ -295,28 +575,44 @@ ENDDISHEADER
$reply{'generation'}.
' ('.$_.') '.$section);
}
- } sort keys %courselist;
+ }
}
# ==================================================== 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>');
+ my $header = '<h1><font color=red>'.&mt('Critical Messages').'</font></h1>'.
+ '<form action=/adm/email method=post>'.
+ '<input type=hidden name=confirm value=true>';
+ my %what=&Apache::lonnet::dump('critical');
+ my $result = '';
+ foreach (sort keys %what) {
+ my %content=&unpackagemsg($what{$_});
+ next if ($content{'senderdomain'} eq '');
+ $content{'message'}=~s/\n/\<br\>/g;
+ $result.='<hr>'.&mt('From').': <b>'.
+&Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
+$content{'sendername'}.'@'.
+ $content{'senderdomain'}.') '.$content{'time'}.
+ '<br>'.&mt('Subject').': '.$content{'subject'}.
+ '<br><blockquote>'.
+ &Apache::lontexconvert::msgtexconverted($content{'message'}).
+ '</blockquote>'.
+ '<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'.
+ '<input type=submit name="reprec_'.$_.'" '.
+ 'value="'.&mt('Confirm Receipt and Reply').'">';
+ }
+ # Check to see if there were any messages.
+ if ($result eq '') {
+ $result = "<h2>".&mt('You have no critical messages.')."</h2>".
+ '<a href="/adm/roles">'.&mt('Select a course').'</a>';
+ } else {
+ $r->print($header);
+ }
+ $r->print($result);
+ $r->print('<input type=hidden name="displayedcrit" value="true"></form>');
}
# =============================================================== Compose reply
@@ -324,67 +620,178 @@ sub discrit {
sub comprep {
my ($r,$msgid)=@_;
my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
- my %content=&unpackagemsg($message{$msgid});
+ my %content=&unpackagemsg($message{$msgid},1);
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 $torepl=&Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('.
+$content{'sendername'}.'@'.
+ $content{'senderdomain'}.')';
+ my $subject=&mt('Re').': '.$content{'subject'};
my $dispcrit='';
if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+ my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
$dispcrit=
- '<input type=checkbox name=critmsg> Send as critical message<br>'.
- '<input type=checkbox name=sendbck> Send as critical message'.
- ' and return receipt<p>';
+ '<input type=checkbox name=critmsg> '.&mt('Send as critical message').' ' . $crithelp .
+ '<br>'.
+ '<input type=checkbox name=sendbck> '.&mt('Send as critical message').' ' .
+ &mt('and return receipt') . $crithelp . '<p>';
}
+ my %lt=&Apache::lonlocal::texthash(
+ 'to' => 'To',
+ 'sb' => 'Subject',
+ 'sr' => 'Send Reply',
+ 'ca' => 'Cancel'
+ );
$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=64 rows=10 wrap=hard>
+<form action="/adm/email" method="post">
+<input type="hidden" name="sendreply" value="$msgid">
+$lt{'to'}: $torepl<br />
+$lt{'sb'}: <input type="text" size=50 name="subject" value="$subject"><p>
+<textarea name="message" cols="84" rows="10" wrap="hard">
$quotemsg
-</textarea><p>
+</textarea></p><br />
$dispcrit
-<input type=submit value="Send Reply">
+<input type="submit" name="send" value="$lt{'sr'}" />
+<input type="submit" name="cancel" value="$lt{'ca'}"/ >
</form>
ENDREPLY
}
+sub sortedmessages {
+ my @messages = &Apache::lonnet::getkeys('nohist_email');
+ #unpack the varibles and repack into temp for sorting
+ my @temp;
+ foreach (@messages) {
+ my $msgid=&Apache::lonnet::escape($_);
+ my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
+ &Apache::lonmsg::unpackmsgid($msgid);
+ my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,
+ $msgid);
+ push @temp ,\@temp1;
+ }
+ #default sort
+ @temp = sort {$a->[0] <=> $b->[0]} @temp;
+ if ($ENV{'form.sortedby'} eq "date"){
+ @temp = sort {$a->[0] <=> $b->[0]} @temp;
+ }
+ if ($ENV{'form.sortedby'} eq "revdate"){
+ @temp = sort {$b->[0] <=> $a->[0]} @temp;
+ }
+ if ($ENV{'form.sortedby'} eq "user"){
+ @temp = sort {lc($a->[2]) cmp lc($b->[2])} @temp;
+ }
+ if ($ENV{'form.sortedby'} eq "revuser"){
+ @temp = sort {lc($b->[2]) cmp lc($a->[2])} @temp;
+ }
+ if ($ENV{'form.sortedby'} eq "domain"){
+ @temp = sort {$a->[3] cmp $b->[3]} @temp;
+ }
+ if ($ENV{'form.sortedby'} eq "revdomain"){
+ @temp = sort {$b->[3] cmp $a->[3]} @temp;
+ }
+ if ($ENV{'form.sortedby'} eq "subject"){
+ @temp = sort {lc($a->[1]) cmp lc($b->[1])} @temp;
+ }
+ if ($ENV{'form.sortedby'} eq "revsubject"){
+ @temp = sort {lc($b->[1]) cmp lc($a->[1])} @temp;
+ }
+ if ($ENV{'form.sortedby'} eq "status"){
+ @temp = sort {$a->[4] cmp $b->[4]} @temp;
+ }
+ if ($ENV{'form.sortedby'} eq "revstatus"){
+ @temp = sort {$b->[4] cmp $a->[4]} @temp;
+ }
+ return @temp;
+}
+
# ======================================================== Display all messages
sub disall {
my $r=shift;
- $r->print(
- '<h1>Display All Messages</h1><form method=post action="/adm/email">'.
- '<table border=2><tr><th colspan=2> </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(<<ENDDISHEADER);
+<script>
+ function checkall() {
+ for (i=0; i<document.forms.disall.elements.length; i++) {
+ if
+ (document.forms.disall.elements[i].name.indexOf('delmark_')==0) {
+ document.forms.disall.elements[i].checked=true;
+ }
+ }
+ }
+
+ function uncheckall() {
+ for (i=0; i<document.forms.disall.elements.length; i++) {
+ if
+ (document.forms.disall.elements[i].name.indexOf('delmark_')==0) {
+ document.forms.disall.elements[i].checked=false;
+ }
}
- $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>'.
+ }
+</script>
+ENDDISHEADER
+ $r->print('<h1>'.&mt('Display All Messages').'</h1><form method=post name=disall '.
+ 'action="/adm/email">'.
+ '<table border=2><tr><th colspan=2> </th><th>');
+ if ($ENV{'form.sortedby'} eq "revdate") {
+ $r->print('<a href = "?sortedby=date">'.&mt('Date').'</a></th>');
+ } else {
+ $r->print('<a href = "?sortedby=revdate">'.&mt('Date').'</a></th>');
+ }
+ $r->print('<th>');
+ if ($ENV{'form.sortedby'} eq "revuser") {
+ $r->print('<a href = "?sortedby=user">'.&mt('Username').'</a>');
+ } else {
+ $r->print('<a href = "?sortedby=revuser">'.&mt('Username').'</a>');
+ }
+ $r->print('</th><th>');
+ if ($ENV{'form.sortedby'} eq "revdomain") {
+ $r->print('<a href = "?sortedby=domain">'.&mt('Domain').'</a>');
+ } else {
+ $r->print('<a href = "?sortedby=revdomain">'.&mt('Domain').'</a>');
+ }
+ $r->print('</th><th>');
+ if ($ENV{'form.sortedby'} eq "revsubject") {
+ $r->print('<a href = "?sortedby=subject">'.&mt('Subject').'</a>');
+ } else {
+ $r->print('<a href = "?sortedby=revsubject">'.&mt('Subject').'</a>');
+ }
+ $r->print('</th><th>');
+ if ($ENV{'form.sortedby'} eq "revstatus") {
+ $r->print('<a href = "?sortedby=status">'.&mt('Status').'</th>');
+ } else {
+ $r->print('<a href = "?sortedby=revstatus">'.&mt('Status').'</th>');
+ }
+ $r->print('</tr>');
+ my @temp=sortedmessages();
+ foreach (@temp){
+ my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @$_;
+ 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='.$origID.$sqs.
+ '">'.&mt('Open').'</a></td><td><a href="/adm/email?markdel='.$origID.$sqs.
+ '">'.&mt('Delete').'</a><input type=checkbox name="delmark_'.$origID.'"></td>'.
+ '<td>'.&Apache::lonlocal::locallocaltime($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><p>'.
- '<input type=submit name="markeddel" value="Delete Checked">'.
+ '<a href="javascript:checkall()">'.&mt('Check All').'</a> '.
+ '<a href="javascript:uncheckall()">'.&mt('Uncheck All').'</a><p>'.
+ '<input type="hidden" name="sortedby" value="'.$ENV{'form.sortedby'}.'" />'.
+ '<input type=submit name="markeddel" value="'.&mt('Delete Checked').'">'.
'</form></body></html>');
}
@@ -395,66 +802,89 @@ sub compout {
my $dispcrit='';
my $dissub='';
my $dismsg='';
- my $func='Send New';
- if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+ my $func=&mt('Send New');
+ my %lt=&Apache::lonlocal::texthash('us' => 'Username',
+ 'do' => 'Domain',
+ 'ad' => 'Additional Recipients',
+ 'sb' => 'Subject',
+ 'ca' => 'Cancel',
+ 'ma' => 'Mail');
+
+ if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+ my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
$dispcrit=
- '<input type=checkbox name=critmsg> Send as critical message<br>'.
- '<input type=checkbox name=sendbck> Send as critical message'.
- ' and return receipt<p>';
+ '<input type="checkbox" name="critmsg"> '.&mt('Send as critical message').' ' . $crithelp .
+ '<br>'.
+ '<input type="checkbox" name="sendbck"> '.&mt('Send as critical message').' ' .
+ &mt('and return receipt') . $crithelp . '<p>';
}
if ($forwarding) {
- $dispcrit.='<input type=hidden name=forwid value="'.
+ $dispcrit.='<input type="hidden" name="forwid" value="'.
$forwarding.'">';
- $func='Forward';
+ $func=&mt('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'};
+ $dissub=&mt('Forwarding').': '.$content{'subject'};
+ $dismsg=&mt('Forwarded message from').' '.
+ $content{'sendername'}.' '.&mt('at').' '.$content{'senderdomain'};
}
my $defdom=$ENV{'user.domain'};
+ if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; }
$r->print(
- '<form action="/adm/email" name="compemail" method=post'.
- ' enctype="multipart/form-data">'.
- '<input type=hidden name=sendmail value=on><table>');
+ '<form action="/adm/email" name="compemail" method="post"'.
+ ' enctype="multipart/form-data">'."\n".
+ '<input type="hidden" name="sendmail" value="on">'."\n".
+ '<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></td></tr>
-<tr><td>Domain:</td>
-<td><input type=text size=12 name=recdomain value="$defdom"></td></tr>
+<tr><td>$lt{'us'}:</td><td><input type="text" size="12" name="recuname" value="$ENV{'form.recname'}"></td><td rowspan="2">$selectlink</td></tr>
+<tr><td>$lt{'do'}:</td>
+<td>$domform</td></tr>
ENDREC
}
- unless ($broadcast eq 'upload') {
+ my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
+ if ($broadcast ne 'upload') {
$r->print(<<"ENDCOMP");
-<tr><td>Additional Recipients<br><tt>username\@domain,username\@domain, ...
+<tr><td>$lt{'ad'}<br /><tt>username\@domain,username\@domain, ...
</tt></td><td>
-<input type=text size=50 name=additionalrec></td></tr>
-<tr><td>Subject:</td><td><input type=text size=50 name=subject value="$dissub">
+<input type="text" size="50" name="additionalrec"></td></tr>
+<tr><td>$lt{'sb'}:</td><td><input type="text" size="50" name="subject" value="$dissub">
</td></tr></table>
-<textarea name=message cols=60 rows=10 wrap=hard>$dismsg
-</textarea><p>
+$latexHelp
+<textarea name="message" cols="80" rows="10" wrap="hard">$dismsg
+</textarea></p><br />
$dispcrit
-<input type=submit value="$func Mail">
+<input type="submit" name="send" value="$func $lt{'ma'}" />
+<input type="submit" name="cancel" value="$lt{'ca'}" />
ENDCOMP
- }
- if ($broadcast eq 'upload') {
+ } else { # $broadcast is 'upload'
$r->print(<<ENDUPLOAD);
<input type=hidden name=sendmode value=upload>
<h3>Generate messages from a file</h3>
+<p>
Subject: <input type=text size=50 name=subject>
+</p>
+<p>General message text<br />
+<textarea name=message cols=60 rows=10 wrap=hard>$dismsg
+</textarea></p>
+<p>
+The file format for the uploaded portion of the message is:
<pre>
username1\@domain1: text
username2\@domain2: text
-username1\@domain1: text
+username3\@domain1: text
</pre>
+</p>
+<p>
The messages will be assembled from all lines with the respective
-<tt>username\@domain</tt>, and appended to the general message text.<p>
+<tt>username\@domain</tt>, and appended to the general message text.</p>
+<p>
<input type=file name=upfile size=20><p>
-General message text:<p>
-<textarea name=message cols=60 rows=10 wrap=hard>$dismsg
-</textarea><p>
$dispcrit
<input type=submit value="Upload and send">
ENDUPLOAD
@@ -465,6 +895,111 @@ 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>'.&mt('Record').'</h3>';
+ } else {
+ $result.='<h3>'.&mt('Sent Message').'</h3>';
+ %content=&unpackagemsg($content{'message'});
+ $content{'message'}=
+ '<b>Subject: '.$content{'subject'}.'</b><br />'.
+ $content{'message'};
+ }
+ $result.=&mt('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 {
+ my ($r,$stage)=@_;
+ 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");
+<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>
+<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'}) {
+ &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" />
+<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>
+<br />
+<input type="hidden" name="recordftf" value="post" />
+<input type="submit" value="Post this record" />
+</form>
+ENDBFORM
+ }
+}
+
# ===================================================================== Handler
sub handler {
@@ -472,73 +1007,107 @@ sub handler {
# ----------------------------------------------------------- Set document type
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
# --------------------------- Get query string for limited number of parameters
-
- map {
- my ($name, $value) = split(/=/,$_);
- $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 '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;
- }
- }
- } (split(/&/,$ENV{'QUERY_STRING'}));
-
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['display','replyto','forward','markread','markdel','markunread',
+ 'sendreply','compose','sendmail','critical','recname','recdom',
+ 'recordftf','sortedby']);
+ $sqs='&sortedby='.$ENV{'form.sortedby'};
+# ------------------------------------------------------ They checked for email
+ &Apache::lonnet::put('email_status',{'recnewemail'=>0});
# --------------------------------------------------------------- Render Output
-
- $r->print('<html><head><title>EMail and Messaging</title></head>');
- $r->print(
- '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');
- $r->print('<h1>EMail</h1>');
+ if (!$ENV{'form.display'}) {
+ $r->print('<html><head><title>EMail and Messaging</title>'.
+ &Apache::loncommon::studentbrowser_javascript().'</head>'.
+ &Apache::loncommon::bodytag('EMail and Messages').
+ &Apache::loncommon::help_open_faq(12).
+ &Apache::loncommon::help_open_bug('Communication Tools'));
+ }
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'});
+# info to generate "next" and "previous" buttons
+ my @messages=&sortedmessages();
+ my $counter=0;
+ $r->print('<pre>');
+ my $escmsgid=&Apache::lonnet::escape($msgid);
+ foreach (@messages) {
+ if ($_->[5] eq $escmsgid){
+ last;
+ }
+ $counter++;
+ }
+ $r->print('</pre>');
+ my $number_of_messages = scalar(@messages); #subtract 1 for last index
+# start output
+ $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').
+ &Apache::loncommon::help_open_faq(12).
+ &Apache::loncommon::help_open_bug('Communication Tools'));
+ $r->print('<b>'.&mt('Subject').':</b> '.$content{'subject'}.
+ '<br><b>'.&mt('From').':</b> '.
+&Apache::loncommon::aboutmewrapper(
+&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
+$content{'sendername'},$content{'senderdomain'}).' ('.
+ $content{'sendername'}.' at '.
+ $content{'senderdomain'}.') '.
+ '<br><b>'.&mt('Time').':</b> '.$content{'time'}.'<p>'.
+ '<table border=2><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'.
+ '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).$sqs.
+ '"><b>'.&mt('Reply').'</b></a></td>'.
+ '<td><a href="/adm/email?forward='.&Apache::lonnet::escape($msgid).$sqs.
+ '"><b>'.&mt('Forward').'</b></a></td>'.
+ '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).$sqs.
+ '"><b>'.&mt('Mark Unread').'</b></a></td>'.
+ '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).$sqs.
+ '"><b>Delete</b></a></td>'.
+ '<td><a href="/adm/email?sortedby='.$ENV{'form.sortedby'}.
+ '"><b>'.&mt('Display all Messages').'</b></a></td>');
+ if ($counter > 0){
+ $r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
+ '"><b>'.&mt('Previous').'</b></a></td>');
+ }
+ if ($counter < $number_of_messages - 1){
+ $r->print('<td><a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.
+ '"><b>'.&mt('Next').'</b></a></td>');
+ }
+ $r->print('</tr></table><p><pre>'.
+ &Apache::lontexconvert::msgtexconverted($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'}) || ($ENV{'form.sendbck'})) &&
- (&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'},
- $ENV{'form.sendbck'}));
- } else {
- $r->print('Sending: '.&user_normal_msg($content{'sendername'},
- $content{'senderdomain'},
- $ENV{'form.subject'},
- $ENV{'form.message'}));
+ if ($ENV{'form.send'}) {
+ my $msgid=$ENV{'form.sendreply'};
+ my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+ my %content=&unpackagemsg($message{$msgid},1);
+ &statuschange($msgid,'replied');
+ if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) &&
+ (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+ $r->print(&mt('Sending critical message').': '.
+ &user_crit_msg($content{'sendername'},
+ $content{'senderdomain'},
+ &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+ &Apache::lonfeedback::clear_out_html($ENV{'form.message'}),
+ $ENV{'form.sendbck'}));
+ } else {
+ $r->print(&mt('Sending').': '.&user_normal_msg($content{'sendername'},
+ $content{'senderdomain'},
+ &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+ &Apache::lonfeedback::clear_out_html($ENV{'form.message'})));
+ }
}
if ($ENV{'form.displayedcrit'}) {
&discrit($r);
@@ -546,7 +1115,7 @@ sub handler {
&disall($r);
}
} elsif ($ENV{'form.confirm'}) {
- map {
+ foreach (keys %ENV) {
if ($_=~/^form\.rec\_(.*)$/) {
$r->print('<b>Confirming Receipt:</b> '.
&user_crit_received($1).'<br>');
@@ -557,7 +1126,7 @@ sub handler {
&user_crit_received($msgid).'<br>');
&comprep($r,$msgid);
}
- } keys %ENV;
+ }
&discrit($r);
} elsif ($ENV{'form.critical'}) {
&discrit($r);
@@ -569,12 +1138,12 @@ sub handler {
&disall($r);
} elsif ($ENV{'form.markeddel'}) {
my $total=0;
- map {
+ foreach (keys %ENV) {
if ($_=~/^form\.delmark_(.*)$/) {
&statuschange(&Apache::lonnet::unescape($1),'deleted');
$total++;
}
- } keys %ENV;
+ }
$r->print('Deleted '.$total.' message(s)<p>');
&disall($r);
} elsif ($ENV{'form.markunread'}) {
@@ -582,65 +1151,78 @@ sub handler {
&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;
- 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'};
+ my $sendstatus='';
+ if ($ENV{'form.send'}) {
+ 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},1);
+ &statuschange($msgid,'forwarded');
+ $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
+ $content{'message'};
+ }
+ my %toaddr=();
+ undef %toaddr;
+ if ($ENV{'form.sendmode'} eq 'group') {
+ foreach (keys %ENV) {
+ if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
+ $toaddr{$1}='';
+ }
+ }
+ } elsif ($ENV{'form.sendmode'} eq 'upload') {
+ foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) {
+ my ($rec,$txt)=split(/\s*\:\s*/,$_);
+ if ($txt) {
+ $rec=~s/\@/\:/;
+ $toaddr{$rec}.=$txt."\n";
+ }
+ }
+ } else {
+ $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';
+ }
+ if ($ENV{'form.additionalrec'}) {
+ foreach (split(/\,/,$ENV{'form.additionalrec'})) {
+ my ($auname,$audom)=split(/\@/,$_);
+ $toaddr{$auname.':'.$audom}='';
+ }
+ }
+ foreach (keys %toaddr) {
+ my ($recuname,$recdomain)=split(/\:/,$_);
+ my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
+ if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; }
+ if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) &&
+ (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+ $r->print(&mt('Sending critical message').' ...');
+ $sendstatus.=' '.&user_crit_msg($recuname,$recdomain,
+ &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+ $msgtxt,
+ $ENV{'form.sendbck'});
+ } else {
+ $r->print(&mt('Sending').' ...');
+ $sendstatus.=' '.&user_normal_msg($recuname,$recdomain,
+ &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+ $msgtxt,
+ $content{'citation'});
+ }
+ $r->print('<br />');
+ }
}
- my %toaddr=();
- undef %toaddr;
- if ($ENV{'form.sendmode'} eq 'group') {
- map {
- if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
- $toaddr{$1}='';
- }
- } keys %ENV;
- } elsif ($ENV{'form.sendmode'} eq 'upload') {
- map {
- my ($rec,$txt)=split(/\s*\:\s*/,$_);
- if ($txt) {
- $rec=~s/\@/\:/;
- $toaddr{$rec}.=$txt."\n";
- }
- } split(/[\n\r\f]+/,$ENV{'form.upfile'});
+ if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+ if ($ENV{'form.displayedcrit'}) {
+ &discrit($r);
+ } else {
+ &disall($r);
+ }
} else {
- $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';
- }
- if ($ENV{'form.additionalrec'}) {
- map {
- my ($auname,$audom)=split(/\@/,$_);
- $toaddr{$auname.':'.$audom}='';
- } split(/\,/,$ENV{'form.additionalrec'});
- }
- map {
- my ($recuname,$recdomain)=split(/\:/,$_);
- my $msgtxt=$ENV{'form.message'};
- if ($toaddr{$_}) { $msgtxt.='<hr>'.$toaddr{$_}; }
- if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) &&
- (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
- $r->print('Sending critical: '.
- &user_crit_msg($recuname,$recdomain,
- $ENV{'form.subject'},
- $msgtxt,
- $ENV{'form.sendbck'}));
- } else {
- $r->print('Sending: '.&user_normal_msg($recuname,$recdomain,
- $ENV{'form.subject'},
- $msgtxt,
- $content{'citation'}));
- }
- $r->print('<br>');
- } keys %toaddr;
- if ($ENV{'form.displayedcrit'}) {
- &discrit($r);
- } else {
- &disall($r);
+ $r->print(
+ '<h2><font color="red">'.&mt('Could not deliver message').'</font></h2>'.
+ &mt('Please use the browser "Back" button and correct the recipient addresses')
+ );
}
} else {
&disall($r);
@@ -651,11 +1233,18 @@ sub handler {
}
# ================================================= Main program, reset counter
-sub BEGIN {
+BEGIN {
$msgcount=0;
}
-1;
+=pod
+
+=back
+
+=cut
+
+1;
+
__END__