loncom/interface/lonmenu.pm - diff

Return to lonmenu.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.353, 2011/10/21 19:26:23	version 1.355, 2011/10/30 22:15:20
Line 334 sub secondary_menu {	Line 334 sub secondary_menu {
and ( $env{'request.noversionuri'} eq ''	and ( $env{'request.noversionuri'} eq ''
\|\| !defined($env{'request.noversionuri'})))	\|\| !defined($env{'request.noversionuri'})))
{	{
($escurl = $env{'request.filename'}) =~	($escurl = $env{'request.filename'}) =~ s{^/home/httpd/html}{};
s{^/home/([^/]+)/public_html/(.*)$}{/priv/$1/$2};

$escurl = &escape($escurl);	$escurl = &escape($escurl);
}	}
$menu =~ s/\[url\]/$escurl/g;	$menu =~ s/\[url\]/$escurl/g;
Line 577 sub innerregister {	Line 575 sub innerregister {
# We are in construction space	# We are in construction space
#	#

	my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
my ($udom,$uname,$thisdisfn) =	my ($udom,$uname,$thisdisfn) =
($env{'request.filename'}=~m\|^/home/httpd/html/priv/([^/]+)/([^/]+)/(.*)$\|);	($env{'request.filename'}=~m{^\Q$londocroot/priv/\E([^/]+)/([^/]+)/(.*)$});
my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn;	my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn;
if ($currdir =~ m-/$-) {	if ($currdir =~ m-/$-) {
$is_const_dir = 1;	$is_const_dir = 1;