From 9c1b2598c8f39189f6c92c80f68d10adbbc645f7 Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Mon, 2 Oct 2023 14:03:18 +0700 Subject: [PATCH] Minor improvements (#287) --- .../attach_mod/includes/functions_thumbs.php | 20 +++++++++---------- library/includes/functions_upload.php | 16 ++++----------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/library/attach_mod/includes/functions_thumbs.php b/library/attach_mod/includes/functions_thumbs.php index 54b9035d..a8b95634 100644 --- a/library/attach_mod/includes/functions_thumbs.php +++ b/library/attach_mod/includes/functions_thumbs.php @@ -58,21 +58,21 @@ function get_supported_image_types($type) switch ($type) { - case 1: + case IMAGETYPE_GIF: $new_type = ($format & IMG_GIF) ? IMG_GIF : 0; break; - case 2: - case 9: - case 10: - case 11: - case 12: + case IMAGETYPE_JPEG: + case IMAGETYPE_JPC: + case IMAGETYPE_JP2: + case IMAGETYPE_JPX: + case IMAGETYPE_JB2: $new_type = ($format & IMG_JPG) ? IMG_JPG : 0; break; - case 3: + case IMAGETYPE_PNG: $new_type = ($format & IMG_PNG) ? IMG_PNG : 0; break; - case 6: - case 15: + case IMAGETYPE_BMP: + case IMAGETYPE_WBMP: $new_type = ($format & IMG_WBMP) ? IMG_WBMP : 0; break; } @@ -186,4 +186,4 @@ function create_thumbnail($source, $new_file, $mimetype) @chmod($new_file, 0664); return true; -} \ No newline at end of file +} diff --git a/library/includes/functions_upload.php b/library/includes/functions_upload.php index cb2e87ee..fa2afabe 100644 --- a/library/includes/functions_upload.php +++ b/library/includes/functions_upload.php @@ -27,18 +27,10 @@ class upload_common var $ext_ids = array(); // array_flip($bb_cfg['file_id_ext']) var $errors = array(); var $img_types = array( - // Не редактируйте! - 1 => 'gif', - 2 => 'jpg', - 3 => 'png', - // 4 => 'swf', // [зарезервировано] - // 5 => 'psd', // [зарезервировано] - 6 => 'bmp', - // 7 => 'tiff', // байтовый порядок intel [зарезервировано] - // 8 => 'tiff', // байтовый порядок motorola [зарезервировано] - // 9 => 'jpc', // [зарезервировано] - // 10 => 'jp2', // [зарезервировано] - // 11 => 'jpx', // [зарезервировано] + IMAGETYPE_GIF => 'gif', + IMAGETYPE_JPEG => 'jpg', + IMAGETYPE_PNG => 'png', + IMAGETYPE_BMP => 'bmp', ); function init ($cfg = array(), $post_params = array(), $uploaded_only = true)