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

www lon-capa-cvs@mail.lon-capa.org
Sat, 01 Jan 2005 17:58:48 -0000


www		Sat Jan  1 12:58:48 2005 EDT

  Modified files:              
    /loncom/interface	lonmsg.pm 
  Log:
  Bug #3772: Remember position in folder and number of displayed messages when
  moving or deleting checked messages.
  
  
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.125 loncom/interface/lonmsg.pm:1.126
--- loncom/interface/lonmsg.pm:1.125	Tue Dec 14 21:35:17 2004
+++ loncom/interface/lonmsg.pm	Sat Jan  1 12:58:48 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.125 2004/12/15 02:35:17 www Exp $
+# $Id: lonmsg.pm,v 1.126 2005/01/01 17:58:48 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -961,7 +961,7 @@
     } 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/) {
@@ -981,13 +981,13 @@
 		      '<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'}.'" />');
@@ -1002,7 +1002,8 @@
 	&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);