manuelcillero/perl-dam
manuelcillero/perl-dam
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix code warning messages in newer Perl installs

Browse source
This commit is contained in:
Manuel Cillero 2020-04-12 12:50:11 +02:00
parent 58ead7c11f
commit 27ed9214ef
7 changed files with 48 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Dam/DamLogic.pm
View file

@ -62,6 +62,7 @@ our @EXPORT = qw(
User__has_access
cgiapp_param
cgiapp_multi
cgiapp_cookie
cgiapp_upload
cgiapp_uploadInfo
@ -360,7 +361,7 @@ sub Component__Get {
my $error = $@;
fatal($error, "\n", 'Form element "', $type, '" can not be loaded');
};
return (scalar(@value) == 1 ? $value[0] : @value) if @value;
return (scalar @value == 1 ? $value[0] : @value) if @value;
return undef;
}
@ -515,7 +516,21 @@ sub User__has_access {
sub cgiapp_param {
return RESERVED('CGIAPP')->query()->param(@_);
return scalar RESERVED('CGIAPP')->query()->param(@_);
}
sub cgiapp_multi {
my @multi = ();
eval {
@multi = RESERVED('CGIAPP')->query()->multi_param(@_);
1;
} or do {
@multi = RESERVED('CGIAPP')->query()->param(@_);
};
return @multi;
}
@ -974,8 +989,8 @@ sub __filter_messages {
my $REPORT_MESSAGES = strval('REPORT_', $arg{MESSAGES});
my $MESSAGES = RESERVED(strval('REF_', $REPORT_MESSAGES));
$arg{TMPL_FILTER}->param($REPORT_MESSAGES => strval(
!is_eq($arg{MESSAGES}, 'INFO') ? strval('<strong>', _t(strval($arg{MESSAGES}, scalar(@$MESSAGES) > 1 ? 'S!' : '!')), '</strong> ') : '',
scalar(@$MESSAGES) == 1 ? $$MESSAGES[0] : strval('<ul>', "\n", '<li>', strval_join(strval('</li>', "\n", '<li>'), @$MESSAGES), '</li>', '</ul>', "\n")
!is_eq($arg{MESSAGES}, 'INFO') ? strval('<strong>', _t(strval($arg{MESSAGES}, scalar @$MESSAGES > 1 ? 'S!' : '!')), '</strong> ') : '',
scalar @$MESSAGES == 1 ? $$MESSAGES[0] : strval('<ul>', "\n", '<li>', strval_join(strval('</li>', "\n", '<li>'), @$MESSAGES), '</li>', '</ul>', "\n")
)) if @$MESSAGES;
}
@ -1021,7 +1036,7 @@ sub __global_messages {
$row = trim($row);
push(@warnings, $row) if $row && !is_eq(substr($row, 0, 1), '#');
}
return '' if scalar(@warnings) == 0;
return '' if scalar @warnings == 0;
my $warnings = '';
my $title = is_eq($type, 'fatal') ? '<h4 class="blink">¡Atención!</h4>' : '<h4>Aviso</h4>';
foreach my $warn (@warnings) { $warnings .= "<li>$warn</li>"; }