--- loncom/auth/lonroles.pm	2001/01/17 17:26:01	1.21
+++ loncom/auth/lonroles.pm	2001/03/03 00:55:36	1.23
@@ -8,7 +8,9 @@
 # 09/04,09/06,09/28,09/29,09/30,10/2,10/5,10/26,10/28,
 # 12/08,12/28,
 # 01/15/01 Gerd Kortemeyer
-#
+# 02/27/01 Scott Harrison
+# 03/02 Gerd Kortemeyer
+
 package Apache::lonroles;
 
 use strict;
@@ -180,8 +182,11 @@ ENDHEADER
                 $tpstart=localtime($tstart);
             }
             if ($tend) {
-                if ($tend<$then) { $tstatus='expired'; }
-                if ($tend<$now) { $tstatus='will_not'; }
+                if ($tend<$then) { 
+                   $tstatus='expired'; 
+                } elsif ($tend<$now) { 
+                   $tstatus='will_not'; 
+                }
                 $tpend=localtime($tend);
             }
             if ($ENV{'request.role'} eq $trolecode) {
@@ -277,9 +282,9 @@ ENDHEADER
     unless ($nochoose) {
 	$r->print("</form>\n");
     }
-# ------------------------------------------------------------ Priviledges Info
+# ------------------------------------------------------------ Privileges Info
   if ($advanced) {
-    $r->print('<hr><h2>Current Priviledges</h2>');
+    $r->print('<hr><h2>Current Privileges</h2>');
 
     foreach $envkey (sort keys %ENV) {
         if ($envkey=~/^user\.priv\.$ENV{'request.role'}\./) {