1berry/webmin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update web-lib-funcs.pl

Browse Source 
quote_escape - usually used to concatenate to string, so the function should always return a string, even if first argument is undef.  The usage of the eq operator on an undef variable cause a warning, in addition '' is evaluated to 'false' in conditions.
This commit is contained in:
MUY 2017-06-01 06:43:59 +02:00 committed by GitHub
parent 1379d2cc35
commit 377bcacff8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web-lib-funcs.pl
View File

@ -195,13 +195,16 @@ Useful for outputing HTML tag values.
sub quote_escape sub quote_escape
{ {
my ($tmp, $only) = @_; my ($tmp, $only) = @_;
if (!defined $tmp) {
return ''; # empty string
};
if ($tmp !~ /\&[a-zA-Z]+;/ && $tmp !~ /\&#/) { if ($tmp !~ /\&[a-zA-Z]+;/ && $tmp !~ /\&#/) {
# convert &, unless it is part of &#nnn; or &foo; # convert &, unless it is part of &#nnn; or &foo;
$tmp =~ s/&([^#])/&$1/g; $tmp =~ s/&([^#])/&$1/g;
} }
$tmp =~ s/&$/&/g; $tmp =~ s/&$/&/g;
$tmp =~ s/\"/"/g if ($only eq '' || $only eq '"'); $tmp =~ s/\"/"/g if (!$only || $only eq '"');
$tmp =~ s/\'/'/g if ($only eq '' || $only eq "'"); $tmp =~ s/\'/'/g if (!$only || $only eq "'");
return $tmp; return $tmp;
} }