--- loncom/interface/lonmsg.pm	2004/12/15 01:17:09	1.124
+++ loncom/interface/lonmsg.pm	2005/01/01 17:58:48	1.126
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.124 2004/12/15 01:17:09 www Exp $
+# $Id: lonmsg.pm,v 1.126 2005/01/01 17:58:48 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>':'');
@@ -918,6 +920,9 @@ ENDDISHEADER
 	$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;
@@ -956,7 +961,7 @@ ENDDISHEADER
     } else {
      	$r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</th>');
     }
-    $r->print('</tr>');
+    $r->print("</tr>\n");
     for (my $n=$firstdis;$n<=$lastdis;$n++) {
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @{$temp[$n]};
 	if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
@@ -976,13 +981,13 @@ ENDDISHEADER
 		      '<td>'.&Apache::lonlocal::locallocaltime($sendtime).'</td><td>'.
 		      $fromname.'</td><td>'.$fromdomain.'</td><td>'.
 		      &Apache::lonnet::unescape($shortsubj).'</td><td>'.
-                      $status.'</td></tr>');
+                      $status."</td></tr>\n");
 	} elsif ($status eq 'deleted') {
 # purge
 	    &movemsg(&Apache::lonnet::unescape($origID),$folder,'trash');
 	}
     }   
-    $r->print('</table><p>'.
+    $r->print("</table>\n<p>".
   '<a href="javascript:checkall()">'.&mt('Check All').'</a>&nbsp;'.
   '<a href="javascript:uncheckall()">'.&mt('Uncheck All').'</a></p>'.
   '<input type="hidden" name="sortedby" value="'.$ENV{'form.sortedby'}.'" />');
@@ -997,7 +1002,8 @@ ENDDISHEADER
 	&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);
@@ -1736,9 +1742,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>');
@@ -1986,9 +1991,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'}) {
@@ -2009,7 +2012,7 @@ sub handler {
     unless ($folder) { 
 	$folder=''; 
     } else {
-	$sqs='&folder='.&Apache::lonnet::escape($folder);
+	$sqs.='&folder='.&Apache::lonnet::escape($folder);
     }
 
 # --------------------------------------------------------------------- Display
@@ -2017,8 +2020,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;
     }
@@ -2031,7 +2037,8 @@ sub handler {
     if ($ENV{'form.nextview'}) {
 	$startdis++;
     }
-
+    my $postedstartdis=$startdis+1;
+    $sqs.='&startdis='.$postedstartdis;
 
 # --------------------------------------------------------------- Render Output