Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	ChangeLog
	htdocs/admin/tools/export_files.php
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
	test/phpunit/FilesLibTest.php
This commit is contained in:
Laurent Destailleur
2021-03-16 14:57:04 +01:00
parent ceba8146c6 f514dec6ab
commit e366d2c379
12 changed files with 87 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/lib/functions.lib.php
View File

@@ -9198,6 +9198,11 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0)
$famime = 'file-audio-o';
}
// Video
if (preg_match('/\.mp4$/i', $tmpfile)) {
$mime = 'video/mp4';
$imgmime = 'video.png';
$famime = 'file-video-o';
}
if (preg_match('/\.ogv$/i', $tmpfile)) {
$mime = 'video/ogg';
$imgmime = 'video.png';
@@ -9229,7 +9234,7 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0)
$famime = 'file-video-o';
}
// Archive
if (preg_match('/\.(zip|rar|gz|tgz|z|cab|bz2|7z|tar|lzh)$/i', $tmpfile)) {
if (preg_match('/\.(zip|rar|gz|tgz|z|cab|bz2|7z|tar|lzh|zst)$/i', $tmpfile)) {
$mime = 'archive';
$imgmime = 'archive.png';
$famime = 'file-archive-o';