--- loncom/interface/lontiny.pm 2022/07/02 19:55:15 1.15 +++ loncom/interface/lontiny.pm 2024/02/10 14:12:32 1.22 @@ -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.15 2022/07/02 19:55:15 raeburn Exp $ +# $Id: lontiny.pm,v 1.22 2024/02/10 14:12:32 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); @@ -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,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'}); @@ -330,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; @@ -355,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; @@ -403,26 +432,56 @@ 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 '')) { - if ($linkprotector) { - &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi}); - } elsif ($env{'request.linkprot'}) { - &Apache::lonnet::delenv('request.linkprot'); - } + $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 ($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'); + } + 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"); } - $newlauncher = 1; } } &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri}); @@ -443,6 +502,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 { @@ -485,7 +554,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'}; @@ -626,6 +696,8 @@ ENDJS origurl => $r->uri, linkprot => $linkprot, linkprotexit => $linkprotexit, + linkprotpbid => $linkprotpbid, + linkprotpburl => $linkprotpburl, ); my $token = &Apache::lonnet::tmpput(\%data,$r->dir_config('lonHostID'),'retry');