version 1.369.2.71, 2017/04/10 05:37:47
|
version 1.369.2.72, 2018/09/03 14:30:16
|
Line 499 sub secondary_menu {
|
Line 499 sub secondary_menu {
|
next if ($item->[2] eq 'mgr' && !$canmgr); |
next if ($item->[2] eq 'mgr' && !$canmgr); |
next if ($item->[2] eq 'vcg' && !$canviewgrps); |
next if ($item->[2] eq 'vcg' && !$canviewgrps); |
next if ($item->[2] eq 'crsedit' && !$canedit && !$canvieweditor); |
next if ($item->[2] eq 'crsedit' && !$canedit && !$canvieweditor); |
|
next if ($item->[2] eq 'author' && !$author); |
|
next if ($item->[2] eq 'cca' && !$canmodifycoauthor); |
push(@scndsub,$item); |
push(@scndsub,$item); |
} |
} |
} |
} |
Line 528 sub secondary_menu {
|
Line 530 sub secondary_menu {
|
} else { |
} else { |
$$menuitem[0] =~ s{\?register=1}{}; |
$$menuitem[0] =~ s{\?register=1}{}; |
} |
} |
|
$$menuitem[0] = &HTML::Entities::encode($$menuitem[0],'&<>"'); |
} |
} |
$menu .= &prep_menuitem(\@$menuitem); |
$menu .= &prep_menuitem(\@$menuitem); |
} |
} |
Line 546 sub secondary_menu {
|
Line 549 sub secondary_menu {
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
($escurl = $env{'request.filename'}) =~ s{^\Q$londocroot\E}{}; |
($escurl = $env{'request.filename'}) =~ s{^\Q$londocroot\E}{}; |
$escurl = &escape($escurl); |
$escurl = &escape($escurl); |
} |
} |
$menu =~ s/\[url\]/$escurl/g; |
$menu =~ s/\[url\]/$escurl/g; |
$menu =~ s/\[symb\]/$escsymb/g; |
$menu =~ s/\[symb\]/$escsymb/g; |
} |
} |
Line 635 sub build_submenu {
|
Line 638 sub build_submenu {
|
next unless (($env{'user.name'} ne '') && ($env{'user.domain'} ne '')); |
next unless (($env{'user.name'} ne '') && ($env{'user.domain'} ne '')); |
$href =~ s/\[domain\]/$env{'user.domain'}/g; |
$href =~ s/\[domain\]/$env{'user.domain'}/g; |
$href =~ s/\[user\]/$env{'user.name'}/g; |
$href =~ s/\[user\]/$env{'user.name'}/g; |
|
} elsif (($href =~ m{^/adm/preferences\?}) && ($href =~ /\[returnurl\]/)) { |
|
my $returnurl = $ENV{'REQUEST_URI'}; |
|
if ($ENV{'REQUEST_URI'} =~ m{/adm/preferences\?action=(?:changedomcoord|authorsettings)\&returnurl=([^\&]+)$}) { |
|
$returnurl = $1; |
|
} |
|
if (($returnurl =~ m{^/adm/createuser($|\?action=)}) || |
|
($returnurl =~ m{^/priv/$match_domain/$match_username}) || |
|
($returnurl =~ m{^/res(/?$|/$match_domain/$match_username)})) { |
|
$returnurl =~ s{\?.*$}{}; |
|
$returnurl = '&returnurl='.&HTML::Entities::encode($returnurl,'"<>&\''); |
|
} else { |
|
undef($returnurl); |
|
} |
|
$href =~ s/\[returnurl\]/$returnurl/; |
} |
} |
unless (($href eq '') || ($href =~ /^\#/)) { |
unless (($href eq '') || ($href =~ /^\#/)) { |
$target = ' target="_top"'; |
$target = ' target="_top"'; |