--- loncom/auth/lonauth.pm 2002/05/29 14:51:42 1.31 +++ loncom/auth/lonauth.pm 2003/01/31 21:46:36 1.35 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.31 2002/05/29 14:51:42 www Exp $ +# $Id: lonauth.pm,v 1.35 2003/01/31 21:46:36 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -83,14 +83,16 @@ sub success { my $clientbrowser='unknown'; my $clientversion='0'; my $clientmathml=''; + my $clientunicode='0'; for ($i=0;$i<=$#browsertype;$i++) { - my ($bname,$match,$notmatch,$vreg,$minv)=split(/\:/,$browsertype[$i]); + my ($bname,$match,$notmatch,$vreg,$minv,$univ)=split(/\:/,$browsertype[$i]); if (($httpbrowser=~/$match/i) && ($httpbrowser!~/$notmatch/i)) { $clientbrowser=$bname; $httpbrowser=~/$vreg/i; $clientversion=$1; $clientmathml=($clientversion>=$minv); - } + $clientunicode=($clientversion>=$univ); + } } my $clientos='unknown'; if (($httpbrowser=~/linux/i) || @@ -107,15 +109,13 @@ sub success { # ------------------------------------------------------------- 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; + my $userenv; + my %userenv=Apache::lonnet::dump('environment',$domain,$username); + my ($tmp) = keys(%userenv); + if ($tmp !~ /^(con_lost|error|no_such_host)/i) { + foreach my $key (keys(%userenv)) { + $userenv.="environment.$key=$userenv{$key}\n"; + } } # --------------------------------------------------------- Write first profile @@ -134,6 +134,7 @@ sub success { print $idf "browser.type=$clientbrowser\n"; print $idf "browser.version=$clientversion\n"; print $idf "browser.mathml=$clientmathml\n"; + print $idf "browser.unicode=$clientunicode\n"; print $idf "browser.os=$clientos\n"; print $idf "request.course.fn=\n"; print $idf "request.course.uri=\n"; @@ -164,8 +165,9 @@ sub success { $cookie="lonID=$cookie; path=/"; # -------------------------------------------------------- Menu script and info my $windowinfo=&Apache::lonmenu::open($clientos); -# ------------------------------------------------------------- Info for Remote - my $configmenu=&Apache::lonmenu::rawconfig($r); + my $startupremote=&Apache::lonmenu::startupremote($lowerurl); + my $setflags=&Apache::lonmenu::setflags(); + my $maincall=&Apache::lonmenu::maincall(); # ------------------------------------------------- Output for successful login $r->send_cgi_header(< Successful Login to the LearningOnline Network with CAPA - +$startupremote - +$setflags $windowinfo

Welcome!

- +Welcome to the LearningOnline Network with CAPA. +Please wait while your session +is being set up.

+Problems?

+$maincall ENDSUCCESS