--- loncom/auth/lonacc.pm 2009/04/14 23:52:07 1.125 +++ loncom/auth/lonacc.pm 2009/07/23 17:40:29 1.126 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.125 2009/04/14 23:52:07 raeburn Exp $ +# $Id: lonacc.pm,v 1.126 2009/07/23 17:40:29 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -278,6 +278,20 @@ sub sso_login { my ($user) = ($r->user =~ m/([a-zA-Z0-9_\-@.]*)/); + my $query = $r->args; + my %form; + if ($query) { + foreach my $pair (split(/&/,$query)) { + my ($name, $value) = split(/=/,$pair); + $name = &unescape($name); + if (($name eq 'role') || ($name eq 'symb')) { + $value =~ tr/+/ /; + $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; + $form{$name} = $value; + } + } + } + my $domain = $r->dir_config('lonDefDomain'); my $home=&Apache::lonnet::homeserver($user,$domain); if ($home !~ /(con_lost|no_host|no_such_host)/) { @@ -285,7 +299,7 @@ sub sso_login { if ($r->dir_config("lonBalancer") eq 'yes') { # login but immeaditly go to switch server to find us a new # machine - &Apache::lonauth::success($r,$user,$domain,$home,'noredirect'); + &Apache::lonauth::success($r,$user,$domain,$home,'noredirect','',\%form); $env{'request.sso.login'} = 1; if (defined($r->dir_config("lonSSOReloginServer"))) { $env{'request.sso.reloginserver'} = @@ -302,6 +316,11 @@ sub sso_login { 'server' => $r->dir_config('lonHostID'), 'sso.login' => 1 ); + foreach my $item ('role','symb') { + if (exists($form{$item})) { + $info{$item} = $form{$item}; + } + } if ($r->dir_config("ssodirecturl") == 1) { $info{'origurl'} = $r->uri; }