Commit Graph

19228 Commits (2a17f566d6ebefe8f0d8cadcfa55d7b4a3d5998a)

Author SHA1 Message Date
Isaac Connor 2a17f566d6 Remove offending extra comma 2022-03-24 19:40:17 -04:00
Isaac Connor 46faec47f2 Add useful title to frame image telling us which we are looking at 2022-03-24 19:40:10 -04:00
Isaac Connor 0602aa8760 terminate when zm_terminate is set. Do a countdown instead of countup. Sleeo for 10000 microseconds instead of 100. This restores the old value 2022-03-24 19:24:18 -04:00
Isaac Connor 34eeab25c7 Remove the decoding code, just populate the av_packet. This fixes rtsp decoding because we weren't copying the decoded frame to shm raw image. 2022-03-24 19:23:06 -04:00
Isaac Connor 10c44c1562 Fix merge problems. 2022-03-23 16:36:16 -04:00
Isaac Connor 7a8f24312c Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed. 2022-03-23 16:28:38 -04:00
Isaac Connor af5d38df2c cleanup and add fallback to read/write if no sendfile support. 2022-03-23 15:18:24 -04:00
Isaac Connor 0b824a0137 rework zm_sendfile to try again if not all bytes were sent. According to the docs, this is entirely possible. 2022-03-23 15:17:49 -04:00
Isaac Connor 05b74e5edb Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed. Use new reworked zm_sendfile and handle if not all bytes are sent. Fixes #3437. 2022-03-23 15:13:53 -04:00
Isaac Connor 4470349b51 Fix curl cameras. PrimeCapture and PreCapture and PostCapture need to return 1. Also need to populate the packet and video stream. 2022-03-23 15:05:17 -04:00
Isaac Connor 5f019ec550 Remove weird cutnpaste User modules stuff from top of Filter.pm 2022-03-23 14:58:46 -04:00
Isaac Connor 024f0c15a4 Add NOT IN case. Also, fix bad SQL when value evals to false. Test for empty string instead. Fixes #3425 2022-03-23 14:58:33 -04:00
Isaac Connor 71fe3741fb Add filtering to Username to prevent XSS 2022-03-23 14:54:10 -04:00
Isaac Connor ae9d2a864c Output valid html only for Username to prevent XSS 2022-03-23 14:53:53 -04:00
Isaac Connor b8531d63a4 Add a pattern to prevent invalid username characters 2022-03-23 14:53:38 -04:00
Isaac Connor 62c39ed0d4 Fix potential XSS from Username 2022-03-23 14:53:26 -04:00
Isaac Connor 0db629fbba Fix potential XSS from Username 2022-03-23 14:53:07 -04:00
Isaac Connor 540748c923 Fix auth'd user information being saved to session before switching session id's leaving bogus authenticated user in previous session. 2022-03-23 14:51:39 -04:00
Isaac Connor 64770fcd46 escape html in Storage names 2022-03-23 14:51:14 -04:00
Isaac Connor 2d8087654b fix need to get lock before checking termiante 2022-03-02 12:15:03 -05:00
Isaac Connor c766162410 hand merge locking fix from master. 2022-03-02 12:13:45 -05:00
ColorfullyZhang 81dec915e0 Set mysql character set to utf8 explicitly to support chinese characters (or other special characters). 2022-03-02 12:08:46 -05:00
Isaac Connor cea84abee8 fix typo 2022-03-02 12:08:11 -05:00
Peter Keresztes Schmidt ce098dd8d8 Reformat touched code 2022-03-02 12:07:52 -05:00
Isaac Connor bdb9acc0fe Release lock before notify 2022-02-20 10:35:22 -05:00
Isaac Connor 484827bdeb Should get lock before testing for connected 2022-02-20 10:33:45 -05:00
Isaac Connor aaf391fc65 Include EndDateTimeShort in event ajax response 2022-02-17 13:32:36 -05:00
Isaac Connor 8822463ac7 Handle empty endtime more gracefully. If there is a next event just jump to it. 2022-02-17 13:32:10 -05:00
Isaac Connor 9cc17024c5 Include EndDateTimeShort in event stats 2022-02-17 13:31:57 -05:00
Isaac Connor 687818e1ec Convert Fatal()s to Errors() which is really more appropriate anyways. Maybe Fixes #3426 2022-02-08 18:11:33 -05:00
Isaac Connor 3abacfa488 Change title of settings button to give an indication WHY it isn't enabled 2022-02-08 17:51:21 -05:00
Isaac Connor 66336106ca When device isn't specified, pass nullptr. Currently zmc device probing is broken. This fixes it. Not needed for master. 2022-02-08 17:43:26 -05:00
Isaac Connor 2396e98fb9 detaint language file. 2022-02-08 14:17:30 -05:00
Isaac Connor 6268652520 Test for valid language file when saving user. 2022-02-08 14:16:50 -05:00
Isaac Connor b10bb9d8b0 Use getBodyTopHTML so that we get error messages in UI 2022-02-08 13:37:39 -05:00
Isaac Connor 2b0398b35a Change the error message banner to always take up space and be seen. 2022-02-08 13:37:39 -05:00
Isaac Connor 5b9ccc6889 Implement a check on change of language. Make sure that the specified language file exists. Reports errors to UI 2022-02-08 13:37:39 -05:00
Isaac Connor 9973b1fbaf Move the version detection down to after we have a repo and hence a commit history on version. Fixes CURRENT builds always being commit 0 2022-02-02 20:56:41 -05:00
Isaac Connor df16099463 Default limit to 0 which means no limit 2022-02-02 11:02:34 -05:00
Isaac Connor b28f97c5c3 Implement filter limits. Which go before pagination/advanced search limits 2022-02-02 10:50:28 -05:00
Isaac Connor 4501a7c2a1 Remove field that ffmpeg 5.0 doesn't have. 2022-02-01 07:25:13 -05:00
Isaac Connor 0125efb93e add some brackets to make logic more clear 2022-01-25 14:25:27 -05:00
Isaac Connor 1bdb4f302c Fix mTerminate not being initialised. 2022-01-25 14:25:13 -05:00
Isaac Connor df7e34a51d Remove the decoding code, just populate the av_packet. This fixes rtsp decoding because we weren't copying the decoded frame to shm raw image. 2022-01-25 14:24:52 -05:00
Isaac Connor 988f118ba9 Fix fail to get Sources in RTSP. the string msg although initially reserved to ZM_NETWORK_BUFSIZ, after use it's capacity is changed whatever it's contents are. So need to re-reserve. 2022-01-25 12:07:32 -05:00
Isaac Connor ae17b2316e break out when zm_terminate is true 2022-01-24 20:07:14 -05:00
Isaac Connor 8891feec74 Fix missing text-right align on Port/Path labels. Set step to 1 for Port 2022-01-24 18:31:31 -05:00
Isaac Connor 42d5101f08 Make Remote Host 100% 2022-01-24 18:31:05 -05:00
Isaac Connor 01030e9850 Preface Debug with ZM 2022-01-13 22:15:29 -05:00
Isaac Connor 9893d37bf1 include user and function error message about insufficient permissions. Will make it easier to figure out who tried what. 2021-12-14 12:26:47 -05:00