mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-27 22:33:10 +09:00
merge from 1.4.5 branche
git-svn-id: http://xe-core.googlecode.com/svn/trunk@8239 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
7d10ebd968
commit
825ccd8328
57 changed files with 932 additions and 645 deletions
|
|
@ -418,8 +418,11 @@
|
|||
|
||||
$path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3));
|
||||
|
||||
// 파일 이름에서 특수문자를 _로 변환
|
||||
$_filename = preg_replace('/[#$&*?+%"\']/', '_', $file_info['name']);
|
||||
// special character to '_'
|
||||
// change to md5 file name. because window php bug. window php is not recognize unicode character file name - by cherryfilter
|
||||
$ext = substr(strrchr($file_info['name'],'.'),1);
|
||||
//$_filename = preg_replace('/[#$&*?+%"\']/', '_', $file_info['name']);
|
||||
$_filename = md5(crypt(rand(1000000,900000), rand(0,100))).'.'.$ext;
|
||||
$filename = $path.$_filename;
|
||||
$idx = 1;
|
||||
while(file_exists($filename)) {
|
||||
|
|
@ -440,13 +443,11 @@
|
|||
if($manual_insert) {
|
||||
@copy($file_info['tmp_name'], $filename);
|
||||
if(!file_exists($filename)) {
|
||||
$ext = substr(strrchr($file_info['name'],'.'),1);
|
||||
$filename = $path. md5(crypt(rand(1000000,900000).$file_info['name'])).'.'.$ext;
|
||||
@copy($file_info['tmp_name'], $filename);
|
||||
}
|
||||
} else {
|
||||
if(!@move_uploaded_file($file_info['tmp_name'], $filename)) {
|
||||
$ext = substr(strrchr($file_info['name'],'.'),1);
|
||||
$filename = $path. md5(crypt(rand(1000000,900000).$file_info['name'])).'.'.$ext;
|
||||
if(!@move_uploaded_file($file_info['tmp_name'], $filename)) return new Object(-1,'msg_file_upload_error');
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue