--- loncom/auth/lonauth.pm 2000/10/02 19:43:49 1.11 +++ loncom/auth/lonauth.pm 2000/11/10 10:08:24 1.17 @@ -3,7 +3,7 @@ # 5/21/99,5/22,5/25,5/26,5/27,5/29,6/2,6/11,6/14,6/15 # 16/11,12/16, # 1/14,2/24,2/28,2/29,3/7,5/29,5/30,5/31,6/1,6/5,6/29, -# 7/1,7/10,10/2 Gerd Kortemeyer +# 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10 Gerd Kortemeyer package Apache::lonauth; @@ -13,6 +13,7 @@ use CGI qw(:standard); use CGI::Cookie(); use Crypt::DES; use Apache::lonnet(); +use Apache::lonmenu(); # ------------------------------------------------------------ Successful login @@ -21,13 +22,19 @@ sub success { my $lonids=$r->dir_config('lonIDsDir'); # See if old ID present, if so, remove - my $cookie; - while ($cookie=<$lonids/$username\_*\_$domain\_$authhost.id>) { - unlink($cookie); + + my $filename; + opendir(DIR,$lonids); + while ($filename=readdir(DIR)) { + if ($filename=~/^$username\_\d+\_$domain\_$authhost\.id$/) { + unlink($lonids.'/'.$filename); + } } + closedir(DIR); # Give them a new cookie + my $cookie; my $now=time; $cookie="$username\_$now\_$domain\_$authhost"; @@ -89,6 +96,11 @@ sub success { print $idf "browser.version=$clientversion\n"; print $idf "browser.mathml=$clientmathml\n"; print $idf "browser.os=$clientos\n"; + print $idf "request.course.fn=\n"; + print $idf "request.course.uri=\n"; + print $idf "request.course.sec=\n"; + print $idf "request.role=cm\n"; + print $idf "request.host=$ENV{'HTTP_HOST'}\n"; if ($userroles ne '') { print $idf "$userroles"; } } @@ -97,10 +109,21 @@ sub success { &Apache::lonnet::log($domain,$username,$authhost, "Login $ENV{'REMOTE_ADDR'}"); +# ------------------------------------------------- Check for critical messages + + my @what=&Apache::lonnet::dump('critical'); + if ($what[0]) { + if ($what[0] ne 'con_lost') { + $lowerurl='/adm/email/critical/'.$what[0]; + } + } + # ------------------------------------------------------------ Get cookie ready $cookie="lonID=$cookie; path=/"; +# -------------------------------------------------------- Menu script and info + my $windowinfo=&Apache::lonmenu::open(); # ------------------------------------------------- Output for successful login $r->send_cgi_header(< - + $windowinfo

Welcome!

@@ -210,7 +230,7 @@ sub handler { return OK; } - if ($firsturl eq '') { + if (($firsturl eq '') || ($firsturl eq '/adm/logout')) { $firsturl='/res/adm/pages/index.html'; }