13251b133a
Make getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options
2022-02-27 14:03:37 -05:00
47fae7a296
spacing, improve debug
2022-02-26 19:18:28 -05:00
a40b305065
Merge branch 'master' into replace_function_concept
2022-02-20 09:52:03 -05:00
fe69261f10
Include MonitorId as second argument of EventStartCommand and EventEndCOmmand at @baudneo's request.
2022-02-19 15:33:05 -05:00
dc8f1bc8ed
Set shared_data->score before state transitions so that linked monitors pick it up. Should help with missed linked events
2022-02-18 17:44:23 -05:00
fc541ac57d
fix potential double lock of jpeg mutex
2022-02-18 17:11:18 -05:00
1a54a96c04
Improve title on alarm buttons when we don't have permission. Move onclick from data-on-click to setup in initPage only if permitted
2022-02-18 17:11:18 -05:00
002b2c39aa
fix button assignments. Don't abort ajax, as it might be important
2022-02-18 17:11:18 -05:00
28f3cb18e4
Make std function warning into a debug. Warning will happen if they are actually used
2022-02-18 15:59:00 -05:00
adf8413333
Include EndDateTimeShort in event stats
2022-02-17 13:31:25 -05:00
8dedac1a21
Handle empty endtime more gracefully. If there is a next event just jump to it.
2022-02-17 13:30:50 -05:00
909c0e903f
Include EndDateTimeShort in event ajax response
2022-02-17 13:30:01 -05:00
1983801004
Merge branch 'master' into replace_function_concept
2022-02-16 18:49:01 -05:00
b9e6cf8038
Spacing, remove dead code, add comments. When implementing CLOSE_ALARM mode, check Alarm Frames against alarm_frame_count instead of 0.
2022-02-16 17:27:17 -05:00
cd2c977ed8
Merge branch 'master' into replace_function_concept
2022-02-16 14:25:38 -05:00
c9de883a7c
Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed.
2022-02-16 14:18:37 -05:00
67563737c3
Rework to remove static temp_img_buffer. Is now a class member. Must be allocated as needed.
2022-02-16 14:16:46 -05:00
243c780a6a
cleanup and add fallback to read/write if no sendfile support.
2022-02-16 14:16:25 -05:00
2336926d90
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-02-16 14:16:01 -05:00
f3d3cad419
Remove non-translations
2022-02-16 09:59:48 -05:00
2d3f99eabb
rework zm_sendfile to try again if not all bytes were sent. According to the docs, this is entirely possible.
2022-02-16 09:59:48 -05:00
055414c778
DefaultCodec is for event view, not live
2022-02-16 09:59:48 -05:00
93ab345a3a
DefaultCodec is for event view, not live
2022-02-16 09:59:48 -05:00
9d400b9f6c
use rockylinux:8 container for ci workflow
2022-02-16 08:33:44 -06:00
a2a4a8e74f
include arp-scan polkit files in rpm
2022-02-16 08:22:37 -06:00
59d283095d
bump rpm specfile rtsp commit
...
anytime the rtsp commit is bumped in packpack, it must also be bumped in the rpm specfile
2022-02-16 07:54:01 -06:00
efc1ec770c
Debug the contents of REQUEST on every hit.
2022-02-15 18:52:46 -05:00
b67e7b8111
serialize form instead of just passing filter id because the modal can now handle unsaved filters
2022-02-15 18:52:46 -05:00
8b14885541
Add handling of NOT IN and =\[\] and \!\[\]
2022-02-15 18:52:46 -05:00
33f23cbd84
Sync up n_frames, frame_count, curr_frame_id on int instead of a mix of long int, int and unsigned long int
2022-02-15 18:52:46 -05:00
2bc0ec269a
Merge branch 'master' into replace_function_concept
2022-02-15 17:02:03 -05:00
4f8aba0801
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-02-15 10:41:51 -05:00
956579d557
handle snap->in_frame being null.
2022-02-15 10:41:42 -05:00
a149fa37fc
Make filter debug modal work on non-saved filter
2022-02-15 10:37:14 -05:00
b2e0f805bd
Add NOT IN case. Also, fix bad SQL when value evals to false. Test for empty string instead. Fixes #3425
2022-02-15 10:29:58 -05:00
59039de985
Use =[] instead of IN as operator. Fixes #3432
2022-02-15 10:23:30 -05:00
ecd27d033c
Merge pull request #3435 from ZoneMinder/revert-3434-3432-fix-events-view-filter-monitorid
...
Revert "Add SQL opTypes IN, NOT IN to filter view, #3432"
2022-02-15 10:07:59 -05:00
554840d811
Revert "Add SQL opTypes IN, NOT IN to filter view, #3432"
2022-02-15 10:07:48 -05:00
03bc24362f
Merge pull request #3434 from jjakob/3432-fix-events-view-filter-monitorid
...
Add SQL opTypes IN, NOT IN to filter view, #3432
2022-02-15 10:05:57 -05:00
5fd5c7fdd1
Maybe fix build on freebsd by including unistd.h
2022-02-15 10:04:37 -05:00
13f2076dc9
Add SQL opTypes IN, NOT IN to filter view, #3432
...
This possibly fixes the issue where changing the filter for an event
view via the filter button would produce invalid SQL and SQL errors.
web_php[43835].ERR [1.2.3.4] [SQL-ERR 'SQLSTATE[HY000]: General error: 4078 Illegal parameter data types int and row for operation '='', statement was 'SELECT E.*, M.Name AS Monitor FROM `Events` AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE ( ( E.StartDateTime >= '2022-02-14 00:47:41'
and E.StartDateTime <= '2022-02-14 11:47:41' )
and E.MonitorId = ('1','3')
) ORDER BY E.StartDateTime DESC' params:] at /usr/share/zoneminder/www/includes/database.php line 161
When in the events view, clicking the filterBtn sends us to the filter view with this query term (url-decoded):
&filter[Query][terms][2][attr]=MonitorId&filter[Query][terms][2][op]=IN&filter[Query][terms][2][val]=1,3&filter[Query][sort_asc]=0
but the filter view displays this as "equals", not "in set", because it doesn't know IN from opTypes, only =[].
2022-02-15 14:15:08 +01:00
c8a2b6d679
Merge branch 'master' into replace_function_concept
2022-02-14 12:03:25 -05:00
b6d2d96d11
Remove offending extra comma
2022-02-14 09:47:59 -05:00
91b536b868
Change the test for slow functions to mod4. The unrolled and SSE function work on 4 pixels at a time or 16 or 12 bytes depending on colours.This will improve cpu use on resolutions like 1280x800
2022-02-14 09:43:48 -05:00
485cc26065
Merge branch 'master' into replace_function_concept
2022-02-12 22:17:47 -05:00
f47aa98b43
html is not a global.. confusing yes.
2022-02-12 22:17:03 -05:00
e3631099f6
Rename v_image to y_image cuz that's what it is
2022-02-12 22:14:51 -05:00
552974c5b7
Pass full packet to AddFrame so that we can also write other contents out
2022-02-12 22:14:21 -05:00
0e2f2cf572
Merge branch 'timeline_multi_monitor'
2022-02-11 18:08:41 -05:00
6e7e6d9e8e
small code cleanup, add Warnings when using slow blend functions.
2022-02-11 18:06:43 -05:00
Isaac Connor
Andrew Bauer
Isaac Connor
Jernej Jakob