--- loncom/auth/lonroles.pm	2022/05/24 16:23:04	1.363
+++ loncom/auth/lonroles.pm	2022/06/26 04:03:47	1.365
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.363 2022/05/24 16:23:04 raeburn Exp $
+# $Id: lonroles.pm,v 1.365 2022/06/26 04:03:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,19 +149,23 @@ my $registered_cleanup;
 my $rosterupdates;
 
 sub start_loading_course {
-    my ($r,$title) = @_;
+    my ($r,$title,$only_body) = @_;
     &Apache::loncommon::content_type($r,'text/html');
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
-    my $swinfo=&Apache::lonmenu::rawconfig();
-    # Breadcrumbs
-    my $brcrum = [{'href' => '',
-                   'text' => $title},];
-    my $start_page = &Apache::loncommon::start_page($title,undef,
-                                                    {'bread_crumbs' => $brcrum,
-                                                     'bread_crumbs_nomenu' => 1,
-                                                     'links_disabled' => 1});
-    $r->print(<<ENDREDIR);
+    if ($only_body) {
+        $r->print(&Apache::loncommon::start_page($title,undef,{'only_body' => 1,
+                                                               'add_progressbar' => 1}));
+    } else {
+        my $swinfo=&Apache::lonmenu::rawconfig();
+        # Breadcrumbs
+        my $brcrum = [{'href' => '',
+                       'text' => $title},];
+        my $start_page = &Apache::loncommon::start_page($title,undef,
+                                                        {'bread_crumbs' => $brcrum,
+                                                         'bread_crumbs_nomenu' => 1,
+                                                         'links_disabled' => 1});
+        $r->print(<<ENDREDIR);
 $start_page
 <script type="text/javascript">
 // <![CDATA[
@@ -176,23 +180,30 @@ document.body.addEventListener('click',
 // ]]>
 </script>
 ENDREDIR
+    }
     return;
 }
 
 sub finish_loading_course {
-    my ($r,$msg,$url) = @_;
+    my ($r,$msg,$url,$only_body) = @_;
     my $link = '<div id="LC_course_loaded" style="display:none"><a href="'.
                &HTML::Entities::encode($url,'"<>&').'">'.&mt('Continue').'</a></div>';
     my $end_page = &Apache::loncommon::end_page();
     my $js_url = &js_escape($url);
+    my $reenable;
+    unless ($only_body) {
+        $reenable = <<REENABLE;
+    \$('.isDisabled > a').removeAttr("aria-disabled");
+    \$('.isDisabled').removeClass("isDisabled");
+REENABLE
+    }
     $r->print(<<END);
 $msg
 <script type="text/javascript">
 // <![CDATA[
 \$(document).ready(function() {
     \$("#LC_course_loaded").css("display","block");
-    \$('.isDisabled > a').removeAttr("aria-disabled");
-    \$('.isDisabled').removeClass("isDisabled");
+    $reenable
     var url = "$js_url";
     \$(location).attr('href',url);
 });
@@ -763,9 +774,21 @@ ENDENTERKEY
                         }
                         my $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum);
                         $crstype = lc($crstype);
+                        my ($msg,$critmsg_check,$title,$loadmsg,$only_body);
+                        $critmsg_check = 1;
+                        $title = &mt("Loading $crstype");
+                        $loadmsg = &mt("Please be patient while your $crstype loads");
+                        if (($env{'request.deeplink.login'}) && ($env{'request.linkprot'})) {
+                            if ($env{'request.linkprot'} =~ /^\d+(c|d):\Q$env{'form.destinationurl'}\E$/) {
+                                $title = &mt('Loading LON-CAPA session');
+                                $loadmsg = &mt('Please be patient while LON-CAPA loads');
+                                $only_body = 1;
+                                $critmsg_check = 0;
+                            }
+                        }
                         my $preamble = '<div id="LC_update_'.$cdom.'_'.$cnum.'" class="LC_info">'.
                                        '<br />'.
-                                       &mt("Please be patient while your $crstype loads").
+                                       $loadmsg.
                                        '<br /></div>'.
                                        '<div style="padding:0;clear:both;margin:0;border:0"></div>';
                         my $closure = <<ENDCLOSE;
@@ -775,22 +798,21 @@ ENDENTERKEY
 // ]]>
 </script>
 ENDCLOSE
