--- loncom/auth/lonauth.pm 2000/07/14 07:43:15 1.10 +++ loncom/auth/lonauth.pm 2000/10/09 19:43:38 1.13 @@ -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 Gerd Kortemeyer +# 7/1,7/10,10/2,10/5,10/9 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 @@ -65,10 +66,23 @@ sub success { ($httpbrowser=~/powerpc/i)) { $clientos='mac'; } if ($httpbrowser=~/win/i) { $clientos='win'; } +# ------------------------------------------------------------- Get environment + + my $userenv=Apache::lonnet::reply("dump:$domain:$username:environment", + $authhost); + if (($userenv eq 'con_lost') || + ($userenv =~ /^error\:/)) { + $userenv=''; + } + $userenv=~s/\&/\nenvironment\./g; + if ($userenv ne '') { + $userenv='environment.'.$userenv; + } # --------------------------------------------------------- Write first profile { my $idf=Apache::File->new(">$lonids/$cookie.id"); + if ($userenv ne '') { print $idf "$userenv\n"; } print $idf "user.name=$username\n"; print $idf "user.domain=$domain\n"; print $idf "user.home=$authhost\n"; @@ -76,8 +90,9 @@ sub success { print $idf "browser.version=$clientversion\n"; print $idf "browser.mathml=$clientmathml\n"; print $idf "browser.os=$clientos\n"; - if ($userroles ne '') { print $idf "$userroles" }; + if ($userroles ne '') { print $idf "$userroles"; } } + # -------------------------------------------------------------------- Log this &Apache::lonnet::log($domain,$username,$authhost, @@ -86,7 +101,9 @@ sub success { # ------------------------------------------------------------ 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!

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