--- loncom/auth/lonauth.pm 2003/03/02 03:58:55 1.44 +++ loncom/auth/lonauth.pm 2003/03/10 20:21:45 1.45 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.44 2003/03/02 03:58:55 www Exp $ +# $Id: lonauth.pm,v 1.45 2003/03/10 20:21:45 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,6 +42,7 @@ use CGI qw(:standard); use CGI::Cookie(); use DynaLoader; # for Crypt::DES version use Crypt::DES; +use Apache::loncommon(); use Apache::lonnet(); use Apache::lonmenu(); use Fcntl qw(:flock); @@ -77,36 +78,8 @@ sub success { # ------------------------------------ Check browser type and MathML capability - my @browsertype=split(/\&/,$r->dir_config("lonBrowsDet")); - my %mathcap=split(/\&/,$r->dir_config("lonMathML")); - my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; - my $i; - my $clientbrowser='unknown'; - my $clientversion='0'; - my $clientmathml=''; - my $clientunicode='0'; - for ($i=0;$i<=$#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) || - ($httpbrowser=~/unix/i) || - ($httpbrowser=~/ux/i) || - ($httpbrowser=~/solaris/i)) { $clientos='unix'; } - if (($httpbrowser=~/vax/i) || - ($httpbrowser=~/vms/i)) { $clientos='vms'; } - if ($httpbrowser=~/next/i) { $clientos='next'; } - if (($httpbrowser=~/mac/i) || - ($httpbrowser=~/powerpc/i)) { $clientos='mac'; } - if ($httpbrowser=~/win/i) { $clientos='win'; } - if ($httpbrowser=~/embed/i) { $clientos='pda'; } + my ($httpbrowser,$clientbrowser,$clientversion,$clientmathml, + $clientunicode,$clientos) = &Apache::loncommon::decode_user_agent($r); # -------------------------------------- Any accessibility options to remember? if (($FORM{'interface'}) && ($FORM{'remember'} eq 'true')) {