--- loncom/auth/lonacc.pm 2022/09/17 23:38:50 1.207 +++ loncom/auth/lonacc.pm 2023/06/02 01:20:26 1.208 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.207 2022/09/17 23:38:50 raeburn Exp $ +# $Id: lonacc.pm,v 1.208 2023/06/02 01:20:26 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -333,7 +333,8 @@ sub sso_login { } } - my ($linkprot,$linkprotuser,$linkprotexit,$linkkey,$deeplinkurl); + my ($linkprot,$linkprotuser,$linkprotexit,$linkkey,$deeplinkurl, + $linkprotpbid,$linkprotpburl); # # If Shibboleth auth is in use, and a dual SSO and non-SSO login page @@ -373,6 +374,8 @@ sub sso_login { $linkprot = $info{'linkprot'}; $linkprotuser = $info{'linkprotuser'}; $linkprotexit = $info{'linkprotexit'}; + $linkprotpbid = $info{'linkprotpbid'}; + $linkprotpburl = $info{'linkprotpburl'}; } elsif ($info{'linkkey'} ne '') { $linkkey = $info{'linkkey'}; } @@ -401,6 +404,8 @@ sub sso_login { $linkprot = $form{'linkprot'}; $linkprotuser = $form{'linkprotuser'}; $linkprotexit = $form{'linkprotexit'}; + $linkprotpbid = $form{'linkprotpbid'}; + $linkprotpburl = $form{'linkprotpburl'}; } elsif ($form{'linkkey'} ne '') { $linkkey = $form{'linkkey'}; } @@ -430,6 +435,8 @@ sub sso_login { $linkprot = $form{'linkprot'}; $linkprotuser = $form{'linkprotuser'}; $linkprotexit = $form{'linkprotexit'}; + $linkprotpbid = $form{'linkprotpbid'}; + $linkprotpburl = $form{'linkprotpburl'}; } elsif ($form{'linkkey'} ne '') { $linkkey = $form{'linkkey'}; } @@ -444,6 +451,12 @@ sub sso_login { if ($link_info{'linkprotexit'} ne '') { $linkprotexit = $link_info{'linkprotexit'}; } + if ($link_info{'linkprotpbid'} ne '') { + $linkprotpbid = $link_info{'linkprotpbid'}; + } + if ($link_info{'linkprotpburl'} ne '') { + $linkprotpburl = $link_info{'linkprotpburl'}; + } } my $delete = &Apache::lonnet::tmpdel($form{'ltoken'}); delete($form{'ltoken'}); @@ -466,6 +479,8 @@ sub sso_login { linkprot => $linkprot, linkprotuser => $linkprotuser, linkprotexit => $linkprotexit, + linkprotpbid => $linkprotpbid, + linkprotpburl => $linkprotpburl, ); if ($env{'form.lcssowin'}) { $data{'lcssowin'} = $env{'form.lcssowin'}; @@ -538,6 +553,12 @@ sub sso_login { if ($linkprotexit ne '') { $env{'request.linkprotexit'} = $linkprotexit; } + if ($linkprotpbid ne '') { + $env{'request.linkprotpbid'} = $linkprotpbid; + } + if ($linkprotpburl ne '') { + $env{'request.linkprotpburl'} = $linkprotpburl; + } } elsif ($linkkey ne '') { $env{'request.linkkey'} = $linkkey; } @@ -598,6 +619,12 @@ sub sso_login { if ($linkprotexit ne '') { $info{'linkprotexit'} = $linkprotexit; } + if ($linkprotpbid ne '') { + $info{'linkprotpbid'} = $linkprotpbid; + } + if ($linkprotpburl ne '') { + $info{'linkprotpburl'} = $linkprotpburl; + } } elsif ($linkkey ne '') { $info{'linkkey'} = $linkkey; } @@ -824,6 +851,8 @@ sub handler { linkprot => $info{'linkprot'}, linkprotuser => $info{'linkprotuser'}, linkprotexit => $info{'linkprotexit'}, + linkprotpbid => $info{'linkprotpbid'}, + linkprotpburl => $info{'linkprotpburl'}, ); } elsif ($info{'ltoken'} ne '') { my %ltoken_info = &Apache::lonnet::tmpget($info{'ltoken'}); @@ -834,6 +863,8 @@ sub handler { linkprot => $ltoken_info{'linkprot'}, linkprotuser => $ltoken_info{'linkprotuser'}, linkprotexit => $ltoken_info{'linkprotexit'}, + linkprotpbid => $ltoken_info{'linkprotpbid'}, + linkprotpburl => $ltoken_info{'linkprotpburl'}, ); } }