--- loncom/interface/lonhtmlcommon.pm 2004/11/23 14:53:05 1.98 +++ loncom/interface/lonhtmlcommon.pm 2004/11/30 18:42:09 1.101 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.98 2004/11/23 14:53:05 matthew Exp $ +# $Id: lonhtmlcommon.pm,v 1.101 2004/11/30 18:42:09 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -132,6 +132,9 @@ sub select_recent { foreach (sort keys %recent) { unless ($_=~/^error\:/) { my $escaped = &Apache::loncommon::escape_url($_); + if ($_ =~ /\/$/ && $escaped !~ /\/$/) { + $escaped .= '/'; + } $return.="\n'; @@ -899,23 +902,25 @@ sub crumbs { if (! defined($size)) { $size = '+2'; } + if ($target) { + $target = ' target="'. + &Apache::loncommon::escape_single($target).'"'; + } my $output=''; unless ($noformat) { $output.='
'; } $output.=''.$prefix.'/'; if ($ENV{'user.adv'}) { my $path=$prefix.'/'; - foreach (split('/',$uri)) { - unless ($_) { next; } - $path.=$_; + foreach my $dir (split('/',$uri)) { + if (! $dir) { next; } + $path .= $dir; unless ($path eq $uri) { $path.='/'; } - my $escaped_linkpath = &Apache::loncommon::escape_single($path); + my $linkpath = &Apache::loncommon::escape_single($path); if ($form) { - $escaped_linkpath="javascript:$form.action='". - &Apache::loncommon::escape_single($path). - "';$form.submit();"; + $linkpath= + qq{javascript:$form.action='$linkpath';$form.submit();}; } - my $escaped_target = &Apache::loncommon::escape_single($target); - $output.=''.$_.'/'; + $output.=qq{$dir/}; } } else { $output.=$uri;