--- loncom/auth/lonroles.pm	2004/01/29 00:44:06	1.84
+++ loncom/auth/lonroles.pm	2004/03/09 21:01:55	1.88
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.84 2004/01/29 00:44:06 www Exp $
+# $Id: lonroles.pm,v 1.88 2004/03/09 21:01:55 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,20 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# (Directory Indexer
-# (Login Screen
-# YEAR=1999
-# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14 Gerd Kortemeyer)
-# 11/23 Gerd Kortemeyer)
-# YEAR=2000
-# 1/14,03/06,06/01,07/22,07/24,07/25,
-# 09/04,09/06,09/28,09/29,09/30,10/2,10/5,10/26,10/28,
-# 12/08,12/28,
-# YEAR=2001
-# 01/15/01 Gerd Kortemeyer
-# 03/02,05/03,05/25,05/30,06/01,07/06,08/06 Gerd Kortemeyer
-# 12/29 Gerd Kortemeyer
-#
 ###
 
 package Apache::lonroles;
@@ -156,6 +142,10 @@ ENDENTERKEY
 			     }
 			 }
 		     }
+		    &Apache::lonnet::log($ENV{'user.domain'},
+					 $ENV{'user.name'},
+					 $ENV{'user.home'},
+					 "Role ".$trolecode);
                     my $tadv=0;
                     if (($trolecode!~/^st/) && 
                         ($trolecode!~/^ta/) && 
@@ -384,6 +374,7 @@ ENDHEADER
                     $tbg='#11CC55';
                     $tfont='#002200';
 		    $inrole=1;
+		    $countactive++;
                     $tremark.=&mt('Currently selected. ');
                 }
                 my $trole;
@@ -538,7 +529,7 @@ ENDHEADER
 	$r->print('</form></body></html>');
 	return OK;
 # Is there only one choice?
-    } elsif ($countactive==1) {
+    } elsif (($countactive==1) && ($ENV{'request.role'} eq 'cm')) {
 	$r->print('<h3>'.&mt('Please stand by.').'</h3>'.
 	    '<input type="hidden" name="'.$possiblerole.'" value="1" />');
 	$r->print("</form>\n");
@@ -664,7 +655,8 @@ ENDHEADER
     $r->print(&Apache::lonnet::getannounce());
     if ($advanced) {
 	$r->print('<p><small><i>This is LON-CAPA '.
-		  $r->dir_config('lonVersion').'</i></small></p>');
+		  $r->dir_config('lonVersion').'</i><br />'.
+		  '<a href="/adm/logout">'.&mt('Logout').'</a></small></p>');
     }
     $r->print("</body></html>\n");
     return OK;