ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore inclusion of video files in export when not including images. Fixes #3324

This commit is contained in:
Isaac Connor 2021-11-17 11:04:28 -05:00
parent 03897bf68e
commit 4945a016cf
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/skins/classic/includes/export_functions.php
View File

@ -786,7 +786,7 @@ function exportFileList(
} }
closedir($dir); closedir($dir);
} }
ZM\Debug(print_r($files, true)); ZM\Debug('All available files: '.print_r($files, true));
$exportFileList = array(); $exportFileList = array();
@ -843,6 +843,18 @@ function exportFileList(
ZM\Debug('Not including frame images'); ZM\Debug('Not including frame images');
} # end if exportImages } # 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) { if ($exportMisc) {
foreach ($files as $file) { foreach ($files as $file) {
$exportFileList[$file] = $file; $exportFileList[$file] = $file;