Upload File Bug

[eluser]mcnux[/eluser]
I've just gone through the is_allowed_filetype method and have come up with the following to fix the mixing images with other file types bug.

Essentially it first checks that the mime type matches before checking for valid image, which is what the function should have been doing in the first place - you don't want to check that the image is valid before you know that you have an image!

Had a quick test and appears to be fine. Also a few lines less than the original ;-)

Code:

function is_allowed_filetype()
    {
        if (count($this->allowed_types) == 0 OR ! is_array($this->allowed_types))
        {
            $this->set_error('upload_no_file_types');
            return FALSE;
        }

        $image_types = array('gif', 'jpg', 'jpeg', 'png', 'jpe');

        foreach ($this->allowed_types as $val)
        {
            $mime = $this->mimes_types(strtolower($val));
            // force $mime into an array
            if (!is_array($mime))
            {
                $mime = array($mime);
            }
            
            if (in_array($this->file_type,$mime,TRUE))
            {
                // matched file type
                
                if (in_array($val,$image_types))
                {
                    // check image is ok
                    if (getimagesize($this->file_temp) === FALSE)
                    {
                        return FALSE;
                    }
                }
                
                // super
                return TRUE;
            }
        }
        
        // didn't match
        return FALSE;
    }