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

[albertel]

albertel		Wed Oct  8 15:22:17 2003 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
  Log:
  - BUG#2219, students don't know when midnight is
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.237 loncom/interface/lonnavmaps.pm:1.238
--- loncom/interface/lonnavmaps.pm:1.237	Sat Oct  4 14:13:36 2003
+++ loncom/interface/lonnavmaps.pm	Wed Oct  8 15:22:17 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.237 2003/10/04 18:13:36 www Exp $
+# $Id: lonnavmaps.pm,v 1.238 2003/10/08 19:22:17 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -501,7 +501,7 @@
         # HH:MM
         if ( $delta < $day * 5 ) {
             my $timeStr = strftime("%A, %b %e at %I:%M %P", localtime($time));
-            $timeStr =~ s/12:00 am/midnight/;
+            $timeStr =~ s/12:00 am/00:00/;
             $timeStr =~ s/12:00 pm/noon/;
             return ($inPast ? "last " : "next ") .
                 $timeStr;
@@ -511,14 +511,14 @@
         if ( $time[5] == $now[5]) {
             # Return on Month Day, HH:MM meridian
             my $timeStr = strftime("on %A, %b %e at %I:%M %P", localtime($time));
-            $timeStr =~ s/12:00 am/midnight/;
+            $timeStr =~ s/12:00 am/00:00/;
             $timeStr =~ s/12:00 pm/noon/;
             return $timeStr;
         }
 
         # Not this year, so show the year
         my $timeStr = strftime("on %A, %b %e %G at %I:%M %P", localtime($time));
-        $timeStr =~ s/12:00 am/midnight/;
+        $timeStr =~ s/12:00 am/00:00/;
         $timeStr =~ s/12:00 pm/noon/;
         return $timeStr;
     }
@@ -1586,7 +1586,6 @@
 	    # If we have the connection, make sure the user is still connected
 	    my $c = $r->connection;
 	    if ($c->aborted()) {
-		Apache::lonnet::logthis("navmaps aborted");
 		# Who cares what we do, nobody will see it anyhow.
 		return '';
 	    }