--- loncom/interface/lonmsg.pm 2004/09/10 08:42:21 1.107
+++ loncom/interface/lonmsg.pm 2006/01/05 20:10:54 1.169
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.107 2004/09/10 08:42:21 www Exp $
+# $Id: lonmsg.pm,v 1.169 2006/01/05 20:10:54 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -90,13 +90,24 @@ 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
it is likely you will not need to programmatically read messages,
since lonmsg already implements that functionality.
+The routines used to package messages and unpackage messages are not
+only used by lonmsg when creating/extracting messages for LON-CAPA's
+internal messaging system, but also by lonnotify.pm which is available
+for use by Domain Coordinators to broadcast standard e-mail to specified
+users in their domain. The XML packaging used in the two cases is very
+similar. The differences are the use of <recuser>$uname</recuser> and
+<recdomain>$udom</recdomain> in stored internal messages, compared
+with <recipient username="$uname:$udom">$email</recipient> in stored
+Domain Coordinator e-mail for the storage of information about
+recipients of the message/e-mail.
+
=head1 FUNCTIONS
=over 4
@@ -104,7 +115,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,14 +125,19 @@ 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;
+my $startdis;
+my $interdis;
# ===================================================================== Package
sub packagemsg {
- my ($subject,$message,$citation,$baseurl,$attachmenturl)=@_;
+ my ($subject,$message,$citation,$baseurl,$attachmenturl,
+ $recuser,$recdomain,$msgid,$type)=@_;
$message =&HTML::Entities::encode($message,'<>&"');
$citation=&HTML::Entities::encode($citation,'<>&"');
$subject =&HTML::Entities::encode($subject,'<>&"');
@@ -131,32 +147,66 @@ sub packagemsg {
#remove machine specification
$attachmenturl =~ s|^http://[^/]+/|/|;
$attachmenturl =&HTML::Entities::encode($attachmenturl,'<>&"');
-
+ my $course_context;
+ if (defined($env{'form.replyid'})) {
+ my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$origcid)=
+ split(/\:/,&Apache::lonnet::unescape($env{'form.replyid'}));
+ $course_context = $origcid;
+ }
+ foreach my $key (keys(%env)) {
+ if ($key=~/^form\.(rep)?rec\_(.*)$/) {
+ my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$origcid) =
+ split(/\:/,&Apache::lonnet::unescape($2));
+ $course_context = $origcid;
+ last;
+ }
+ }
+ unless(defined($course_context)) {
+ $course_context = $env{'request.course.id'};
+ }
my $now=time;
$msgcount++;
- 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>'.
+ unless(defined($msgid)) {
+ $msgid = &buildmsgid($now,$subject,$env{'user.name'},$env{'user.domain'},
+ $msgcount,$course_context,$$);
+ }
+ 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>'.
- '<msgid>'.$msgid.'</msgid>'.
- '<message>'.$message.'</message>';
+ '<courseid>'.$course_context.'</courseid>'.
+ '<coursesec>'.$env{'request.course.sec'}.'</coursesec>'.
+ '<role>'.$env{'request.role'}.'</role>'.
+ '<resource>'.$env{'request.filename'}.'</resource>'.
+ '<msgid>'.$msgid.'</msgid>';
+ if (ref($recuser) eq 'ARRAY') {
+ for (my $i=0; $i<@{$recuser}; $i++) {
+ if ($type eq 'dcmail') {
+ my ($username,$email) = split(/:/,$$recuser[$i]);
+ $username = &Apache::lonnet::unescape($username);
+ $email = &Apache::lonnet::unescape($email);
+ $username = &HTML::Entities::encode($username,'<>&"');
+ $email = &HTML::Entities::encode($email,'<>&"');
+ $result .= '<recipient username="'.$username.'">'.
+ $email.'</recipient>';
+ } else {
+ $result .= '<recuser>'.$$recuser[$i].'</recuser>'.
+ '<recdomain>'.$$recdomain[$i].'</recdomain>';
+ }
+ }
+ } else {
+ $result .= '<recuser>'.$recuser.'</recuser>'.
+ '<recdomain>'.$recdomain.'</recdomain>';
+ }
+ $result .= '<message>'.$message.'</message>';
if (defined($citation)) {
$result.='<citation>'.$citation.'</citation>';
}
@@ -180,9 +230,18 @@ sub unpackagemsg {
if ($token->[0] eq 'S') {
my $entry=$token->[1];
my $value=$parser->get_text('/'.$entry);
- $content{$entry}=$value;
+ if (($entry eq 'recuser') || ($entry eq 'recdomain')) {
+ push(@{$content{$entry}},$value);
+ } elsif ($entry eq 'recipient') {
+ my $username = $token->[2]{'username'};
+ $username = &HTML::Entities::decode($username,'<>&"');
+ $content{$entry}{$username} = $value;
+ } else {
+ $content{$entry}=$value;
+ }
}
}
+ if (!exists($content{'recuser'})) { $content{'recuser'} = []; }
if ($content{'attachmenturl'}) {
my ($fname)=($content{'attachmenturl'}=~m|/([^/]+)$|);
if ($notoken) {
@@ -200,17 +259,32 @@ sub unpackagemsg {
# ======================================================= Get info out of msgid
+sub buildmsgid {
+ my ($now,$subject,$uname,$udom,$msgcount,$course_context,$pid) = @_;
+ $subject=&Apache::lonnet::escape($subject);
+ return(&Apache::lonnet::escape($now.':'.$subject.':'.$uname.':'.
+ $udom.':'.$msgcount.':'.$course_context.':'.$pid));
+}
+
sub unpackmsgid {
- my ($msgid,$folder)=@_;
+ my ($msgid,$folder,$skipstatus,$status_cache)=@_;
$msgid=&Apache::lonnet::unescape($msgid);
- my $suffix=&foldersuffix($folder);
- my ($sendtime,$shortsubj,$fromname,$fromdomain)=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});
-}
+ my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$fromcid,
+ $processid)=split(/\:/,&Apache::lonnet::unescape($msgid));
+ if (!defined($processid)) { $fromcid = ''; }
+ my %status=();
+ unless ($skipstatus) {
+ if (ref($status_cache)) {
+ $status{$msgid} = $status_cache->{$msgid};
+ } else {
+ my $suffix=&foldersuffix($folder);
+ %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},$fromcid);
+}
sub sendemail {
@@ -221,22 +295,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;
@@ -245,18 +321,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; }
@@ -325,7 +405,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 {
@@ -341,11 +434,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,$sentmessage)=@_;
# 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);
@@ -354,28 +448,30 @@ sub user_crit_msg_raw {
'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);
- }
+ if (defined($sentmessage)) {
+ $$sentmessage = $message;
+ }
} else {
$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;
@@ -392,7 +488,7 @@ sub user_crit_msg_raw {
=cut
sub user_crit_msg {
- my ($user,$domain,$subject,$message,$sendback)=@_;
+ my ($user,$domain,$subject,$message,$sendback,$toperm,$sentmessage)=@_;
my $status='';
my %userenv = &Apache::lonnet::get('environment',['msgforward'],
$domain,$user);
@@ -402,10 +498,10 @@ sub user_crit_msg {
my ($forwuser,$forwdomain)=split(/\:/,$_);
$status.=
&user_crit_msg_raw($forwuser,$forwdomain,$subject,$message,
- $sendback).' ';
+ $sendback,$toperm,$sentmessage).' ';
}
} else {
- $status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback);
+ $status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback,$toperm,$sentmessage);
}
return $status;
}
@@ -418,8 +514,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"
@@ -429,8 +525,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;
@@ -439,32 +535,56 @@ 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,$currid,$newid,$sentmessage)=@_;
# 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') {
($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl,
- $attachmenturl);
+ $attachmenturl,$user,$domain,$currid);
+# Store in user folder
$status=&Apache::lonnet::critical(
'put:'.$domain.':'.$user.':nohist_email:'.
&Apache::lonnet::escape($msgid).'='.
&Apache::lonnet::escape($message),$homeserver);
+# Save new message received time
&Apache::lonnet::put
('email_status',{'recnewemail'=>time},$domain,$user);
+# Into sent-mail folder unless a broadcast message or critical message
+ unless (($env{'request.course.id'}) &&
+ (($env{'form.sendmode'} eq 'group') ||
+ (($env{'form.critmsg'}) || ($env{'form.sendbck'})) &&
+ (&Apache::lonnet::allowed('srm',$env{'request.course.id'})))) {
+ $status .= &store_sent_mail($msgid,$message);
+ }
} else {
$status='no_host';
}
+ if (defined($newid)) {
+ $$newid = $msgid;
+ }
+ if (defined($sentmessage)) {
+ $$sentmessage = $message;
+ }
+
# 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);
}
- &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
- $ENV{'user.home'},
+ if ($toperm && $userenv{'permanentemail'}) {
+ &sendnotification($userenv{'permanentemail'},$user,$domain,$subject,0,
+ $text);
+ }
+ &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
+ $env{'user.home'},
'Sending '.$msgid.' to '.$user.' at '.$domain.' with status: '.$status);
return $status;
}
@@ -480,7 +600,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,$sentmessage)=@_;
my $status='';
my %userenv = &Apache::lonnet::get('environment',['msgforward'],
$domain,$user);
@@ -490,15 +611,24 @@ sub user_normal_msg {
my ($forwuser,$forwdomain)=split(/\:/,$_);
$status.=
&user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
- $citation,$baseurl,$attachmenturl).' ';
+ $citation,$baseurl,$attachmenturl,$toperm,undef,undef,$sentmessage).' ';
}
} else {
$status=&user_normal_msg_raw($user,$domain,$subject,$message,
- $citation,$baseurl,$attachmenturl);
+ $citation,$baseurl,$attachmenturl,$toperm,undef,undef,$sentmessage);
}
return $status;
}
+sub store_sent_mail {
+ my ($msgid,$message) = @_;
+ my $status =' '.&Apache::lonnet::critical(
+ 'put:'.$env{'user.domain'}.':'.$env{'user.name'}.
+ ':nohist_email_sent:'.
+ &Apache::lonnet::escape($msgid).'='.
+ &Apache::lonnet::escape($message),$env{'user.home'});
+ return $status;
+}
# ============================================================ List all folders
@@ -507,15 +637,37 @@ sub folderlist {
my @allfolders=&Apache::lonnet::getkeys('email_folders');
if ($allfolders[0]=~/^error:/) { @allfolders=(); }
return '<form method="post" action="/adm/email">'.
- '<input type="submit" value="'.&mt('View Folder').'" />'.
+ &mt('Folder').': '.
&Apache::loncommon::select_form($folder,'folder',
('' => &mt('INBOX'),'trash' => &mt('TRASH'),
+ 'new' => &mt('New Messages Only'),
+ 'critical' => &mt('Critical'),
'sent' => &mt('Sent Messages'),
map { $_ => $_ } @allfolders)).
- '<a href="/adm/email?critical=display">'.
- &mt('View Critical Messages').'</a>'.
- '</form>';
+ ' '.&mt('Show').
+ '<select name="interdis">'.
+ join("\n",map { '<option value="'.$_.'"'.
+ ($_==$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'}.'" />'.
+ ($folder=~/^(new|critical)/?'</form>':'');
+}
+
+sub scrollbuttons {
+ my ($start,$maxdis,$first,$finish,$total)=@_;
+ unless ($total>0) { return ''; }
+ $start++; $maxdis++;$first++;$finish++;
+ 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('Showing messages [_1] through [_2] of [_3]',$first,$finish,$total).'</form>';
}
+
# =============================================================== Folder suffix
sub foldersuffix {
@@ -539,12 +691,19 @@ 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
sub makefolder {
my ($newfolder)=@_;
+ if (($newfolder eq 'sent')
+ || ($newfolder eq 'critical')
+ || ($newfolder eq 'trash')
+ || ($newfolder eq 'new')) { return; }
&Apache::lonnet::put('email_folders',{$newfolder => time});
}
@@ -552,7 +711,7 @@ sub makefolder {
sub movemsg {
my ($msgid,$srcfolder,$trgfolder)=@_;
- my $unmsgid=&Apache::lonnet::unescape($msgid);
+ if ($srcfolder eq 'new') { $srcfolder=''; }
my $srcsuffix=&foldersuffix($srcfolder);
my $trgsuffix=&foldersuffix($trgfolder);
@@ -561,30 +720,24 @@ sub movemsg {
&Apache::lonnet::put('nohist_email'.$trgsuffix,{$msgid => $message{$msgid}});
# Copy status
- my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$unmsgid]);
- &Apache::lonnet::put('email_status'.$trgsuffix,{$unmsgid => $status{$unmsgid}});
-# See if was deleted -> becomes "read" in trash
- my $currentstatus=(&unpackmsgid($status{$unmsgid}));
- 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]);
- &Apache::lonnet::del('email_status'.$srcsuffix,[$unmsgid]);
+ &Apache::lonnet::del('email_status'.$srcsuffix,[$msgid]);
}
# ======================================================= Display a course list
sub discourse {
my $r=shift;
- my %courselist=&Apache::lonnet::dump(
- 'classlist',
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ 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>
@@ -618,43 +771,50 @@ 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
- my %coursepersonnel=
- &Apache::lonnet::get_course_adv_roles();
+ my %coursepersonnel=&Apache::lonnet::get_course_adv_roles();
+ $r->print('<table>');
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 (split(/\,/,$coursepersonnel{$role})) {
+ my ($puname,$pudom)=split(/\:/,$_);
+ $r->print('<tr><td><label>'.
+ '<input type="checkbox" name="send_to_&&&&&&_'.
+ $puname.':'.$pudom.'" /> '.
+ &Apache::loncommon::plainname($puname,$pudom).
+ '</label></td>'.
+ '<td>('.$_.'),</td><td><i>'.$role.'</i></td></tr>');
+ }
}
-
- foreach (sort keys %courselist) {
- my ($end,$start)=split(/\:/,$courselist{$_});
- my $active=1;
- if (($end) && ($now>$end)) { $active=0; }
- if ($active) {
- my ($sname,$sdom)=split(/\:/,$_);
- my %reply=&Apache::lonnet::get('environment',
- ['firstname','middlename','lastname','generation'],
- $sdom,$sname);
- my $section=&Apache::lonnet::usection
- ($sdom,$sname,$ENV{'request.course.id'});
- $r->print(
- '<br><input type=checkbox name="send_to_&&&'.$section.'&&&_'.$_.'"> '.
- $reply{'firstname'}.' '.
- $reply{'middlename'}.' '.
- $reply{'lastname'}.' '.
- $reply{'generation'}.
- ' ('.$_.') '.$section);
- }
+ $r->print('</table><table>');
+ 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(),
+ &Apache::loncoursedata::CL_STATUS(),
+ &Apache::loncoursedata::CL_FULLNAME(),
+ &Apache::loncoursedata::CL_SECTION()]);
+ next if ($status ne 'Active');
+ 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.'</label></td><td>'.$sname.'@'.$sdom.'</td><td>'.$section.
+ '</td></tr>');
}
+ $r->print('</table>');
}
# ==================================================== Display Critical Message
@@ -662,28 +822,27 @@ 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) {
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>'.
+ '<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 '') {
@@ -694,7 +853,7 @@ $content{'sendername'}.'@'.
$r->print($header);
}
$r->print($result);
- $r->print('<input type=hidden name="displayedcrit" value="true" /></form>');
+ $r->print('<input type="hidden" name="displayedcrit" value="true" /></form>');
}
sub sortedmessages {
@@ -703,12 +862,17 @@ sub sortedmessages {
my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);
#unpack the varibles and repack into temp for sorting
my @temp;
+ my %descriptions;
+ my %status_cache =
+ &Apache::lonnet::get('email_status'.&foldersuffix($folder),\@messages);
foreach (@messages) {
my $msgid=&Apache::lonnet::escape($_);
- my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
- &Apache::lonmsg::unpackmsgid($msgid);
+ my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)=
+ &Apache::lonmsg::unpackmsgid($msgid,$folder,undef,
+ \%status_cache);
+ my $description = &get_course_desc($fromcid,\%descriptions);
my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,
- $msgid);
+ $msgid,$description);
# Check whether message was sent during blocking period.
if ($sendtime >= $startblock && ($sendtime <= $endblock && $endblock > 0) ) {
my $escid = &Apache::lonnet::unescape($msgid);
@@ -720,43 +884,173 @@ 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 "course"){
+ @temp = sort {lc($a->[6]) cmp lc($b->[6])} @temp;
+ }
+ if ($env{'form.sortedby'} eq "revcourse"){
+ @temp = sort {lc($b->[6]) cmp lc($a->[6])} @temp;
+ }
+ 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;
}
+sub get_course_desc {
+ my ($fromcid,$descriptions) = @_;
+ my $description;
+ if (!$fromcid) {
+ return $description;
+ } else {
+ if (defined($$descriptions{$fromcid})) {
+ $description = $$descriptions{$fromcid};
+ } else {
+ if (defined($env{'course.'.$fromcid.'.description'})) {
+ $description = $env{'course.'.$fromcid.'.description'};
+ } else {
+ my %courseinfo=&Apache::lonnet::coursedescription($fromcid); $description = $courseinfo{'description'};
+ $description = $courseinfo{'description'};
+ }
+ $$descriptions{$fromcid} = $description;
+ }
+ return $description;
+ }
+}
+
+# ======================================================== Display new messages
+
+
+sub disnew {
+ my $r=shift;
+ my %lt=&Apache::lonlocal::texthash(
+ 'nm' => 'New Messages',
+ 'su' => 'Subject',
+ 'co' => 'Course',
+ 'da' => 'Date',
+ 'us' => 'Username',
+ 'op' => 'Open',
+ 'do' => 'Domain'
+ );
+ my @msgids = sort(&Apache::lonnet::getkeys('nohist_email'));
+ my @newmsgs;
+ my %setters = ();
+ my $startblock = 0;
+ my $endblock = 0;
+ my %blocked = ();
+ my $numblocked = 0;
+ # Check for blocking of display because of scheduled online exams.
+ &blockcheck(\%setters,\$startblock,\$endblock);
+ my %status_cache =
+ &Apache::lonnet::get('email_status',\@msgids);
+ my %descriptions;
+ foreach (@msgids) {
+ my $msgid=&Apache::lonnet::escape($_);
+ my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
+ &Apache::lonmsg::unpackmsgid($msgid,undef,undef,\%status_cache);
+ if (defined($sendtime) && $sendtime!~/error/) {
+ my $description = &get_course_desc($fromcid,\%descriptions);
+ my $numsendtime = $sendtime;
+ $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
+ if ($status eq 'new') {
+ if ($numsendtime >= $startblock && ($numsendtime <= $endblock && $endblock > 0) ) {
+ $blocked{$_} = 'ON';
+ $numblocked ++;
+ } else {
+ push @newmsgs, {
+ msgid => $msgid,
+ sendtime => $sendtime,
+ shortsub => &Apache::lonnet::unescape($shortsubj),
+ from => $fromname,
+ fromdom => $fromdom,
+ course => $description
+ }
+ }
+ }
+ }
+ }
+ if ($#newmsgs >= 0) {
+ $r->print(<<TABLEHEAD);
+<h2>$lt{'nm'}</h2>
+<table border=2><tr><th> </th>
+<th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th><th>$lt{'co'}</th></tr>
+TABLEHEAD
+ foreach my $msg (@newmsgs) {
+ $r->print(<<"ENDLINK");
+<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','course') {
+ $r->print("<td>$msg->{$_}</td>");
+ }
+ $r->print("</td></tr>");
+ }
+ $r->print('</table>'.&Apache::loncommon::endbodytag().'</html>');
+ } elsif ($numblocked == 0) {
+ $r->print("<h3>".&mt('You have no unread messages')."</h3>");
+ }
+ if ($numblocked > 0) {
+ my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
+ my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
+ if ($numblocked == 1) {
+ $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread message').".</h3>");
+ $r->print(&mt('This message is not viewable because').' ');
+ } else {
+ $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread messages').".</h3>");
+ $r->print(&mt('These').' '.$numblocked.' '.&mt('messages are not viewable because '));
+ }
+ $r->print(
+&mt('display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams').'.');
+ &build_block_table($r,$startblock,$endblock,\%setters);
+ }
+}
+
+
# ======================================================== Display all messages
sub disall {
my ($r,$folder)=@_;
+ $r->print(&folderlist($folder));
+ if ($folder eq 'new') {
+ &disnew($r);
+ } elsif ($folder eq 'critical') {
+ &discrit($r);
+ } else {
+ &disfolder($r,$folder);
+ }
+}
+
+# ============================================================ Display a folder
+
+sub disfolder {
+ my ($r,$folder)=@_;
my %blocked = ();
my %setters = ();
my $startblock;
@@ -784,82 +1078,103 @@ sub disall {
}
</script>
ENDDISHEADER
- $r->print('<h2>'.&mt('Display All Messages').'</h2>'.
- &folderlist($folder).
- '<form method="post" name="disall" action="/adm/email">'.
+ my $fsqs='&folder='.$folder;
+ my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
+ my $totalnumber=$#temp+1;
+ unless ($totalnumber>0) {
+ $r->print('<h2>'.&mt('Empty Folder').'</h2>');
+ return;
+ }
+ unless ($interdis) {
+ $interdis=20;
+ }
+ my $number=int($totalnumber/$interdis);
+ if (($startdis<0) || ($startdis>$number)) { $startdis=$number; }
+ my $firstdis=$interdis*$startdis;
+ if ($firstdis>$#temp) { $firstdis=$#temp-$interdis+1; }
+ my $lastdis=$firstdis+$interdis-1;
+ if ($lastdis>$#temp) { $lastdis=$#temp; }
+ $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") {
- $r->print('<a href = "?sortedby=date">'.&mt('Date').'</a></th>');
+ if ($env{'form.sortedby'} eq "revdate") {
+ $r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
} else {
- $r->print('<a href = "?sortedby=revdate">'.&mt('Date').'</a></th>');
+ $r->print('<a href = "?sortedby=revdate'.$fsqs.'">'.&mt('Date').'</a></th>');
}
$r->print('<th>');
- if ($ENV{'form.sortedby'} eq "revuser") {
- $r->print('<a href = "?sortedby=user">'.&mt('Username').'</a>');
+ if ($env{'form.sortedby'} eq "revuser") {
+ $r->print('<a href = "?sortedby=user'.$fsqs.'">'.&mt('Username').'</a>');
} else {
- $r->print('<a href = "?sortedby=revuser">'.&mt('Username').'</a>');
+ $r->print('<a href = "?sortedby=revuser'.$fsqs.'">'.&mt('Username').'</a>');
}
$r->print('</th><th>');
- if ($ENV{'form.sortedby'} eq "revdomain") {
- $r->print('<a href = "?sortedby=domain">'.&mt('Domain').'</a>');
+ if ($env{'form.sortedby'} eq "revdomain") {
+ $r->print('<a href = "?sortedby=domain'.$fsqs.'">'.&mt('Domain').'</a>');
} else {
- $r->print('<a href = "?sortedby=revdomain">'.&mt('Domain').'</a>');
+ $r->print('<a href = "?sortedby=revdomain'.$fsqs.'">'.&mt('Domain').'</a>');
}
$r->print('</th><th>');
- if ($ENV{'form.sortedby'} eq "revsubject") {
- $r->print('<a href = "?sortedby=subject">'.&mt('Subject').'</a>');
+ if ($env{'form.sortedby'} eq "revsubject") {
+ $r->print('<a href = "?sortedby=subject'.$fsqs.'">'.&mt('Subject').'</a>');
} else {
- $r->print('<a href = "?sortedby=revsubject">'.&mt('Subject').'</a>');
+ $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">'.&mt('Status').'</th>');
+ if ($env{'form.sortedby'} eq "revcourse") {
+ $r->print('<a href = "?sortedby=course'.$fsqs.'">'.&mt('Course').'</a>');
} else {
- $r->print('<a href = "?sortedby=revstatus">'.&mt('Status').'</th>');
+ $r->print('<a href = "?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>');
}
- $r->print('</tr>');
- my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
- foreach (@temp){
- my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @$_;
+ $r->print('</th><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').'</a></th>');
+ }
+ $r->print("</tr>\n");
+ for (my $n=$firstdis;$n<=$lastdis;$n++) {
+ my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,$description)= @{$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>'.
- $status.'</td></tr>');
+ $description.'</td><td>'.$status.'</td></tr>'."\n");
} elsif ($status eq 'deleted') {
# purge
- &movemsg($origID,$folder,'trash');
+ &movemsg(&Apache::lonnet::unescape($origID),$folder,'trash');
}
}
- $r->print('</table><p>'.
+ $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>');
}
-$r->print('<p><input type="submit" name="markedmove" value="'.&mt('Move Checked to Folder').'" />');
+ $r->print('<p><input type="submit" name="markedmove" value="'.&mt('Move Checked to Folder').'" />');
my @allfolders=&Apache::lonnet::getkeys('email_folders');
if ($allfolders[0]=~/^error:/) { @allfolders=(); }
$r->print(
&Apache::loncommon::select_form('','movetofolder',
( map { $_ => $_ } @allfolders))
);
- $r->print('<input type="hidden" name="folder" value="'.$folder.'" /></form>');
+ 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>');
if ($numblocked > 0) {
my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
@@ -872,7 +1187,8 @@ $r->print('<p><input type="submit" name=
# ============================================================== Compose output
sub compout {
- my ($r,$forwarding,$replying,$broadcast,$replycrit)=@_;
+ my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder,$dismode)=@_;
+ my $suffix=&foldersuffix($folder);
if ($broadcast eq 'individual') {
&printheader($r,'/adm/email?compose=individual',
@@ -903,6 +1219,7 @@ sub compout {
my $dispcrit='';
my $dissub='';
my $dismsg='';
+ my $disbase='';
my $func=&mt('Send New');
my %lt=&Apache::lonlocal::texthash('us' => 'Username',
'do' => 'Domain',
@@ -911,20 +1228,23 @@ 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',[$forwarding]);
- %content=&unpackagemsg($message{$forwarding});
+ %message=&Apache::lonnet::get('nohist_email'.$suffix,[$forwarding]);
+ %content=&unpackagemsg($message{$forwarding},$folder);
$dispcrit.='<input type="hidden" name="forwid" value="'.
$forwarding.'" />';
$func=&mt('Forward');
@@ -932,21 +1252,34 @@ sub compout {
$dissub=&mt('Forwarding').': '.$content{'subject'};
$dismsg=&mt('Forwarded message from').' '.
$content{'sendername'}.' '.&mt('at').' '.$content{'senderdomain'};
+ if ($content{'baseurl'}) {
+ $disbase='<input type="hidden" name="baseurl" value="'.&Apache::lonnet::escape($content{'baseurl'}).'" />';
+ }
}
if ($replying) {
- %message=&Apache::lonnet::get('nohist_email',[$replying]);
- %content=&unpackagemsg($message{$replying});
+ %message=&Apache::lonnet::get('nohist_email'.$suffix,[$replying]);
+ %content=&unpackagemsg($message{$replying},$folder);
$dispcrit.='<input type="hidden" name="replyid" value="'.
$replying.'" />';
- $func=&mt('Replying to');
+ $func=&mt('Send Reply to');
$dissub=&mt('Reply').': '.$content{'subject'};
$dismsg='> '.$content{'message'};
$dismsg=~s/\r/\n/g;
$dismsg=~s/\f/\n/g;
$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.='<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 />';
+ }
+ }
}
- if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; }
+ my $citation=&displayresource(%content);
+ if ($env{'form.recdom'}) { $defdom=$env{'form.recdom'}; }
$r->print(
'<form action="/adm/email" name="compemail" method="post"'.
' enctype="multipart/form-data">'."\n".
@@ -967,7 +1300,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
@@ -982,11 +1315,15 @@ 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'}" />
+<input type="submit" name="cancel" value="$lt{'ca'}" /><hr />
+$citation
ENDCOMP
} else { # $broadcast is 'upload'
$r->print(<<ENDUPLOAD);
@@ -997,7 +1334,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:
@@ -1019,29 +1356,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";
@@ -1051,24 +1390,30 @@ 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/) {
$result .='<h3>'.&mt('Broadcast Message').'</h3>';
+ if ($content{'subject'}=~/^Broadcast\./) {
+ %content=&unpackagemsg($content{'message'});
+ $content{'message'}=
+ '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.
+ $content{'message'};
+ }
} else {
$result.='<h3>'.&mt('Critical Message').'</h3>';
%content=&unpackagemsg($content{'message'});
@@ -1081,9 +1426,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 '') {
@@ -1101,7 +1446,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,
@@ -1109,12 +1454,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
@@ -1130,7 +1475,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>
@@ -1141,23 +1486,24 @@ $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'}) {
+ my $recordtxt = $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'}.']',
+ $recordtxt);
}
- $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 />
@@ -1174,8 +1520,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',
@@ -1215,12 +1561,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;
@@ -1244,7 +1591,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;
@@ -1262,23 +1609,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;
@@ -1312,8 +1659,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};
@@ -1331,7 +1678,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',
@@ -1366,8 +1713,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 ++;
@@ -1397,7 +1744,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',
@@ -1419,8 +1766,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>
@@ -1440,12 +1787,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;
@@ -1457,14 +1804,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}} = ();
@@ -1495,7 +1842,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',
@@ -1580,10 +1927,10 @@ 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>'.
- '<td><a href="/adm/email?sortedby='.$ENV{'form.sortedby'}.
- '&folder='.&Apache::lonnet::escape($folder).
- '"><b>'.&mt('Display all Messages').'</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.
'"><b>'.&mt('Previous').'</b></a></td>');
@@ -1593,27 +1940,91 @@ 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>');
+ }
+ my $tolist;
+ my @recipients = ();
+ for (my $i=0; $i<@{$content{'recuser'}}; $i++) {
+ $recipients[$i] = &Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($content{'recuser'}[$i],
+ $content{'recdomain'}[$i]),
+ $content{'recuser'}[$i],$content{'recdomain'}[$i]).
+ ' ('.$content{'recuser'}[$i].' at '.$content{'recdomain'}[$i].') ';
+ }
+ $tolist = join(', ',@recipients);
$r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
- '<br /><b>'.&mt('From').':</b> '.
+ ($folder ne 'sent'?'<br /><b>'.&mt('From').':</b> '.
&Apache::loncommon::aboutmewrapper(
&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
$content{'sendername'},$content{'senderdomain'}).' ('.
$content{'sendername'}.' at '.
- $content{'senderdomain'}.') '.
+ $content{'senderdomain'}.') ':'<br /><b>'.&mt('To').':</b> '.
+ $tolist).
($content{'courseid'}?'<br /><b>'.&mt('Course').':</b> '.$courseinfo{'description'}.
($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):'').
'<br /><b>'.&mt('Time').':</b> '.$content{'time'}.
+ ($content{'baseurl'}?'<br /><b>'.&mt('Refers to').':</b> <a href="'.$content{'baseurl'}.'">'.
+ $content{'baseurl'}.' ('.&Apache::lonnet::gettitle($content{'baseurl'}).')</a>':'').
'<p><pre>'.
&Apache::lontexconvert::msgtexconverted($content{'message'},1).
- '</pre><hr />'.$content{'citation'}.'</p>');
+ '</pre><hr />'.&displayresource(%content).'</p>');
return;
}
+# =========================================================== Show the citation
+
+sub displayresource {
+ my %content=@_;
+#
+# 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'})
+ && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
+ my $symb=&Apache::lonnet::symbread($content{'baseurl'});
+# Could not get a symb, give up
+ unless ($symb) { return $content{'citation'}; }
+# Have a symb, can render
+ return '<h2>'.&mt('Current attempts of student (if applicable)').'</h2>'.
+ &Apache::loncommon::get_previous_attempt($symb,
+ $content{'sendername'},
+ $content{'senderdomain'},
+ $content{'courseid'}).
+ '<hr /><h2>'.&mt('Current screen output (if applicable)').'</h2>'.
+ &Apache::loncommon::get_student_view($symb,
+ $content{'sendername'},
+ $content{'senderdomain'},
+ $content{'courseid'}).
+ '<h2>'.&mt('Correct Answer(s) (if applicable)').'</h2>'.
+ &Apache::loncommon::get_student_answers($symb,
+ $content{'sendername'},
+ $content{'senderdomain'},
+ $content{'courseid'});
+ } else {
+ return $content{'citation'};
+ }
+}
+
# ================================================================== The Header
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\" />");
}
@@ -1634,6 +2045,206 @@ sub printheader {
&header($r,$title,$baseurl);
}
+# ------------------------------------------------------------ Store the comment
+
+sub storecomment {
+ my ($r)=@_;
+ 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;
+ &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(&Apache::lonxml::xmlbegin().'<head>'.
+ &Apache::lonxml::fontsettings().'</head><body>');
+ if ((keys %msgs)[0]=~/^error\:/) {
+ $r->print(&mt('No stored comments yet.'));
+ } else {
+ my $found=0;
+ foreach (sort keys %msgs) {
+ $r->print("\n".$msgs{$_}."<hr />");
+ $found=1;
+ }
+ unless ($found) {
+ $r->print(&mt('No stored comments yet for this resource.'));
+ }
+ }
+}
+
+# ---------------------------------------------------------------- Send an email
+
+sub sendoffmail {
+ my ($r,$folder)=@_;
+ my $suffix=&foldersuffix($folder);
+ my $sendstatus='';
+ my %specialmsg_status;
+ my $numspecial = 0;
+ if ($env{'form.send'}) {
+ &printheader($r,'','Messages being sent.');
+ $r->rflush();
+ my %content=();
+ undef %content;
+ 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".
+ $content{'message'};
+ }
+ 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 ($_=~/^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}='';
+ }
+ }
+
+ my $savemsg;
+ my $msgtype;
+ my %sentmessage;
+ if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) &&
+ (&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) {
+ $savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'},1);
+ $msgtype = 'critical';
+ } else {
+ $savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'});
+ }
+
+ foreach (keys %toaddr) {
+ my ($recuname,$recdomain)=split(/\:/,$_);
+ my $msgtxt = $savemsg;
+ if ($toaddr{$_}) { $msgtxt.='<hr />'.$toaddr{$_}; }
+ my $thismsg;
+ 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'}),
+ $msgtxt,
+ $env{'form.sendbck'},$env{'form.permanent'},\$sentmessage{$_});
+ } else {
+ $r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');
+ $thismsg=&user_normal_msg($recuname,$recdomain,
+ &Apache::lonfeedback::clear_out_html($env{'form.subject'}),
+ $msgtxt,
+ $content{'citation'},undef,undef,$env{'form.permanent'},\$sentmessage{$_});
+ }
+ if (($env{'request.course.id'}) && (($msgtype eq 'critical') ||
+ ($env{'form.sendmode'} eq 'group'))) {
+ $specialmsg_status{$recuname.':'.$recdomain} = $thismsg;
+ if ($thismsg eq 'ok') {
+ $numspecial ++;
+ }
+ }
+ $r->print($thismsg.'<br />');
+ $sendstatus.=' '.$thismsg;
+ }
+ if (($env{'request.course.id'}) && (($env{'form.sendmode'} eq 'group')
+ || ($msgtype eq 'critical'))) {
+ my $subj_prefix;
+ if ($msgtype eq 'critical') {
+ $subj_prefix = 'Critical.';
+ } else {
+ $subj_prefix = 'Broadcast.';
+ }
+ my ($specialmsgid,$specialresult);
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $course_str = &Apache::lonnet::escape('['.$cnum.':'.$cdom.']');
+
+ if ($numspecial) {
+ $specialresult = &user_normal_msg_raw($cnum,$cdom,$subj_prefix.
+ ' '.$course_str,$savemsg,undef,undef,undef,
+ undef,undef,\$specialmsgid);
+ $specialmsgid = &Apache::lonnet::unescape($specialmsgid);
+ }
+ if ($specialresult eq 'ok') {
+ my $record_sent;
+ my @recusers = ();
+ my @recudoms = ();
+ my ($stamp,$msgsubj,$msgname,$msgdom,$msgcount,$context,$pid) =
+ split(/\:/,&Apache::lonnet::unescape($specialmsgid));
+ foreach my $recipient (sort(keys(%toaddr))) {
+ if ($specialmsg_status{$recipient} eq 'ok') {
+ my $usersubj = $subj_prefix.'['.$recipient.']';
+ my $usermsgid = &buildmsgid($stamp,$usersubj,$msgname,
+ $msgdom,$msgcount,$context,$pid);
+ &user_normal_msg_raw($cnum,$cdom,$subj_prefix.
+ ' ['.$recipient.']',$sentmessage{$recipient},
+ undef,undef,undef,undef,$usermsgid);
+ my ($uname,$udom) = split/:/,$recipient;
+ push(@recusers,$uname);
+ push(@recudoms,$udom);
+ }
+ }
+ if (@recusers) {
+ my $specialmessage;
+ my $sentsubj = $subj_prefix.' ('.$numspecial.' sent) '.
+ &Apache::lonfeedback::clear_out_html($env{'form.subject'});
+ $sentsubj = &HTML::Entities::encode($sentsubj,'<>&"');
+ my $sentmsgid = &buildmsgid($stamp,$sentsubj,$msgname,
+ $msgdom,$msgcount,$context,$pid);
+ ($specialmsgid,$specialmessage) =
+ &packagemsg(&Apache::lonfeedback::clear_out_html(
+ $env{'form.subject'}),$savemsg,undef,undef,undef,
+ \@recusers,\@recudoms,$sentmsgid);
+ $record_sent = &store_sent_mail($specialmsgid,$specialmessage);
+ }
+ } else {
+ &Apache::lonnet::logthis('Failed to create record of critical message or broadcast in '.$env{'course.'.$env{'request.course.id'}.'.num'}.' at '.$env{'course.'.$env{'request.course.id'}.'.domain'}.' - no msgid generated');
+ }
+ }
+ } else {
+ &printheader($r,'','No messages sent.');
+ }
+ if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+ $r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
+ if ($env{'form.displayedcrit'}) {
+ &discrit($r);
+ } else {
+ &Apache::loncommunicate::menu($r);
+ }
+ } else {
+ $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')
+ );
+ }
+}
# ===================================================================== Handler
@@ -1651,10 +2262,12 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['display','replyto','forward','markread','markdel','markunread',
'sendreply','compose','sendmail','critical','recname','recdom',
- 'recordftf','sortedby','block','folder']);
- $sqs='&sortedby='.$ENV{'form.sortedby'};
+ 'recordftf','sortedby','block','folder','startdis','interdis',
+ '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});
}
@@ -1668,22 +2281,55 @@ sub handler {
# ------------------------------------------------------------------ Get Folder
- my $folder=$ENV{'form.folder'};
+ my $folder=$env{'form.folder'};
unless ($folder) {
$folder='';
} else {
- $sqs='&folder='.&Apache::lonnet::escape($folder);
+ $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--;
+ unless ($startdis) { $startdis=0; }
+
+ $interdis=$env{'form.interdis'};
+ unless ($interdis) { $interdis=20; }
+ $sqs.='&interdis='.$interdis;
+
+ if ($env{'form.firstview'}) {
+ $startdis=0;
+ }
+ if ($env{'form.lastview'}) {
+ $startdis=-1;
+ }
+ if ($env{'form.prevview'}) {
+ $startdis--;
+ }
+ if ($env{'form.nextview'}) {
+ $startdis++;
+ }
+ my $postedstartdis=$startdis+1;
+ $sqs.='&startdis='.$postedstartdis;
+
# --------------------------------------------------------------- Render Output
- if ($ENV{'form.display'}) {
- &displaymessage($r,$ENV{'form.display'},$folder);
- } elsif ($ENV{'form.replyto'}) {
- &compout($r,'',$ENV{'form.replyto'});
- } 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>');
@@ -1696,149 +2342,78 @@ 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'});
- } 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);
- &disall($r,$folder);
- } elsif ($ENV{'form.markedmove'}) {
+ &statuschange($env{'form.markdel'},'deleted',$folder);
+ &Apache::loncommunicate::menu($r);
+ &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>');
- &disall($r,$folder);
- } elsif ($ENV{'form.markeddel'}) {
+ &Apache::loncommunicate::menu($r);
+ &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');
+ &statuschange(&Apache::lonnet::unescape($1),'deleted',$folder);
$total++;
}
}
&printheader($r,'','Deleted Messages');
$r->print('Deleted '.$total.' message(s)<p>');
- &disall($r,$folder);
- } elsif ($ENV{'form.markunread'}) {
+ &Apache::loncommunicate::menu($r);
+ &disall($r,($folder?$folder:$dismode));
+ } elsif ($env{'form.markunread'}) {
&printheader($r,'','Marked Message as Unread');
- &statuschange($ENV{'form.markunread'},'new');
- &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'}) {
- my $sendstatus='';
- if ($ENV{'form.send'}) {
- &printheader($r,'','Messages being sent.');
- $r->rflush();
- 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'};
- }
- if ($ENV{'form.replyid'}) {
- my $msgid=$ENV{'form.replyid'};
- my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
- %content=&unpackagemsg($message{$msgid},1);
- &statuschange($msgid,'replied');
- }
- 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{$_}; }
- my $thismsg;
- 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'}),
- $msgtxt,
- $ENV{'form.sendbck'});
- } else {
- $r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');
- $thismsg=&user_normal_msg($recuname,$recdomain,
- &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
- $msgtxt,
- $content{'citation'});
- 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'},
- 'Broadcast ['.$recuname.':'.$recdomain.']',
- $msgtxt);
- }
- }
- $r->print($thismsg.'<br />');
- $sendstatus.=' '.$thismsg;
- }
- } else {
- &printheader($r,'','No messages sent.');
+ &statuschange($env{'form.markunread'},'new');
+ &Apache::loncommunicate::menu($r);
+ &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'}) {
+ &storecomment($r);
}
- if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
- $r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
- if ($ENV{'form.displayedcrit'}) {
- &discrit($r);
- } else {
- &Apache::loncommunicate::menu($r);
- }
- } else {
- $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')
- );
+ 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');
}
- } elsif ($ENV{'form.newfolder'}) {
+ &disall($r,($folder?$folder:$dismode));
+ } elsif ($env{'form.newfolder'}) {
&printheader($r,'','New Folder');
- &makefolder($ENV{'form.newfolder'});
- &disall($r,$ENV{'form.newfolder'});
+ &makefolder($env{'form.newfolder'});
+ &Apache::loncommunicate::menu($r);
+ &disall($r,$env{'form.newfolder'});
+ } elsif ($env{'form.showcommentbaseurl'}) {
+ &storedcommentlisting($r);
} else {
&printheader($r,'','Display All Messages');
- &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