[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /auth lonroles.pm

[raeburn]

raeburn		Thu Feb 24 15:09:05 2022 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/auth	lonroles.pm 
  Log:
  - For 2.11
    - Backport 1.360, 1.362
    - Remove part of 1.269.2.39 which supports LTI; not used in 2.11
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.269.2.39 loncom/auth/lonroles.pm:1.269.2.40
--- loncom/auth/lonroles.pm:1.269.2.39	Sun Dec 12 18:17:11 2021
+++ loncom/auth/lonroles.pm	Thu Feb 24 15:09:05 2022
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.269.2.39 2021/12/12 18:17:11 raeburn Exp $
+# $Id: lonroles.pm,v 1.269.2.40 2022/02/24 15:09:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -177,7 +177,8 @@
 
 sub finish_loading_course {
     my ($r,$msg,$url) = @_;
-    my $link = '<div id="LC_course_loaded" style="display:none"><a href="'.$url.'">'.&mt('Continue').'</a></div>';
+    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);
     $r->print(<<END);
@@ -191,6 +192,7 @@
     var url = "$js_url";
     \$(location).attr('href',url);
 });
+// ]]>
 </script>
 $link
 $end_page
@@ -836,10 +838,6 @@
                                                   &Apache::loncommon::end_page());
                                     }
                                 } else {
-                                    if (($env{'request.lti.login'}) &&
-                                        ($env{'request.lti.rosterid'} || $env{'request.lti.passbackid'})) {
-                                        &process_lti($r,$cdom,$cnum);
-                                    }
                                     $msg = '<p>'.&mt('Entering [_1] ...',
                                                      $env{'course.'.$cdom.'_'.$cnum.'.description'}).
                                            '</p>';