--- loncom/auth/lonroles.pm	2021/12/12 18:17:11	1.269.2.39
+++ loncom/auth/lonroles.pm	2024/12/29 02:02:29	1.269.2.42
@@ -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.42 2024/12/29 02:02:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -177,7 +177,8 @@ ENDREDIR
 
 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 @@ $msg
     var url = "$js_url";
     \$(location).attr('href',url);
 });
+// ]]>
 </script>
 $link
 $end_page
@@ -637,7 +639,7 @@ sub handler {
 						     $env{'user.name'},
                                                      &mt('Assigned from [_1] at [_2] for [_3]'
                                                         ,$ip
-                                                        ,&Apache::lonlocal::locallocaltime()
+                                                        ,&Apache::lonlocal::locallocaltime($now)
                                                         ,$trolecode)
                                                      );
 				 unless ($assignresult eq 'ok') {
@@ -836,10 +838,6 @@ ENDCLOSE
                                                   &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>';
@@ -1079,14 +1077,16 @@ ENDCLOSE
     if ($domdefs{'catauth'}) {
         $cattype = $domdefs{'catauth'};
     }
-    my ($funcs,$crumbsright);
+    my ($funcs,$crumbsright,$crumbs_style);
     $funcs = &get_roles_functions($showcount,$cattype);
     if ($env{'browser.mobile'}) {
         $crumbsright = $funcs;
         undef($funcs);
+        $crumbs_style = 'overflow: visible;';
     }
     my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum,
-                                                                    bread_crumbs_component=>$crumbsright});
+                                                                    bread_crumbs_component=>$crumbsright,
+                                                                    bread_crumbs_style=>$crumbs_style,});
     &js_escape(\$standby);
     my $noscript='<br /><span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
 
@@ -1559,9 +1559,9 @@ sub gather_roles {
                                 foreach my $rolename (sort(keys(%{$domdef{'adhocroles'}}))) {
                                     if (ref($domdef{'adhocroles'}{$rolename}) eq 'HASH') {
                                         $adhocdesc{$tdom}{$rolename} = $domdef{'adhocroles'}{$rolename}{'desc'};
-                                        $desc = $adhocdesc{$tdom}{$rolename};
                                     }
                                 }
+                                $desc = $adhocdesc{$tdom}{$rolename}; 
                             }
                         }
                         if ($desc ne '') {
@@ -2000,7 +2000,7 @@ sub build_roletext {
                         $trolecode."','".$buttonname.'\');" /></td>';
         }
     }
-    if (($trolecode !~ m/^(dc|ca|au|aa)\./) && (!$skipcal)) {
+    if (($trolecode !~ m/^(ca|aa)\./) && ($trest ne '') && (!$skipcal)) {
 	$tremark.=&Apache::lonannounce::showday(time,1,
 			 &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
     }