Allow all extensions and longer comments in filebox

This commit is contained in:
Kijin Sung 2016-02-06 15:15:18 +09:00
parent 7fec63867a
commit bb814dbae8
5 changed files with 19 additions and 8 deletions

View file

@ -1242,9 +1242,14 @@ class moduleController extends module
$ext = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
$vars->ext = $ext;
if($vars->filter) $filter = explode(',',$vars->filter);
else $filter = array('jpg','jpeg','gif','png');
if(!in_array($ext,$filter)) return new Object(-1, 'msg_error_occured');
if ($vars->filter)
{
$filter = array_map('trim', explode(',',$vars->filter));
if (!in_array($ext, $filter))
{
return new Object(-1, 'msg_error_occured');
}
}
$vars->member_srl = $logged_info->member_srl;
@ -1314,9 +1319,9 @@ class moduleController extends module
$args->module_filebox_srl = $vars->module_filebox_srl;
$args->comment = $vars->comment;
// FIXME $args ??
return executeQuery('module.updateModuleFileBox', $vars);
return executeQuery('module.updateModuleFileBox', $args);
$output->add('save_filename', $save_filename);
return $output;
}

View file

@ -4,6 +4,6 @@
<column name="filename" type="varchar" size="250" notnull="notnull" />
<column name="fileextension" type="varchar" size="4" notnull="notnull" index="idx_fileextension" />
<column name="filesize" type="number" size="11" default="0" notnull="notnull" />
<column name="comment" type="varchar" size="250" />
<column name="comment" type="bigtext" />
<column name="regdate" type="date" />
</table>
</table>

View file

@ -63,6 +63,8 @@
</object>
<!--@elseif(in_array($val->fileextension,array('gif','png','jpg','jpeg')))-->
<img src="{getUrl('')}{$val->filename}" style="max-height:60px" />
<!--@else-->
<a href="{getUrl('')}{$val->filename}">{basename($val->filename)}</a>
<!--@end-->
</td>
<td>

View file

@ -26,6 +26,8 @@
<!--@elseif(in_array($val->fileextension,array('gif','png','jpg','jpeg')))-->
<img src="{getUrl('')}{$val->filename}" width="100" height="100" />
<!--@else-->
<a href="{getUrl('')}{$val->filename}">{basename($val->filename)}</a>
<!--@end-->
</div>
</td>

View file

@ -17,6 +17,8 @@
</object>
<!--@elseif(in_array($val->fileextension,array('gif','png','jpg','jpeg')))-->
<img src="{getUrl('')}{$val->filename}" class="filebox_item" />
<!--@else-->
<a href="{getUrl('')}{$val->filename}">{basename($val->filename)}</a>
<!--@end-->
</td>
<td>