--- loncom/interface/lontiny.pm	2022/07/02 17:23:02	1.14
+++ 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.14 2022/07/02 17:23:02 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'};
+                                        }
                                     }
                                 }
                             }
@@ -118,14 +126,14 @@ sub handler {
                                             $realuri .= '?symb='.$symb;
                                         }
                                     }
-                                    my $update;
+                                    my ($update,$reinitresult);
                                     # Check if course needs to be re-initialized
                                     if ($newlauncher) {
                                         $update = 1;
                                     } else {
                                         my $loncaparev = $r->dir_config('lonVersion');
-                                        my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
-                                        if ($result eq 'update') {
+                                        ($reinitresult,my @reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
+                                        if (($reinitresult eq 'main') || ($reinitresult eq 'both')) {
                                             $update = 1;
                                         } elsif (!-e $env{'request.course.fn'}.'.db') {
                                             $update = 1;
@@ -155,6 +163,16 @@ sub handler {
                                             return HTTP_NOT_ACCEPTABLE;
                                         }
                                     }
+                                    if (($reinitresult eq 'both') || ($reinitresult eq 'supp')) {
+                                        my $possdel;
+                                        if ($reinitresult eq 'supp') {
+                                            $possdel = 1;
+                                        }
+                                        my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel);
+                                        unless ($refs_updated) {
+                                            &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental,$possdel);
+                                        }
+                                    }
                                     my $host = $r->headers_in->get('Host');
                                     if (!$host) {
                                         $r->internal_redirect($realuri);
@@ -237,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";
@@ -250,7 +269,7 @@ sub handler {
                                         $destination .= '&ttoken='.$env{'form.ttoken'};
                                     }
                                     &do_redirect($r,$destination,$linkprot);
-                                } elsif (keys(%possroles) > 1) {
+                                } elsif (@allposs > 1) {
                                     if (grep(/^(cc|co)$/,@allposs)) {
                                         my $newrole;
                                         if (exists($possroles{'cc'})) {
@@ -270,7 +289,7 @@ sub handler {
                                         if (grep(/^cr\//,@allposs)) {
                                             $hascustom = 1;
                                         }
-                                        &show_roles($r,\%crsenv,\%possroles,$hassection,$hascustom);
+                                        &show_roles($r,\%crsenv,\%active,$hassection,$hascustom);
                                     }
                                 }
                                 return OK;
@@ -289,7 +308,7 @@ sub handler {
 
 sub launch_check {
     my ($linkuri,$symb) = @_;
-    my ($linkprotector,$linkproturi,$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'});
@@ -327,6 +346,15 @@ sub launch_check {
             } else {
                 &Apache::lonnet::appenv({'user.linkproturi' => $linkproturi});
             }
+            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;
@@ -366,7 +394,7 @@ sub launch_check {
     }
     if ($deeplink ne '') {
         my $disallow;
-        my ($state,$others,$listed,$scope,$protect,$display,$target) = split(/,/,$deeplink);
+        my ($state,$others,$listed,$scope,$protect,$display,$target,$exit) = split(/,/,$deeplink);
         if (($protect ne 'none') && ($protect ne '')) {
             my ($acctype,$item) = split(/:/,$protect);
             if ($acctype =~ /lti(c|d)$/) {
@@ -394,6 +422,18 @@ sub launch_check {
                 if ($env{'request.deeplink.target'} ne '') {
                     &Apache::lonnet::delenv('request.deeplink.target');
                 }
+                if ($env{'request.linkprot'} ne '') {
+                    &Apache::lonnet::delenv('request.linkprot');
+                }
+                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) {
@@ -403,6 +443,21 @@ sub launch_check {
                     } 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) {
+                        &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 '') {
@@ -424,6 +479,21 @@ sub launch_check {
         } 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) {
+            &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 {
@@ -466,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'};
@@ -607,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');