Commit Graph

20070 Commits (0f0f571c7a2673db5f8849437e81a4a1fcec66ef)

Author SHA1 Message Date
Isaac Connor e1028c1d7f Escape <> in log messages to prevent html shenanigans. Fixes #3596 2023-02-18 18:10:08 -05:00
Isaac Connor 1546fabfc8 Don't start the statusCmdQuery on streaming start, because it is used when doing still updates. If we start it too fast, zms may not have started yet 2023-02-16 14:48:07 -05:00
Isaac Connor 247805edad Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2023-02-16 14:09:48 -05:00
Isaac Connor 8370ae6c82 Set a short expiry 1min and set the cookie name to include the filter so that each and every filter gets it;s own pagination saved. Fixes #3510 2023-02-16 14:09:18 -05:00
Isaac Connor dc08e8c49e Use reload instead of restart on zone save 2023-02-16 13:58:09 -05:00
Isaac Connor d9d2f4d10d Add reload to monitor zmcControl 2023-02-16 13:57:42 -05:00
Isaac Connor 45157030df Stop streams when clicking cancel/Save so that we don't log errors trying to access a dead zms. Fixes #3643 2023-02-16 13:54:02 -05:00
Isaac Connor 5c0f42ba15 Fix spacing 2023-02-16 12:50:47 -05:00
Isaac Connor 6585db7463 Adding :80 to address is not worthy of an Error log 2023-02-13 14:55:34 -05:00
Isaac Connor 6d5e8f3e09 Add a sleeping flag so that when we get sigterm, we can just exit instead of returning to the sleep 2023-02-13 14:52:43 -05:00
Isaac Connor a2a35dccfa Don't strip tags from log Message. It removes anything involving > OR < 2023-02-13 14:52:28 -05:00
Isaac Connor 23a0ea3f5f format endtime 2023-02-13 14:51:24 -05:00
Isaac Connor 041953ec4f tabs instead of spaces are messing up ul layout 2023-02-13 14:49:10 -05:00
Isaac Connor 7a7b5c99c3 Include command line in debug output when generating images 2023-02-13 14:48:56 -05:00
Isaac Connor 760ff33663 Add the actual packet, not the first packet over and over and over. Fixes #3656 2023-02-13 14:48:42 -05:00
Isaac Connor c9066f7423 Remove test for Enabled on monitor. Motion detection being disabled has nothing to do with manual triggering. Fixes #3657 2023-02-06 14:52:38 -05:00
Isaac Connor 4727aac644 Allow viewing of events whose Monitor[Function]=None 2023-01-25 13:38:51 -05:00
Isaac Connor ff4a8c6e0d Remove stripslashes when saving config values. The values in REQUEST have not been escaped, so stripslashes is not appropriate. Fixes #3655 2023-01-24 11:48:32 -05:00
Isaac Connor d0c1f823f4 Apply chosen styles to dropdowns in Options 2023-01-20 01:38:44 -05:00
Isaac Connor af57b53583 Queue packets instead of packet locks in event thread. Since we are using std::shared_ptr and not modifying the packet, should not need locking. Also, locking in one thread and unlocking in another is apparentlyundefined behaviour and doesn't work infreebsd. 2023-01-20 01:38:09 -05:00
Isaac Connor a0b4aa04c5 Increase infomation in packet lock debugging 2023-01-20 01:36:51 -05:00
Isaac Connor 52f02d97d8 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2023-01-17 20:42:59 -05:00
Isaac Connor 237b6fda90 Fix complaint 2023-01-18 16:18:30 -05:00
Isaac Connor 4282c25493 include sys/socket.h to define MSG_DONTWAIT 2023-01-18 01:14:02 +00:00
Isaac Connor 577c827bac Upgrade sendfile7 to not mash size on stack. offset is a nullptr most of the time, don't dereference it. When falling back to read/write, just read in chunks of 4096, because I don't know how to make llvm use c99 dynamic arrays. Check for HAVE_SENDFILE. Fixes #3505 2023-01-17 16:09:30 -05:00
Isaac Connor c4d0c4ded4 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2023-01-17 13:09:50 -05:00
Isaac Connor 779ae5051e Don't wait for decode in Analyze. 2023-01-17 12:58:52 -05:00
Isaac Connor 2883e53a02 Must tell everyone in the packetqueue that we are done before expecting everyone to leave the packetqueue. This syncs up with master. 2023-01-08 15:07:33 -05:00
Isaac Connor 61b9dec336 Hide timestamp caption from bottom of video.js event view. It serves no purpose. Fixes #3488 2023-01-03 19:20:20 -05:00
Isaac Connor 5833812514 Add 2>&1 to command to delete event dir so that we get error messages logged. 2023-01-03 19:12:27 -05:00
Isaac Connor e805a22844 Move code from Event to Storage to implement delete_path() 2023-01-03 19:12:23 -05:00
Isaac Connor cd61619bce Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2023-01-03 18:09:26 -05:00
Isaac Connor 390d914b61 Use ajax() instead of getJSON with no timeout when deleting events. 2023-01-03 13:37:57 -05:00
Isaac Connor 29e7f7de4c Update monitor preset view: Use a submit button instead of input with javascript. Remove no longer needed js code. Sort presets by Name. 2023-01-02 17:22:13 -05:00
Isaac Connor 4bcfc2360d Remove stopping the statusCmdTimer, it isn't used. 2023-01-02 17:06:35 -05:00
Isaac Connor d78d30836b Fix saving Server modal. Form was incomplete, action and view were duplicated. Don't need javascript just use the submit button Save. 2022-12-22 12:54:54 -05:00
Isaac Connor 43bdbcc43e Bump version to 1.36.33 2022-11-29 13:01:11 -05:00
Isaac Connor 0eeb9bff10 Improve info when moving event to show source and Dest paths 2022-11-29 12:59:08 -05:00
Isaac Connor a996dbe99a Remove dead code from report_event_audit.js 2022-11-29 12:57:00 -05:00
Isaac Connor 17b51355ed Use Y-m-d H:i:s instead of c for date formatting to match what datetimepicker expects. remove unused action input and put view in the get part of form action 2022-11-29 12:56:49 -05:00
Isaac Connor 1130790ff6 Add styles to table headers to left align them to match the body 2022-11-29 12:56:38 -05:00
Isaac Connor 6c8e2b61db Remove debug 2022-11-18 14:21:30 -05:00
Isaac Connor 38b5ddd80a Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2022-11-17 13:28:52 -05:00
Isaac Connor 46ddbeba92 Must convert strings into integers before doing math as of php 8.2 Fixes Unsupported operand types: string - int 2022-11-17 13:28:31 -05:00
Isaac Connor 101aa82776 implode the output from zmu to fix php complaint abou array to string conversion 2022-11-16 16:16:27 -05:00
Michael 940bfcdfa6 Set web backend db connection to utf8 2022-11-16 10:36:14 -05:00
Isaac Connor 03fe7fb627 Cleanup the state modal. Fix form post 2022-11-16 10:15:31 -05:00
Isaac Connor 16528cadf6 Make .form-group styles export page specific because they are affecting modals 2022-11-16 10:15:19 -05:00
Isaac Connor 1a0c08c32c Fix crash in zmfilter DiskSpace Update when Event doesn't exist 2022-11-15 13:39:41 -05:00
Isaac Connor 0eacb7d650 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2022-11-15 13:38:43 -05:00