From ac505d98759a7ab86c261f10911f576b26838573 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Tue, 19 Apr 2022 20:20:48 +0300 Subject: [PATCH] fix db regexp --- install/core/Installer.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/install/core/Installer.php b/install/core/Installer.php index 6501714b65..4a64506293 100644 --- a/install/core/Installer.php +++ b/install/core/Installer.php @@ -315,14 +315,14 @@ class Installer $pdo = $this->getDatabaseHelper() ->createPdoConnection($params, true); - $dbname = preg_replace('/[^A-Za-z0-9_]+/', '', $params['dbname']); + $dbname = preg_replace('/[^A-Za-z0-9_\-@$#\(\)]+/', '', $params['dbname']); if ($dbname !== $params['dbname']) { throw new Exception("Bad database name."); } $pdo->query( - "CREATE DATABASE IF NOT EXISTS `" . $dbname . "`" + "CREATE DATABASE IF NOT EXISTS `{$dbname}`" ); return $this->checkDatabaseConnection($params, false); @@ -335,17 +335,17 @@ class Installer } /** - * Save data + * Save data. * - * @param array $database - * array ( + * @param array $database + * array( * 'driver' => 'pdo_mysql', * 'host' => 'localhost', * 'dbname' => 'espocrm_test', * 'user' => 'root', * 'password' => '', - * ), - * @param string $language + * ) + * @param string $language * @return bool */ public function saveData(array $saveData)