59039de985
Use =[] instead of IN as operator. Fixes #3432
2022-02-15 10:23:30 -05:00
554840d811
Revert "Add SQL opTypes IN, NOT IN to filter view, #3432"
2022-02-15 10:07:48 -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
b6d2d96d11
Remove offending extra comma
2022-02-14 09:47:59 -05:00
0e2f2cf572
Merge branch 'timeline_multi_monitor'
2022-02-11 18:08:41 -05:00
94bc40a6cf
Split the data by monitor and display a monitor image/info for each monitor.
2022-02-11 18:06:42 -05:00
3250e0edfe
simplify some code, pass around zm_event json objects instead of event_id. Each monitor has it's own image so when loading event data put it into a div/img referenced by monitor Id
2022-02-11 18:06:08 -05:00
4cc82e24f3
convert some tags to classes instead of ids. Add margin: 0 auto so that monitor images are centered
2022-02-11 18:04:54 -05:00
cb80283398
Merge branch 'master' into timeline_multi_monitor
...
update code to use jquery instead of mootools
when only viewing 1 monitor, split view in half
load first event image righ toff the bat
2022-02-11 18:03:35 -05:00
b700e7b5ce
Merge pull request #3424 from r01k/master
...
Fixed in export.php "Class 'Filter' not found" and SQL query with wrong syntax
2022-02-10 21:39:50 -05:00
b866888062
Change title of settings button to give an indication WHY it isn't enabled
2022-02-08 17:52:59 -05:00
b1d235f991
Use getBodyTopHTML so that we get error messages in UI
2022-02-08 13:33:22 -05:00
d7a8947e05
Only include janus.js if needed
2022-02-08 13:33:02 -05:00
cc9306afe3
Change the error message banner to always take up space and be seen.
2022-02-08 13:32:37 -05:00
03f6637060
Only load janus.js if we are using it
2022-02-08 11:03:25 -05:00
2f5a403fc4
Handle when no swap is configured
2022-02-08 10:04:19 -05:00
33473eac6a
Add arp-scan as a tool for getting list of devices on network. Add an interface specifier to monitor probe just like on onvif-probe. Rough in support for Hikvision cameras
2022-02-07 12:33:53 -05:00
02d896abe2
Fixed in export.php "Class 'Filter' not found" and construction of SQL query with wrong syntax
2022-02-04 22:19:15 -05:00
3c655807e8
Use new Event->Server function to return the correct (and matching url to zms) url to use for ajax status calls. Fixes errors in a multi-server environment.
2022-02-03 14:47:32 -05:00
7a95aa7210
Don't render cues if we don't have any. This occurs on initial load we call changeScale which would re-render the cues but the cur ajax hasn't completed yet, so this just avoids an error being logged
2022-02-03 14:46:39 -05:00
3feb4fcc51
Merge branch 'master' into master
2022-02-02 12:28:17 -05:00
bc4884afe5
fix replacement on escape. For some reason needs double bacl slash
2022-02-01 10:07:04 -05:00
462ec45a07
Escape newlines in config values.
2022-02-01 09:46:37 -05:00
0eb4d95d0e
remove geolocation copies from config to javscript land. Now all of config is brought in my skin.js.php
2022-01-31 18:33:03 -05:00
fe8747e5e7
Make ONVIF inputs 100%
2022-01-26 11:45:07 -05:00
57a697093e
Remove redundant JS define
2022-01-25 22:38:06 -06:00
ec9403fb6f
Adds Amcrest On-camera Motion Detection
2022-01-25 22:38:00 -06:00
d110987935
Fix indentation for ESLint
2022-01-22 13:37:44 -06:00
abbd27d1cb
Remove hard-coded config Vars
2022-01-22 13:31:47 -06:00
8125aa633b
Merge branch 'ZoneMinder:master' into master
2022-01-22 12:20:13 -06:00
90f75dae93
Make config entries const
2022-01-22 12:33:48 -05:00
3a0b88c013
Don't make private config entries available to js land.
2022-01-22 12:31:36 -05:00
45db266ede
Put full config available to javascript
2022-01-22 12:07:18 -05:00
2e9bda1af1
Add firefox specific workaround for Janus streaming
2022-01-21 23:21:41 -06:00
52e48c02b6
Add janus_path and janus_secret, allowing for more secure and flexible Janus installs
2022-01-21 22:23:41 -06:00
5ce701f5cb
Use Monitor->getStatusHTML to generate status html
2022-01-20 11:53:44 -05:00
91d6ff2029
Use Monitor->getStatusHTML to generate status html
2022-01-20 11:53:35 -05:00
57bb91e105
add connKey to monitorData
2022-01-20 11:53:05 -05:00
9c3509a620
put an mid in imageFeed id so we can use MOnitorStream.js. Use Monitor->getStatusHTML to generate status html
2022-01-20 11:52:54 -05:00
e73659843a
Rework to use MonitorStream.js
2022-01-20 11:52:01 -05:00
7748616992
If rate > 1600, limit it to 1600 to prevent logged errors
2022-01-20 11:51:08 -05:00
24a9dcbf47
If rate > 1600, limit it to 1600 to prevent logged errors
2022-01-20 11:50:53 -05:00
97f2c0a02b
Load ajaxQueue
2022-01-20 11:50:25 -05:00
db866fa668
Implement zm_setcookie to simplify setting cookies, set samesite, deal with older php etc. Use it.
2022-01-20 09:46:38 -05:00
fb832e7d1b
Adds janus_enable_audio, a switch to try to enable audio in live stream viewing.
2022-01-19 00:14:52 -06:00
688f505f28
Adds better error handling, changes expected location of janus.js
2022-01-16 19:44:52 -06:00
59056b4103
Refactor Montage view js -- Janus in MonitorStream
2022-01-15 01:33:17 -06:00
8d757d37a6
fix eslint
2022-01-14 16:43:59 -05:00
2beffeb1b4
Add Janus to Cycle view. Remove debug Alert() messages
2022-01-12 22:47:35 -06:00
50c824f3bb
Janus cleanup, adds support to the "watch" view
2022-01-11 21:21:58 -06:00
Isaac Connor
Isaac Connor
Jernej Jakob
r01k
Jonathan Bennett