tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center

This commit is contained in:
fbsanchez 2021-07-05 20:56:48 +02:00
parent 8365b47be7 2be851ef83
commit 198e4bf6a3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/class/ExternalTools.class.php
View File

@ -752,7 +752,7 @@ class ExternalTools extends HTML
true true
); );
} else { } else {
if ($operation === COMMAND_SNMP) { if ((int) $operation === COMMAND_SNMP) {
$snmp_obj = [ $snmp_obj = [
'ip_target' => $ip, 'ip_target' => $ip,
'snmp_version' => $snmp_version, 'snmp_version' => $snmp_version,
@ -821,7 +821,7 @@ class ExternalTools extends HTML
} }
html_print_table($table); html_print_table($table);
} else if ($operation === COMMAND_DIGWHOIS) { } else if ((int) $operation === COMMAND_DIGWHOIS) {
echo '<h3>'.__('Domain and IP information for ').$ip.'</h3>'; echo '<h3>'.__('Domain and IP information for ').$ip.'</h3>';
// Dig execution. // Dig execution.

1
pandora_console/include/class/Tree.class.php
View File

@ -993,7 +993,6 @@ class Tree
$inner $inner
GROUP BY g GROUP BY g
ORDER BY $order_by_final"; ORDER BY $order_by_final";
hd($sql, true);
return $sql; return $sql;
} }