Skip to content

Commit cd48c7c

Browse files
author
Till Brehm
committed
Added missing underscores in table name validation functions.
1 parent 19b5e01 commit cd48c7c

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

interface/lib/classes/db_mysql.inc.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,8 @@ public function datalogSave($db_table, $action, $primary_field, $primary_id, $re
263263
global $app, $conf;
264264

265265
// Check fields
266-
if(!preg_match('/^[a-zA-Z0-9\.\-]{1,64}$/',$db_table)) $app->error('Invalid table name '.$db_table);
267-
if(!preg_match('/^[a-zA-Z0-9\-]{1,64}$/',$primary_field)) $app->error('Invalid primary field '.$primary_field.' in table '.$db_table);
266+
if(!preg_match('/^[a-zA-Z0-9\.\-\_]{1,64}$/',$db_table)) $app->error('Invalid table name '.$db_table);
267+
if(!preg_match('/^[a-zA-Z0-9\-\_]{1,64}$/',$primary_field)) $app->error('Invalid primary field '.$primary_field.' in table '.$db_table);
268268

269269
if(strpos($db_table, '.') !== false) {
270270
$db_table = preg_replace('/^(.+)\.(.+)$/', '`$1`.`$2`', $db_table);
@@ -314,8 +314,8 @@ public function datalogInsert($tablename, $insert_data, $index_field) {
314314
global $app;
315315

316316
// Check fields
317-
if(!preg_match('/^[a-zA-Z0-9\.\-]{1,64}$/',$tablename)) $app->error('Invalid table name '.$tablename);
318-
if(!preg_match('/^[a-zA-Z0-9\-]{1,64}$/',$index_field)) $app->error('Invalid index field '.$index_field.' in table '.$tablename);
317+
if(!preg_match('/^[a-zA-Z0-9\.\-\_]{1,64}$/',$tablename)) $app->error('Invalid table name '.$tablename);
318+
if(!preg_match('/^[a-zA-Z0-9\-\_]{1,64}$/',$index_field)) $app->error('Invalid index field '.$index_field.' in table '.$tablename);
319319

320320
if(strpos($tablename, '.') !== false) {
321321
$tablename = preg_replace('/^(.+)\.(.+)$/', '`$1`.`$2`', $tablename);
@@ -353,8 +353,8 @@ public function datalogUpdate($tablename, $update_data, $index_field, $index_val
353353
global $app;
354354

355355
// Check fields
356-
if(!preg_match('/^[a-zA-Z0-9\.\-]{1,64}$/',$tablename)) $app->error('Invalid table name '.$tablename);
357-
if(!preg_match('/^[a-zA-Z0-9\-]{1,64}$/',$index_field)) $app->error('Invalid index field '.$index_field.' in table '.$tablename);
356+
if(!preg_match('/^[a-zA-Z0-9\.\-\_]{1,64}$/',$tablename)) $app->error('Invalid table name '.$tablename);
357+
if(!preg_match('/^[a-zA-Z0-9\-\_]{1,64}$/',$index_field)) $app->error('Invalid index field '.$index_field.' in table '.$tablename);
358358

359359
if(strpos($tablename, '.') !== false) {
360360
$tablename = preg_replace('/^(.+)\.(.+)$/', '`$1`.`$2`', $tablename);
@@ -389,8 +389,8 @@ public function datalogDelete($tablename, $index_field, $index_value) {
389389
global $app;
390390

391391
// Check fields
392-
if(!preg_match('/^[a-zA-Z0-9\.\-]{1,64}$/',$tablename)) $app->error('Invalid table name '.$tablename);
393-
if(!preg_match('/^[a-zA-Z0-9\-]{1,64}$/',$index_field)) $app->error('Invalid index field '.$index_field.' in table '.$tablename);
392+
if(!preg_match('/^[a-zA-Z0-9\.\-\_]{1,64}$/',$tablename)) $app->error('Invalid table name '.$tablename);
393+
if(!preg_match('/^[a-zA-Z0-9\-\_]{1,64}$/',$index_field)) $app->error('Invalid index field '.$index_field.' in table '.$tablename);
394394

395395
if(strpos($tablename, '.') !== false) {
396396
$tablename = preg_replace('/^(.+)\.(.+)$/', '`$1`.`$2`', $tablename);

0 commit comments

Comments
 (0)