[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm
raeburn
raeburn at source.lon-capa.org
Wed Jun 26 00:25:41 EDT 2013
raeburn Wed Jun 26 04:25:41 2013 EDT
Modified files:
/loncom/interface lonmenu.pm
Log:
- Scope and sanity checking.
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.415 loncom/interface/lonmenu.pm:1.416
--- loncom/interface/lonmenu.pm:1.415 Sun May 26 12:39:23 2013
+++ loncom/interface/lonmenu.pm Wed Jun 26 04:25:41 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.415 2013/05/26 12:39:23 raeburn Exp $
+# $Id: lonmenu.pm,v 1.416 2013/06/26 04:25:41 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -487,16 +487,18 @@
foreach my $item (@{$submenu}) {
$count ++;
if (ref($item) eq 'ARRAY') {
+ my $href = $item->[0];
+ if ($href =~ /(aboutme|rss\.html)$/) {
+ next unless (($env{'user.name'} ne '') && ($env{'user.domain'} ne ''));
+ $href =~ s/\[domain\]/$env{'user.domain'}/g;
+ $href =~ s/\[user\]/$env{'user.name'}/g;
+ }
my $borderbot;
if ($count == $numsub) {
$borderbot = 'border-bottom:1px solid black;';
}
- if ($item->[0] =~ /(aboutme|rss\.html)$/) {
- $item->[0] =~ s/\[domain\]/$env{'user.domain'}/g;
- $item->[0] =~ s/\[user\]/$env{'user.name'}/g;
- }
$menu .= '<li style="margin:0;padding:0;'.
- $borderbot.'"><a href="'.$item->[0].'">'.
+ $borderbot.'"><a href="'.$href.'">'.
&mt($item->[1]).'</a></li>';
}
}
More information about the LON-CAPA-cvs
mailing list