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

improve the download ui

This commit is contained in:
Isaac Connor 2017-12-11 14:33:17 -08:00
parent 5bd5f03611
commit 9fe7ba25e2
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,18 +23,25 @@ if ( !canView('Events') ) {
return; return;
} }
$total_size = 0;
if (isset($_SESSION['montageReviewFilter'])) { //Handles montageReview filter if (isset($_SESSION['montageReviewFilter'])) { //Handles montageReview filter
$eventsSql = 'SELECT E.Id 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);
$eids = []; $eids = [];
while ( $event_row = dbFetchNext( $results ) ) { while ( $event_row = dbFetchNext( $results ) ) {
array_push($eids, 'eids[]='.$event_row['Id']); array_push($eids, 'eids[]='.$event_row['Id']);
$total_size += $event_row['DiskSpace'];
} }
$_REQUEST['eids'] = $eids; $_REQUEST['eids'] = $eids;
session_start(); if ( ! count($eids) ) {
unset($_SESSION['montageReviewFilter']); Error("No events found for download using $eventsSql");
session_write_close(); }
#session_start();
#unset($_SESSION['montageReviewFilter']);
#session_write_close();
#} else {
#Logger::Debug("NO montageReviewFilter");
} }
$focusWindow = true; $focusWindow = true;
@ -56,6 +63,8 @@ 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'] );
echo 'Downloading event ' . $_REQUEST['eid'] . ' Resulting file should be approximately ' . human_filesize( $Event->DiskSpace() );
} else if ( !empty($_REQUEST['eids']) ) { } else if ( !empty($_REQUEST['eids']) ) {
foreach ( $_REQUEST['eids'] as $eid ) { foreach ( $_REQUEST['eids'] as $eid ) {
?> ?>
@ -63,6 +72,9 @@ if ( !empty($_REQUEST['eid']) ) {
<?php <?php
} }
unset( $eid ); unset( $eid );
echo "Downloading " . count($_REQUEST['eids']) . ' events. Resulting file should be approximately ' . human_filesize($total_size);
} else {
echo '<div class="warning">There are no events found. Resulting download will be empty.</div>';
} }
?> ?>
<table id="contentTable" class="minor" cellspacing="0"> <table id="contentTable" class="minor" cellspacing="0">

1
web/skins/classic/views/montagereview.php
View File

@ -83,6 +83,7 @@ if (isset($_REQUEST['minTime']) && isset($_REQUEST['maxTime']) && count($display
} }
} }
parseFilter( $filter ); parseFilter( $filter );
# This is to enable the download button
session_start(); session_start();
$_SESSION['montageReviewFilter'] = $filter; $_SESSION['montageReviewFilter'] = $filter;
session_write_close(); session_write_close();