--- loncom/interface/loncommon.pm 2021/12/13 19:55:44 1.1075.2.158
+++ loncom/interface/loncommon.pm 2022/01/16 19:11:03 1.1075.2.162
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1075.2.158 2021/12/13 19:55:44 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.162 2022/01/16 19:11:03 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4814,7 +4814,10 @@ sub blockcheck {
my $startblock = 0;
my $endblock = 0;
my $triggerblock = '';
- my %live_courses = &findallcourses(undef,$uname,$udom);
+ my %live_courses;
+ unless (($activity eq 'wishlist') || ($activity eq 'annotate')) {
+ %live_courses = &findallcourses(undef,$uname,$udom);
+ }
# If uname is for a user, and activity is course-specific, i.e.,
# boards, chat or groups, check for blocking in current course only.
@@ -5157,6 +5160,10 @@ END_MYBLOCK
$text = &mt('Search Blocked');
} elsif ($activity eq 'about') {
$text = &mt('Access to User Information Pages Blocked');
+ } elsif ($activity eq 'wishlist') {
+ $text = &mt('Access to Stored Links Blocked');
+ } elsif ($activity eq 'annotate') {
+ $text = &mt('Access to Annotations Blocked');
}
$output .= <<"END_BLOCK";
@@ -5424,8 +5431,12 @@ sub domainlogo {
&Apache::lonnet::repcopy($local_name);
}
$imgsrc = &lonhttpdurl($imgsrc);
- }
- return '

';
+ }
+ my $alttext = $domain;
+ if ($designhash{$domain.'.login.alttext_domlogo'} ne '') {
+ $alttext = $designhash{$domain.'.login.alttext_domlogo'};
+ }
+ return '

';
} elsif (defined(&Apache::lonnet::domain($domain,'description'))) {
return &Apache::lonnet::domain($domain,'description');
} else {
@@ -5689,7 +5700,7 @@ sub bodytag {
if ($realm) {
$realm = '/'.$realm;
}
- if ($rol eq 'ca') {
+ if ($role eq 'ca') {
my ($rdom,$rname) = ($realm =~ m{^/($match_domain)/($match_username)$});
$realm = &plainname($rname,$rdom);
}
@@ -5748,7 +5759,7 @@ sub bodytag {
#
# Extra info if you are the DC
my $dc_info = '';
- if (($env{'user.adv'} && ($env{'request.course.id'}) &&
+ if (($env{'user.adv'}) && ($env{'request.course.id'}) &&
(exists($env{'user.role.dc./'.$env{'course.'.$cid.'.domain'}.'/'}))) {
$dc_info = $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
$dc_info =~ s/\s+$//;
@@ -5818,8 +5829,8 @@ sub bodytag {
} elsif ($forcereg) {
$bodytag .= &Apache::lonmenu::innerregister($forcereg,undef,
$args->{'group'},
- $args->{'hide_buttons',
- $hostname});
+ $args->{'hide_buttons'},
+ $hostname);
} else {
my $forbodytag;
&Apache::lonmenu::prepare_functions($env{'request.noversionuri'},