From 85faa7321cfc8bf5ea8fbb1c5a361a85c05dec98 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 17 Oct 2016 13:12:13 -0400 Subject: [PATCH 1/2] reorder if logic to handle first page load before AuthHash has ever been set. --- web/includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/includes/functions.php b/web/includes/functions.php index 3b6f2b542..509f97b7c 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -143,7 +143,7 @@ function getAuthUser( $auth ) { function generateAuthHash( $useRemoteAddr ) { if ( ZM_OPT_USE_AUTH and ZM_AUTH_RELAY == 'hashed' and $_SESSION['username'] and $_SESSION['passwordHash'] ) { # regenerate a hash at half the liftetime of a hash, an hour is 3600 so half is 1800 - if ( ( $_SESSION['AuthHashGeneratedAt'] < time() - ( ZM_AUTH_HASH_TTL * 1800 ) ) or ! isset($_SESSION['AuthHash']) ) { + if ( ( ! isset($_SESSION['AuthHash']) ) or ( $_SESSION['AuthHashGeneratedAt'] < time() - ( ZM_AUTH_HASH_TTL * 1800 ) ) ) { # Don't both regenerating Auth Hash if an hour hasn't gone by yet $time = localtime(); $authKey = ''; From 420d141bc704b2d21d8581186d3ad5abb42eba63 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 18 Oct 2016 09:50:01 -0400 Subject: [PATCH 2/2] split the reading of max fps and alarm max fps to remove an extra atof and make them more understandable --- src/zm_monitor.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index a13b96a68..1f93e67ac 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -2429,8 +2429,10 @@ int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose int motion_frame_skip = atoi(dbrow[col]); col++; double analysis_fps = dbrow[col] ? strtod(dbrow[col], NULL) : 0; col++; unsigned int analysis_update_delay = strtoul(dbrow[col++], NULL, 0); - int capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++; - int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++; + double capture_fps = dbrow[col] ? atof(dbrow[col]) : 0;col++; + int capture_delay = capture_fps >0.0 ?int(DT_PREC_3/capture_fps):0; + double alarm_capture_fps = dbrow[col] ? atof(dbrow[col]) : 0; col++; + int alarm_capture_delay = alarm_capture_fps > 0.0 ?int(DT_PREC_3/alarm_capture_fps):0; int fps_report_interval = atoi(dbrow[col]); col++; int ref_blend_perc = atoi(dbrow[col]); col++; int alarm_ref_blend_perc = atoi(dbrow[col]); col++;