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

use a unique connection key for downloads

This commit is contained in:
Isaac Connor 2018-07-12 14:07:19 -04:00
parent 43cee7c383
commit 05f0338219
5 changed files with 74 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/skins/classic/views/download.php
View File

@ -24,7 +24,8 @@ if ( !canView('Events') ) {
} }
$total_size = 0; $total_size = 0;
if (isset($_SESSION['montageReviewFilter'])) { //Handles montageReview filter if (isset($_SESSION['montageReviewFilter']) and !isset($_REQUEST['eids']) ) {
# Handles montageReview filter
$eventsSql = 'SELECT E.Id,E.DiskSpace FROM Events as E WHERE 1'; $eventsSql = 'SELECT E.Id,E.DiskSpace FROM Events as E WHERE 1';
$eventsSql .= $_SESSION['montageReviewFilter']['sql']; $eventsSql .= $_SESSION['montageReviewFilter']['sql'];
$results = dbQuery($eventsSql); $results = dbQuery($eventsSql);
@ -45,6 +46,7 @@ if (isset($_SESSION['montageReviewFilter'])) { //Handles montageReview filter
} }
$focusWindow = true; $focusWindow = true;
$connkey = isset($_REQUEST['connkey']) ? $_REQUEST['connkey'] : generateConnKey();
xhtmlHeaders(__FILE__, translate('Download') ); xhtmlHeaders(__FILE__, translate('Download') );
?> ?>
@ -58,23 +60,28 @@ xhtmlHeaders(__FILE__, translate('Download') );
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="connkey" value="<?php echo $connkey; ?>"/>
<?php <?php
if ( !empty($_REQUEST['eid']) ) { if ( !empty($_REQUEST['eid']) ) {
?> ?>
<input type="hidden" name="id" value="<?php echo validInt($_REQUEST['eid']) ?>"/> <input type="hidden" name="id" value="<?php echo validInt($_REQUEST['eid']) ?>"/>
<?php <?php
$Event = new Event( $_REQUEST['eid'] ); $Event = new Event($_REQUEST['eid']);
echo 'Downloading event ' . $_REQUEST['eid'] . ' Resulting file should be approximately ' . human_filesize( $Event->DiskSpace() ); echo 'Downloading event ' . $_REQUEST['eid'] . ' Resulting file should be approximately ' . human_filesize( $Event->DiskSpace() );
} else if ( !empty($_REQUEST['eids']) ) { } else if ( !empty($_REQUEST['eids']) ) {
$total_size = 0; $total_size = 0;
foreach ( $_REQUEST['eids'] as $eid ) { foreach ( $_REQUEST['eids'] as $eid ) {
$Event = new Event($eid); if ( ! validInt($eid) ) {
$total_size += $Event->DiskSpace(); Warning("Invalid event id in eids[] $eid");
continue;
}
$Event = new Event($eid);
$total_size += $Event->DiskSpace();
?> ?>
<input type="hidden" name="eids[]" value="<?php echo validInt($eid) ?>"/> <input type="hidden" name="eids[]" value="<?php echo validInt($eid) ?>"/>
<?php <?php
} }
unset( $eid ); unset($eid);
echo "Downloading " . count($_REQUEST['eids']) . ' events. Resulting file should be approximately ' . human_filesize($total_size); echo "Downloading " . count($_REQUEST['eids']) . ' events. Resulting file should be approximately ' . human_filesize($total_size);
} else { } else {
echo '<div class="warning">There are no events found. Resulting download will be empty.</div>'; echo '<div class="warning">There are no events found. Resulting download will be empty.</div>';
@ -96,7 +103,9 @@ if ( !empty($_REQUEST['eid']) ) {
</tr> </tr>
</tbody> </tbody>
</table> </table>
<input type="button" id="exportButton" name="exportButton" value="<?php echo translate('GenerateDownload') ?>" onclick="exportEvent(this.form);" /> <button type="button" id="exportButton" name="exportButton" value="GenerateDownload" onclick="exportEvent(this.form);">
<?php echo translate('GenerateDownload') ?>
</button>
</form> </form>
</div> </div>
<?php <?php

54
web/skins/classic/views/events.php
View File

@ -153,17 +153,17 @@ while ( $event_row = dbFetchNext($results) ) {
if ( ($count++%ZM_WEB_EVENTS_PER_PAGE) == 0 ) { if ( ($count++%ZM_WEB_EVENTS_PER_PAGE) == 0 ) {
?> ?>
<tr> <tr>
<th class="colId"><a href="<?php echo sortHeader( 'Id' ) ?>"><?php echo translate('Id') ?><?php echo sortTag( 'Id' ) ?></a></th> <th class="colId"><a href="<?php echo sortHeader('Id') ?>"><?php echo translate('Id') ?><?php echo sortTag('Id') ?></a></th>
<th class="colName"><a href="<?php echo sortHeader( 'Name' ) ?>"><?php echo translate('Name') ?><?php echo sortTag( 'Name' ) ?></a></th> <th class="colName"><a href="<?php echo sortHeader('Name') ?>"><?php echo translate('Name') ?><?php echo sortTag('Name') ?></a></th>
<th class="colMonitor"><a href="<?php echo sortHeader( 'MonitorName' ) ?>"><?php echo translate('Monitor') ?><?php echo sortTag( 'MonitorName' ) ?></a></th> <th class="colMonitor"><a href="<?php echo sortHeader('MonitorName') ?>"><?php echo translate('Monitor') ?><?php echo sortTag('MonitorName') ?></a></th>
<th class="colCause"><a href="<?php echo sortHeader( 'Cause' ) ?>"><?php echo translate('Cause') ?><?php echo sortTag( 'Cause' ) ?></a></th> <th class="colCause"><a href="<?php echo sortHeader('Cause') ?>"><?php echo translate('Cause') ?><?php echo sortTag('Cause') ?></a></th>
<th class="colTime"><a href="<?php echo sortHeader( 'StartTime' ) ?>"><?php echo translate('Time') ?><?php echo sortTag( 'StartTime' ) ?></a></th> <th class="colTime"><a href="<?php echo sortHeader('StartTime') ?>"><?php echo translate('Time') ?><?php echo sortTag('StartTime') ?></a></th>
<th class="colDuration"><a href="<?php echo sortHeader( 'Length' ) ?>"><?php echo translate('Duration') ?><?php echo sortTag( 'Length' ) ?></a></th> <th class="colDuration"><a href="<?php echo sortHeader('Length') ?>"><?php echo translate('Duration') ?><?php echo sortTag('Length') ?></a></th>
<th class="colFrames"><a href="<?php echo sortHeader( 'Frames' ) ?>"><?php echo translate('Frames') ?><?php echo sortTag( 'Frames' ) ?></a></th> <th class="colFrames"><a href="<?php echo sortHeader('Frames') ?>"><?php echo translate('Frames') ?><?php echo sortTag('Frames') ?></a></th>
<th class="colAlarmFrames"><a href="<?php echo sortHeader( 'AlarmFrames' ) ?>"><?php echo translate('AlarmBrFrames') ?><?php echo sortTag( 'AlarmFrames' ) ?></a></th> <th class="colAlarmFrames"><a href="<?php echo sortHeader('AlarmFrames') ?>"><?php echo translate('AlarmBrFrames') ?><?php echo sortTag('AlarmFrames') ?></a></th>
<th class="colTotScore"><a href="<?php echo sortHeader( 'TotScore' ) ?>"><?php echo translate('TotalBrScore') ?><?php echo sortTag( 'TotScore' ) ?></a></th> <th class="colTotScore"><a href="<?php echo sortHeader('TotScore') ?>"><?php echo translate('TotalBrScore') ?><?php echo sortTag('TotScore') ?></a></th>
<th class="colAvgScore"><a href="<?php echo sortHeader( 'AvgScore' ) ?>"><?php echo translate('AvgBrScore') ?><?php echo sortTag( 'AvgScore' ) ?></a></th> <th class="colAvgScore"><a href="<?php echo sortHeader('AvgScore') ?>"><?php echo translate('AvgBrScore') ?><?php echo sortTag('AvgScore') ?></a></th>
<th class="colMaxScore"><a href="<?php echo sortHeader( 'MaxScore' ) ?>"><?php echo translate('MaxBrScore') ?><?php echo sortTag( 'MaxScore' ) ?></a></th> <th class="colMaxScore"><a href="<?php echo sortHeader('MaxScore') ?>"><?php echo translate('MaxBrScore') ?><?php echo sortTag('MaxScore') ?></a></th>
<?php <?php
if ( count($storage_areas) > 1 ) { if ( count($storage_areas) > 1 ) {
?> ?>
@ -181,7 +181,7 @@ while ( $event_row = dbFetchNext($results) ) {
<?php <?php
} }
?> ?>
<th class="colMark"><input type="checkbox" name="toggleCheck" value="1" onclick="toggleCheckbox(this, 'markEids');"/></th> <th class="colMark"><input type="checkbox" name="toggleCheck" value="1" onclick="toggleCheckbox(this, 'eids[]');"/></th>
</tr> </tr>
<?php <?php
} }
@ -225,7 +225,7 @@ while ( $event_row = dbFetchNext($results) ) {
echo '</td>'; echo '</td>';
} // end if ZM_WEB_LIST_THUMBS } // end if ZM_WEB_LIST_THUMBS
?> ?>
<td class="colMark"><input type="checkbox" name="markEids[]" value="<?php echo $event->Id() ?>" onclick="configureButton(this, 'markEids');"/></td> <td class="colMark"><input type="checkbox" name="eids[]" value="<?php echo $event->Id() ?>" onclick="configureButton(this, 'eids[]');"/></td>
</tr> </tr>
<?php <?php
} }
@ -266,13 +266,27 @@ if ( $pagination ) {
if ( true || canEdit( 'Events' ) ) { if ( true || canEdit( 'Events' ) ) {
?> ?>
<div id="contentButtons"> <div id="contentButtons">
<input type="button" name="viewBtn" value="<?php echo translate('View') ?>" onclick="viewEvents( this, 'markEids' );" disabled="disabled"/> <button type="button" name="viewBtn" value="View" onclick="viewEvents(this, 'eids[]');" disabled="disabled">
<input type="button" name="archiveBtn" value="<?php echo translate('Archive') ?>" onclick="archiveEvents( this, 'markEids' )" disabled="disabled"/> <?php echo translate('View') ?>"
<input type="button" name="unarchiveBtn" value="<?php echo translate('Unarchive') ?>" onclick="unarchiveEvents( this, 'markEids' );" disabled="disabled"/> </button>
<input type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editEvents( this, 'markEids' )" disabled="disabled"/> <button type="button" name="archiveBtn" value="Archive" onclick="archiveEvents(this, 'eids[]')" disabled="disabled">
<input type="button" name="exportBtn" value="<?php echo translate('Export') ?>" onclick="exportEvents( this, 'markEids' )" disabled="disabled"/> <?php echo translate('Archive') ?>
<input type="button" name="downloadBtn" value="<?php echo translate('DownloadVideo') ?>" onclick="downloadVideo( this, 'markEids' )" disabled="disabled"/> </button>
<input type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" onclick="deleteEvents( this, 'markEids' );" disabled="disabled"/> <button type="button" name="unarchiveBtn" value="Unarchive" onclick="unarchiveEvents(this, 'eids[]');" disabled="disabled">
<?php echo translate('Unarchive') ?>
</button>
<button type="button" name="editBtn" value="Edit" onclick="editEvents(this, 'eids[]')" disabled="disabled">
<?php echo translate('Edit') ?>
</button>
<button type="button" name="exportBtn" value="Export" onclick="exportEvents(this, 'eids[]')" disabled="disabled">
<?php echo translate('Export') ?>
</button>
<button type="button" name="downloadBtn" value="DownloadVideo" onclick="downloadVideo(this, 'eids[]')" disabled="disabled">
<?php echo translate('DownloadVideo') ?>
</button>
<button type="button" name="deleteBtn" value="Delete" onclick="deleteEvents(this, 'eids[]');" disabled="disabled">
<?php echo translate('Delete') ?>
</button>
</div> </div>
<?php <?php
} }

10
web/skins/classic/views/export.php
View File

@ -67,13 +67,15 @@ if ( $user['MonitorIds'] ) {
$eventsSql .= ' 1'; $eventsSql .= ' 1';
} }
if ( !empty($_REQUEST['eid']) ) { if ( isset($_REQUEST['eid']) and $_REQUEST['eid'] ) {
Logger::Debug("Loading events by single eid");
$eventsSql .= ' AND E.Id=?'; $eventsSql .= ' AND E.Id=?';
$eventsValues[] = $_REQUEST['eid']; $eventsValues[] = $_REQUEST['eid'];
} elseif ( !empty($_REQUEST['eids']) ) { } elseif ( isset($_REQUEST['eids']) and count($_REQUEST['eids']) > 0 ) {
Logger::Debug("Loading events by eids");
$eventsSql .= ' AND E.Id IN ('.implode(',', array_map(function(){return '?';}, $_REQUEST['eids'])). ')'; $eventsSql .= ' AND E.Id IN ('.implode(',', array_map(function(){return '?';}, $_REQUEST['eids'])). ')';
$eventsValues += $_REQUEST['eids']; $eventsValues += $_REQUEST['eids'];
} else if ( !empty($_REQUEST['filter']) ) { } else if ( isset($_REQUEST['filter']) ) {
parseSort(); parseSort();
parseFilter($_REQUEST['filter']); parseFilter($_REQUEST['filter']);
$filterQuery = $_REQUEST['filter']['query']; $filterQuery = $_REQUEST['filter']['query'];
@ -194,7 +196,7 @@ while ( $event_row = dbFetchNext($results) ) {
} }
if ( !empty($_REQUEST['generated']) ) { if ( !empty($_REQUEST['generated']) ) {
?> ?>
<button href="<?php echo validHtmlStr($_REQUEST['exportFile']) ?>"><?php echo translate('Download') ?></button> <button type="button" onclick="startDownload('<?php echo validHtmlStr($_REQUEST['exportFile']) ?>');"><?php echo translate('Download') ?></button>
<?php <?php
} }
?> ?>

15
web/skins/classic/views/js/download.js
View File

@ -1,3 +1,18 @@
function configureExportButton( element ) {
var form = element.form;
var checkCount = 0;
var radioCount = 0;
for ( var i = 0; i < form.elements.length; i++ ) {
if ( form.elements[i].type == "checkbox" && form.elements[i].checked )
checkCount++;
else if ( form.elements[i].type == "radio" && form.elements[i].checked )
radioCount++;
}
form.elements['exportButton'].disabled = (radioCount == 0);
//checkCount == 0 ||
}
function startDownload( exportFile ) { function startDownload( exportFile ) {
window.location.replace( exportFile ); window.location.replace( exportFile );
} }

7
web/skins/classic/views/js/events.js
View File

@ -97,8 +97,8 @@ function downloadVideo( element, name ) {
createPopup( '?view=download&'+eids.join( '&' ), 'zmDownload', 'download' ); createPopup( '?view=download&'+eids.join( '&' ), 'zmDownload', 'download' );
} }
function exportEvents( element, name ) { function exportEvents(element, name) {
var form = element.form; var form = $j(element.form);
if ( 0 ) { if ( 0 ) {
var eids = new Array(); var eids = new Array();
for (var i = 0; i < form.elements.length; i++) { for (var i = 0; i < form.elements.length; i++) {
@ -110,7 +110,8 @@ function exportEvents( element, name ) {
} }
createPopup( '?view=export&'+eids.join( '&' ), 'zmExport', 'export' ); createPopup( '?view=export&'+eids.join( '&' ), 'zmExport', 'export' );
} }
form.action='?view=export'; form.attr('action', '?view=export');
form[0].elements['view'].value='export';
form.submit(); form.submit();
} }