-                        my $title = &mt("Loading $crstype");
-                        &start_loading_course($r,$title);
+                        &start_loading_course($r,$title,$only_body);
                         my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble);
                         &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Loading ...'));
                         $r->rflush();
-                        my ($msg,$blockcrit,$critmsg_check);
-                        $critmsg_check = 1;
-                        $blockcrit = &Apache::loncommon::blocking_status('alert',$clientip,$cnum,$cdom,undef,1);
-                        if ($blockcrit) {
-                            my $checkrole = "cm./$cdom/$cnum";
-                            if ($csec ne '') {
-                                $checkrole .= "/$csec";
-                            }
-                            unless ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) &&
-                                    ($trolecode !~ m{^st\./$cdom/$cnum})) {
-                                $critmsg_check = 0;
+                        if ($critmsg_check) {
+                            my $blockcrit = &Apache::loncommon::blocking_status('alert',$clientip,$cnum,$cdom,undef,1);
+                            if ($blockcrit) {
+                                my $checkrole = "cm./$cdom/$cnum";
+                                if ($csec ne '') {
+                                    $checkrole .= "/$csec";
+                                }
+                                unless ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) &&
+                                        ($trolecode !~ m{^st\./$cdom/$cnum})) {
+                                    $critmsg_check = 0;
+                                }
                             }
                         }
                         my ($furl,$ferr)=
@@ -905,7 +927,7 @@ ENDCLOSE
                                     $msg = '<p>'.&mt('Entering [_1] ...',
                                                      $env{'course.'.$cdom.'_'.$cnum.'.description'}).
                                            '</p>';
-                                    &finish_loading_course($r,$msg,$dest);
+                                    &finish_loading_course($r,$msg,$dest,$only_body);
                                 }
 			    }
                             $r->rflush();
@@ -951,7 +973,7 @@ ENDCLOSE
                                             $msg = '<p>'.&mt('Entering [_1] ...',
                                                              $env{'course.'.$cdom.'_'.$cnum.'.description'}).
                                                    '</p>';
-                                            &finish_loading_course($r,$msg,'/adm/placement');
+                                            &finish_loading_course($r,$msg,'/adm/placement',$only_body);
                                             $r->rflush();
                                             return OK;
                                         }
@@ -1023,7 +1045,7 @@ ENDCLOSE
                                                              $env{'course.'.$cdom.'_'.$cnum.'.description'}).
                                                    '</p>';
                                         }
-                                        &finish_loading_course($r,$msg,$dest);
+                                        &finish_loading_course($r,$msg,$dest,$only_body);
                                         $r->rflush();
                                         return OK;
                                     }
@@ -1038,7 +1060,7 @@ ENDCLOSE
 					    $msg = '<p>'.&mt('Entering [_1] ...',
 						             $env{'course.'.$cdom.'_'.$cnum.'.description'}).
                                                    '</p>';
-                                            &finish_loading_course($r,$msg,'/adm/whatsnew?refpage=start');
+                                            &finish_loading_course($r,$msg,'/adm/whatsnew?refpage=start',$only_body);
                                             $r->rflush();
 					    return OK;
 					}
@@ -1086,12 +1108,12 @@ ENDCLOSE
                                 }
                                 if ($env{'request.lti.login'}) {
                                     undef($msg);
-                                    &finish_loading_course($r,$msg,$furl);
+                                    &finish_loading_course($r,$msg,$furl,$only_body);
                                 } else {
                                     $msg = '<p>'.&mt('Entering [_1] ...',
 					              $env{'course.'.$cdom.'_'.$cnum.'.description'}).
                                            '</p>';
-                                    &finish_loading_course($r,$msg,$furl);
+                                    &finish_loading_course($r,$msg,$furl,$only_body);
                                 }
 			    }
                             $r->rflush();
@@ -3573,6 +3595,8 @@ sub set_deeplink_target {
                 my ($state,$others,$listed,$scope,$protect,$display,$target) = split(/,/,$deeplink);
                 if ($target ne '') {
                     &Apache::lonnet::appenv({'request.deeplink.target' => $target});
+                } elsif (exists($env{'request.deeplink.target'})) {
+                    &Apache::lonnet::delenv('request.deeplink.target');
                 }
             }
         }