--- loncom/interface/lontiny.pm 2022/07/02 19:55:15 1.15 +++ loncom/interface/lontiny.pm 2022/10/19 18:09:04 1.17 @@ -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.17 2022/10/19 18:09:04 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::lonnet::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;