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

Add more of the resulting SQL to the filter debug modal

This commit is contained in:
Isaac Connor 2021-12-13 15:00:55 -05:00
parent 6511dc8a4f
commit 69faa42ca7
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
web/ajax/modals/filterdebug.php
View File

@ -9,13 +9,13 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<?php <?php
//require_once('includes/Filter.php'); require_once('includes/Filter.php');
$fid = validInt($_REQUEST['fid']); $fid = validInt($_REQUEST['fid']);
if ( !$fid ) { if (!$fid) {
echo '<div class="error">No filter id specified.</div>'; echo '<div class="error">No filter id specified.</div>';
} else { } else {
$filter = new ZM\Filter($_REQUEST['fid']); $filter = new ZM\Filter($_REQUEST['fid']);
if ( ! $filter->Id() ) { if (!$filter->Id()) {
echo '<div class="error">Filter not found for id '.$_REQUEST['fid'].'</div>'; echo '<div class="error">Filter not found for id '.$_REQUEST['fid'].'</div>';
} }
} }
@ -25,7 +25,16 @@
// We have to manually insert the csrf key into the form when using a modal generated via ajax call // We have to manually insert the csrf key into the form when using a modal generated via ajax call
echo getCSRFinputHTML(); echo getCSRFinputHTML();
?> ?>
<p><label>SQL</label><?php echo $filter->sql() ?></p> <p><label>SQL</label>
<?php
$sql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultScale<br/>FROM Monitors AS M INNER JOIN Events AS E ON (M.Id = E.MonitorId)<br/>WHERE<br/>';
$sql .= $filter->sql();
$sql .= $filter->sort_field() ? ' ORDER BY '.$filter->sort_field(). ' ' .($filter->sort_asc() ? 'ASC' : 'DESC') : '';
$sql .= $filter->limit() ? ' LIMIT '.$filter->limit() : '';
$sql .= $filter->skip_locked() ? ' SKIP LOCKED' : '';
echo $sql;
?></p>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel')?> </button> <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel')?> </button>
</div> </div>