--- loncom/interface/lonmsg.pm	2004/12/11 16:31:59	1.123
+++ loncom/interface/lonmsg.pm	2004/12/15 02:35:17	1.125
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.123 2004/12/11 16:31:59 raeburn Exp $
+# $Id: lonmsg.pm,v 1.125 2004/12/15 02:35:17 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -527,9 +527,11 @@ sub folderlist {
                               'critical' => &mt('Critical'),
 			      'sent' => &mt('Sent Messages'),
 			      map { $_ => $_ } @allfolders)).
-			      ' '.&mt('Show').' '.
-	    &Apache::loncommon::select_form($interdis,'interdis',
-(' 10' => '10', ' 20' => '20', ' 50' => '50', '100' => '100', '200' => '200')).	
+			      ' '.&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>':'');
@@ -537,7 +539,9 @@ sub folderlist {
 
 sub scrollbuttons {
     my ($start,$maxdis,$first,$finish,$total)=@_;
+    unless ($total>0) { return ''; }
     $start++; $maxdis++;$first++;$finish++;
+    return 
    '<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.
@@ -912,6 +916,13 @@ ENDDISHEADER
     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;
@@ -1730,9 +1741,8 @@ sub displaymessage {
 	      '"><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>');
+	      '<td><a href="/adm/email?'.$sqs.
+	      '"><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>');
@@ -1980,9 +1990,7 @@ sub handler {
          'sendreply','compose','sendmail','critical','recname','recdom',
          'recordftf','sortedby','block','folder','startdis','interdis',
 	 'showcommentbaseurl']);
-    $sqs='&sortedby='.$ENV{'form.sortedby'}.
-	 '&startdis='.$ENV{'form.startdis'}.
-	 '&interdis='.$ENV{'form.interdis'};
+    $sqs='&sortedby='.$ENV{'form.sortedby'};
 
 # ------------------------------------------------------ They checked for email
     unless ($ENV{'form.block'}) {
@@ -2003,7 +2011,7 @@ sub handler {
     unless ($folder) { 
 	$folder=''; 
     } else {
-	$sqs='&folder='.&Apache::lonnet::escape($folder);
+	$sqs.='&folder='.&Apache::lonnet::escape($folder);
     }
 
 # --------------------------------------------------------------------- Display
@@ -2011,8 +2019,11 @@ sub handler {
     $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;
     }
@@ -2025,7 +2036,8 @@ sub handler {
     if ($ENV{'form.nextview'}) {
 	$startdis++;
     }
-
+    my $postedstartdis=$startdis+1;
+    $sqs.='&startdis='.$postedstartdis;
 
 # --------------------------------------------------------------- Render Output