From 4945a016cf7383bdb51d8190247c083640b10615 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 17 Nov 2021 11:04:28 -0500 Subject: [PATCH] Restore inclusion of video files in export when not including images. Fixes #3324 --- web/skins/classic/includes/export_functions.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/web/skins/classic/includes/export_functions.php b/web/skins/classic/includes/export_functions.php index 0e348152f..f34d53546 100644 --- a/web/skins/classic/includes/export_functions.php +++ b/web/skins/classic/includes/export_functions.php @@ -786,7 +786,7 @@ function exportFileList( } closedir($dir); } - ZM\Debug(print_r($files, true)); + ZM\Debug('All available files: '.print_r($files, true)); $exportFileList = array(); @@ -843,6 +843,18 @@ function exportFileList( ZM\Debug('Not including frame images'); } # end if exportImages + if ($exportVideo) { + $filesLeft = array(); + foreach ($files as $file) { + if (preg_match('/\.(?:mpg|mpeg|mov|swf|mp4|mkv|avi|asf|3gp)$/', $file)) { + $exportFileList[$file] = $file; + } else { + $filesLeft[$file] = $file; + } + } + $files = $filesLeft; + } + if ($exportMisc) { foreach ($files as $file) { $exportFileList[$file] = $file;