--- loncom/interface/lontiny.pm	2022/07/08 16:14:45	1.8.2.3
+++ loncom/interface/lontiny.pm	2024/02/09 20:08:16	1.21
@@ -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.3 2022/07/08 16:14:45 raeburn Exp $
+# $Id: lontiny.pm,v 1.21 2024/02/09 20:08:16 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'};
+                                        $linkprotpburl = $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);
@@ -210,13 +228,40 @@ sub handler {
                                     }
                                 }
                                 my @allposs = keys(%active);
+                                if ($env{'request.lti.login'}) {
+                                    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+                                    if ($env{'request.lti.target'} eq '') {
+                                        if ($env{'form.ltitarget'} eq 'iframe') {
+                                            &Apache::lonnet::appenv({'request.lti.target' => 'iframe'});
+                                            delete($env{'form.ltitarget'});
+                                        }
+                                    }
+                                    if ($env{'form.selectrole'}) {
+                                        foreach my $role (@allposs) {
+                                            my $newrole = "$role./$cdom/$cnum";
+                                            if ($possroles{$allposs[0]} ne '') {
+                                                $newrole .= "/$possroles{$role}";
+                                            }
+                                            if ($env{"form.$newrole"}) {
+                                                my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'.
+                                                                   '&destinationurl='.&HTML::Entities::encode($r->uri,'&<>"');
+                                                if ($env{'form.ltitarget'} eq 'iframe') {
+                                                    $destination .= '&ltitarget=iframe';
+                                                }
+                                                &do_redirect($r,$destination);
+                                                return OK;
+                                            }
+                                        }
+                                    }
+                                }
                                 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";
                                     if ($possroles{$allposs[0]} ne '') {
-                                        $newrole .= "/$possroles{$allposs[0]}"; 
+                                        $newrole .= "/$possroles{$allposs[0]}";
                                     }
                                     my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'.
                                                        '&destinationurl='.&HTML::Entities::encode($r->uri,'&<>"');
@@ -263,7 +308,8 @@ sub handler {
 
 sub launch_check {
     my ($linkuri,$symb) = @_;
-    my ($linkprotector,$linkproturi,$linkprotexit,$linkkey,$newlauncher);
+    my ($linkprotector,$linkproturi,$linkprotexit,$linkprotpbid,$linkprotpburl,
+        $linkkey,$newlauncher,$prevlaunch);
     if ($env{'form.ttoken'}) {
         my %link_info = &Apache::lonnet::tmpget($env{'form.ttoken'});
         &Apache::lonnet::tmpdel($env{'form.ttoken'});
@@ -304,6 +350,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;
@@ -329,6 +381,9 @@ 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;
@@ -377,9 +432,16 @@ 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 (($currdeeplinklogin ne $linkuri) ||
+                (($prevlaunch ne '') && ($currdeeplinklogin ne $prevlaunch))) {
                 if (($linkprotector) || ($linkkey ne '')) {
                     if ($linkprotector) {
                         &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi});
@@ -391,6 +453,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 '') {
@@ -417,6 +489,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 {
@@ -433,6 +515,9 @@ sub launch_check {
 sub do_redirect {
     my ($r,$destination,$linkprot) = @_;
     my $windowname = 'loncapaclient';
+    if ($env{'request.lti.login'}) {
+        $windowname .= 'lti';
+    }
     my $header = '<meta HTTP-EQUIV="Refresh" CONTENT="0; url='.$destination.'" />';
     my $args = {'bread_crumbs' => [{'href' => '','text' => 'Role initialization'},],};
     if ($linkprot) {
@@ -456,7 +541,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'};
@@ -597,6 +683,8 @@ ENDJS
                                 origurl => $r->uri,
                                 linkprot => $linkprot,
                                 linkprotexit => $linkprotexit,
+                                linkprotpbid => $linkprotpbid,
+                                linkprotpburl => $linkprotpburl,
                     );
                     my $token =
                         &Apache::lonnet::tmpput(\%data,$r->dir_config('lonHostID'),'retry');
@@ -633,13 +721,15 @@ ENDJS
 sub generic_error {
     my ($r) = @_;
     my $continuelink;
-    my $linktext;
-    if ($env{'user.adv'}) {
-        $linktext = &mt('Continue to your roles page');
-    } else {
-        $linktext = &mt('Continue to your courses page');
+    unless ($env{'request.lti.login'}) {
+        my $linktext;
+        if ($env{'user.adv'}) {
+            $linktext = &mt('Continue to your roles page');
+        } else {
+            $linktext = &mt('Continue to your courses page');
+        }
+        $continuelink='<a href="/adm/roles">'.$linktext.'</a>';
     }
-    $continuelink='<a href="/adm/roles">'.$linktext.'</a>';
     my $msg = &mt('The page you requested does not exist.');
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;