fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 03:01:43 +09:00
Code Issues Projects Releases Packages Wiki Activity

Use full paths for table checking and creating

Browse source
This commit is contained in:
Kijin Sung 2021-01-09 00:17:01 +09:00
parent b136b3e0c7
commit cdfd2196ec
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/install/install.controller.php
View file

@ -531,20 +531,21 @@ class installController extends install
foreach ($schema_files as $filename) foreach ($schema_files as $filename)
{ {
if (!preg_match('/^([a-zA-Z0-9_]+)\.xml$/', $filename, $matches)) if (!preg_match('/\/([a-zA-Z0-9_]+)\.xml$/', $filename, $matches))
{ {
continue; continue;
} }
if (!preg_match('/<table\s[^>]*deleted="true"/i', file_get_contents($schema_dir . $filename))) if (preg_match('/<table\s[^>]*deleted="true"/i', file_get_contents($filename)))
{ {
continue; continue;
} }
$table_name = $matches[1]; $table_name = $matches[1];
if($oDB->isTableExists($table_name)) if($oDB->isTableExists($table_name))
{ {
continue; continue;
} }
$output = $oDB->createTable($schema_dir . $filename); $output = $oDB->createTable($filename);
if(!$output->toBool()) if(!$output->toBool())
{ {
throw new Exception(lang('msg_create_table_failed') . ': ' . $table_name . ': ' . $oDB->getError()->getMessage()); throw new Exception(lang('msg_create_table_failed') . ': ' . $table_name . ': ' . $oDB->getError()->getMessage());

12
modules/module/module.model.php
View file

@ -1443,10 +1443,10 @@ class moduleModel extends module
// Get the number of xml files to create a table in schemas // Get the number of xml files to create a table in schemas
$table_count = 0; $table_count = 0;
$schema_files = FileHandler::readDir($path.'schemas', '/(\.xml)$/'); $schema_files = FileHandler::readDir($path.'schemas', '/(\.xml)$/', false, true);
foreach ($schema_files as $filename) foreach ($schema_files as $filename)
{ {
if (!preg_match('/<table\s[^>]*deleted="true"/i', file_get_contents($path . 'schemas/' . $filename))) if (!preg_match('/<table\s[^>]*deleted="true"/i', file_get_contents($filename)))
{ {
$table_count++; $table_count++;
} }
@ -1456,8 +1456,12 @@ class moduleModel extends module
$created_table_count = 0; $created_table_count = 0;
foreach ($schema_files as $filename) foreach ($schema_files as $filename)
{ {
list($table_name, $unused) = explode('.', $filename); if (!preg_match('/\/([a-zA-Z0-9_]+)\.xml$/', $filename, $matches))
if($oDB->isTableExists($table_name)) {
continue;
}
if($oDB->isTableExists($matches[1]))
{ {
$created_table_count++; $created_table_count++;
} }