Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 43 additions & 11 deletions SL/Menu.pm
Original file line number Diff line number Diff line change
Expand Up @@ -16,46 +16,78 @@ package SL::Menu;
use SL::Inifile;
use parent 'SL::Inifile';

sub _url ($form, $s) {
$s = '' if !defined $s;
return $form->escape($s, 1);
}

sub _ha ($s) {
$s = '' if !defined $s;
$s =~ s/&/&/g;
$s =~ s/</&lt;/g;
$s =~ s/>/&gt;/g;
$s =~ s/"/&quot;/g;
return $s;
}


sub menuitem ($self, $myconfig, $form, $item, $) {

my $module = ($self->{$item}{module}) ? $self->{$item}{module} : $form->{script};
my $action = ($self->{$item}{action}) ? $self->{$item}{action} : "section_menu";
my $target = ($self->{$item}{target}) ? $self->{$item}{target} : "";

my $level = $form->escape($item);
my $login = $form->{login};
$login =~ s/ /\%20/;
my $legacy = $self->{$item}{jsmenu} ? 1 : 0;

my $str = qq|<a href=$module?path=$form->{path}&action=$action&level=$level&login=$login&js=$form->{js}|;
my $href = $module
. '?path=' . _url($form, $form->{path})
. '&action='. _url($form, $action)
. '&level=' . _url($form, $item)
. '&login=' . _url($form, $form->{login})
. '&js=' . _url($form, $form->{js});

my $str;

my @vars = qw(module action target href);

if ($self->{$item}{href}) {
$str = qq|<a href=$self->{$item}{href}|;
$href = $self->{$item}{href};
@vars = qw(module target href);
}

for (@vars) { delete $self->{$item}{$_} }

delete $self->{$item}{submenu};

# add other params
foreach my $key (keys %{ $self->{$item} }) {
$str .= "&".$form->escape($key)."=";
foreach my $key (keys %{ $self->{$item} // {} }) {
$href .= "&" . _url($form, $key) . "=";
my ($value, $conf) = split /=/, $self->{$item}{$key}, 2;
$value = "$myconfig->{$value}$conf" if $self->{$item}{$key} =~ /=/;

$str .= $form->escape($value);
$href .= _url($form, $value);
}

my $tag = $form->{tag} // 0;
$href .= qq|#id$tag| if $target eq 'acc_menu' && !$form->{js};

if ($legacy) {
$str = qq|<a href=$href|;
$str .= qq| target=$target| if $target;
$str .= qq|>|;
return $str;
}

$str .= qq|#id$form->{tag}| if $target eq 'acc_menu';
my $href_html = _ha($href);
$str = qq|<a href="$href_html"|;

if ($target) {
$str .= qq| target=$target|;
my $t_html = _ha($target);
$str .= qq| target="$t_html"|;
$str .= qq| rel="noopener noreferrer"| if $target eq '_blank';
}

$str .= qq|>|;
return $str;

}

Expand Down
Loading