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

#11559 refactored

This commit is contained in:
Daniel Cebrian 2023-06-13 17:27:23 +02:00
parent 75b25bd670
commit 4d53f4cbc4
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -2198,6 +2198,10 @@ switch ($action) {
); );
if ($values['treport_custom_sql_id'] == 0) { if ($values['treport_custom_sql_id'] == 0) {
$sql = get_parameter('sql', ''); $sql = get_parameter('sql', '');
if ($sql !== '') {
$good_format = db_validate_sql($sql);
}
$values['external_source'] = $sql; $values['external_source'] = $sql;
} }
@ -2214,10 +2218,6 @@ switch ($action) {
} else { } else {
$values['server_name'] = get_parameter('combo_server'); $values['server_name'] = get_parameter('combo_server');
} }
if ($sql !== '') {
$good_format = db_validate_sql($sql, (is_metaconsole() === true) ? $values['server_name'] : false);
}
} else if ($values['type'] == 'url') { } else if ($values['type'] == 'url') {
$values['external_source'] = get_parameter('url'); $values['external_source'] = get_parameter('url');
} else if ($values['type'] == 'event_report_group') { } else if ($values['type'] == 'event_report_group') {

1
pandora_console/include/functions_db.php
View File

@ -2568,7 +2568,6 @@ function db_get_column_type(string $table, string $column='')
function db_validate_sql(string $sql, $server=false) function db_validate_sql(string $sql, $server=false)
{ {
if ($server !== false && is_metaconsole() === true) { if ($server !== false && is_metaconsole() === true) {
metaconsole_restore_db();
$setup = metaconsole_get_connection($server); $setup = metaconsole_get_connection($server);
if (metaconsole_connect($setup) !== NOERR) { if (metaconsole_connect($setup) !== NOERR) {
return false; return false;