fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-30 15:52:17 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-08-19 15:41:14 +09:00
commit 9782c30654
14 changed files with 42 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/file/file.class.php
View file

@ -93,10 +93,18 @@ class file extends ModuleObject
{
return true;
}
if($oDB->getColumnInfo('files', 'mime_type')->size < 100)
{
return true;
}
if(!$oDB->isColumnExists('files', 'original_type'))
{
return true;
}
if($oDB->getColumnInfo('files', 'original_type')->size < 100)
{
return true;
}
if(!$oDB->isColumnExists('files', 'width'))
{
return true;
@ -190,7 +198,11 @@ class file extends ModuleObject
}
if(!$oDB->isColumnExists('files', 'mime_type'))
{
$oDB->addColumn('files', 'mime_type', 'varchar', '60', '', true, 'file_size');
$oDB->addColumn('files', 'mime_type', 'varchar', '100', '', true, 'file_size');
}
if($oDB->getColumnInfo('files', 'mime_type')->size < 100)
{
$oDB->modifyColumn('files', 'mime_type', 'varchar', 100, '', true);
}
if(!$oDB->isIndexExists('files', 'idx_mime_type'))
{
@ -198,7 +210,11 @@ class file extends ModuleObject
}
if(!$oDB->isColumnExists('files', 'original_type'))
{
$oDB->addColumn('files', 'original_type', 'varchar', '60', null, false, 'mime_type');
$oDB->addColumn('files', 'original_type', 'varchar', '100', null, false, 'mime_type');
}
if($oDB->getColumnInfo('files', 'original_type')->size < 100)
{
$oDB->modifyColumn('files', 'original_type', 'varchar', 100, '', false);
}
if(!$oDB->isColumnExists('files', 'width'))
{

4
modules/file/schemas/files.xml
View file

@ -11,8 +11,8 @@
<column name="uploaded_filename" type="varchar" size="250" />
<column name="thumbnail_filename" type="varchar" size="250" />
<column name="file_size" type="number" size="11" default="0" notnull="notnull" index="idx_file_size" />
<column name="mime_type" type="varchar" size="60" notnull="notnull" index="idx_mime_type" />
<column name="original_type" type="varchar" size="60" />
<column name="mime_type" type="varchar" size="100" notnull="notnull" index="idx_mime_type" />
<column name="original_type" type="varchar" size="100" />
<column name="width" type="number" size="11" />
<column name="height" type="number" size="11" />
<column name="duration" type="number" size="11" />