diff --git a/src/pretix/_base_settings.py b/src/pretix/_base_settings.py index 098f175f97..276a666e01 100644 --- a/src/pretix/_base_settings.py +++ b/src/pretix/_base_settings.py @@ -259,3 +259,20 @@ PRETIX_PRIMARY_COLOR = '#8E44B3' # stressful for some cache setups so it is enabled by default and currently can't be enabled through pretix.cfg CACHE_LARGE_VALUES_ALLOWED = False CACHE_LARGE_VALUES_ALIAS = 'default' + +# Allowed file extensions for various places plus matching Pillow formats. +# Never allow EPS, it is full of dangerous bugs. +FILE_UPLOAD_EXTENSIONS_IMAGE = (".png", ".jpg", ".gif", ".jpeg") +PILLOW_FORMATS_IMAGE = ('PNG', 'GIF', 'JPEG') + +FILE_UPLOAD_EXTENSIONS_FAVICON = (".ico", ".png", "jpg", ".gif", ".jpeg") + +FILE_UPLOAD_EXTENSIONS_QUESTION_IMAGE = (".png", "jpg", ".gif", ".jpeg", ".bmp", ".tif", ".tiff", ".jfif") +PILLOW_FORMATS_QUESTIONS_IMAGE = ('PNG', 'GIF', 'JPEG', 'BMP', 'TIFF') + +FILE_UPLOAD_EXTENSIONS_EMAIL_ATTACHMENT = ( + ".png", ".jpg", ".gif", ".jpeg", ".pdf", ".txt", ".docx", ".gif", ".svg", + ".pptx", ".ppt", ".doc", ".xlsx", ".xls", ".jfif", ".heic", ".heif", ".pages", + ".bmp", ".tif", ".tiff" +) +FILE_UPLOAD_EXTENSIONS_OTHER = FILE_UPLOAD_EXTENSIONS_EMAIL_ATTACHMENT diff --git a/src/pretix/settings.py b/src/pretix/settings.py index 4661534752..1e5e05eba0 100644 --- a/src/pretix/settings.py +++ b/src/pretix/settings.py @@ -735,22 +735,5 @@ FILE_UPLOAD_MAX_SIZE_EMAIL_ATTACHMENT = 1024 * 1024 * config.getint("pretix_file FILE_UPLOAD_MAX_SIZE_EMAIL_AUTO_ATTACHMENT = 1024 * 1024 * config.getint("pretix_file_upload", "max_size_email_auto_attachment", fallback=1) FILE_UPLOAD_MAX_SIZE_OTHER = 1024 * 1024 * config.getint("pretix_file_upload", "max_size_other", fallback=10) -# Allowed file extensions for various places plus matching Pillow formats. -# Never allow EPS, it is full of dangerous bugs. -FILE_UPLOAD_EXTENSIONS_IMAGE = (".png", ".jpg", ".gif", ".jpeg") -PILLOW_FORMATS_IMAGE = ('PNG', 'GIF', 'JPEG') - -FILE_UPLOAD_EXTENSIONS_FAVICON = (".ico", ".png", "jpg", ".gif", ".jpeg") - -FILE_UPLOAD_EXTENSIONS_QUESTION_IMAGE = (".png", "jpg", ".gif", ".jpeg", ".bmp", ".tif", ".tiff", ".jfif") -PILLOW_FORMATS_QUESTIONS_IMAGE = ('PNG', 'GIF', 'JPEG', 'BMP', 'TIFF') - -FILE_UPLOAD_EXTENSIONS_EMAIL_ATTACHMENT = ( - ".png", ".jpg", ".gif", ".jpeg", ".pdf", ".txt", ".docx", ".gif", ".svg", - ".pptx", ".ppt", ".doc", ".xlsx", ".xls", ".jfif", ".heic", ".heif", ".pages", - ".bmp", ".tif", ".tiff" -) -FILE_UPLOAD_EXTENSIONS_OTHER = FILE_UPLOAD_EXTENSIONS_EMAIL_ATTACHMENT - DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' # sadly. we would prefer BigInt, and should use it for all new models but the migration will be hard