[LON-CAPA-cvs] cvs: loncom /interface lonmsg.pm

[www]

www		Thu Nov 11 13:24:44 2004 EDT

  Modified files:              
    /loncom/interface	lonmsg.pm 
  Log:
  Saving my work: trying to consolidate INBOX and Critical Messages into folder
  idea.
  
  
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.112 loncom/interface/lonmsg.pm:1.113
--- loncom/interface/lonmsg.pm:1.112	Tue Nov  9 11:29:32 2004
+++ loncom/interface/lonmsg.pm	Thu Nov 11 13:24:44 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.112 2004/11/09 16:29:32 www Exp $
+# $Id: lonmsg.pm,v 1.113 2004/11/11 18:24:44 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -523,6 +523,7 @@
 	&mt('Folder').': '.
 	&Apache::loncommon::select_form($folder,'folder',
 			     ('' => &mt('INBOX'),'trash' => &mt('TRASH'),
+                              'critical' => &mt('Critical'),
 			      'sent' => &mt('Sent Messages'),
 			      map { $_ => $_ } @allfolders)).
 			      ' '.&mt('Show').' '.
@@ -568,6 +569,9 @@
 
 sub makefolder {
     my ($newfolder)=@_;
+    if (($newfolder eq 'sent')
+     || ($newfolder eq 'critical')
+     || ($newfolder eq 'trash')) { return; }
     &Apache::lonnet::put('email_folders',{$newfolder => time});
 }
 
@@ -858,6 +862,14 @@
 
 sub disall {
     my ($r,$folder)=@_;
+    $r->print(&folderlist($folder));
+    unless ($folder) {
+	&disnew();
+	return;
+    }
+    if ($folder eq 'critical') {
+	&discrit();
+    }
     my %blocked = ();
     my %setters = ();
     my $startblock;
@@ -893,9 +905,7 @@
     if ($firstdis>$#temp) { $firstdis=$#temp-$interdis+1; }
     my $lastdis=$firstdis+$interdis-1;
     if ($lastdis>$#temp) { $lastdis=$#temp; }
-    $r->print('<h2>'.&mt('Display All Messages').'</h2>'.
-	      &folderlist($folder).
-	      '<form method="post" name="disall" action="/adm/email">'.
+    $r->print('<form method="post" name="disall" action="/adm/email">'.
 	      '<table border=2><tr><th colspan="3">&nbsp</th><th>');
     if ($ENV{'form.sortedby'} eq "revdate") {
 	$r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');