--- loncom/interface/lonmsg.pm 2005/01/01 18:36:13 1.128
+++ loncom/interface/lonmsg.pm 2005/11/18 13:35:30 1.155
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.128 2005/01/01 18:36:13 www Exp $
+# $Id: lonmsg.pm,v 1.155 2005/11/18 13:35:30 www 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
@@ -104,7 +104,7 @@ since lonmsg already implements that fun
=cut
use strict;
-use Apache::lonnet();
+use Apache::lonnet;
use vars qw($msgcount);
use HTML::TokeParser();
use Apache::Constants qw(:common);
@@ -114,6 +114,8 @@ use HTML::Entities();
use Mail::Send;
use Apache::lonlocal;
use Apache::loncommunicate;
+use Apache::lonfeedback;
+use Apache::lonrss();
# Querystring component with sorting type
my $sqs;
@@ -140,24 +142,25 @@ sub packagemsg {
my $partsubj=$subject;
$partsubj=&Apache::lonnet::escape($partsubj);
my $msgid=&Apache::lonnet::escape(
- $now.':'.$partsubj.':'.$ENV{'user.name'}.':'.
- $ENV{'user.domain'}.':'.$msgcount.':'.$$);
- my $result='<sendername>'.$ENV{'user.name'}.'</sendername>'.
- '<senderdomain>'.$ENV{'user.domain'}.'</senderdomain>'.
+ $now.':'.$partsubj.':'.$env{'user.name'}.':'.
+ $env{'user.domain'}.':'.$msgcount.':'.
+ $env{'request.course.id'}.':'.$$);
+ my $result='<sendername>'.$env{'user.name'}.'</sendername>'.
+ '<senderdomain>'.$env{'user.domain'}.'</senderdomain>'.
'<subject>'.$subject.'</subject>'.
'<time>'.&Apache::lonlocal::locallocaltime($now).'</time>'.
'<servername>'.$ENV{'SERVER_NAME'}.'</servername>'.
'<host>'.$ENV{'HTTP_HOST'}.'</host>'.
'<client>'.$ENV{'REMOTE_ADDR'}.'</client>'.
- '<browsertype>'.$ENV{'browser.type'}.'</browsertype>'.
- '<browseros>'.$ENV{'browser.os'}.'</browseros>'.
- '<browserversion>'.$ENV{'browser.version'}.'</browserversion>'.
- '<browsermathml>'.$ENV{'browser.mathml'}.'</browsermathml>'.
+ '<browsertype>'.$env{'browser.type'}.'</browsertype>'.
+ '<browseros>'.$env{'browser.os'}.'</browseros>'.
+ '<browserversion>'.$env{'browser.version'}.'</browserversion>'.
+ '<browsermathml>'.$env{'browser.mathml'}.'</browsermathml>'.
'<browserraw>'.$ENV{'HTTP_USER_AGENT'}.'</browserraw>'.
- '<courseid>'.$ENV{'request.course.id'}.'</courseid>'.
- '<coursesec>'.$ENV{'request.course.sec'}.'</coursesec>'.
- '<role>'.$ENV{'request.role'}.'</role>'.
- '<resource>'.$ENV{'request.filename'}.'</resource>'.
+ '<courseid>'.$env{'request.course.id'}.'</courseid>'.
+ '<coursesec>'.$env{'request.course.sec'}.'</coursesec>'.
+ '<role>'.$env{'request.role'}.'</role>'.
+ '<resource>'.$env{'request.filename'}.'</resource>'.
'<msgid>'.$msgid.'</msgid>'.
'<recuser>'.$recuser.'</recuser>'.
'<recdomain>'.$recdomain.'</recdomain>'.
@@ -209,13 +212,13 @@ sub unpackmsgid {
my ($msgid,$folder)=@_;
$msgid=&Apache::lonnet::unescape($msgid);
my $suffix=&foldersuffix($folder);
- my ($sendtime,$shortsubj,$fromname,$fromdomain)=split(/\:/,
+ my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$fromcid)=split(/\:/,
&Apache::lonnet::unescape($msgid));
my %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]);
if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; }
unless ($status{$msgid}) { $status{$msgid}='new'; }
- return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});
-}
+ return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid},$fromcid);
+}
sub sendemail {
@@ -226,22 +229,24 @@ sub sendemail {
my $msg = new Mail::Send;
$msg->to($to);
$msg->subject('[LON-CAPA] '.$subject);
- my %oldENV=%ENV;
- undef(%ENV);
if (my $fh = $msg->open()) {
print $fh $body;
$fh->close;
}
- %ENV=%oldENV;
- undef(%oldENV);
}
# ==================================================== Send notification emails
sub sendnotification {
- my ($to,$touname,$toudom,$subj,$crit)=@_;
- my $sender=$ENV{'environment.firstname'}.' '.$ENV{'environment.lastname'};
+ 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,18 +255,22 @@ 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);
}
# ============================================================= Check for email
sub newmail {
- if ((time-$ENV{'user.mailcheck.time'})>300) {
+ 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; }
@@ -330,7 +339,20 @@ sub del_url_author_res_msg {
}
return &Apache::lonnet::del('nohist_res_msgs',\@delmsgs,$domain,$author);
}
+# =================================== Clear out all author messages in URL path
+sub clear_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/) {
+ 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 {
@@ -346,11 +368,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);
@@ -359,10 +382,10 @@ sub user_crit_msg_raw {
'put:'.$domain.':'.$user.':critical:'.
&Apache::lonnet::escape($msgid).'='.
&Apache::lonnet::escape($message),$homeserver);
- if ($ENV{'request.course.id'}) {
+ if ($env{'request.course.id'}) {
&user_normal_msg_raw(
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'},
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
'Critical ['.$user.':'.$domain.']',
$message);
}
@@ -370,17 +393,23 @@ 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(
'Sending critical email '.$msgid.
', log status: '.
- &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
- $ENV{'user.home'},
+ &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
+ $env{'user.home'},
'Sending critical '.$msgid.' to '.$user.' at '.$domain.' with status: '
.$status));
return $status;
@@ -397,7 +426,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 +436,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;
}
@@ -423,8 +452,8 @@ sub user_crit_received {
my %contents=&unpackagemsg($message{$msgid},1);
my $status='rec: '.($contents{'sendback'}?
&user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
- &mt('Receipt').': '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.', '.$contents{'subject'},
- &mt('User').' '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.
+ &mt('Receipt').': '.$env{'user.name'}.' '.&mt('at').' '.$env{'user.domain'}.', '.$contents{'subject'},
+ &mt('User').' '.$env{'user.name'}.' '.&mt('at').' '.$env{'user.domain'}.
' acknowledged receipt of message'."\n".' "'.
$contents{'subject'}.'"'."\n".&mt('dated').' '.
$contents{'time'}.".\n"
@@ -434,8 +463,8 @@ sub user_crit_received {
'nohist_email',{$contents{'msgid'} => $message{$msgid}});
$status.=' del: '.
&Apache::lonnet::del('critical',[$contents{'msgid'}]);
- &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
- $ENV{'user.home'},'Received critical message '.
+ &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
+ $env{'user.home'},'Received critical message '.
$contents{'msgid'}.
', '.$status);
return $status;
@@ -444,10 +473,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') {
@@ -463,21 +494,27 @@ sub user_normal_msg_raw {
('email_status',{'recnewemail'=>time},$domain,$user);
# Into sent-mail folder
$status.=' '.&Apache::lonnet::critical(
- 'put:'.$ENV{'user.domain'}.':'.$ENV{'user.name'}.
+ 'put:'.$env{'user.domain'}.':'.$env{'user.name'}.
':nohist_email_sent:'.
&Apache::lonnet::escape($msgid).'='.
- &Apache::lonnet::escape($message),$ENV{'user.home'});
+ &Apache::lonnet::escape($message),$env{'user.home'});
} else {
$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'},
+ &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
+ $env{'user.home'},
'Sending '.$msgid.' to '.$user.' at '.$domain.' with status: '.$status);
return $status;
}
@@ -493,7 +530,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 +541,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;
}
@@ -533,7 +571,7 @@ sub folderlist {
($_==$interdis?' selected="selected"':'').'>'.$_.'</option>' }
(10,20,50,100,200)).'</select>'.
'<input type="submit" value="'.&mt('View Folder').'" /><br />'.
- '<input type="hidden" name="sortedby" value="'.$ENV{'form.sortedby'}.'" />'.
+ '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.
($folder=~/^(new|critical)/?'</form>':'');
}
@@ -541,13 +579,14 @@ sub scrollbuttons {
my ($start,$maxdis,$first,$finish,$total)=@_;
unless ($total>0) { return ''; }
$start++; $maxdis++;$first++;$finish++;
- return
+ return
+ &mt('Page').': '.
'<input type="submit" name="firstview" value="'.&mt('First').'" />'.
'<input type="submit" name="prevview" value="'.&mt('Previous').'" />'.
'<input type="text" size="5" name="startdis" value="'.$start.'" onChange="this.form.submit()" /> of '.$maxdis.
'<input type="submit" name="nextview" value="'.&mt('Next').'" />'.
'<input type="submit" name="lastview" value="'.&mt('Last').'" /><br />'.
- &mt('Messages [_1] through [_2] of [_3]',$first,$finish,$total).'</form>';
+ &mt('Showing messages [_1] through [_2] of [_3]',$first,$finish,$total).'</form>';
}
# =============================================================== Folder suffix
@@ -573,6 +612,9 @@ sub statuschange {
if (($newstatus eq 'deleted') || ($newstatus eq 'new')) {
&Apache::lonnet::put('email_status'.$suffix,{$msgid => $newstatus});
}
+ if ($newstatus eq 'deleted') {
+ &movemsg(&Apache::lonnet::unescape($msgid),$folder,'trash');
+ }
}
# ============================================================= Make new folder
@@ -590,6 +632,7 @@ sub makefolder {
sub movemsg {
my ($msgid,$srcfolder,$trgfolder)=@_;
+ if ($srcfolder eq 'new') { $srcfolder=''; }
my $srcsuffix=&foldersuffix($srcfolder);
my $trgsuffix=&foldersuffix($trgfolder);
@@ -613,9 +656,9 @@ sub discourse {
my $r=shift;
my $classlist = &Apache::loncoursedata::get_classlist();
my $now=time;
- my %lt=&Apache::lonlocal::texthash('cfa' => 'Check for All',
- 'cfs' => 'Check for Section/Group',
- 'cfn' => 'Check for None');
+ my %lt=&Apache::lonlocal::texthash('cfa' => 'Check All',
+ 'cfs' => 'Check Section/Group',
+ 'cfn' => 'Uncheck All');
$r->print(<<ENDDISHEADER);
<input type="hidden" name="sendmode" value="group" />
<script>
@@ -649,7 +692,7 @@ sub discourse {
</script>
<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="text" size="5" name="chksec" />
<input type="button" onClick="uncheckall()" value="$lt{'cfn'}" />
<p>
ENDDISHEADER
@@ -667,7 +710,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(),
@@ -675,11 +726,13 @@ ENDDISHEADER
&Apache::loncoursedata::CL_FULLNAME(),
&Apache::loncoursedata::CL_SECTION()]);
next if ($status ne 'Active');
- my $key = 'send_to_&&&'.$section.'&&&'.$student;
+ next if ($env{'request.course.sec'} &&
+ $section ne $env{'request.course.sec'});
+ 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).
- $fullname.'</td><td>'.$sname.'@'.$sdom.'</td><td>'.$section.
+ qq{<input type="checkbox" name="$key" />}.(' 'x2).
+ $fullname.'</label></td><td>'.$sname.'@'.$sdom.'</td><td>'.$section.
'</td></tr>');
}
$r->print('</table>');
@@ -690,8 +743,8 @@ ENDDISHEADER
sub discrit {
my $r=shift;
my $header = '<h1><font color=red>'.&mt('Critical Messages').'</font></h1>'.
- '<form action=/adm/email method=post>'.
- '<input type=hidden name=confirm value=true>';
+ '<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) {
@@ -703,14 +756,14 @@ 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').'">'.
- '<input type=submit name="reprec_'.$_.'" '.
- 'value="'.&mt('Confirm Receipt and Reply').'">';
+ '<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 '') {
@@ -732,7 +785,7 @@ sub sortedmessages {
my @temp;
foreach (@messages) {
my $msgid=&Apache::lonnet::escape($_);
- my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
+ my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)=
&Apache::lonmsg::unpackmsgid($msgid,$folder);
my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,
$msgid);
@@ -747,34 +800,34 @@ sub sortedmessages {
}
#default sort
@temp = sort {$a->[0] <=> $b->[0]} @temp;
- if ($ENV{'form.sortedby'} eq "date"){
+ if ($env{'form.sortedby'} eq "date"){
@temp = sort {$a->[0] <=> $b->[0]} @temp;
}
- if ($ENV{'form.sortedby'} eq "revdate"){
+ if ($env{'form.sortedby'} eq "revdate"){
@temp = sort {$b->[0] <=> $a->[0]} @temp;
}
- if ($ENV{'form.sortedby'} eq "user"){
+ if ($env{'form.sortedby'} eq "user"){
@temp = sort {lc($a->[2]) cmp lc($b->[2])} @temp;
}
- if ($ENV{'form.sortedby'} eq "revuser"){
+ if ($env{'form.sortedby'} eq "revuser"){
@temp = sort {lc($b->[2]) cmp lc($a->[2])} @temp;
}
- if ($ENV{'form.sortedby'} eq "domain"){
+ if ($env{'form.sortedby'} eq "domain"){
@temp = sort {$a->[3] cmp $b->[3]} @temp;
}
- if ($ENV{'form.sortedby'} eq "revdomain"){
+ if ($env{'form.sortedby'} eq "revdomain"){
@temp = sort {$b->[3] cmp $a->[3]} @temp;
}
- if ($ENV{'form.sortedby'} eq "subject"){
+ if ($env{'form.sortedby'} eq "subject"){
@temp = sort {lc($a->[1]) cmp lc($b->[1])} @temp;
}
- if ($ENV{'form.sortedby'} eq "revsubject"){
+ if ($env{'form.sortedby'} eq "revsubject"){
@temp = sort {lc($b->[1]) cmp lc($a->[1])} @temp;
}
- if ($ENV{'form.sortedby'} eq "status"){
+ if ($env{'form.sortedby'} eq "status"){
@temp = sort {$a->[4] cmp $b->[4]} @temp;
}
- if ($ENV{'form.sortedby'} eq "revstatus"){
+ if ($env{'form.sortedby'} eq "revstatus"){
@temp = sort {$b->[4] cmp $a->[4]} @temp;
}
return @temp;
@@ -794,9 +847,9 @@ sub disnew {
'do' => 'Domain'
);
my @msgids = sort split(/\&/,&Apache::lonnet::reply
- ('keys:'.$ENV{'user.domain'}.':'.
- $ENV{'user.name'}.':nohist_email',
- $ENV{'user.home'}));
+ ('keys:'.$env{'user.domain'}.':'.
+ $env{'user.name'}.':nohist_email',
+ $env{'user.home'}));
my @newmsgs;
my %setters = ();
my $startblock = 0;
@@ -806,7 +859,7 @@ sub disnew {
# Check for blocking of display because of scheduled online exams.
&blockcheck(\%setters,\$startblock,\$endblock);
foreach (@msgids) {
- my ($sendtime,$shortsubj,$fromname,$fromdom,$status)=
+ my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
&Apache::lonmsg::unpackmsgid($_);
if (defined($sendtime) && $sendtime!~/error/) {
my $numsendtime = $sendtime;
@@ -835,15 +888,16 @@ sub disnew {
TABLEHEAD
foreach my $msg (@newmsgs) {
$r->print(<<"ENDLINK");
-<tr bgcolor="#FFBB77">
-<td><a href="/adm/email?display=$msg->{'msgid'}">$lt{'op'}</a></td>
+<tr class="new" bgcolor="#FFBB77" onMouseOver="javascript:style.backgroundColor='#DD9955'"
+onMouseOut="javascript:style.backgroundColor='#FFBB77'">
+<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>");
}
$r->print("</td></tr>");
}
- $r->print('</table></body></html>');
+ $r->print('</table>'.&Apache::loncommon::endbodytag().'</html>');
} elsif ($numblocked == 0) {
$r->print("<h3>".&mt('You have no unread messages')."</h3>");
}
@@ -928,52 +982,52 @@ ENDDISHEADER
$r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber));
$r->print('<form method="post" name="disall" action="/adm/email">'.
'<table border=2><tr><th colspan="3"> </th><th>');
- if ($ENV{'form.sortedby'} eq "revdate") {
+ if ($env{'form.sortedby'} eq "revdate") {
$r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
} else {
$r->print('<a href = "?sortedby=revdate'.$fsqs.'">'.&mt('Date').'</a></th>');
}
$r->print('<th>');
- if ($ENV{'form.sortedby'} eq "revuser") {
+ if ($env{'form.sortedby'} eq "revuser") {
$r->print('<a href = "?sortedby=user'.$fsqs.'">'.&mt('Username').'</a>');
} else {
$r->print('<a href = "?sortedby=revuser'.$fsqs.'">'.&mt('Username').'</a>');
}
$r->print('</th><th>');
- if ($ENV{'form.sortedby'} eq "revdomain") {
+ if ($env{'form.sortedby'} eq "revdomain") {
$r->print('<a href = "?sortedby=domain'.$fsqs.'">'.&mt('Domain').'</a>');
} else {
$r->print('<a href = "?sortedby=revdomain'.$fsqs.'">'.&mt('Domain').'</a>');
}
$r->print('</th><th>');
- if ($ENV{'form.sortedby'} eq "revsubject") {
+ if ($env{'form.sortedby'} eq "revsubject") {
$r->print('<a href = "?sortedby=subject'.$fsqs.'">'.&mt('Subject').'</a>');
} else {
$r->print('<a href = "?sortedby=revsubject'.$fsqs.'">'.&mt('Subject').'</a>');
}
$r->print('</th><th>');
- if ($ENV{'form.sortedby'} eq "revstatus") {
- $r->print('<a href = "?sortedby=status'.$fsqs.'">'.&mt('Status').'</th>');
+ if ($env{'form.sortedby'} eq "revstatus") {
+ $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++) {
my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @{$temp[$n]};
if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
if ($status eq 'new') {
- $r->print('<tr bgcolor="#FFBB77">');
+ $r->print('<tr bgcolor="#FFBB77" onMouseOver="javascript:style.backgroundColor=\'#DD9955\'" onMouseOut="javascript:style.backgroundColor=\'#FFBB77\'">');
} elsif ($status eq 'read') {
- $r->print('<tr bgcolor="#BBBB77">');
+ $r->print('<tr bgcolor="#BBBB77" onMouseOver="javascript:style.backgroundColor=\'#999944\'" onMouseOut="javascript:style.backgroundColor=\'#BBBB77\'">');
} elsif ($status eq 'replied') {
- $r->print('<tr bgcolor="#AAAA88">');
+ $r->print('<tr bgcolor="#AAAA88" onMouseOver="javascript:style.backgroundColor=\'#888855\'" onMouseOut="javascript:style.backgroundColor=\'#AAAA88\'">');
} else {
- $r->print('<tr bgcolor="#99BBBB">');
+ $r->print('<tr bgcolor="#99BBBB" onMouseOver="javascript:style.backgroundColor=\'#669999\'" onMouseOut="javascript:style.backgroundColor=\'#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>'.
@@ -986,7 +1040,7 @@ ENDDISHEADER
$r->print("</table>\n<p>".
'<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="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />');
if ($folder ne 'trash') {
$r->print(
'<p><input type="submit" name="markeddel" value="'.&mt('Delete Checked').'" /></p>');
@@ -999,7 +1053,7 @@ ENDDISHEADER
( map { $_ => $_ } @allfolders))
);
my $postedstartdis=$startdis+1;
- $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$ENV{'form.interdis'}.'" /></form>');
+ $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /></form>');
if ($numblocked > 0) {
my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
@@ -1012,7 +1066,7 @@ ENDDISHEADER
# ============================================================== Compose output
sub compout {
- my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder)=@_;
+ my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder,$dismode)=@_;
my $suffix=&foldersuffix($folder);
if ($broadcast eq 'individual') {
@@ -1053,17 +1107,20 @@ sub compout {
'ca' => 'Cancel',
'ma' => 'Mail');
- if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+ 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" /> '.&mt('Send as critical message').' ' . $crithelp .
- '<br>'.
- '<input type="checkbox" name="sendbck" /> '.&mt('Send as critical message').' ' .
- &mt('and return receipt') . $crithelp . '<p>';
- }
+ '<p><label><input type="checkbox" name="critmsg" /> '.&mt('Send as critical message').'</label> ' . $crithelp .
+ '</p><p>'.
+ '<label><input type="checkbox" name="sendbck" /> '.&mt('Send as critical message').' ' .
+ &mt('and return receipt') . '</label>' . $crithelp .
+ '</p><p><label><input type="checkbox" name="permanent" /> '.
+&mt('Send copy to permanent email address (if known)').'</label></p>'.
+'<p><label><input type="checkbox" name="rsspost" /> '.
+ &mt('Include in course RSS newsfeed').'</label></p>'; }
my %message;
my %content;
- my $defdom=$ENV{'user.domain'};
+ my $defdom=$env{'user.domain'};
if ($forwarding) {
%message=&Apache::lonnet::get('nohist_email'.$suffix,[$forwarding]);
%content=&unpackagemsg($message{$forwarding},$folder);
@@ -1092,16 +1149,16 @@ sub compout {
$dismsg=~s/\n+/\n\> /g;
if ($content{'baseurl'}) {
$disbase='<input type="hidden" name="baseurl" value="'.&Apache::lonnet::escape($content{'baseurl'}).'" />';
- if ($ENV{'user.adv'}) {
- $disbase.='<input type="checkbox" name="storebasecomment" />'.&mt('Store message for re-use').
- ' <a href="/adm/email?showcommentbaseurl='.
+ if ($env{'user.adv'}) {
+ $disbase.='<label><input type="checkbox" name="storebasecomment" />'.&mt('Store message for re-use').
+ '</label> <a href="/adm/email?showcommentbaseurl='.
&Apache::lonnet::escape($content{'baseurl'}).'" target="comments">'.
&mt('Show re-usable messages').'</a><br />';
}
}
}
my $citation=&displayresource(%content);
- if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; }
+ if ($env{'form.recdom'}) { $defdom=$env{'form.recdom'}; }
$r->print(
'<form action="/adm/email" name="compemail" method="post"'.
' enctype="multipart/form-data">'."\n".
@@ -1122,7 +1179,7 @@ sub compout {
my $selectlink=&Apache::loncommon::selectstudent_link
('compemail','recuname','recdomain');
$r->print(<<"ENDREC");
-<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{'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
@@ -1137,10 +1194,12 @@ ENDREC
<tr><td>$lt{'sb'}:</td><td><input type="text" size="50" name="subject" value="$dissub" />
</td></tr></table>
$latexHelp
-<textarea name="message" cols="80" rows="15" wrap="hard">$dismsg
+<textarea name="message" id="message" cols="80" rows="15" wrap="hard">$dismsg
</textarea></p><br />
$dispcrit
$disbase
+<input type="hidden" name="folder" value="$folder" />
+<input type="hidden" name="dismode" value="$dismode" />
<input type="submit" name="send" value="$func $lt{'ma'}" />
<input type="submit" name="cancel" value="$lt{'ca'}" /><hr />
$citation
@@ -1154,7 +1213,7 @@ ENDCOMP
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 name="message" id="message" cols="60" rows="10" wrap="hard">$dismsg
</textarea></p>
<p>
The file format for the uploaded portion of the message is:
@@ -1176,29 +1235,31 @@ ENDUPLOAD
if ($broadcast eq 'group') {
&discourse;
}
- $r->print('</form>');
+ $r->print('</form>'.
+ &Apache::lonfeedback::generate_preview_button('compemail','message').
+ &Apache::lonhtmlcommon::htmlareaselectactive('message'));
}
# ---------------------------------------------------- Display all face to face
sub retrieve_instructor_comments {
my ($user,$domain)=@_;
- my $target=$ENV{'form.grade_target'};
- if (! $ENV{'request.course.id'}) { return; }
- if (! &Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+ my $target=$env{'form.grade_target'};
+ if (! $env{'request.course.id'}) { return; }
+ if (! &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'},
+ $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 '');
next if ($content{'subject'} !~ /^Record/);
- # $content{'message'}=~s/\n/\<br\>/g;
- $result.='Recorded by '.
+ # &Apache::lonfeedback::newline_to_br(\$content{'message'});
+ $result.='Recorded by '.
$content{'sendername'}.'@'.$content{'senderdomain'}."\n";
$result.=
&Apache::lontexconvert::msgtexconverted($content{'message'})."\n";
@@ -1208,20 +1269,20 @@ sub retrieve_instructor_comments {
sub disfacetoface {
my ($r,$user,$domain)=@_;
- my $target=$ENV{'form.grade_target'};
- unless ($ENV{'request.course.id'}) { return; }
- unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+ my $target=$env{'form.grade_target'};
+ 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'},
+ $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;
+ &Apache::lonfeedback::newline_to_br(\$content{'message'});
if ($content{'subject'}=~/^Record/) {
$result.='<h3>'.&mt('Record').'</h3>';
} elsif ($content{'subject'}=~/^Broadcast/) {
@@ -1238,9 +1299,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 '') {
@@ -1258,7 +1319,7 @@ $content{'sendername'}.'@'.
sub facetoface {
my ($r,$stage)=@_;
- unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+ unless (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) {
return;
}
&printheader($r,
@@ -1266,12 +1327,12 @@ sub facetoface {
"User Notes, Face-to-Face, Critical Messages, Broadcast Messages");
# from query string
- if ($ENV{'form.recname'}) { $ENV{'form.recuname'}=$ENV{'form.recname'}; }
- if ($ENV{'form.recdom'}) { $ENV{'form.recdomain'}=$ENV{'form.recdom'}; }
+ 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'};
+ my $defdom=$env{'user.domain'};
# already filled in
- if ($ENV{'form.recdomain'}) { $defdom=$ENV{'form.recdomain'}; }
+ 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
@@ -1287,7 +1348,7 @@ sub facetoface {
<form method="post" action="/adm/email" name="stdselect">
<input type="hidden" name="recordftf" value="retrieve" />
<table>
-<tr><td>$lt{'user'}:</td><td><input type="text" size="12" name="recuname" value="$ENV{'form.recuname'}" /></td>
+<tr><td>$lt{'user'}:</td><td><input type="text" size="12" name="recuname" value="$env{'form.recuname'}" /></td>
<td rowspan="2">
$stdbrws
<input type="submit" value="$lt{'subm'}" /></td>
@@ -1298,23 +1359,23 @@ $stdbrws
</form>
ENDTREC
if (($stage ne 'query') &&
- ($ENV{'form.recdomain'}) && ($ENV{'form.recuname'})) {
- chomp($ENV{'form.newrecord'});
- if ($ENV{'form.newrecord'}) {
+ ($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'},
+ $env{'course.'.$env{'request.course.id'}.'.num'},
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
&mt('Record').
- ' ['.$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}.']',
- $ENV{'form.newrecord'});
+ ' ['.$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('<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" />
+<input name="recdomain" value="$env{'form.recdomain'}" type="hidden" />
+<input name="recuname" value="$env{'form.recuname'}" type="hidden" />
ENDRHEAD
$r->print(<<ENDBFORM);
<hr />$lt{'newr'}<br />
@@ -1331,8 +1392,8 @@ ENDBFORM
sub examblock {
my ($r,$action) = @_;
- unless ($ENV{'request.course.id'}) { return;}
- unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { $r->print('Not allowed'); }
+ unless ($env{'request.course.id'}) { return;}
+ unless (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) { $r->print('Not allowed'); }
my %lt=&Apache::lonlocal::texthash(
'comb' => 'Communication Blocking',
'cbds' => 'Communication blocking during scheduled exams',
@@ -1372,12 +1433,13 @@ sub examblock {
$r->print($lt{'ncbc'}.'<br /><br />');
}
&display_addblocker_table($r,$parmcount,\%ltext);
+ my $endbody=&Apache::loncommon::endbodytag();
$r->print(<<"END");
<br />
<input type="hidden" name="blocktotal" value="$blockcount" />
<input type ="submit" value="Save Changes" />
</form>
-</body>
+$endbody
</html>
END
return;
@@ -1401,7 +1463,7 @@ sub blockstore {
my $addtotal = 0;
my %blocking = ();
$r->print('<h3>'.$lt{'head'}.'</h3>');
- foreach (keys %ENV) {
+ foreach (keys %env) {
if ($_ =~ m/^form\.modify_(\w+)$/) {
$adds{$1} = $1;
$removals{$1} = $1;
@@ -1419,23 +1481,23 @@ sub blockstore {
}
foreach (keys %removals) {
- my $hashkey = $ENV{'form.key_'.$_};
+ my $hashkey = $env{'form.key_'.$_};
&Apache::lonnet::del('comm_block',["$hashkey"],
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'}
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'}
);
}
foreach (keys %adds) {
unless ( defined($cancels{$_}) ) {
my ($newstart,$newend) = &get_dates_from_form($_);
my $newkey = $newstart.'____'.$newend;
- $blocking{$newkey} = $ENV{'user.name'}.'@'.$ENV{'user.domain'}.':'.$ENV{'form.title_'.$_};
+ $blocking{$newkey} = $env{'user.name'}.'@'.$env{'user.domain'}.':'.$env{'form.title_'.$_};
}
}
if ($addtotal + $modtotal > 0) {
&Apache::lonnet::put('comm_block',\%blocking,
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'}
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'}
);
}
my $chgestotal = $canceltotal + $modtotal + $addtotal;
@@ -1469,8 +1531,8 @@ sub get_blockdates {
my ($records,$blockcount) = @_;
$$blockcount = 0;
%{$records} = &Apache::lonnet::dump('comm_block',
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'}
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'}
);
$$blockcount = keys %{$records};
@@ -1488,7 +1550,7 @@ sub display_blocker_status {
my @bgcols = ("#eeeeee","#dddddd");
my $function = &Apache::loncommon::get_users_function();
my $color = &Apache::loncommon::designparm($function.'.tabbg',
- $ENV{'user.domain'});
+ $env{'user.domain'});
my %lt = &Apache::lonlocal::texthash(
'modi' => 'Modify',
'canc' => 'Cancel',
@@ -1523,8 +1585,8 @@ END
<tr bgcolor="$bgcols[$iter]">
<td>$$ltext{'star'}: $startform<br/>$$ltext{'endd'}: $endform</td>
<td>$settername</td>
- <td><input type="text" name="title_$parmcount" size="15" value="$title"/><input type="hidden" name="key_$parmcount" value="$_"></td>
- <td>$lt{'modi'}? <input type="checkbox" name="modify_$parmcount"/><br />$lt{'canc'}? <input type="checkbox" name="cancel_$parmcount"/>
+ <td><input type="text" name="title_$parmcount" size="15" value="$title" /><input type="hidden" name="key_$parmcount" value="$_" /></td>
+ <td><label>$lt{'modi'}? <input type="checkbox" name="modify_$parmcount" /></label><br /><label>$lt{'canc'}? <input type="checkbox" name="cancel_$parmcount" /></label>
</tr>
END
$parmcount ++;
@@ -1554,7 +1616,7 @@ sub display_addblocker_table {
my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange);
my $function = &Apache::loncommon::get_users_function();
my $color = &Apache::loncommon::designparm($function.'.tabbg',
- $ENV{'user.domain'});
+ $env{'user.domain'});
my %lt = &Apache::lonlocal::texthash(
'addb' => 'Add block',
'exam' => 'e.g., Exam 1',
@@ -1576,8 +1638,8 @@ sub display_addblocker_table {
</tr>
<tr bgcolor="#eeeeee">
<td>$$ltext{'star'}: $startform<br />$$ltext{'endd'}: $endform</td>
- <td><input type="text" name="title_$parmcount" size="15" value=""/></td>
- <td>$lt{'addb'}? <input type="checkbox" name="add_$parmcount" value="1"/></td>
+ <td><input type="text" name="title_$parmcount" size="15" value="" /></td>
+ <td><label>$lt{'addb'}? <input type="checkbox" name="add_$parmcount" value="1" /></label></td>
</tr>
</table>
</td>
@@ -1597,12 +1659,12 @@ sub blockcheck {
my @staffcses = ();
$$startblock = 0;
$$endblock = 0;
- foreach (keys %ENV) {
+ foreach (keys %env) {
if ($_ =~ m-^user\.role\.(st|cc|in)\./(.+)$-) {
my $role = $1;
my $cse = $2;
$cse =~ s|/|_|;
- if ($ENV{$_} =~ m/^(\d*)\.(\d*)$/) {
+ if ($env{$_} =~ m/^(\d*)\.(\d*)$/) {
unless (($2 > 0 && $2 < time) || ($1 > time)) {
if ($role eq 'st') {
push @livecses, $cse;
@@ -1614,14 +1676,14 @@ sub blockcheck {
}
}
} elsif ($_ =~ m-user\.role\.cr/(\w+)/(\w+)/([^/]+)\./(.+)$- ) {
- my $rolepriv = $ENV{'user.role..rolesdef_'.$3};
+ my $rolepriv = $env{'user.role..rolesdef_'.$3};
}
}
# Retrieve blocking times and identity of blocker for active courses for students.
if (@livecses > 0) {
foreach my $cse (@livecses) {
my ($cdom,$crs) = split/_/,$cse;
- if ( (grep/^$cse$/,@staffcses) && ($ENV{'request.role'} !~ m-^st\./$cdom/$crs$-) ) {
+ if ( (grep/^$cse$/,@staffcses) && ($env{'request.role'} !~ m-^st\./$cdom/$crs$-) ) {
next;
} else {
%{$$setters{$cse}} = ();
@@ -1652,7 +1714,7 @@ sub build_block_table {
my ($r,$startblock,$endblock,$setters) = @_;
my $function = &Apache::loncommon::get_users_function();
my $color = &Apache::loncommon::designparm($function.'.tabbg',
- $ENV{'user.domain'});
+ $env{'user.domain'});
my %lt = &Apache::lonlocal::texthash(
'cacb' => 'Currently active communication blocks',
'cour' => 'Course',
@@ -1737,8 +1799,9 @@ sub displaymessage {
'<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>'.
+ '"><b>'.&mt('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.
@@ -1749,6 +1812,20 @@ sub displaymessage {
'"><b>'.&mt('Next').'</b></a></td>');
}
$r->print('</tr></table>');
+ if ($env{'user.adv'}) {
+ $r->print('<table border="2" width="100%"><tr bgcolor="#FFAAAA"><td>'.&mt('Currently available actions (will open extra window)').':</td>');
+ my $symb=&Apache::lonnet::symbread($content{'baseurl'});
+ if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
+ $r->print('<td><b>'.&Apache::loncommon::track_student_link(&mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check').'</b></td>');
+ }
+ if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) && $symb) {
+ $r->print('<td><b>'.&Apache::loncommon::pprmlink(&mt('Set/Change parameters'),$content{'sendername'},$content{'senderdomain'},$symb,'check').'</b></td>');
+ }
+ if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}) && $symb) {
+ $r->print('<td><b>'.&Apache::loncommon::pgrdlink(&mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check').'</b></td>');
+ }
+ $r->print('</tr></table>');
+ }
$r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
($folder ne 'sent'?'<br /><b>'.&mt('From').':</b> '.
&Apache::loncommon::aboutmewrapper(
@@ -1780,7 +1857,7 @@ sub displayresource {
# If the recipient is in the same course that the message was sent from and
# has sufficient privileges, show "all details," else show citation
#
- if (($ENV{'request.course.id'} eq $content{'courseid'})
+ if (($env{'request.course.id'} eq $content{'courseid'})
&& (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
my $symb=&Apache::lonnet::symbread($content{'baseurl'});
# Could not get a symb, give up
@@ -1810,7 +1887,10 @@ sub displayresource {
sub header {
my ($r,$title,$baseurl)=@_;
- $r->print('<html><head><title>Communication and Messages</title>');
+ $r->print(&Apache::lonxml::xmlbegin().
+ '<head>'.&Apache::lonxml::fontsettings().
+ '<title>Communication and Messages</title>'.
+ &Apache::lonhtmlcommon::htmlareaheaders());
if ($baseurl) {
$r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />");
}
@@ -1835,22 +1915,23 @@ sub printheader {
sub storecomment {
my ($r)=@_;
- my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
+ my $msgtxt=&Apache::lonfeedback::clear_out_html($env{'form.message'});
my $cleanmsgtxt='';
foreach (split(/[\n\r]/,$msgtxt)) {
unless ($_=~/^\s*(\>|\>\;)/) {
$cleanmsgtxt.=$_."\n";
}
}
- my $key=&Apache::lonnet::escape($ENV{'form.baseurl'}).'___'.time;
+ my $key=&Apache::lonnet::escape($env{'form.baseurl'}).'___'.time;
&Apache::lonnet::put('nohist_stored_comments',{ $key => $cleanmsgtxt });
}
sub storedcommentlisting {
my ($r)=@_;
my %msgs=&Apache::lonnet::dump('nohist_stored_comments',undef,undef,
- '^'.&Apache::lonnet::escape(&Apache::lonnet::escape($ENV{'form.showcommentbaseurl'})));
- $r->print('<html><body>');
+ '^'.&Apache::lonnet::escape(&Apache::lonnet::escape($env{'form.showcommentbaseurl'})));
+ $r->print(&Apache::lonxml::xmlbegin().'<head>'.
+ &Apache::lonxml::fontsettings().'</head><body>');
if ((keys %msgs)[0]=~/^error\:/) {
$r->print(&mt('No stored comments yet.'));
} else {
@@ -1871,35 +1952,35 @@ sub sendoffmail {
my ($r,$folder)=@_;
my $suffix=&foldersuffix($folder);
my $sendstatus='';
- if ($ENV{'form.send'}) {
+ if ($env{'form.send'}) {
&printheader($r,'','Messages being sent.');
$r->rflush();
my %content=();
undef %content;
- if ($ENV{'form.forwid'}) {
- my $msgid=$ENV{'form.forwid'};
+ if ($env{'form.forwid'}) {
+ my $msgid=$env{'form.forwid'};
my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
%content=&unpackagemsg($message{$msgid},1);
&statuschange($msgid,'forwarded',$folder);
- $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
+ $env{'form.message'}.="\n\n-- Forwarded message --\n\n".
$content{'message'};
}
- if ($ENV{'form.replyid'}) {
- my $msgid=$ENV{'form.replyid'};
+ if ($env{'form.replyid'}) {
+ my $msgid=$env{'form.replyid'};
my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
%content=&unpackagemsg($message{$msgid},1);
&statuschange($msgid,'replied',$folder);
}
my %toaddr=();
undef %toaddr;
- if ($ENV{'form.sendmode'} eq 'group') {
- foreach (keys %ENV) {
+ 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'})) {
+ } elsif ($env{'form.sendmode'} eq 'upload') {
+ foreach (split(/[\n\r\f]+/,$env{'form.upfile'})) {
my ($rec,$txt)=split(/\s*\:\s*/,$_);
if ($txt) {
$rec=~s/\@/\:/;
@@ -1907,10 +1988,10 @@ sub sendoffmail {
}
}
} else {
- $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';
+ $toaddr{$env{'form.recuname'}.':'.$env{'form.recdomain'}}='';
}
- if ($ENV{'form.additionalrec'}) {
- foreach (split(/\,/,$ENV{'form.additionalrec'})) {
+ if ($env{'form.additionalrec'}) {
+ foreach (split(/\,/,$env{'form.additionalrec'})) {
my ($auname,$audom)=split(/\@/,$_);
$toaddr{$auname.':'.$audom}='';
}
@@ -1919,31 +2000,31 @@ sub sendoffmail {
foreach (keys %toaddr) {
my ($recuname,$recdomain)=split(/\:/,$_);
my $msgtxt;
- if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) &&
- (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
- $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'},1);
+ if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) &&
+ (&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) {
+ $msgtxt=&Apache::lonfeedback::clear_out_html($env{'form.message'},1);
} else {
- $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
+ $msgtxt=&Apache::lonfeedback::clear_out_html($env{'form.message'});
}
if ($toaddr{$_}) { $msgtxt.='<hr />'.$toaddr{$_}; }
my $thismsg;
- if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) &&
- (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+ if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) &&
+ (&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) {
$r->print(&mt('Sending critical message').' '.$recuname.'@'.$recdomain.': ');
$thismsg=&user_crit_msg($recuname,$recdomain,
- &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+ &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'}),
+ &Apache::lonfeedback::clear_out_html($env{'form.subject'}),
$msgtxt,
- $content{'citation'});
- if (($ENV{'request.course.id'}) && ($ENV{'form.sendmode'} eq 'group')) {
+ $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'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'},
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
'Broadcast ['.$recuname.':'.$recdomain.']',
$msgtxt);
}
@@ -1956,7 +2037,7 @@ sub sendoffmail {
}
if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
$r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
- if ($ENV{'form.displayedcrit'}) {
+ if ($env{'form.displayedcrit'}) {
&discrit($r);
} else {
&Apache::loncommunicate::menu($r);
@@ -1986,11 +2067,11 @@ sub handler {
['display','replyto','forward','markread','markdel','markunread',
'sendreply','compose','sendmail','critical','recname','recdom',
'recordftf','sortedby','block','folder','startdis','interdis',
- 'showcommentbaseurl']);
- $sqs='&sortedby='.$ENV{'form.sortedby'};
+ 'showcommentbaseurl','dismode']);
+ $sqs='&sortedby='.$env{'form.sortedby'};
# ------------------------------------------------------ They checked for email
- unless ($ENV{'form.block'}) {
+ unless ($env{'form.block'}) {
&Apache::lonnet::put('email_status',{'recnewemail'=>0});
}
@@ -2004,33 +2085,41 @@ sub handler {
# ------------------------------------------------------------------ Get Folder
- my $folder=$ENV{'form.folder'};
+ my $folder=$env{'form.folder'};
unless ($folder) {
$folder='';
} else {
$sqs.='&folder='.&Apache::lonnet::escape($folder);
}
+# ------------------------------------------------------------ Get Display Mode
+
+ my $dismode=$env{'form.dismode'};
+ unless ($dismode) {
+ $dismode='';
+ } else {
+ $sqs.='&dismode='.&Apache::lonnet::escape($dismode);
+ }
# --------------------------------------------------------------------- Display
- $startdis=$ENV{'form.startdis'};
+ $startdis=$env{'form.startdis'};
$startdis--;
unless ($startdis) { $startdis=0; }
- $interdis=$ENV{'form.interdis'};
+ $interdis=$env{'form.interdis'};
unless ($interdis) { $interdis=20; }
$sqs.='&interdis='.$interdis;
- if ($ENV{'form.firstview'}) {
+ if ($env{'form.firstview'}) {
$startdis=0;
}
- if ($ENV{'form.lastview'}) {
+ if ($env{'form.lastview'}) {
$startdis=-1;
}
- if ($ENV{'form.prevview'}) {
+ if ($env{'form.prevview'}) {
$startdis--;
}
- if ($ENV{'form.nextview'}) {
+ if ($env{'form.nextview'}) {
$startdis++;
}
my $postedstartdis=$startdis+1;
@@ -2038,13 +2127,13 @@ sub handler {
# --------------------------------------------------------------- Render Output
- if ($ENV{'form.display'}) {
- &displaymessage($r,$ENV{'form.display'},$folder);
- } elsif ($ENV{'form.replyto'}) {
- &compout($r,'',$ENV{'form.replyto'},undef,undef,$folder);
- } elsif ($ENV{'form.confirm'}) {
+ if ($env{'form.display'}) {
+ &displaymessage($r,$env{'form.display'},$folder);
+ } elsif ($env{'form.replyto'}) {
+ &compout($r,'',$env{'form.replyto'},undef,undef,$folder,$dismode);
+ } elsif ($env{'form.confirm'}) {
&printheader($r,'','Confirmed Receipt');
- foreach (keys %ENV) {
+ foreach (keys %env) {
if ($_=~/^form\.rec\_(.*)$/) {
$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
&user_crit_received($1).'<br>');
@@ -2057,32 +2146,32 @@ sub handler {
}
}
&discrit($r);
- } elsif ($ENV{'form.critical'}) {
+ } elsif ($env{'form.critical'}) {
&printheader($r,'','Displaying Critical Messages');
&discrit($r);
- } elsif ($ENV{'form.forward'}) {
- &compout($r,$ENV{'form.forward'},undef,undef,undef,$folder);
- } elsif ($ENV{'form.markdel'}) {
+ } elsif ($env{'form.forward'}) {
+ &compout($r,$env{'form.forward'},undef,undef,undef,$folder);
+ } elsif ($env{'form.markdel'}) {
&printheader($r,'','Deleted Message');
- &statuschange($ENV{'form.markdel'},'deleted',$folder);
+ &statuschange($env{'form.markdel'},'deleted',$folder);
&Apache::loncommunicate::menu($r);
- &disall($r,$folder);
- } elsif ($ENV{'form.markedmove'}) {
+ &disall($r,($folder?$folder:$dismode));
+ } elsif ($env{'form.markedmove'}) {
my $total=0;
- foreach (keys %ENV) {
+ foreach (keys %env) {
if ($_=~/^form\.delmark_(.*)$/) {
&movemsg(&Apache::lonnet::unescape($1),$folder,
- $ENV{'form.movetofolder'});
+ $env{'form.movetofolder'});
$total++;
}
}
&printheader($r,'','Moved Messages');
$r->print('Moved '.$total.' message(s)<p>');
&Apache::loncommunicate::menu($r);
- &disall($r,$folder);
- } elsif ($ENV{'form.markeddel'}) {
+ &disall($r,($folder?$folder:$dismode));
+ } elsif ($env{'form.markeddel'}) {
my $total=0;
- foreach (keys %ENV) {
+ foreach (keys %env) {
if ($_=~/^form\.delmark_(.*)$/) {
&statuschange(&Apache::lonnet::unescape($1),'deleted',$folder);
$total++;
@@ -2091,37 +2180,44 @@ sub handler {
&printheader($r,'','Deleted Messages');
$r->print('Deleted '.$total.' message(s)<p>');
&Apache::loncommunicate::menu($r);
- &disall($r,$folder);
- } elsif ($ENV{'form.markunread'}) {
+ &disall($r,($folder?$folder:$dismode));
+ } elsif ($env{'form.markunread'}) {
&printheader($r,'','Marked Message as Unread');
- &statuschange($ENV{'form.markunread'},'new');
+ &statuschange($env{'form.markunread'},'new');
&Apache::loncommunicate::menu($r);
- &disall($r,$folder);
- } elsif ($ENV{'form.compose'}) {
- &compout($r,'','',$ENV{'form.compose'});
- } elsif ($ENV{'form.recordftf'}) {
- &facetoface($r,$ENV{'form.recordftf'});
- } elsif ($ENV{'form.block'}) {
- &examblock($r,$ENV{'form.block'});
- } elsif ($ENV{'form.sendmail'}) {
+ &disall($r,($folder?$folder:$dismode));
+ } elsif ($env{'form.compose'}) {
+ &compout($r,'','',$env{'form.compose'});
+ } elsif ($env{'form.recordftf'}) {
+ &facetoface($r,$env{'form.recordftf'});
+ } elsif ($env{'form.block'}) {
+ &examblock($r,$env{'form.block'});
+ } elsif ($env{'form.sendmail'}) {
&sendoffmail($r,$folder);
- if ($ENV{'form.storebasecomment'}) {
+ if ($env{'form.storebasecomment'}) {
&storecomment($r);
}
- &disall($r,$folder);
- } elsif ($ENV{'form.newfolder'}) {
+ if (($env{'form.rsspost'}) && ($env{'request.course.id'})) {
+ &Apache::lonrss::addentry($env{'course.'.$env{'request.course.id'}.'.num'},
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ 'Course_Announcements',
+ $env{'form.subject'},
+ $env{'form.message'},'/adm/communicate','public');
+ }
+ &disall($r,($folder?$folder:$dismode));
+ } elsif ($env{'form.newfolder'}) {
&printheader($r,'','New Folder');
- &makefolder($ENV{'form.newfolder'});
+ &makefolder($env{'form.newfolder'});
&Apache::loncommunicate::menu($r);
- &disall($r,$ENV{'form.newfolder'});
- } elsif ($ENV{'form.showcommentbaseurl'}) {
+ &disall($r,$env{'form.newfolder'});
+ } elsif ($env{'form.showcommentbaseurl'}) {
&storedcommentlisting($r);
} else {
&printheader($r,'','Display All Messages');
- &Apache::loncommunicate::menu($r);
- &disall($r,$folder);
+ &Apache::loncommunicate::menu($r);
+ &disall($r,($folder?$folder:$dismode));
}
- $r->print('</body></html>');
+ $r->print(&Apache::loncommon::endbodytag().'</html>');
return OK;
}
# ================================================= Main program, reset counter