mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-23 07:52:07 +02:00
Code Issues Releases Wiki Activity

Make more tolerant of file format

Browse Source
This commit is contained in:
e107steved
2007-12-11 21:18:04 +00:00
parent 5692f4f011
commit 53b0ebdf23
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_handlers/upload_handler.php
View File

@@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/upload_handler.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/upload_handler.php,v $
| $Revision: 1.10 $ | $Revision: 1.11 $
| $Date: 2007-10-30 22:34:32 $ | $Date: 2007-12-11 21:17:59 $
| $Author: e107steved $ | $Author: e107steved $
+---------------------------------------------------------------+ +---------------------------------------------------------------+
*/ */
@@ -548,6 +548,7 @@ function vet_file($filename, $target_name, $allowed_filetypes = '', $unknown = F
case 'pdf' : case 'pdf' :
case 'rar' : case 'rar' :
case '7z' : case '7z' :
case 'csv' :
break; // Just accept these break; // Just accept these
case 'php' : case 'php' :
@@ -585,12 +586,17 @@ function get_allowed_filetypes($def_file = FALSE, $file_mask = '')
{ {
$a_filetypes = trim(file_get_contents(e_ADMIN.$def_file)); $a_filetypes = trim(file_get_contents(e_ADMIN.$def_file));
$a_filetypes = explode(',', $a_filetypes); $a_filetypes = explode(',', $a_filetypes);
foreach ($a_filetypes as $ftype) }
else
{ // Its an 'override' array
$a_filetypes = explode(',', $def_file);
}
foreach ($a_filetypes as $ftype)
{
$ftype = strtolower(trim(str_replace('.', '', $ftype)));
if (!$file_mask || in_array($ftype, $file_array))
{ {
if (!$file_mask || in_array($ftype, $file_array)) $ret[] = $ftype;
{
$ret[] = strtolower(trim(str_replace('.', '', $ftype)));
}
} }
} }
return $ret; return $ret;