diff options
| -rw-r--r-- | php/includes/settings.inc.php | 11 | ||||
| -rw-r--r-- | php/upload.php | 13 |
2 files changed, 11 insertions, 13 deletions
diff --git a/php/includes/settings.inc.php b/php/includes/settings.inc.php index cc33f7b..19a3987 100644 --- a/php/includes/settings.inc.php +++ b/php/includes/settings.inc.php @@ -93,20 +93,13 @@ define('ID_CHARSET', 'abcdefghijklmnopqrstuvwxyz'); * Blocked mime types * @param string[] $FILTER_MIME blocked mime types */ -$FILTER_MIME = array("") - -/** - * Whitelisted mime types - * @param bool $WHIELIST to enable whitelist of mime types - */ - -define('WHITELSIST', false); +$FILTER_MIME = array(""); /** * Whitelisted mime types * @param string[] $WHITELIST_MIME_MIME allowed mime types */ -$WHITELIST_MIME = array("") +$WHITELIST_MIME = array(""); /** * Double dot file extensions diff --git a/php/upload.php b/php/upload.php index a4d7a5a..9b58ba4 100644 --- a/php/upload.php +++ b/php/upload.php @@ -74,6 +74,8 @@ function generateName($file) function uploadFile($file) { global $db; + global $WHITELIST_MIME; + global $FILTER_MIME; // Handle file errors if ($file->error) { @@ -81,12 +83,15 @@ function uploadFile($file) } // Check if mime type is blocked - if (!in_array(mime_content_type($file), $FILTER_MIME)) { - throw new UploadException(UPLOAD_ERR_EXTENSION); + if (!empty($FILTER_MIME)) { + if (in_array($file->mime, $FILTER_MIME)) { + throw new UploadException(UPLOAD_ERR_EXTENSION); + } } - if WHITELIST == true { - if (!in_array(mime_content_type($file), $WHITELIST_MIME)) { + if (!empty($WHITELIST_MIME)) { + if (!in_array($file->mime, $WHITELIST_MIME)) { throw new UploadException(UPLOAD_ERR_EXTENSION); + } } |