Isaac Connor
|
c18a5e422a
|
Rework code to be smaller. Don't require SystemView permission to post a log entry. Default to ERR if invalid err code provided instead of PANIC so that the log entry still gets saved
|
2022-08-10 09:18:39 -04:00 |
Isaac Connor
|
ad764ca0bb
|
rough in major actions for reports
|
2022-08-04 09:11:24 -04:00 |
|
Isaac Connor
|
e1581b6be6
|
db limits should not be affected by pre-conditions, so include the limit regardless of pre-sql-conditions.
|
2022-07-29 13:59:01 -04:00 |
Doug Nazar
|
262c087800
|
Use old event unpack() on 32bit systems.
PHP unpack() 64bit formats aren't available on 32bit.
|
2022-07-24 04:28:37 -04:00 |
|
Isaac Connor
|
e38dd4649d
|
Convert missed strftimes to dateTimeFormatter. Fixes #3526
|
2022-07-13 18:47:27 -04:00 |
ovargasp
|
db2a22fcb9
|
translations
|
2022-07-11 13:02:33 -06:00 |
|
Isaac Connor
|
e08b826843
|
Add support for lambda functions as post processing. Use the to replace StartDateTimeShort with StartDateTimeFormatted so that dates on viewed events use the specified formatting.
|
2022-06-21 11:42:18 -04:00 |
|
Isaac Connor
|
3299f5ed49
|
Handle php versions < 5.6.1 which don't have non-blocking semaphore support
|
2022-06-13 15:56:52 -04:00 |
Nic Boet
|
f6fdcc2953
|
Fix semaphore_tries on systems without System V
This appears to be impacting systems without php System V semaphore support
have_semaphore is not a boolean
Signed-off-by: Nic Boet <nic@boet.cc>
|
2022-06-06 22:51:34 -05:00 |
|
Isaac Connor
|
baebdb277e
|
Only return error messages, not a bunch of empty arrays
|
2022-06-06 13:09:41 -04:00 |
|
Isaac Connor
|
5068cf5e62
|
Add a progress ticker, and delete events in chunks of 10. Fixes #3444
|
2022-06-06 13:09:41 -04:00 |
|
Isaac Connor
|
d45f6bb7f6
|
fix formatter->format
|
2022-06-03 14:25:19 -04:00 |
|
Isaac Connor
|
d135be17ba
|
Must pass time() to format()
|
2022-06-03 14:25:19 -04:00 |
|
Isaac Connor
|
2dfc8297d5
|
Use dateTimeFOrmatter to format the date/time on session access
|
2022-06-01 16:02:47 -04:00 |
|
Isaac Connor
|
d3b1ede73a
|
Use dateTimeFOrmatter to format the date/time on events
|
2022-06-01 15:46:18 -04:00 |
|
Isaac Connor
|
6325dc6d1c
|
Use dateTimeFOrmatter to format the date/time on frames
|
2022-06-01 15:43:15 -04:00 |
|
Isaac Connor
|
b4d5029884
|
Use dateTimeFOrmatter to format the date/time on logs
|
2022-06-01 15:42:44 -04:00 |
|
Isaac Connor
|
da0483f3e7
|
Use global dateFormatter to format time in ajax events response. Don't format Length as it loses precision. Let javascript side do it. Turn off error_reporting in the output as it breaks the json
|
2022-06-01 13:32:32 -04:00 |
|
Isaac Connor
|
05a38c76ba
|
Turn back on flat structure for video Download
|
2022-05-24 12:11:18 -04:00 |
tftadmin Appleton
|
8912aeb56d
|
Fix loading sessions
|
2022-05-18 18:59:45 -04:00 |
|
tftadmin Appleton
|
ad2a2be7ef
|
Specify only sessions active in the last ZM_COOKIE_LIFTTIME seconds when loading logout modal
|
2022-05-18 18:59:28 -04:00 |
|
Isaac Connor
|
01ab1c2535
|
Fix errors when sorting by EndDateTime.
|
2022-04-13 17:18:59 -04:00 |
|
Isaac Connor
|
c6a1a4ff0e
|
Fix potential XSS from Username
|
2022-03-13 08:34:44 -04:00 |
|
Isaac Connor
|
48d3526459
|
Fix potential XSS from Username
|
2022-03-13 08:19:12 -04:00 |
|
Isaac Connor
|
e33b41745d
|
Merge branch 'master' into replace_function_concept
|
2022-02-27 14:04:01 -05:00 |
|
Isaac Connor
|
47fae7a296
|
spacing, improve debug
|
2022-02-26 19:18:28 -05:00 |
|
Isaac Connor
|
959b08f46a
|
Include EndDateTimeShort in event ajax response
|
2022-02-22 08:31:41 -05:00 |
Ben Dailey
|
ce267c7e3c
|
Most programmatic images are lazy.
|
2022-02-22 08:31:02 -05:00 |
|
Isaac Connor
|
909c0e903f
|
Include EndDateTimeShort in event ajax response
|
2022-02-17 13:30:01 -05:00 |
|
Isaac Connor
|
a149fa37fc
|
Make filter debug modal work on non-saved filter
|
2022-02-15 10:37:14 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
31eff49a46
|
Implement filter limits. Which go before pagination/advanced search limits
|
2022-02-02 10:49:05 -05:00 |
Jonathan Bennett
|
fb832e7d1b
|
Adds janus_enable_audio, a switch to try to enable audio in live stream viewing.
|
2022-01-19 00:14:52 -06:00 |
|
Jonathan Bennett
|
3a9c16aeea
|
First working Janus build
|
2022-01-10 23:22:37 -06:00 |
|
Isaac Connor
|
79c45f50d5
|
define raw as an empty array so we don't generate js errors
|
2022-01-07 16:21:34 -05:00 |
|
Isaac Connor
|
edbe726e86
|
Implement semaphore retry. Make not getting the semaphore an error
|
2021-12-17 09:41:45 -05:00 |
|
Isaac Connor
|
30e4d72c1d
|
Implement CMD_MAXFPS
|
2021-12-16 16:36:12 -05:00 |
|
Isaac Connor
|
69faa42ca7
|
Add more of the resulting SQL to the filter debug modal
|
2021-12-13 15:00:55 -05:00 |
|
Isaac Connor
|
6511dc8a4f
|
Allow empty sort field.
|
2021-12-13 15:00:35 -05:00 |
|
Isaac Connor
|
529e889d99
|
remove extra ,
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
9036728bdc
|
Report error if sql fails. Add check for access to specific event.
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
3ac5402699
|
Pretty up the v4l field names
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
1fd99424bb
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-11-05 10:13:41 -04:00 |
|
Isaac Connor
|
3208059040
|
Fix event listing when not paginated.
|
2021-11-02 17:24:05 -04:00 |
|
Isaac Connor
|
224b34d69d
|
Send all stats rows instead of just 1. Handle receiving all rows, and don't list event id and frame id
|
2021-10-29 18:54:23 -04:00 |
SzymekCRX
|
2bcad7bf5e
|
Critical bug in events.php
Two extra brackets causes fatal error in Ajax request causing 500 HTTP error and problems with listing / deleting events
|
2021-10-28 07:43:44 +02:00 |
|
Isaac Connor
|
8afed25d18
|
Use filter->sort_asc and sort_field which will use either the value specified in query, or defaults set in system. url params order and sort will override.
|
2021-10-25 12:34:28 -04:00 |
|
Isaac Connor
|
d960f9b6af
|
Fix settings being blank due to missing v4l2-ctl
|
2021-10-16 13:19:19 -04:00 |
|
Isaac Connor
|
d71a5932f5
|
Turn off useless shm display in header. Add ram and swap usage
|
2021-10-14 13:33:29 -04:00 |
|
Isaac Connor
|
94cd3a6e69
|
Use v4l2-ctrl to list the available controls and display all of them. Use range sliders where appropriate.
|
2021-10-05 19:49:42 -04:00 |
|
Isaac Connor
|
292b3c1d37
|
add an ajax request for querying the available models
|
2021-09-25 20:49:53 -04:00 |
|
Isaac Connor
|
e7e8996060
|
Can export events if canView Snapshots. Event->canView will filter events that are not in a snapshot
|
2021-08-18 10:53:59 -04:00 |
|
Isaac Connor
|
f236e25e22
|
Fix deleting snapshots
|
2021-08-06 13:11:04 -04:00 |
|
Isaac Connor
|
1f1678064e
|
Allow specifying export Structure to get a flat zip
|
2021-08-06 13:10:44 -04:00 |
|
Isaac Connor
|
bed41ca44b
|
Support specifying the export filename by passing the export_root
|
2021-08-05 13:30:52 -04:00 |
|
Isaac Connor
|
29fb2d3885
|
Add special handling of sorting by EndTime because it can be NULL. Fixes #3298
|
2021-06-15 10:34:33 -04:00 |
|
Isaac Connor
|
7878fbc878
|
Add a limit of 1000 when pulling sessions. Sessions table can contain hundreds of thousands of lines all relatively useless. Modals need to pop up fast.
|
2021-06-12 12:22:15 -04:00 |
|
Isaac Connor
|
4a40214f73
|
StartTimeShort should be StartDateTimeShort. Leave StartTimeShort for backwards compatibility. Add Storage, DiskSpace in status=>event
|
2021-06-08 16:58:50 -04:00 |
|
Isaac Connor
|
55f2a7f55e
|
spacing
|
2021-06-08 16:58:50 -04:00 |
|
Isaac Connor
|
f754b82f3b
|
When we do not have permission to edit monitors, return empty string instead of nothing so that we don't generate an error
|
2021-04-28 12:03:44 -04:00 |
|
Isaac Connor
|
29e91f48e6
|
Use Snapshots permission instead of Events for snapshots
|
2021-04-12 15:59:31 -04:00 |
|
Isaac Connor
|
7743445323
|
Handle when there isn't a server Id
|
2021-03-22 21:30:56 -04:00 |
|
Isaac Connor
|
f306febb5f
|
use find_one when loading Server which can use caching
|
2021-03-22 17:49:59 -04:00 |
|
Isaac Connor
|
587cebecbb
|
navbar requests don't pass an auth token so we never send an auth update. Just always send it.
|
2021-03-13 12:10:35 -05:00 |
|
Isaac Connor
|
62cfdd8d61
|
fix searching in snapshots
|
2021-03-12 10:52:23 -05:00 |
|
Isaac Connor
|
9504d8be61
|
event_ids => snapshot_ids
|
2021-03-12 10:40:23 -05:00 |
|
Isaac Connor
|
70073ea017
|
Add thumbnails to snapshots list
|
2021-03-12 10:07:17 -05:00 |
|
Isaac Connor
|
11c2318a05
|
Rough in the ui for Snapshots
|
2021-03-12 09:28:05 -05:00 |
|
Isaac Connor
|
4dcce4ac95
|
Merge branch 'rtsp_server'
|
2021-01-26 14:22:10 -05:00 |
Andrew Bauer
|
c13d2ea99f
|
make watch view event list more efficient
|
2021-01-19 10:10:51 -06:00 |
|
Isaac Connor
|
cb90c06cde
|
Merge branch 'master' into zma_to_thread
|
2021-01-17 17:38:34 -05:00 |
|
Isaac Connor
|
50af7f25b8
|
Use less memory in event querying. More work to do here
|
2021-01-16 13:17:46 -05:00 |
|
Andrew Bauer
|
b1b71e5f09
|
fix return too soon when no log results
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
b6d5802301
|
revert back to a standard modal (no static backdrop) for objdetect
|
2021-01-11 13:46:50 -05:00 |
rabsym
|
56bb4a74fc
|
Avoid top-scroll when returning from bs_modal objdetect
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
c166b0de0f
|
fix return too soon when no log results
|
2021-01-02 16:33:56 -06:00 |
|
Andrew Bauer
|
56e88aea89
|
revert back to a standard modal (no static backdrop) for objdetect
|
2021-01-02 12:34:33 -06:00 |
|
rabsym
|
b7970d69a5
|
Avoid top-scroll when returning from bs_modal objdetect
|
2021-01-01 14:15:35 +01:00 |
|
Isaac Connor
|
a1917d83d0
|
Merge branch 'master' into zma_to_thread
|
2020-12-22 19:52:09 -05:00 |
|
Andrew Bauer
|
2ea4b39d93
|
don't use quotes around the event id
|
2020-12-22 11:46:31 -06:00 |
|
Andrew Bauer
|
ee45916526
|
move objdetect image to a modal
|
2020-12-22 10:08:31 -06:00 |
|
Isaac Connor
|
e123322d06
|
Merge branch 'master' into rtsp_server
|
2020-12-15 11:00:13 -05:00 |
|
Isaac Connor
|
99e7ae3505
|
Merge branch 'master' into rtsp_server
|
2020-12-15 10:14:19 -05:00 |
|
Andrew Bauer
|
c24564e0cd
|
insert frame stats into frame view
|
2020-12-13 13:20:26 -06:00 |
|
Andrew Bauer
|
2f0df74c54
|
show the analyse image in frames view if it exists
|
2020-12-12 11:37:50 -06:00 |
|
Isaac Connor
|
4667e21636
|
Add DecodingEnabled to Function modal
|
2020-12-10 14:06:40 -05:00 |
|
Isaac Connor
|
37d4b3472f
|
Add useful help for function modal describing each mode and the purpose of the Enabled checkbox
|
2020-12-10 13:43:28 -05:00 |
|
Isaac Connor
|
28a3868069
|
report both capture_fps and analysis_fps
|
2020-12-09 15:03:33 -05:00 |
|
Isaac Connor
|
84c7a117f5
|
Use width and height attrs instead of css for rendering speed. Also alt doesn't need validHtmlStr because Event.Id will have no weird characters
|
2020-12-08 11:26:43 -05:00 |
|
Isaac Connor
|
c156731f0b
|
Allow users with canView Events to view event list. Don't allow unarchive or delete if they don't have canEdit
|
2020-12-08 10:33:25 -05:00 |
|
Isaac Connor
|
b261fbb397
|
Merge branch 'master' into zma_to_thread
|
2020-12-07 16:26:26 -05:00 |
|
Andrew Bauer
|
347c64eb7d
|
remove warning
|
2020-12-01 13:30:57 -06:00 |
|
Andrew Bauer
|
6da826d79c
|
fix typo
|
2020-12-01 13:29:43 -06:00 |
|
Andrew Bauer
|
23fcd1f2c5
|
modernize the event playback view
|
2020-12-01 09:07:42 -06:00 |
|
Isaac Connor
|
80c4e2fa57
|
Fix table not being 100%. Use appropriate bootstrap style labels for radios
|
2020-11-27 13:29:57 -05:00 |
|
Andrew Bauer
|
a2b5271835
|
fix copy/paste typo
|
2020-11-14 17:34:59 -06:00 |
|
Andrew Bauer
|
0ffb5e153c
|
modify FilterTerm to support Frames view searches
|
2020-11-14 17:33:18 -06:00 |
|
Andrew Bauer
|
f3756def08
|
deploy server side pagination for frames view
|
2020-11-14 14:45:22 -06:00 |
|
Andrew Bauer
|
9aa6fea6a3
|
frames view server pagination WIP
|
2020-11-14 14:19:28 -06:00 |
|
Andrew Bauer
|
f88d721ae3
|
fix issue with events view and ALL pagination
|
2020-11-14 10:27:33 -06:00 |
|
Isaac Connor
|
f32d10a1ab
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-13 17:16:13 -05:00 |
|
Isaac Connor
|
66f7cc55dc
|
Spacing code comments, quotes
|
2020-11-13 17:05:23 -05:00 |
|
Andrew Bauer
|
52e747791d
|
rough in frames server pagination backend
|
2020-11-13 12:34:01 -06:00 |
|
Andrew Bauer
|
c0225a35aa
|
use different variable assignment for clarity
|
2020-11-13 07:24:17 -06:00 |
|
Andrew Bauer
|
a15c8ea7d8
|
Merge pull request #3072 from ZoneMinder/iconnor_ajax_event_changes
Rework code to use Filter methods to generate advanced search
|
2020-11-13 07:10:08 -06:00 |
|
Isaac Connor
|
df783f4835
|
Merge branch 'master' into zma_to_thread
|
2020-11-12 12:53:55 -05:00 |
|
Isaac Connor
|
52c7cc5869
|
reorganize code. Remove Server caching as it is done in Object.php.
|
2020-11-11 11:49:44 -05:00 |
|
Isaac Connor
|
7b8ee6af9f
|
Rework code to use Filter methods to generate advanced search functionality. Reduces sql queries to 1 or 2, using count() to populate [total] and [totalNotFiltered]. Does pagination using array_splice instead of SQL queries. Will use more ram, but reduces db load.
|
2020-11-05 12:20:49 -05:00 |
|
Isaac Connor
|
ee89eb45e6
|
Fix EndTime to EndDateTime
|
2020-11-04 18:39:02 -05:00 |
|
Isaac Connor
|
e085e08caa
|
Fix missed StartTime to StartDateTime
|
2020-11-04 18:27:51 -05:00 |
|
Isaac Connor
|
130588eb8f
|
fix typos
|
2020-11-04 18:22:50 -05:00 |
|
Isaac Connor
|
b17fa8f9c1
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:58:03 -05:00 |
|
Andrew Bauer
|
736c2e4cf5
|
Merge pull request #3068 from ZoneMinder/fix_endtime
Test for EndTime value before using strftime on it.
|
2020-11-02 15:21:43 -06:00 |
|
Isaac Connor
|
0f74e24bfc
|
Join Monitors as M as well in total and totalNotFiltered queries
|
2020-11-02 15:50:38 -05:00 |
|
Isaac Connor
|
bd1d4f954b
|
Test for EndTime value before using strftime on it.
|
2020-11-02 15:45:05 -05:00 |
|
Andrew Bauer
|
96a9a73320
|
roll back events.php
|
2020-11-02 14:33:40 -06:00 |
|
Isaac Connor
|
787953559d
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-01 16:11:10 -05:00 |
|
Isaac Connor
|
30e0e49ee7
|
Fix total rows when using search
|
2020-10-31 14:09:47 -04:00 |
|
Andrew Bauer
|
5047c28157
|
attempt to fix totalnotfiltered
|
2020-10-31 11:26:29 -05:00 |
|
Isaac Connor
|
41e88fad6e
|
translate \n to <br/>. Fixes #3064
|
2020-10-29 15:08:14 -04:00 |
|
Isaac Connor
|
638a05b207
|
Fix totalrows in pagination. Still figuring this out.
|
2020-10-29 09:39:48 -04:00 |
|
Isaac Connor
|
df788f2810
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-28 12:40:00 -04:00 |
|
Isaac Connor
|
1690bcbd38
|
update auth_relay when we update auth_hash
|
2020-10-26 18:49:14 -04:00 |
|
Andrew Bauer
|
7b106e2522
|
don't use wildcards in advanced search
|
2020-10-26 12:20:26 -05:00 |
|
Isaac Connor
|
5ed168bccd
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-26 13:07:18 -04:00 |
|
Isaac Connor
|
da87b5b475
|
Make invalid sort field non-fatal. Fix column specification in search and advscearch and fix resulting sql due to = instead of .=
|
2020-10-26 13:06:05 -04:00 |
|
Andrew Bauer
|
97573122bc
|
fix EndTime
|
2020-10-26 09:33:11 -05:00 |
|
Andrew Bauer
|
27b39a0258
|
comment out warning used for debug
|
2020-10-26 09:19:08 -05:00 |
|
Isaac Connor
|
4abfa61bbc
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-26 10:03:12 -04:00 |
|
Isaac Connor
|
4c791b390f
|
fix warning due to undefined vars being used
|
2020-10-26 09:59:15 -04:00 |
|
Isaac Connor
|
706bf085f4
|
Add pre and post sql conditions and pre-populate the return
|
2020-10-26 09:58:47 -04:00 |
|
Andrew Bauer
|
8cf899efc5
|
remove commented line
|
2020-10-25 10:58:27 -05:00 |
|
Andrew Bauer
|
e9b71b4ce1
|
events view server pagination - fix sorting name & monitor
|
2020-10-25 10:40:29 -05:00 |
|
Andrew Bauer
|
cb073950b9
|
events view server pagination WIP
|
2020-10-25 10:28:22 -05:00 |
|
Andrew Bauer
|
f87be2d289
|
specify the table name when we sort in events view
|
2020-10-25 08:24:56 -05:00 |
|
Isaac Connor
|
760e20bc0f
|
Populate Monitor name and use event class DiskSpace to get DiskSpace when it hasn't been populated in the db yet
|
2020-10-24 08:50:59 -04:00 |
|
Isaac Connor
|
2ebd686d19
|
Use a ZM\Filter for initial filtering. SELECT E.*,M.* to match how we do it in Filters and older event code. pass the row into new Event() so that it doesn't go back to the DB to get the Event property data.
|
2020-10-23 17:55:43 -04:00 |
|
Isaac Connor
|
da080d44c1
|
rename filter from bootstrap-table to advsearch so as not to conflict with our existing filter
|
2020-10-23 16:44:50 -04:00 |
|
Andrew Bauer
|
d425d1006e
|
push newevents.php to master
|
2020-10-23 10:21:32 -05:00 |
|
Andrew Bauer
|
235dd2a2fb
|
don't use wildcards in event view advanced search fields
|
2020-10-22 15:06:06 -05:00 |
|
Andrew Bauer
|
29819d8044
|
fix copy/paste error with events.php
|
2020-10-22 13:27:47 -05:00 |
|
Andrew Bauer
|
d117e993ad
|
add create task to ajax/log.php
|
2020-10-22 10:17:34 -05:00 |
|
Isaac Connor
|
4a0ada5335
|
improve logging of invalid task in ajax/log
|
2020-10-22 08:52:54 -04:00 |
|
Isaac Connor
|
e6f08959fa
|
Fix use of result instead of NearEvents
|
2020-10-21 10:40:26 -04:00 |
|
Isaac Connor
|
34ce3a1498
|
Use Filter::parse instead of parseFilter. Use Filter->addTerm to limit to User's monitor restrictions. Return early with better logging in the event of error. Introduce Filter->addTerm
|
2020-10-21 10:36:40 -04:00 |
|
Isaac Connor
|
2eda49333f
|
Merge branch 'master' into zma_to_thread
|
2020-10-20 16:20:29 -04:00 |
|
Andrew Bauer
|
b5aa215e31
|
WIP events view server pagination
|
2020-10-20 12:59:30 -05:00 |
|
Andrew Bauer
|
6357c02ec9
|
WIP events view server pagination
|
2020-10-20 12:13:12 -05:00 |
|
Isaac Connor
|
41ed267b71
|
move view to the form action so that it is part of get request instead of post
|
2020-10-20 12:31:38 -04:00 |
|
Andrew Bauer
|
bfa45b0c43
|
continue work on event view server pagination
|
2020-10-20 08:10:43 -05:00 |