--- loncom/auth/lonauth.pm 2001/11/29 19:12:44 1.27 +++ loncom/auth/lonauth.pm 2003/02/03 18:03:52 1.36 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.27 2001/11/29 19:12:44 www Exp $ +# $Id: lonauth.pm,v 1.36 2003/02/03 18:03:52 harris41 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,9 +30,7 @@ # 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,10/5,10/9,10/26,10/30,11/10, # 05/28,05/29 Gerd Kortemeyer -# 07/24 Scott Harrison # 07/28,08/03 Gerd Kortemeyer -# 8/15 Scott Harrison # 8/20 Gerd Kortemeyer package Apache::lonauth; @@ -83,14 +81,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) || @@ -103,18 +103,17 @@ sub success { if (($httpbrowser=~/mac/i) || ($httpbrowser=~/powerpc/i)) { $clientos='mac'; } if ($httpbrowser=~/win/i) { $clientos='win'; } + if ($httpbrowser=~/embed/i) { $clientos='pda'; } # ------------------------------------------------------------- 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 @@ -133,6 +132,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"; @@ -143,6 +143,7 @@ sub success { $idf->close(); } $ENV{'request.role'}='cm'; + $ENV{'browser.type'}=$clientbrowser; # -------------------------------------------------------------------- Log this &Apache::lonnet::log($domain,$username,$authhost, @@ -161,9 +162,10 @@ sub success { $cookie="lonID=$cookie; path=/"; # -------------------------------------------------------- Menu script and info - my $windowinfo=&Apache::lonmenu::open(); -# ------------------------------------------------------------- Info for Remote - my $configmenu=&Apache::lonmenu::rawconfig(); + my $windowinfo=&Apache::lonmenu::open($clientos); + 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