--- loncom/auth/migrateuser.pm 2022/09/17 23:38:50 1.66 +++ loncom/auth/migrateuser.pm 2023/06/02 01:20:26 1.67 @@ -1,7 +1,7 @@ # The LearningOnline Network # Starts a user off based of an existing token. # -# $Id: migrateuser.pm,v 1.66 2022/09/17 23:38:50 raeburn Exp $ +# $Id: migrateuser.pm,v 1.67 2023/06/02 01:20:26 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -289,7 +289,7 @@ sub ip_changed { 'username' => $dataref->{'username'}, 'sessionserver' => $lonhost, ); - my @names = ('origurl','symb','role','linkprotuser','linkprotexit','linkprot','linkkey'); + my @names = ('origurl','symb','role','linkprotuser','linkprotexit','linkprot','linkkey','linkprotpbid','linkprotpburl'); foreach my $name (@names) { if ($dataref->{$name} ne '') { $info{$name} = $dataref->{$name}; @@ -760,6 +760,12 @@ sub handler { unless ($env{'request.linkprotexit'} eq $data{'linkprotexit'}) { $checklaunch = 1; } + unless ($env{'request.linkprotpbid'} eq $data{'linkprotpbid'}) { + $checklaunch = 1; + } + unless ($env{'request.linkprotpburl'} eq $data{'linkprotpburl'}) { + $checklaunch = 1; + } unless ($env{'request.linkkey'} eq $data{'linkkey'}) { $checklaunch = 1; } @@ -771,7 +777,7 @@ sub handler { if (($env{'user.name'} ne $data{'username'}) || ($env{'user.domain'} ne $data{'domain'})) { my %linkprot_env; - foreach my $item ('linkprot','linkprotexit','deeplink.login') { + foreach my $item ('linkprot','linkprotexit','linkprotpbid','linkprotpburl','deeplink.login') { if ($data{$item}) { $linkprot_env{$item} = $data{$item}; } @@ -921,7 +927,7 @@ sub handler { my %info; if ($env{'request.linkprot'}) { $info{'linkprot'} = $env{'request.linkprot'}; - foreach my $item ('linkprotuser','linkprotexit') { + foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') { if ($data{$item}) { $info{$item} = $data{$item}; } @@ -980,8 +986,14 @@ sub handler { if ($data{'linkprotexit'}) { $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'}; } + if ($data{'linkprotpbid'}) { + $extra_env->{'request.linkprotpbid'} = $data{'linkprotpbid'}; + } + if ($data{'linkprotpburl'}) { + $extra_env->{'request.linkprotpburl'} = $data{'linkprotpburl'}; + } } - foreach my $item ('linkprotuser','linkprotexit') { + foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') { if ($data{$item} ne '') { $form{$item} = $data{$item}; } @@ -1093,7 +1105,13 @@ sub handler { if ($data{'linkprotexit'}) { $extra_env->{'request.linkprotexit'} = $data{'linkprotexit'}; } - foreach my $item ('linkprotuser','linkprotexit') { + if ($data{'linkprotpbid'}) { + $extra_env->{'request.linkprotpassbid'} = $data{'linkprotpbid'}; + } + if ($data{'linkprotpburl'}) { + $extra_env->{'request.linkprotpassburl'} = $data{'linkprotpburl'}; + } + foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') { if ($data{$item}) { $form{'request.'.$item} = $data{$item}; }