Commit Graph

14915 Commits

Author SHA1 Message Date
Isaac Connor c28ff1f2b4 Include loading EndTime when loading Events data so that we can determine if an event is in-progress
Keep track of last_id which is the last frame id that we have info for. Use it instead of Frame Count to prevent
accessing non-existent frame records
close ffmpeg_input on event change
include duration in status messages because it may change when playing an in-progress event.
when we hit the end of our frame data if it is an in-progress event, reload the event data instead of moving to the next event.
Include X-Timestamp in http headers to match live stream behaviour
Only send time to next event when mode=ALL
Fix scale behaviour on event view
2020-10-08 09:06:56 -04:00
Isaac Connor 7cc023c1ec Update Event details when writing Frame Data. Write Frame Details when inserting a Bulk Frame 2020-10-07 18:37:38 -04:00
Isaac Connor 044ce61ddb Always do event change detection whether we are paused or not. Because we might be single-stepping. Change progress to a double as that it what it should be. 2020-10-06 16:47:51 -04:00
Isaac Connor d7429014b6 Convert progress to a double instead of int. 2020-10-06 16:36:56 -04:00
Isaac Connor 061c889394 Implement SEEK to offset using two 32bit integers to represent the double value 2020-10-06 16:35:46 -04:00
Isaac Connor 0e89d28c26 Send SEEK as two integers representing a float 2020-10-06 16:34:06 -04:00
Isaac Connor de6a51ec15 Fix incorrect operator used for NOT IN and add IN operator to match php 2020-10-06 09:38:15 -04:00
Isaac Connor b27eac3cbf Make centerCoord take a font size parameter to fix centering when using large font. 2020-10-05 16:12:48 -04:00
Isaac Connor 1c2dd92d31 Add LabelSize to get label_size from monitor 2020-10-05 16:12:33 -04:00
Isaac Connor 93ecb87caa Clear the textframe before Annotating it. 2020-10-05 16:12:09 -04:00
Isaac Connor c1c407ea39 debug new offset as well when SEEKING 2020-10-05 15:55:42 -04:00
Isaac Connor 3db8490d9c Escape another case of Function for mysql8 2020-09-25 10:59:31 -04:00
Isaac Connor f4f02e24bd Use /run/zm instead of /var/run/zm 2020-09-25 09:48:56 -04:00
Joseph Yasi 52ca2abf69 Quote some more MySQL8 Reserved keywords
See:
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295/comments/1
https://github.com/ZoneMinder/zoneminder/issues/2659
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295
2020-09-25 09:37:21 -04:00
Isaac Connor 32e0c92747 After adding SaveJPEGs to Events, need to populate them with SaveJPegs from MOnitors 2020-09-24 13:43:05 -04:00
Isaac Connor 2457dcb16f Minimum value for label position is 0, not 1. 2020-09-22 13:12:39 -04:00
Isaac Connor 2f03ceeccf log referer when unable to authenticate 2020-09-22 13:10:39 -04:00
Isaac Connor a43cbc05af Fix case on Servers. Turn off error reporting so that mkdir(ZM_DIR_EXPORTS) doesn't generate a warning. Fix server column in xml output 2020-09-21 13:03:03 -04:00
Isaac Connor e2502f49e9 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-09-19 12:00:36 -04:00
Isaac Connor 3492582b98 add missing css for settings popup 2020-09-19 12:00:32 -04:00
Isaac Connor 17369e73e2 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-09-16 15:30:05 -04:00
Isaac Connor f86e83b4c4 Indicate default action 2020-09-16 15:29:42 -04:00
Isaac Connor 89913adfa3 Bump version to 1.34.21 for release 2020-09-16 14:23:23 -04:00
Isaac Connor 6b2773ad8c Handle invalid eid more gracefully. 2020-09-16 14:21:03 -04:00
Isaac Connor 9268db14a7 Fix xss reported by Noccolo Picca relating to not sanitizing connkey 2020-09-16 14:14:31 -04:00
Isaac Connor 147238027c Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-09-16 09:59:28 -04:00
Pliable Pixels 8ad62b8905 another try at fixing Eventcontroller 2020-09-13 16:43:49 -04:00
Isaac Connor 2cd9c8e232 Update api Zone Saving. Fixes #3037 2020-09-10 13:32:15 -04:00
Isaac Connor b428cd3ef5 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-09-07 10:21:10 -04:00
Isaac Connor 3b1be3346b escape table name when updating Objects 2020-09-07 10:21:06 -04:00
Isaac Connor 74d2ba56db Persist video volume in a cookie so that subsequent events remember the volume level. 2020-08-26 15:15:10 -04:00
Isaac Connor b5ef7b08b9 settings popup has to come from the server hosting the v4l device, so use monitor->UrlToIndex and include auth. 2020-08-25 12:40:22 -04:00
Isaac Connor 6587cdd3de Handle failure to get v4l settings. Fix assignment of values to monitor object. 2020-08-25 12:39:44 -04:00
Isaac Connor b0f5f3617a Always set auth_hash and always set auth_relay, using our handy new get_auth_relay function 2020-08-25 12:39:14 -04:00
Isaac Connor f1fab6361f fix dimensions of v4l settings popup 2020-08-25 12:38:46 -04:00
Isaac Connor 98dce06d6b Introduce get_auth_relay to return an auth string to use in urls. 2020-08-25 12:38:31 -04:00
Isaac Connor 3c29228df5 Use zm_session_start 2020-08-25 11:30:22 -04:00
Isaac Connor 586f9f3e52 Use zm_session_start 2020-08-25 11:27:25 -04:00
Isaac Connor 977dee29f1 bump for release 1.34.20 2020-08-23 11:48:00 -04:00
Isaac Connor cf63cc65c8 eoan is deprecated. 2020-08-23 11:42:08 -04:00
Isaac Connor c2d6b8f493 revert code that passed the div hightlightOn/Off. Better to pass index. Fixes js errors. 2020-08-19 14:39:15 -04:00
Isaac Connor d0c21995cd Fixes to function converting from pixels to percent. Adjust to 100 if > 100. 2020-08-19 14:14:32 -04:00
Isaac Connor efec1e7d4f remove debug 2020-08-19 14:13:48 -04:00
Isaac Connor 177df46113 Apply min=0 to filterX and Y so that we don't get negative values 2020-08-19 14:11:16 -04:00
Isaac Connor 16efa9dbb2 Add extra checks for Deleting without an Archived State term and Running in the background without any actions. 2020-08-18 11:17:22 -04:00
Isaac Connor 768c746944 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-08-18 09:00:20 -04:00
Isaac Connor 4c69d7b748
Merge pull request #3001 from connortechnology/update_users_controller
Update permissions checking when viewing/editing users.  Fixes #2982.…
2020-08-18 09:00:07 -04:00
Isaac Connor a92a16f13e Merge branch 'update_users_controller' into release-1.34 2020-08-17 19:33:31 -04:00
Isaac Connor 57b4d2b278 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-08-17 19:29:07 -04:00
Isaac Connor e5dda8d142 Include avutils/imgutils.h to support compile on libav-tools 2020-08-16 14:56:52 -04:00