--- loncom/interface/lontiny.pm	2022/10/29 18:13:28	1.18
+++ loncom/interface/lontiny.pm	2023/06/02 01:20:26	1.19
@@ -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.18 2022/10/29 18:13:28 raeburn Exp $
+# $Id: lontiny.pm,v 1.19 2023/06/02 01:20:26 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,$linkprotexit,$ltoken);
+                            my ($linkprot,$linkprotuser,$linkprotexit,$ltoken,$linkprotpbid,$linkprotpburl);
                             if ($env{'form.ttoken'}) {
                                 my %link_info = &Apache::lonnet::tmpget($env{'form.ttoken'});
                                 if ($link_info{'origurl'} eq $r->uri) {
@@ -78,6 +78,8 @@ sub handler {
                                         $linkprot = $ltoken_info{'linkprot'};
                                         $linkprotuser = $ltoken_info{'linkprotuser'};
                                         $linkprotexit = $ltoken_info{'linkprotexit'};
+                                        $linkprotpbid = $ltoken_info{'linkprotpbid'};
+                                        $linkprotpbid = $ltoken_info{'linkprotpburl'};
                                     } elsif ($link_info{'linkprot'}) {
                                         $linkprot = $link_info{'linkprot'};
                                         if ($link_info{'linkprotuser'}) {
@@ -86,6 +88,12 @@ sub handler {
                                         if ($link_info{'linkprotexit'}) {
                                             $linkprotexit = $link_info{'linkprotexit'};
                                         }
+                                        if ($link_info{'linkprotpbid'}) {
+                                            $linkprotpbid = $link_info{'linkprotpbid'};
+                                        }
+                                        if ($link_info{'linkprotpburl'}) {
+                                            $linkprotpburl = $link_info{'linkprotpburl'};
+                                        }
                                     }
                                 }
                             }
@@ -247,7 +255,8 @@ sub handler {
                                     }
                                 }
                                 if (@allposs == 0) {
-                                    &show_roles($r,\%crsenv,\%active,'','',\%future,\%expired,$linkprot,$linkprotuser,$linkprotexit,$ltoken);
+                                    &show_roles($r,\%crsenv,\%active,'','',\%future,\%expired,$linkprot,$linkprotuser,
+                                                $linkprotexit,$linkprotpbid,$linkprotpburl,$ltoken);
                                 } elsif (@allposs == 1) {
                                     my $newrole = "$allposs[0]./$cdom/$cnum";
                                     $newrole = "$allposs[0]./$cdom/$cnum";
@@ -299,7 +308,7 @@ sub handler {
 
 sub launch_check {
     my ($linkuri,$symb) = @_;
-    my ($linkprotector,$linkproturi,$linkprotexit,$linkkey,$newlauncher);
+    my ($linkprotector,$linkproturi,$linkprotexit,$linkprotpbid,$linkprotpburl,$linkkey,$newlauncher);
     if ($env{'form.ttoken'}) {
         my %link_info = &Apache::lonnet::tmpget($env{'form.ttoken'});
         &Apache::lonnet::tmpdel($env{'form.ttoken'});
@@ -340,6 +349,12 @@ sub launch_check {
             if ($link_info{'linkprotexit'}) {
                 $linkprotexit = $link_info{'linkprotexit'};
             }
+            if ($link_info{'linkprotpbid'}) {
+                $linkprotpbid = $link_info{'linkprotpbid'};
+            }
+            if ($link_info{'linkprotpburl'}) {
+                $linkprotpburl = $link_info{'linkprotpburl'};
+            }
         } elsif ($link_info{'linkkey'} ne '') {
             $linkkey = $link_info{'linkkey'};
             my $keyedlinkuri = $linkuri;
@@ -413,6 +428,12 @@ sub launch_check {
                 if ($env{'request.linkprotexit'} ne '') {
                     &Apache::lonnet::delenv('request.linkprotexit');
                 }
+                if ($env{'request.linkprotpbid'} ne '') {
+                    &Apache::lonnet::delenv('request.linkprotpbid');
+                }
+                if ($env{'request.linkprotpburl'} ne '') {
+                    &Apache::lonnet::delenv('request.linkprotpburl');
+                }
             }
         } else {
             unless ($currdeeplinklogin eq $linkuri) {
@@ -427,6 +448,16 @@ sub launch_check {
                     } elsif ($env{'request.linkprotexit'}) {
                         &Apache::lonnet::delenv('request.linkprotexit');
                     }
+                    if ($linkprotpbid) {
+                        &Apache::lonnet::appenv({'request.linkprotpbid' => $linkprotpbid});
+                    } elsif ($env{'request.linkprotpbid'}) {
+                        &Apache::lonnet::delenv('request.linkprotpbid');
+                    }
+                    if ($linkprotpburl) {
+                        &Apache::lonnet::appenv({'request.linkprotpburl' => $linkprotpburl});
+                    } elsif ($env{'request.linkprotpburl'}) {
+                        &Apache::lonnet::delenv('request.linkprotpburl');
+                    }
                     if ($linkkey ne '') {
                         &Apache::lonnet::appenv({'request.linkkey' => $linkkey});
                     } elsif ($env{'request.linkkey'} ne '') {
@@ -453,6 +484,16 @@ sub launch_check {
         } elsif ($env{'request.linkprotexit'}) {
             &Apache::lonnet::delenv('request.linkprotexit');
         }
+        if ($linkprotpbid) {
+            &Apache::lonnet::appenv({'request.linkprotpbid' => $linkprotpbid});
+        } elsif ($env{'request.linkprotpbid'}) {
+            &Apache::lonnet::delenv('request.linkprotpbid');
+        }
+        if ($linkprotpburl) {
+            &Apache::lonnet::appenv({'request.linkprotpburl' => $linkprotpburl});
+        } elsif ($env{'request.linkprotpburl'}) {
+            &Apache::lonnet::delenv('request.linkprotpburl');
+        }
         if ($linkkey ne '') {
             &Apache::lonnet::appenv({'request.linkkey' => $linkkey});
         } else {
@@ -495,7 +536,8 @@ sub do_redirect {
 }
 
 sub show_roles {
-    my ($r,$crsenv,$possroles,$hassection,$hascustom,$futureroles,$expiredroles,$linkprot,$linkprotuser,$linkprotexit,$ltoken) = @_;
+    my ($r,$crsenv,$possroles,$hassection,$hascustom,$futureroles,$expiredroles,
+        $linkprot,$linkprotuser,$linkprotexit,$linkprotpbid,$linkprotpburl,$ltoken) = @_;
     my ($crsdesc,$crstype,$cdom,$cnum,$header,$title,$preamble,$datatable,$js,$args);
     if (ref($crsenv) eq 'HASH') {
         $crsdesc = $crsenv->{'description'};
@@ -636,6 +678,8 @@ ENDJS
                                 origurl => $r->uri,
                                 linkprot => $linkprot,
                                 linkprotexit => $linkprotexit,
+                                linkprotpbid => $linkprotpbid,
+                                linkprotpburl => $linkprotpburl,
                     );
                     my $token =
                         &Apache::lonnet::tmpput(\%data,$r->dir_config('lonHostID'),'retry');