tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid unexpected else when variables are undefined

Browse Source
This commit is contained in:
Félix Suárez 2023-05-29 10:02:19 -06:00
parent bb1f67c960
commit 883351b68d
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -5253,9 +5253,10 @@ sub get_module_status ($$$$) {
if ($module_type !~ m/_string/) { if ($module_type !~ m/_string/) {
# Critical # Critical
if ($critical_min ne $critical_max) { if ($critical_min ne $critical_max && defined($module->{'critical_inverse'})) {
# [critical_min, critical_max) # [critical_min, critical_max)
if (defined($module->{'critical_inverse'}) && $module->{'critical_inverse'} == 0) { if ($module->{'critical_inverse'} == 0) {
return 1 if ($data >= $critical_min && $data < $critical_max); return 1 if ($data >= $critical_min && $data < $critical_max);
return 1 if ($data >= $critical_min && $critical_max < $critical_min); return 1 if ($data >= $critical_min && $critical_max < $critical_min);
} }
@ -5270,9 +5271,10 @@ sub get_module_status ($$$$) {
} }
# Warning # Warning
if ($warning_min ne $warning_max) { if ($warning_min ne $warning_max && defined($module->{'warning_inverse'})) {
# [warning_min, warning_max) # [warning_min, warning_max)
if (defined($module->{'warning_inverse'}) && $module->{'warning_inverse'} == 0) { if ($module->{'warning_inverse'} == 0) {
return 2 if ($data >= $warning_min && $data < $warning_max); return 2 if ($data >= $warning_min && $data < $warning_max);
return 2 if ($data >= $warning_min && $warning_max < $warning_min); return 2 if ($data >= $warning_min && $warning_max < $warning_min);
} }
@ -5290,25 +5292,33 @@ sub get_module_status ($$$$) {
else { else {
# Critical # Critical
if(defined($module->{'critical_inverse'})){
$eval_result = eval { $eval_result = eval {
if (defined($module->{'critical_inverse'}) && $module->{'critical_inverse'} == 0) { if ($module->{'critical_inverse'} == 0) {
$critical_str ne '' && $data =~ /$critical_str/ ; $critical_str ne '' && $data =~ /$critical_str/ ;
} else { } else {
$critical_str ne '' && $data !~ /$critical_str/ ; $critical_str ne '' && $data !~ /$critical_str/ ;
} }
}; };
return 1 if ($eval_result); return 1 if ($eval_result);
}
# Warning # Warning
if(defined($module->{'critical_inverse'})){
$eval_result = eval { $eval_result = eval {
if (defined($module->{'warning_inverse'}) && $module->{'warning_inverse'} == 0) { if ($module->{'warning_inverse'} == 0) {
$warning_str ne '' && $data =~ /$warning_str/ ; $warning_str ne '' && $data =~ /$warning_str/ ;
} else { } else {
$warning_str ne '' && $data !~ /$warning_str/ ; $warning_str ne '' && $data !~ /$warning_str/ ;
} }
}; };
return 2 if ($eval_result); return 2 if ($eval_result);
} }
}
# Normal # Normal
return 0; return 0;