--- loncom/interface/lontiny.pm	2025/01/16 21:42:12	1.8.2.7
+++ loncom/interface/lontiny.pm	2022/06/30 21:04:14	1.12
@@ -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.7 2025/01/16 21:42:12 raeburn Exp $
+# $Id: lontiny.pm,v 1.12 2022/06/30 21:04:14 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,18 +86,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'};
-                                        }
                                     }
                                 }
                             }
                             if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
                                 # Check for ttoken
-                                my $newlauncher = &launch_check($r->uri,$symb,$cdom,$cnum);
+                                my $newlauncher = &launch_check($r->uri,$symb);
                                 my ($map,$resid,$url) = &Apache::lonnet::decode_symb($symb);
                                 if (&Apache::lonnet::is_on_map($url)) {
                                     my $realuri;
@@ -126,14 +118,14 @@ sub handler {
                                             $realuri .= '?symb='.$symb;
                                         }
                                     }
-                                    my ($update,$reinitresult);
+                                    my $update;
                                     # Check if course needs to be re-initialized
                                     if ($newlauncher) {
                                         $update = 1;
                                     } else {
                                         my $loncaparev = $r->dir_config('lonVersion');
-                                        ($reinitresult,my @reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
-                                        if (($reinitresult eq 'main') || ($reinitresult eq 'both')) {
+                                        my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
+                                        if ($result eq 'update') {
                                             $update = 1;
                                         } elsif (!-e $env{'request.course.fn'}.'.db') {
                                             $update = 1;
@@ -163,16 +155,6 @@ 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);
@@ -255,8 +237,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";
@@ -269,7 +250,7 @@ sub handler {
                                         $destination .= '&ttoken='.$env{'form.ttoken'};
                                     }
                                     &do_redirect($r,$destination,$linkprot);
-                                } elsif (@allposs > 1) {
+                                } elsif (keys(%possroles) > 1) {
                                     if (grep(/^(cc|co)$/,@allposs)) {
                                         my $newrole;
                                         if (exists($possroles{'cc'})) {
@@ -289,7 +270,7 @@ sub handler {
                                         if (grep(/^cr\//,@allposs)) {
                                             $hascustom = 1;
                                         }
-                                        &show_roles($r,\%crsenv,\%active,$hassection,$hascustom);
+                                        &show_roles($r,\%crsenv,\%possroles,$hassection,$hascustom);
                                     }
                                 }
                                 return OK;
@@ -307,9 +288,8 @@ sub handler {
 }
 
 sub launch_check {
-    my ($linkuri,$symb,$cdom,$cnum) = @_;
-    my ($linkprotector,$linkproturi,$linkprotexit,$linkprotpbid,$linkprotpburl,
-        $linkkey,$newlauncher,$prevlaunch);
+    my ($linkuri,$symb) = @_;
+    my ($linkprotector,$linkproturi,$linkkey,$newlauncher);
     if ($env{'form.ttoken'}) {
         my %link_info = &Apache::lonnet::tmpget($env{'form.ttoken'});
         &Apache::lonnet::tmpdel($env{'form.ttoken'});
@@ -347,15 +327,6 @@ 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;
@@ -381,9 +352,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;
@@ -398,7 +366,7 @@ sub launch_check {
     }
     if ($deeplink ne '') {
         my $disallow;
-        my ($state,$others,$listed,$scope,$protect,$display,$target,$exit) = split(/,/,$deeplink);
+        my ($state,$others,$listed,$scope,$protect,$display,$target) = split(/,/,$deeplink);
         if (($protect ne 'none') && ($protect ne '')) {
             my ($acctype,$item) = split(/:/,$protect);
             if ($acctype =~ /lti(c|d)$/) {
@@ -426,67 +394,21 @@ 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) {
                 if (($linkprotector) || ($linkkey ne '')) {
-                    $newlauncher = 1;
-                }
-            }
-            if ($linkprotector) {
-                &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi});
-                if ($linkprotpburl && $linkprotpbid) {
-                    my ($res,$error) = &store_passback_info($cdom,$cnum,$linkuri,$linkprotector,
-                                                        $scope,$symb,$linkprotpbid,$linkprotpburl,
-                                                        $currdeeplinklogin);
-                }
-            } 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 ($linkprotexit) {
-                        &Apache::lonnet::appenv({'request.linkprotexit' => $linkprotexit});
-                    } elsif ($env{'request.linkprotexit'}) {
-                        &Apache::lonnet::delenv('request.linkprotexit');
+                    if ($linkprotector) {
+                        &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi});
+                    } elsif ($env{'request.linkprot'}) {
+                        &Apache::lonnet::delenv({'request.linkprot'});
                     }
-                }
-                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});
@@ -500,27 +422,12 @@ sub launch_check {
         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) {
-            &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');
+            &Apache::lonnet::delenv({'request.linkprot'});
         }
         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 '') {
@@ -530,68 +437,6 @@ sub launch_check {
     return $newlauncher;
 }
 
-#
-# Store linkprotpburl and linkprotpbid in user's nohist_$cid_linkprot_pb.db
-# $linkuri\0$linkprotector\0$scope = [$linkprotpbid,$linkprotpburl]
-# Separately store $symb in course's nohist_linkprot_passback.db
-# which should trigger passback:
-# $symb => {$linkuri\0$linkprotector\0$scope => 1};
-#
-
-sub store_passback_info {
-    my ($cdom,$cnum,$linkuri,$linkprotector,$scope,$symb,
-        $linkprotpbid,$linkprotpburl,$currdeeplinklogin) = @_;
-    my $key = join("\0",($linkuri,$linkprotector,$scope));
-    my $namespace = 'nohist_'.$cdom.'_'.$cnum.'_linkprot_pb';
-    if ($linkuri eq $currdeeplinklogin) {
-        my %pbinfo = &Apache::lonnet::get($namespace,[$key]);
-        if (ref($pbinfo{$key}) eq 'ARRAY') {
-            if (($pbinfo{$key}[0] eq $linkprotpbid) &&
-                ($pbinfo{$key}[1] eq $linkprotpburl)) {
-                return ('ok');
-            }
-        }
-    }
-    my $now = time;
-    my $result = &Apache::lonnet::cput($namespace,{$key => [$linkprotpbid,$linkprotpburl]});
-    my $error;
-    if (($result eq 'ok') || ($result eq 'con_delayed')) {
-        $namespace = 'nohist_linkprot_passback';
-        my %triggers = &Apache::lonnet::get($namespace,[$symb],$cdom,$cnum);
-        my $newtrigger;
-        if ((exists($triggers{$symb})) && (ref($triggers{$symb}) eq 'HASH')) {
-            unless (exists($triggers{$symb}{$key})) {
-                $newtrigger = 1;
-            }
-        } else {
-            $newtrigger = 1;
-        }
-        if ($newtrigger) {
-            my ($lockhash,$tries,$gotlock);
-            $lockhash = {
-                          lock => $env{'user.name'}.
-                                  ':'.$env{'user.domain'},
-                        };
-            $tries = 0;
-            $gotlock = &Apache::lonnet::newput($namespace,$lockhash,$cdom,$cnum);
-            while (($gotlock ne 'ok') && ($tries<10)) {
-                $tries ++;
-                sleep (0.1);
-                $gotlock = &Apache::lonnet::newput($namespace,$lockhash,$cdom,$cnum);
-            }
-            if ($gotlock eq 'ok') {
-                %triggers = &Apache::lonnet::get($namespace,[$symb],$cdom,$cnum);
-                $triggers{$symb}{$key} = 1;
-                $result = &Apache::lonnet::cput($namespace,{$symb => $triggers{$symb}},$cdom,$cnum);
-                my $dellockoutcome = &Apache::lonnet::del($namespace,['lock'],$cdom,$cnum);
-            } else {
-                $error = 'nolock';
-            }
-        }
-    }
-    return ($result,$error);
-}
-
 sub do_redirect {
     my ($r,$destination,$linkprot) = @_;
     my $windowname = 'loncapaclient';
@@ -621,8 +466,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'};
@@ -763,8 +607,6 @@ ENDJS
                                 origurl => $r->uri,
                                 linkprot => $linkprot,
                                 linkprotexit => $linkprotexit,
-                                linkprotpbid => $linkprotpbid,
-                                linkprotpburl => $linkprotpburl,
                     );
                     my $token =
                         &Apache::lonnet::tmpput(\%data,$r->dir_config('lonHostID'),'retry');