--- loncom/auth/lonauth.pm 2022/06/26 04:03:47 1.175 +++ loncom/auth/lonauth.pm 2022/06/30 21:04:13 1.176 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.175 2022/06/26 04:03:47 raeburn Exp $ +# $Id: lonauth.pm,v 1.176 2022/06/30 21:04:13 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -188,8 +188,10 @@ sub success { my %info; if ($env{'request.linkprot'}) { $info{'linkprot'} = $env{'request.linkprot'}; - if ($form->{'linkprotuser'}) { - $info{'linkprotuser'} = $form->{'linkprotuser'}; + foreach my $item ('linkprotuser','linkprotexit') { + if ($form->{$item}) { + $info{$item} = $form->{$item}; + } } $args = {'only_body' => 1,}; } elsif ($env{'request.linkkey'} ne '') { @@ -371,8 +373,10 @@ sub failed { my %info = ( 'linkprot' => $form->{'linkprot'}, ); - if ($form->{linkprotuser} ne '') { - $info{'linkprotuser'} = $form->{linkprotuser}; + foreach my $item ('linkprotuser','linkprotexit') { + if ($form->{$item} ne '') { + $info{$item} = $form->{$item}; + } } my $ltoken = &Apache::lonnet::tmpput(\%info, $r->dir_config('lonHostID'),'retry'); @@ -815,8 +819,10 @@ sub handler { } if ($form{'linkprot'}) { $env{'request.linkprot'} = $form{'linkprot'}; - if ($form{'linkprotuser'}) { - $env{'request.linkprotuser'} = $form{'linkprotuser'}; + foreach my $item ('linkprotuser','linkprotexit') { + if ($form{$item}) { + $env{'request.'.$item} = $form{$item}; + } } } elsif ($form{'linkkey'} ne '') { $env{'request.linkkey'} = $form{'linkkey'}; @@ -849,8 +855,10 @@ sub handler { } if ($form{'linkprot'}) { $env{'request.linkprot'} = $form{'linkprot'}; - if ($form{'linkprotuser'}) { - $env{'request.linkprotuser'} = $form{'linkprotuser'}; + foreach my $item ('linkprotuser','linkprotexit') { + if ($form{$item}) { + $env{'request.'.$item} = $form{$item}; + } } } elsif ($form{'linkkey'} ne '') { $env{'request.linkkey'} = $form{'linkkey'}; @@ -935,6 +943,9 @@ sub handler { } else { $extra_env = {'request.linkprot' => $form{'linkprot'}}; } + if ($form{'linkprotexit'}) { + $extra_env->{'request.linkprotexit'} = $form{'linkprotexit'}; + } } elsif ($form{'linkkey'} ne '') { if (ref($extra_env) eq 'HASH') { %{$extra_env} = ( %{$extra_env}, 'request.linkkey' => $form{'linkkey'} ); @@ -1023,7 +1034,7 @@ sub set_retry_token { my ($form,$lonhost,$querystr) = @_; if (ref($form) eq 'HASH') { my ($firsturl,$token,$extras,@names); - @names = ('role','symb','linkprotuser','linkprot','linkkey','iptoken'); + @names = ('role','symb','linkprotuser','linkprotexit','linkprot','linkkey','iptoken'); foreach my $name (@names) { if ($form->{$name} ne '') { $extras .= '&'.$name.'='.&escape($form->{$name});