loncom/interface/lonmenu.pm - diff

Return to lonmenu.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.545, 2024/01/01 00:53:49	version 1.547, 2024/04/18 16:42:58
Line 378 sub primary_menu {	Line 378 sub primary_menu {
} else {	} else {
next;	next;
}	}
	}
if ($env{'request.course.id'} && $menucoll) {	if ($env{'request.course.id'} && $menucoll) {
next if ($item->[3]) && (!$menuopts{$item->[3]});	next if ($item->[3]) && (!$menuopts{$item->[3]});
}	}
Line 1709 sub prepare_functions {	Line 1710 sub prepare_functions {
} elsif (($resurl !~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) &&	} elsif (($resurl !~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) &&
($resurl ne '/cgi-bin/printout.pl')) {	($resurl ne '/cgi-bin/printout.pl')) {
if ($env{'request.filename'}) {	if ($env{'request.filename'}) {
my $file=&Apache::lonnet::declutter($env{'request.filename'});	my $file;
	my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
	if ($env{'request.filename'} =~ m{^\Q$londocroot\E/priv/}) {
	$file = $env{'request.filename'};
	$file =~ s{^\Q$londocroot\E/}{};
	} else {
	$file=&Apache::lonnet::declutter($env{'request.filename'});
	}
($cfile,$home,$switchserver,$forceedit,$forceview) =	($cfile,$home,$switchserver,$forceedit,$forceview) =
&Apache::lonnet::can_edit_resource($file,$cnum,$cdom,	&Apache::lonnet::can_edit_resource($file,$cnum,$cdom,
&Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);	&Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);