This commit is contained in:
Isaac Connor 2019-03-20 14:27:23 -04:00
parent 09b42f8b55
commit ad059f985e
1 changed files with 4 additions and 4 deletions

View File

@ -233,11 +233,11 @@ function getNavBarHTML($reload = null) {
if (!$sortQuery) { if (!$sortQuery) {
parseSort(); parseSort();
} }
if (!$filterQuery) { if ( (!$filterQuery) and isset($_REQUEST['filter']) ) {
parseFilter( $_REQUEST['filter'] ); parseFilter($_REQUEST['filter']);
$filterQuery = $_REQUEST['filter']['query']; $filterQuery = $_REQUEST['filter']['query'];
} }
if ($reload === null) { if ( $reload === null ) {
ob_start(); ob_start();
if ( $running == null ) if ( $running == null )
$running = daemonCheck(); $running = daemonCheck();
@ -270,7 +270,7 @@ function getNavBarHTML($reload = null) {
# zmaudit can clean the logs, but if we aren't running it, then we should clean them regularly # zmaudit can clean the logs, but if we aren't running it, then we should clean them regularly
if ( preg_match('/^\d+$/', ZM_LOG_DATABASE_LIMIT) ) { if ( preg_match('/^\d+$/', ZM_LOG_DATABASE_LIMIT) ) {
# Number of lines, instead of an interval # Number of lines, instead of an interval
$rows = dbFetchOne('SELECT Count(*) AS Rows FROM Logs', 'Rows' ); $rows = dbFetchOne('SELECT Count(*) AS Rows FROM Logs', 'Rows');
if ( $rows > ZM_LOG_DATABASE_LIMIT ) { if ( $rows > ZM_LOG_DATABASE_LIMIT ) {
dbQuery('DELETE low_priority FROM Logs ORDER BY TimeKey ASC LIMIT ?', array($rows - ZM_LOG_DATABASE_LIMIT)); dbQuery('DELETE low_priority FROM Logs ORDER BY TimeKey ASC LIMIT ?', array($rows - ZM_LOG_DATABASE_LIMIT));
} }