--- loncom/interface/lonmsg.pm 2004/11/11 18:24:44 1.113
+++ loncom/interface/lonmsg.pm 2004/11/11 20:41:53 1.114
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.113 2004/11/11 18:24:44 www Exp $
+# $Id: lonmsg.pm,v 1.114 2004/11/11 20:41:53 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -523,6 +523,7 @@ sub folderlist {
&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)).
@@ -530,13 +531,12 @@ sub folderlist {
&Apache::loncommon::select_form($interdis,'interdis',
(' 10' => '10', ' 20' => '20', ' 50' => '50', '100' => '100', '200' => '200')).
'
'.
+ ($folder!~/^(new|critical)/?
''.
''.
''.
''.
- ''.
- ''.
- &mt('View Critical Messages').''.
+ '':'').
'';
}
@@ -571,7 +571,8 @@ sub makefolder {
my ($newfolder)=@_;
if (($newfolder eq 'sent')
|| ($newfolder eq 'critical')
- || ($newfolder eq 'trash')) { return; }
+ || ($newfolder eq 'trash')
+ || ($newfolder eq 'new')) { return; }
&Apache::lonnet::put('email_folders',{$newfolder => time});
}
@@ -863,13 +864,19 @@ ENDLINK
sub disall {
my ($r,$folder)=@_;
$r->print(&folderlist($folder));
- unless ($folder) {
- &disnew();
- return;
- }
- if ($folder eq 'critical') {
- &discrit();
+ 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;