Skip to content

ADO reports / use proper sql escape function according to database vendor #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ADO reports / use proper sql escape function according to database vendor #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions classes/report_types/AdoPivotReportType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ public static function getVariableOptions($params, &$report) {
foreach($macros as $key=>$value) {
if(is_array($value)) {
foreach($value as $key2=>$value2) {
$value[$key2] = mysql_real_escape_string(trim($value2));
$value[$key2] = AdoReportType::sql_escape_string($report,trim($value2));
}
$macros[$key] = $value;
}
else {
$macros[$key] = mysql_real_escape_string($value);
$macros[$key] = AdoReportType::sql_escape_string($report,$value);
}

if($value === 'ALL') $macros[$key.'_all'] = true;
Expand Down Expand Up @@ -109,13 +109,13 @@ public static function run(&$report) {
if(is_array($value)) {
$first = true;
foreach($value as $key2=>$value2) {
$value[$key2] = mysql_real_escape_string(trim($value2));
$value[$key2] = AdoReportType::sql_escape_string($report,trim($value2));
$first = false;
}
$macros[$key] = $value;
}
else {
$macros[$key] = mysql_real_escape_string($value);
$macros[$key] = AdoReportType::sql_escape_string($report,$value);
}

if($value === 'ALL') $macros[$key.'_all'] = true;
Expand Down
12 changes: 10 additions & 2 deletions classes/report_types/AdoReportType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@ public static function run(&$report) {
if(is_array($value)) {
$first = true;
foreach($value as $key2=>$value2) {
$value[$key2] = mysql_real_escape_string(trim($value2));
$value[$key2] = AdoReportType::sql_escape_string($report,trim($value2));
$first = false;
}
$macros[$key] = $value;
}
else {
$macros[$key] = mysql_real_escape_string($value);
$macros[$key] = AdoReportType::sql_escape_string($report,$value);
}

if($value === 'ALL') $macros[$key.'_all'] = true;
Expand Down Expand Up @@ -153,4 +153,12 @@ public static function run(&$report) {

return $result->GetArray();
}

public static function sql_escape_string(&$report,&$value) {
$uri = PhpReports::$config['environments'][$report->options['Environment']]['ado']['uri'];
if(preg_match('/^postgres:/',$uri)) {
return pg_escape_string($value);
}
return mysql_real_escape_string($value);
}
}