--- loncom/interface/lontiny.pm	2022/06/30 21:04:14	1.12
+++ loncom/interface/lontiny.pm	2022/10/29 18:13:28	1.18
@@ -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.12 2022/06/30 21:04:14 raeburn Exp $
+# $Id: lontiny.pm,v 1.18 2022/10/29 18:13:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,14 +118,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 +155,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);
@@ -250,7 +260,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 +280,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 +299,7 @@ sub handler {
 
 sub launch_check {
     my ($linkuri,$symb) = @_;
-    my ($linkprotector,$linkproturi,$linkkey,$newlauncher);
+    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'});
@@ -327,6 +337,9 @@ sub launch_check {
             } else {
                 &Apache::lonnet::appenv({'user.linkproturi' => $linkproturi});
             }
+            if ($link_info{'linkprotexit'}) {
+                $linkprotexit = $link_info{'linkprotexit'};
+            }
         } elsif ($link_info{'linkkey'} ne '') {
             $linkkey = $link_info{'linkkey'};
             my $keyedlinkuri = $linkuri;
@@ -366,7 +379,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 +407,12 @@ 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');
+                }
             }
         } else {
             unless ($currdeeplinklogin eq $linkuri) {
@@ -401,12 +420,17 @@ sub launch_check {
                     if ($linkprotector) {
                         &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi});
                     } elsif ($env{'request.linkprot'}) {
-                        &Apache::lonnet::delenv({'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 ($linkkey ne '') {
                         &Apache::lonnet::appenv({'request.linkkey' => $linkkey});
                     } elsif ($env{'request.linkkey'} ne '') {
-                        &Apache::lonnet::delenv({'request.linkkey'});
+                        &Apache::lonnet::delenv('request.linkkey');
                     }
                     $newlauncher = 1;
                 }
@@ -422,12 +446,17 @@ sub launch_check {
         if ($linkprotector) {
             &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi});
         } elsif ($env{'request.linkprot'}) {
-            &Apache::lonnet::delenv({'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 ($linkkey ne '') {
             &Apache::lonnet::appenv({'request.linkkey' => $linkkey});
         } else {
-            &Apache::lonnet::delenv({'request.linkkey'});
+            &Apache::lonnet::delenv('request.linkkey');
         }
         &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri});
         if ($env{'request.deeplink.target'} ne '') {