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

* Merge file upload allowed

Browse Source
This commit is contained in:
pengjiangxiu
2017-06-15 09:46:13 +08:00
parent a29c6f2143
commit 97bbc1bef0
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/file/model.php
+1 -12
View File
@@ -153,12 +153,6 @@ class fileModel extends model
$file['title'] = $purifier->purify($file['title']);
$file['size'] = $size[$id];
$file['tmpname'] = $tmp_name[$id];
if(stripos($this->config->file->allowed, ',' . $file['extension'] . ',') === false)
{
$file['pathname'] = $file['pathname'] . '.notAllowed';
}
$files[] = $file;
}
}
@@ -174,12 +168,6 @@ class fileModel extends model
$file['title'] = $purifier->purify($file['title']);
$file['size'] = $size;
$file['tmpname'] = $tmp_name;
if(stripos($this->config->file->allowed, ',' . $file['extension'] . ',') === false)
{
$file['pathname'] = $file['pathname'] . '.notAllowed';
}
return array($file);
}
return $files;
@@ -304,6 +292,7 @@ class fileModel extends model
{
$extension = trim(strtolower(pathinfo($filename, PATHINFO_EXTENSION)));
if(empty($extension) or stripos(",{$this->config->file->dangers},", ",{$extension},") !== false) return 'txt';
if(empty($extension) or stripos(",{$this->config->file->allowed},", ",{$extension},") === false) return 'txt';
if($extension == 'php') return 'txt';
return $extension;
}