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

Remove requirement for id or eids. We can specify by filter now. Fix populating exportIds making sure it is an array.

pull/3831/head
Isaac Connor 2024-02-15 16:21:39 -05:00
parent f339ba5508
commit 7e98cf36d6
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/ajax/event.php
View File

@ -1,10 +1,6 @@
<?php <?php
ini_set('display_errors', '0'); ini_set('display_errors', '0');
if ( empty($_REQUEST['id']) && empty($_REQUEST['eids']) ) {
ajaxError('No event id(s) supplied');
}
if ( canView('Events') or canView('Snapshots') ) { if ( canView('Events') or canView('Snapshots') ) {
switch ( $_REQUEST['action'] ) { switch ( $_REQUEST['action'] ) {
case 'video' : case 'video' :
@ -86,7 +82,13 @@ if ( canView('Events') or canView('Snapshots') ) {
session_write_close(); session_write_close();
$exportIds = !empty($_REQUEST['eids']) ? array_map(function($eid) {return validCardinal($eid);}, $_REQUEST['eids']) : validCardinal($_REQUEST['id']); $exportIds = [];
if (!empty($_REQUEST['eids'])) {
$exportIds = array_map(function($eid) {return validCardinal($eid);}, $_REQUEST['eids']);
} else if (isset($_REQUEST['id'])) {
$exportIds = [validCardinal($_REQUEST['id'])];
}
if ($exportFile = exportEvents( if ($exportFile = exportEvents(
$exportIds, $exportIds,
(isset($_REQUEST['connkey'])?$_REQUEST['connkey']:''), (isset($_REQUEST['connkey'])?$_REQUEST['connkey']:''),
@ -113,7 +115,12 @@ if ( canView('Events') or canView('Snapshots') ) {
if (!$exportFileName) $exportFileName = 'Export'.(isset($_REQUEST['connkey'])?$_REQUEST['connkey']:''); if (!$exportFileName) $exportFileName = 'Export'.(isset($_REQUEST['connkey'])?$_REQUEST['connkey']:'');
$exportFileName = preg_replace('/[^\w\-\.\(\):]+/', '', $exportFileName); $exportFileName = preg_replace('/[^\w\-\.\(\):]+/', '', $exportFileName);
$exportIds = !empty($_REQUEST['eids']) ? array_map(function($eid) {return validCardinal($eid);}, $_REQUEST['eids']) : validCardinal($_REQUEST['id']); $exportIds = [];
if (!empty($_REQUEST['eids'])) {
$exportIds = array_map(function($eid) {return validCardinal($eid);}, $_REQUEST['eids']);
} else if (isset($_REQUEST['id'])) {
$exportIds = [validCardinal($_REQUEST['id'])];
}
ZM\Debug("Export IDS". print_r($exportIds, true)); ZM\Debug("Export IDS". print_r($exportIds, true));
$filter = isset($_REQUEST['filter']) ? ZM\Filter::parse($_REQUEST['filter']) : null; $filter = isset($_REQUEST['filter']) ? ZM\Filter::parse($_REQUEST['filter']) : null;