--- loncom/interface/lontiny.pm	2024/02/10 14:24:46	1.8.2.6
+++ loncom/interface/lontiny.pm	2022/10/19 18:09:04	1.17
@@ -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.8.2.6 2024/02/10 14:24:46 raeburn Exp $
+# $Id: lontiny.pm,v 1.17 2022/10/19 18:09:04 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,$linkprotpbid,$linkprotpburl);
+                            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) {
@@ -78,8 +78,6 @@ sub handler {
                                         $linkprot = $ltoken_info{'linkprot'};
                                         $linkprotuser = $ltoken_info{'linkprotuser'};
                                         $linkprotexit = $ltoken_info{'linkprotexit'};
-                                        $linkprotpbid = $ltoken_info{'linkprotpbid'};
-                                        $linkprotpburl = $ltoken_info{'linkprotpburl'};
                                     } elsif ($link_info{'linkprot'}) {
                                         $linkprot = $link_info{'linkprot'};
                                         if ($link_info{'linkprotuser'}) {
@@ -88,12 +86,6 @@ 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'};
-                                        }
                                     }
                                 }
                             }
@@ -168,7 +160,7 @@ sub handler {
                                         if ($reinitresult eq 'supp') {
                                             $possdel = 1;
                                         }
-                                        my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel);
+                                        my ($supplemental,$refs_updated) = &Apache::lonnet::get_supplemental($cnum,$cdom,'',$possdel);
                                         unless ($refs_updated) {
                                             &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental,$possdel);
                                         }
@@ -255,8 +247,7 @@ sub handler {
                                     }
                                 }
                                 if (@allposs == 0) {
-                                    &show_roles($r,\%crsenv,\%active,'','',\%future,\%expired,$linkprot,$linkprotuser,
-                                                $linkprotexit,$linkprotpbid,$linkprotpburl,$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";
@@ -308,8 +299,7 @@ sub handler {
 
 sub launch_check {
     my ($linkuri,$symb) = @_;
-    my ($linkprotector,$linkproturi,$linkprotexit,$linkprotpbid,$linkprotpburl,
-        $linkkey,$newlauncher,$prevlaunch);
+    my ($linkprotector,$linkproturi,$linkprotexit,$linkkey,$newlauncher);
     if ($env{'form.ttoken'}) {
         my %link_info = &Apache::lonnet::tmpget($env{'form.ttoken'});
         &Apache::lonnet::tmpdel($env{'form.ttoken'});
@@ -350,12 +340,6 @@ 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;
@@ -381,9 +365,6 @@ sub launch_check {
         if ($link_info{'checklaunch'}) {
             $newlauncher = 1;
         }
-        if ($link_info{'prevlaunch'} ne '') {
-            $prevlaunch = $link_info{'prevlaunch'};
-        }
     }
     my $currdeeplinklogin = $env{'request.deeplink.login'};
     my $deeplink;
@@ -432,56 +413,26 @@ 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) {
                 if (($linkprotector) || ($linkkey ne '')) {
-                    $newlauncher = 1;
-                }
-            }
-            if ($linkprotector) {
-                &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi});
-            } elsif ($env{'request.linkprot'}) {
-                &Apache::lonnet::delenv('request.linkprot');
-            }
-            if ($linkkey ne '') {
-                &Apache::lonnet::appenv({'request.linkkey' => $linkkey});
-            } elsif ($env{'request.linkkey'} ne '') {
-                &Apache::lonnet::delenv('request.linkkey');
-            }
-            if (($linkprotector) || ($linkkey ne '')) {
-                if ($linkprotexit ne $env{'request.linkprotexit'}) {
+                    if ($linkprotector) {
+                        &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi});
+                    } elsif ($env{'request.linkprot'}) {
+                        &Apache::lonnet::delenv('request.linkprot');
+                    }
                     if ($linkprotexit) {
                         &Apache::lonnet::appenv({'request.linkprotexit' => $linkprotexit});
                     } elsif ($env{'request.linkprotexit'}) {
                         &Apache::lonnet::delenv('request.linkprotexit');
                     }
-                }
-                if ($linkprotpbid ne $env{'request.linkprotpbid'}) {
-                    if ($linkprotpbid) {
-                        &Apache::lonnet::appenv({'request.linkprotpbid' => $linkprotpbid});
-                    } elsif ($env{'request.linkprotpbid'}) {
-                        &Apache::lonnet::delenv('request.linkprotpbid');
-                    }
-                }
-                if ($linkprotpburl ne $env{'request.linkprotpburl'}) {
-                    if ($linkprotpburl) {
-                        &Apache::lonnet::appenv({'request.linkprotpburl' => $linkprotpburl});
-                    } elsif ($env{'request.linkprotpburl'}) {
-                        &Apache::lonnet::delenv('request.linkprotpburl');
-                    }
-                }
-            } elsif ($prevlaunch) {
-                foreach my $requestkey ('linkprotpbid','linkprotpburl','linkprotexit') {
-                    if ($env{"request.$requestkey"}) {
-                        &Apache::lonnet::delenv("request.$requestkey");
+                    if ($linkkey ne '') {
+                        &Apache::lonnet::appenv({'request.linkkey' => $linkkey});
+                    } elsif ($env{'request.linkkey'} ne '') {
+                        &Apache::lonnet::delenv('request.linkkey');
                     }
+                    $newlauncher = 1;
                 }
             }
             &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri});
@@ -502,16 +453,6 @@ 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 {
@@ -554,8 +495,7 @@ sub do_redirect {
 }
 
 sub show_roles {
-    my ($r,$crsenv,$possroles,$hassection,$hascustom,$futureroles,$expiredroles,
-        $linkprot,$linkprotuser,$linkprotexit,$linkprotpbid,$linkprotpburl,$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'};
@@ -696,8 +636,6 @@ ENDJS
                                 origurl => $r->uri,
                                 linkprot => $linkprot,
                                 linkprotexit => $linkprotexit,
-                                linkprotpbid => $linkprotpbid,
-                                linkprotpburl => $linkprotpburl,
                     );
                     my $token =
                         &Apache::lonnet::tmpput(\%data,$r->dir_config('lonHostID'),'retry');