--- loncom/auth/lonauth.pm 2002/11/09 22:11:17 1.33 +++ loncom/auth/lonauth.pm 2003/02/13 16:31:54 1.37 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.33 2002/11/09 22:11:17 albertel Exp $ +# $Id: lonauth.pm,v 1.37 2003/02/13 16:31:54 www 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 { @@ -140,7 +141,12 @@ sub success { 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"; + 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'}; + } if ($userroles ne '') { print $idf "$userroles"; } $idf->close(); } @@ -165,8 +171,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 @@ -255,7 +231,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/+/ /;