--- loncom/interface/lontiny.pm 2022/06/26 04:03:48 1.11 +++ loncom/interface/lontiny.pm 2022/06/30 21:04:14 1.12 @@ -2,7 +2,7 @@ # Extract domain, courseID, and symb from a shortened URL, # and switch role to a role in designated course. # -# $Id: lontiny.pm,v 1.11 2022/06/26 04:03:48 raeburn Exp $ +# $Id: lontiny.pm,v 1.12 2022/06/30 21:04:14 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -68,7 +68,7 @@ sub handler { my $chome = &Apache::lonnet::homeserver($cnum,$cdom); if ($chome ne 'no_host') { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['ttoken']); - my ($linkprot,$linkprotuser,$ltoken); + my ($linkprot,$linkprotuser,$linkprotexit,$ltoken); if ($env{'form.ttoken'}) { my %link_info = &Apache::lonnet::tmpget($env{'form.ttoken'}); if ($link_info{'origurl'} eq $r->uri) { @@ -77,11 +77,15 @@ sub handler { my %ltoken_info = &Apache::lonnet::tmpget($link_info{'ltoken'}); $linkprot = $ltoken_info{'linkprot'}; $linkprotuser = $ltoken_info{'linkprotuser'}; + $linkprotexit = $ltoken_info{'linkprotexit'}; } elsif ($link_info{'linkprot'}) { $linkprot = $link_info{'linkprot'}; if ($link_info{'linkprotuser'}) { $linkprotuser = $link_info{'linkprotuser'}; } + if ($link_info{'linkprotexit'}) { + $linkprotexit = $link_info{'linkprotexit'}; + } } } } @@ -233,7 +237,7 @@ sub handler { } } if (@allposs == 0) { - &show_roles($r,\%crsenv,\%active,'','',\%future,\%expired,$linkprot,$linkprotuser,$ltoken); + &show_roles($r,\%crsenv,\%active,'','',\%future,\%expired,$linkprot,$linkprotuser,$linkprotexit,$ltoken); } elsif (@allposs == 1) { my $newrole = "$allposs[0]./$cdom/$cnum"; $newrole = "$allposs[0]./$cdom/$cnum"; @@ -462,7 +466,7 @@ sub do_redirect { } sub show_roles { - my ($r,$crsenv,$possroles,$hassection,$hascustom,$futureroles,$expiredroles,$linkprot,$linkprotuser,$ltoken) = @_; + my ($r,$crsenv,$possroles,$hassection,$hascustom,$futureroles,$expiredroles,$linkprot,$linkprotuser,$linkprotexit,$ltoken) = @_; my ($crsdesc,$crstype,$cdom,$cnum,$header,$title,$preamble,$datatable,$js,$args); if (ref($crsenv) eq 'HASH') { $crsdesc = $crsenv->{'description'}; @@ -602,6 +606,7 @@ ENDJS my %data = ( origurl => $r->uri, linkprot => $linkprot, + linkprotexit => $linkprotexit, ); my $token = &Apache::lonnet::tmpput(\%data,$r->dir_config('lonHostID'),'retry');