--- loncom/interface/lonmsg.pm	2005/04/11 21:51:43	1.141
+++ loncom/interface/lonmsg.pm	2005/05/15 01:11:32	1.142
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.141 2005/04/11 21:51:43 raeburn Exp $
+# $Id: lonmsg.pm,v 1.142 2005/05/15 01:11:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -613,6 +613,7 @@ sub makefolder {
 
 sub movemsg {
     my ($msgid,$srcfolder,$trgfolder)=@_;
+    if ($srcfolder eq 'new') { $srcfolder=''; }
     my $srcsuffix=&foldersuffix($srcfolder);
     my $trgsuffix=&foldersuffix($trgfolder);
 
@@ -1043,7 +1044,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') {
@@ -1174,6 +1175,8 @@ $latexHelp
 </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
@@ -2048,6 +2051,14 @@ sub handler {
     } 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
 
@@ -2079,7 +2090,7 @@ sub handler {
     if ($env{'form.display'}) {
 	&displaymessage($r,$env{'form.display'},$folder);
     } elsif ($env{'form.replyto'}) {
-	&compout($r,'',$env{'form.replyto'},undef,undef,$folder);
+	&compout($r,'',$env{'form.replyto'},undef,undef,$folder,$dismode);
     } elsif ($env{'form.confirm'}) {
 	&printheader($r,'','Confirmed Receipt');
 	foreach (keys %env) {
@@ -2104,7 +2115,7 @@ sub handler {
 	&printheader($r,'','Deleted Message');
 	&statuschange($env{'form.markdel'},'deleted',$folder);
 	&Apache::loncommunicate::menu($r);
-	&disall($r,$folder);
+	&disall($r,($folder?$folder:$dismode));
     } elsif ($env{'form.markedmove'}) {
 	my $total=0;
 	foreach (keys %env) {
@@ -2117,7 +2128,7 @@ sub handler {
 	&printheader($r,'','Moved Messages');
 	$r->print('Moved '.$total.' message(s)<p>');
 	&Apache::loncommunicate::menu($r);
-	&disall($r,$folder);
+	&disall($r,($folder?$folder:$dismode));
     } elsif ($env{'form.markeddel'}) {
 	my $total=0;
 	foreach (keys %env) {
@@ -2129,12 +2140,12 @@ sub handler {
 	&printheader($r,'','Deleted Messages');
 	$r->print('Deleted '.$total.' message(s)<p>');
 	&Apache::loncommunicate::menu($r);
-	&disall($r,$folder);
+	&disall($r,($folder?$folder:$dismode));
     } elsif ($env{'form.markunread'}) {
 	&printheader($r,'','Marked Message as Unread');
 	&statuschange($env{'form.markunread'},'new');
 	&Apache::loncommunicate::menu($r);
-	&disall($r,$folder);
+	&disall($r,($folder?$folder:$dismode));
     } elsif ($env{'form.compose'}) {
 	&compout($r,'','',$env{'form.compose'});
     } elsif ($env{'form.recordftf'}) {
@@ -2146,7 +2157,7 @@ sub handler {
 	if ($env{'form.storebasecomment'}) {
 	    &storecomment($r);
 	}
-	&disall($r,$folder);
+	&disall($r,($folder?$folder:$dismode));
     } elsif ($env{'form.newfolder'}) {
 	&printheader($r,'','New Folder');
 	&makefolder($env{'form.newfolder'});
@@ -2156,8 +2167,8 @@ sub handler {
 	&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(&Apache::loncommon::endbodytag().'</html>');
     return OK;