--- loncom/auth/lonauth.pm 2002/05/06 14:20:27 1.29 +++ loncom/auth/lonauth.pm 2003/02/20 06:49:23 1.41 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.29 2002/05/06 14:20:27 matthew Exp $ +# $Id: lonauth.pm,v 1.41 2003/02/20 06:49:23 albertel 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; @@ -47,6 +45,9 @@ use Crypt::DES; use Apache::lonnet(); use Apache::lonmenu(); use Fcntl qw(:flock); + +my %FORM; + # ------------------------------------------------------------ Successful login sub success { @@ -83,14 +84,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,47 +106,74 @@ sub success { if (($httpbrowser=~/mac/i) || ($httpbrowser=~/powerpc/i)) { $clientos='mac'; } if ($httpbrowser=~/win/i) { $clientos='win'; } + if ($httpbrowser=~/embed/i) { $clientos='pda'; } +# -------------------------------------- Any accessibility options to remember? + if (($FORM{'interface'}) && ($FORM{'remember'} eq 'true')) { + foreach ('imagesuppress','appletsuppress', + 'embedsuppress','fontenhance','blackwhite') { + if ($FORM{$_} eq 'true') { + &Apache::lonnet::put('environment',{$_ => 'on'}, + $domain,$username); + } else { + &Apache::lonnet::del('environment',[$_],$domain,$username); + } + } + } # ------------------------------------------------------------- Get environment - my $userenv=Apache::lonnet::reply("dump:$domain:$username:environment", - $authhost); - if (($userenv eq 'con_lost') || - ($userenv =~ /^error\:/)) { - $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"; + } } - $userenv=~s/\&/\nenvironment\./g; - if ($userenv ne '') { - $userenv='environment.'.$userenv; + if (($userenv{'interface'}) && (!$FORM{'interface'})) { + $FORM{'interface'}=$userenv{'interface'}; } # --------------------------------------------------------- Write first profile - { - my $idf=Apache::File->new(">$lonids/$cookie.id"); - unless (flock($idf,LOCK_EX)) { - &Apache::lonnet::logthis("WARNING: ". - 'Could not obtain exclusive lock in lonauth: '.$!); - $idf->close(); - return 'error: '.$!; - } - 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"; - print $idf "browser.type=$clientbrowser\n"; - 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"; } + { + my $idf=Apache::File->new(">$lonids/$cookie.id"); + unless (flock($idf,LOCK_EX)) { + &Apache::lonnet::logthis("WARNING: ". + 'Could not obtain exclusive lock in lonauth: '.$!); $idf->close(); - } - $ENV{'request.role'}='cm'; - $ENV{'browser.type'}=$clientbrowser; + return 'error: '.$!; + } + 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"; + 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"; + print $idf "request.course.sec=\n"; + print $idf "request.role=cm\n"; + print $idf "request.host=$ENV{'HTTP_HOST'}\n"; + if ($FORM{'interface'}) { + $FORM{'interface'}=~s/\W//gs; + print $idf "browser.interface=$FORM{'interface'}\n"; + $ENV{'browser.interface'}=$FORM{'interface'}; + foreach ('imagesuppress','appletsuppress', + 'embedsuppress','fontenhance','blackwhite') { + if (($FORM{$_} eq 'true') || + ($userenv{$_} eq 'on')) { + print $idf "browser.$_=on\n"; + } + } + } + if ($userroles ne '') { print $idf "$userroles"; } + $idf->close(); + } + $ENV{'request.role'}='cm'; + $ENV{'browser.type'}=$clientbrowser; # -------------------------------------------------------------------- Log this &Apache::lonnet::log($domain,$username,$authhost, @@ -162,9 +192,10 @@ sub success { $cookie="lonID=$cookie; path=/"; # -------------------------------------------------------- Menu script and info - my $windowinfo=&Apache::lonmenu::open(); -# ------------------------------------------------------------- Info for Remote - my $configmenu=&Apache::lonmenu::rawconfig($r); + 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 @@ -253,7 +253,9 @@ sub handler { my $buffer; $r->read($buffer,$r->header_in('Content-length')); my @pairs=split(/&/,$buffer); - my $pair; my $name; my $value; my %FORM; + my $pair; my $name; my $value; + undef %FORM; + %FORM=(); foreach $pair (@pairs) { ($name,$value) = split(/=/,$pair); $value =~ tr/+/ /;