Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fix bug for check icovn or mb_convert_encoding and check Directory separator.

Browse Source
This commit is contained in:
wangyidong
2016-03-14 14:17:41 +08:00
parent ff43f65926
commit 82a46bd196
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/file/model.php
+10 -2
View File
@@ -436,8 +436,16 @@ class fileModel extends model
foreach($files as $i => $uploadFile)
{
if($uploadFile['folder']) continue;
$fileName = mb_convert_encoding($uploadFile['filename'], 'UTF-8', 'gbk');
$fileName = substr($fileName, strrpos($fileName, '/') + 1);
$fileName = $uploadFile['filename'];
if(function_exists('iconv'))
{
$fileName = iconv('gbk', 'utf-8//TRANSLIT', $fileName);
}
elseif(function_exists('mb_convert_encoding'))
{
$fileName = mb_convert_encoding($fileName, 'utf-8', 'gbk');
}
if(($pos = strrpos($fileName, '/')) !== false) $fileName = substr($fileName, $pos + 1);
$file = array();
$file['extension'] = $this->getExtension($fileName);