ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use to determine export filename

pull/2158/head
Isaac Connor 2018-07-09 12:02:05 -04:00
parent e29ed9bc54
commit 62946578c6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/views/archive.php
View File

@ -24,6 +24,7 @@ if ( !canView('Events') ) {
} }
$archivetype = $_REQUEST['type']; $archivetype = $_REQUEST['type'];
$connkey = isset($_REQUEST['connkey'])?$_REQUEST['connkey']:'';
if ( $archivetype ) { if ( $archivetype ) {
switch ($archivetype) { switch ($archivetype) {
@ -41,7 +42,7 @@ if ( $archivetype ) {
} }
if ( $mimetype ) { if ( $mimetype ) {
$filename = "zmExport.$file_ext"; $filename = "zmExport_$connkey.$file_ext";
$filename_path = ZM_DIR_EXPORTS.'/'.$filename; $filename_path = ZM_DIR_EXPORTS.'/'.$filename;
Logger::Debug("downloading archive from $filename_path"); Logger::Debug("downloading archive from $filename_path");
if ( is_readable($filename_path) ) { if ( is_readable($filename_path) ) {
@ -49,7 +50,7 @@ if ( $archivetype ) {
header("Content-Disposition: inline; filename=$filename"); header("Content-Disposition: inline; filename=$filename");
header('Content-Length: ' . filesize($filename_path) ); header('Content-Length: ' . filesize($filename_path) );
set_time_limit(0); set_time_limit(0);
if ( ! @readfile( $filename_path ) ) { if ( ! @readfile($filename_path) ) {
Error("Error sending $filename_path"); Error("Error sending $filename_path");
} }
} else { } else {