diff --git a/bl-kernel/admin/views/editor/file-manager.php b/bl-kernel/admin/views/editor/file-manager.php index 830755f6..a779b866 100644 --- a/bl-kernel/admin/views/editor/file-manager.php +++ b/bl-kernel/admin/views/editor/file-manager.php @@ -120,16 +120,22 @@ '' + formatBytes(file.size) + '' + '' + '' + '' + ''; diff --git a/bl-kernel/boot/variables.php b/bl-kernel/boot/variables.php index aafdb741..0da8edec 100644 --- a/bl-kernel/boot/variables.php +++ b/bl-kernel/boot/variables.php @@ -113,7 +113,7 @@ $GLOBALS['ALLOWED_IMG_EXTENSIONS'] = array('gif', 'png', 'jpg', 'jpeg', 'svg'); $GLOBALS['ALLOWED_IMG_MIMETYPES'] = array('image/gif', 'image/png', 'image/jpeg', 'image/svg+xml'); // Allowed files extensions -$GLOBALS['ALLOWED_FILE_EXTENSIONS'] = array('gif', 'png', 'jpg', 'jpeg', 'svg', 'pdf'); +$GLOBALS['ALLOWED_FILE_EXTENSIONS'] = array_merge($GLOBALS['ALLOWED_IMG_EXTENSIONS'], array('pdf')); // Allowed files mime types -$GLOBALS['ALLOWED_FILE_MIMETYPES'] = array('image/gif', 'image/png', 'image/jpeg', 'image/svg+xml', 'application/pdf'); +$GLOBALS['ALLOWED_FILE_MIMETYPES'] = array_merge($GLOBALS['ALLOWED_IMG_MIMETYPES'], array('application/pdf')); diff --git a/bl-kernel/js/variables.php b/bl-kernel/js/variables.php index 534cf961..ae2686a7 100644 --- a/bl-kernel/js/variables.php +++ b/bl-kernel/js/variables.php @@ -23,6 +23,7 @@ echo 'var DB_DATE_FORMAT = "'.DB_DATE_FORMAT.'";'.PHP_EOL; echo 'var AUTOSAVE_INTERVAL = "'.AUTOSAVE_INTERVAL.'";'.PHP_EOL; echo 'var PAGE_BREAK = "'.PAGE_BREAK.'";'.PHP_EOL; echo 'var tokenCSRF = "'.$security->getTokenCSRF().'";'.PHP_EOL; +echo 'var ALLOWED_IMG_MIMETYPES = '.json_encode($GLOBALS['ALLOWED_IMG_MIMETYPES']).';'.PHP_EOL; echo 'var ALLOWED_FILE_MIMETYPES = '.json_encode($GLOBALS['ALLOWED_FILE_MIMETYPES']).';'.PHP_EOL; echo 'var UPLOAD_MAX_FILESIZE = '.Text::toBytes( ini_get('upload_max_filesize') ).';'.PHP_EOL; echo 'var DEBUG_MODE = '.(DEBUG_MODE?'true':'false').';'.PHP_EOL;