--- loncom/interface/lonmsg.pm 2005/01/01 18:24:12 1.127
+++ loncom/interface/lonmsg.pm 2005/02/17 04:02:47 1.135
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.127 2005/01/01 18:24:12 www Exp $
+# $Id: lonmsg.pm,v 1.135 2005/02/17 04:02:47 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -90,7 +90,7 @@ also has a student role in the course, A
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
+are much more useful than traditional email can be made to be, even
with HTML support.
Right now, this document will cover just how to send a message, since
@@ -239,9 +239,15 @@ sub sendemail {
# ==================================================== Send notification emails
sub sendnotification {
- my ($to,$touname,$toudom,$subj,$crit)=@_;
+ my ($to,$touname,$toudom,$subj,$crit,$text)=@_;
my $sender=$ENV{'environment.firstname'}.' '.$ENV{'environment.lastname'};
+ unless ($sender=~/\w/) {
+ $sender=$ENV{'user.name'}.'@'.$ENV{'user.domain'};
+ }
my $critical=($crit?' critical':'');
+ $text=~s/\<\;/\</gs;
+ $text=~s/\>\;/\>/gs;
+ $text=~s/\<\/*[^\>]+\>//gs;
my $url='http://'.
$Apache::lonnet::hostname{&Apache::lonnet::homeserver($touname,$toudom)}.
'/adm/email?username='.$touname.'&domain='.$toudom;
@@ -250,11 +256,15 @@ You received a$critical message from $se
$subj
+=== Excerpt ============================================================
+$text
+========================================================================
+
Use
$url
-to access this message.
+to access the full message.
ENDMSG
&sendemail($to,'New'.$critical.' message from '.$sender,$body);
}
@@ -346,11 +356,12 @@ sub all_url_author_res_msg {
# ================================================== Critical message to a user
sub user_crit_msg_raw {
- my ($user,$domain,$subject,$message,$sendback)=@_;
+ my ($user,$domain,$subject,$message,$sendback,$toperm)=@_;
# Check if allowed missing
my $status='';
my $msgid='undefined';
unless (($message)&&($user)&&($domain)) { $status='empty'; };
+ my $text=$message;
my $homeserver=&Apache::lonnet::homeserver($user,$domain);
if ($homeserver ne 'no_host') {
($msgid,$message)=&packagemsg($subject,$message);
@@ -370,10 +381,16 @@ sub user_crit_msg_raw {
$status='no_host';
}
# Notifications
- my %userenv = &Apache::lonnet::get('environment',['critnotification'],
+ my %userenv = &Apache::lonnet::get('environment',['critnotification',
+ 'permanentemail'],
$domain,$user);
if ($userenv{'critnotification'}) {
- &sendnotification($userenv{'critnotification'},$user,$domain,$subject,1);
+ &sendnotification($userenv{'critnotification'},$user,$domain,$subject,1,
+ $text);
+ }
+ if ($toperm && $userenv{'permanentemail'}) {
+ &sendnotification($userenv{'permanentemail'},$user,$domain,$subject,1,
+ $text);
}
# Log this
&Apache::lonnet::logthis(
@@ -397,7 +414,7 @@ sub user_crit_msg_raw {
=cut
sub user_crit_msg {
- my ($user,$domain,$subject,$message,$sendback)=@_;
+ my ($user,$domain,$subject,$message,$sendback,$toperm)=@_;
my $status='';
my %userenv = &Apache::lonnet::get('environment',['msgforward'],
$domain,$user);
@@ -407,10 +424,10 @@ sub user_crit_msg {
my ($forwuser,$forwdomain)=split(/\:/,$_);
$status.=
&user_crit_msg_raw($forwuser,$forwdomain,$subject,$message,
- $sendback).' ';
+ $sendback,$toperm).' ';
}
} else {
- $status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback);
+ $status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback,$toperm);
}
return $status;
}
@@ -444,10 +461,12 @@ sub user_crit_received {
# ======================================================== Normal communication
sub user_normal_msg_raw {
- my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_;
+ my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl,
+ $toperm)=@_;
# Check if allowed missing
my $status='';
my $msgid='undefined';
+ my $text=$message;
unless (($message)&&($user)&&($domain)) { $status='empty'; };
my $homeserver=&Apache::lonnet::homeserver($user,$domain);
if ($homeserver ne 'no_host') {
@@ -471,10 +490,16 @@ sub user_normal_msg_raw {
$status='no_host';
}
# Notifications
- my %userenv = &Apache::lonnet::get('environment',['notification'],
+ my %userenv = &Apache::lonnet::get('environment',['notification',
+ 'permanentemail'],
$domain,$user);
if ($userenv{'notification'}) {
- &sendnotification($userenv{'notification'},$user,$domain,$subject,0);
+ &sendnotification($userenv{'notification'},$user,$domain,$subject,0,
+ $text);
+ }
+ if ($toperm && $userenv{'permanentemail'}) {
+ &sendnotification($userenv{'permanentemail'},$user,$domain,$subject,0,
+ $text);
}
&Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
$ENV{'user.home'},
@@ -493,7 +518,8 @@ sub user_normal_msg_raw {
=cut
sub user_normal_msg {
- my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_;
+ my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl,
+ $toperm)=@_;
my $status='';
my %userenv = &Apache::lonnet::get('environment',['msgforward'],
$domain,$user);
@@ -503,11 +529,11 @@ sub user_normal_msg {
my ($forwuser,$forwdomain)=split(/\:/,$_);
$status.=
&user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
- $citation,$baseurl,$attachmenturl).' ';
+ $citation,$baseurl,$attachmenturl,$toperm).' ';
}
} else {
$status=&user_normal_msg_raw($user,$domain,$subject,$message,
- $citation,$baseurl,$attachmenturl);
+ $citation,$baseurl,$attachmenturl,$toperm);
}
return $status;
}
@@ -598,12 +624,9 @@ sub movemsg {
&Apache::lonnet::put('nohist_email'.$trgsuffix,{$msgid => $message{$msgid}});
# Copy status
- my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]);
- &Apache::lonnet::put('email_status'.$trgsuffix,{$msgid => $status{$msgid}});
-# See if was deleted -> becomes "read" in trash
- my $currentstatus=(&unpackmsgid($status{$msgid}),$srcfolder);
- if ($currentstatus eq 'deleted') {
- &statuschange($msgid,'read',$trgfolder);
+ unless ($trgfolder eq 'trash') {
+ my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]);
+ &Apache::lonnet::put('email_status'.$trgsuffix,{$msgid => $status{$msgid}});
}
# Delete orginals
&Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]);
@@ -670,7 +693,15 @@ ENDDISHEADER
}
}
$r->print('</table><table>');
- while (my ($student,$info) = each(%$classlist)) {
+ my $sort = sub {
+ my $aname=lc($classlist->{$a}[&Apache::loncoursedata::CL_FULLNAME()]);
+ if (!$aname) { $aname=$a; }
+ my $bname=lc($classlist->{$b}[&Apache::loncoursedata::CL_FULLNAME()]);
+ if (!$bname) { $bname=$b; }
+ return $aname cmp $bname;
+ };
+ foreach my $student (sort $sort (keys(%{$classlist}))) {
+ my $info=$classlist->{$student};
my ($sname,$sdom,$status,$fullname,$section) =
(@{$info}[&Apache::loncoursedata::CL_SNAME(),
&Apache::loncoursedata::CL_SDOM(),
@@ -678,7 +709,7 @@ ENDDISHEADER
&Apache::loncoursedata::CL_FULLNAME(),
&Apache::loncoursedata::CL_SECTION()]);
next if ($status ne 'Active');
- my $key = 'send_to_&&&'.$section.'&&&'.$student;
+ my $key = 'send_to_&&&'.$section.'&&&_'.$student;
if (! defined($fullname) || $fullname eq '') { $fullname = $sname; }
$r->print('<tr><td><label>'.
qq{<input type="checkbox" name="$key">}.(' 'x2).
@@ -706,9 +737,9 @@ sub discrit {
$content{'sendername'}.'@'.
$content{'senderdomain'}.') '.$content{'time'}.
'<br />'.&mt('Subject').': '.$content{'subject'}.
- '<br /><blockquote>'.
+ '<br /><pre>'.
&Apache::lontexconvert::msgtexconverted($content{'message'}).
- '</blockquote><small>'.
+ '</pre><small>'.
&mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox').
'</small><br />'.
'<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'.
@@ -839,7 +870,7 @@ TABLEHEAD
foreach my $msg (@newmsgs) {
$r->print(<<"ENDLINK");
<tr bgcolor="#FFBB77">
-<td><a href="/adm/email?display=$msg->{'msgid'}">$lt{'op'}</a></td>
+<td><a href="/adm/email?dismode=new&display=$msg->{'msgid'}">$lt{'op'}</a></td>
ENDLINK
foreach ('sendtime','from','fromdom','shortsub') {
$r->print("<td>$msg->{$_}</td>");
@@ -956,9 +987,9 @@ ENDDISHEADER
}
$r->print('</th><th>');
if ($ENV{'form.sortedby'} eq "revstatus") {
- $r->print('<a href = "?sortedby=status'.$fsqs.'">'.&mt('Status').'</th>');
+ $r->print('<a href = "?sortedby=status'.$fsqs.'">'.&mt('Status').'</a></th>');
} else {
- $r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</th>');
+ $r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');
}
$r->print("</tr>\n");
for (my $n=$firstdis;$n<=$lastdis;$n++) {
@@ -973,10 +1004,10 @@ ENDDISHEADER
} else {
$r->print('<tr bgcolor="#99BBBB">');
}
- $r->print('<td></a><input type=checkbox name="delmark_'.$origID.'" /></td><td><a href="/adm/email?display='.$origID.$sqs.
+ $r->print('<td><input type=checkbox name="delmark_'.$origID.'" /></td><td><a href="/adm/email?display='.$origID.$sqs.
'">'.&mt('Open').'</a></td><td>'.
($folder ne 'trash'?'<a href="/adm/email?markdel='.$origID.$sqs.
- '">'.&mt('Delete'):' ').'</td>'.
+ '">'.&mt('Delete'):' ').'</a></td>'.
'<td>'.&Apache::lonlocal::locallocaltime($sendtime).'</td><td>'.
$fromname.'</td><td>'.$fromdomain.'</td><td>'.
&Apache::lonnet::unescape($shortsubj).'</td><td>'.
@@ -1060,9 +1091,11 @@ sub compout {
my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
$dispcrit=
'<input type="checkbox" name="critmsg" /> '.&mt('Send as critical message').' ' . $crithelp .
- '<br>'.
+ '<br />'.
'<input type="checkbox" name="sendbck" /> '.&mt('Send as critical message').' ' .
- &mt('and return receipt') . $crithelp . '<p>';
+ &mt('and return receipt') . $crithelp .
+ '<br /><input type="checkbox" name="permanent" /> '.
+&mt('Send copy to permanent email address (if known)').'<p>';
}
my %message;
my %content;
@@ -1241,9 +1274,9 @@ sub disfacetoface {
&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
$content{'sendername'}.'@'.
$content{'senderdomain'}.') '.$content{'time'}.
- '<br /><blockquote>'.
+ '<br /><pre>'.
&Apache::lontexconvert::msgtexconverted($content{'message'}).
- '</blockquote>';
+ '</pre>';
}
# Check to see if there were any messages.
if ($result eq '') {
@@ -1742,6 +1775,7 @@ sub displaymessage {
'<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).$sqs.
'"><b>Delete</b></a></td>'.
'<td><a href="/adm/email?'.$sqs.
+ ($ENV{'form.dismode'} eq 'new'?'&folder=new':'').
'"><b>'.&mt('Back to Folder Display').'</b></a></td>');
if ($counter > 0){
$r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
@@ -1936,13 +1970,13 @@ sub sendoffmail {
$thismsg=&user_crit_msg($recuname,$recdomain,
&Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
$msgtxt,
- $ENV{'form.sendbck'});
+ $ENV{'form.sendbck'},$ENV{'form.permanent'});
} else {
$r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');
$thismsg=&user_normal_msg($recuname,$recdomain,
&Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
$msgtxt,
- $content{'citation'});
+ $content{'citation'},undef,undef,$ENV{'form.permanent'});
if (($ENV{'request.course.id'}) && ($ENV{'form.sendmode'} eq 'group')) {
&user_normal_msg_raw(
$ENV{'course.'.$ENV{'request.course.id'}.'.num'},
@@ -1989,7 +2023,7 @@ sub handler {
['display','replyto','forward','markread','markdel','markunread',
'sendreply','compose','sendmail','critical','recname','recdom',
'recordftf','sortedby','block','folder','startdis','interdis',
- 'showcommentbaseurl']);
+ 'showcommentbaseurl','dismode']);
$sqs='&sortedby='.$ENV{'form.sortedby'};
# ------------------------------------------------------ They checked for email