diff --git a/ext/handle_flash/main.php b/ext/handle_flash/main.php index 5c188d99..c960bc38 100644 --- a/ext/handle_flash/main.php +++ b/ext/handle_flash/main.php @@ -57,10 +57,6 @@ class FlashFileHandler extends DataHandlerExtension $fp = fopen($tmpname, "r"); $head = fread($fp, 3); fclose($fp); - if (!in_array($head, ["CWS", "FWS"])) { - return false; - } - - return true; + return in_array($head, ["CWS", "FWS"]); } } diff --git a/ext/handle_mp3/main.php b/ext/handle_mp3/main.php index a2ac2865..171f71be 100644 --- a/ext/handle_mp3/main.php +++ b/ext/handle_mp3/main.php @@ -51,7 +51,6 @@ class MP3FileHandler extends DataHandlerExtension protected function check_contents(string $tmpname): bool { - $mimeType = getMimeType($tmpname); - return ($mimeType == 'audio/mpeg'); + return getMimeType($tmpname) == 'audio/mpeg'; } } diff --git a/ext/handle_pixel/main.php b/ext/handle_pixel/main.php index 70036b90..6dd8f27d 100644 --- a/ext/handle_pixel/main.php +++ b/ext/handle_pixel/main.php @@ -64,13 +64,7 @@ class PixelFileHandler extends DataHandlerExtension { $valid = [IMAGETYPE_PNG, IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_WEBP]; $info = getimagesize($tmpname); - if (!$info) { - return false; - } - if (in_array($info[2], $valid)) { - return true; - } - return false; + return $info && in_array($info[2], $valid); } protected function create_thumb(string $hash, string $type): bool