--- loncom/auth/lonauth.pm 2003/02/03 18:03:52 1.36 +++ 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.36 2003/02/03 18:03:52 harris41 Exp $ +# $Id: lonauth.pm,v 1.41 2003/02/20 06:49:23 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -45,6 +45,9 @@ use Crypt::DES; use Apache::lonnet(); use Apache::lonmenu(); use Fcntl qw(:flock); + +my %FORM; + # ------------------------------------------------------------ Successful login sub success { @@ -105,6 +108,18 @@ sub success { 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; @@ -115,35 +130,50 @@ sub success { $userenv.="environment.$key=$userenv{$key}\n"; } } + 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.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 ($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, @@ -223,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/+/ /;