44a3a7a6a8
Fix loading event due to missing GROUP BY. Fixes event video generation.
2023-12-01 12:46:05 -05:00
23a0e561eb
Remove depth of nested if's by returning early.
2023-11-21 10:49:09 -05:00
9a271e8960
Add are you still watching modal
2023-11-20 14:23:57 -05:00
8e0793f5e7
Do not format StartDateTime and EndDateTime in ajax events results. Do the formatting in js.
2023-11-16 10:34:43 -05:00
abb4230f86
Use ajax error when specified storage not found.
2023-11-13 11:37:47 -05:00
50ece0ae57
Turn off debugging of status ajax results. Can be a lot of info and can be gotten from browser dev tools
2023-10-26 09:25:45 -04:00
f4d69d524a
Undo the extreme splitting up of the SQL so that it is a little less multiple-liney. Hopefully may fix the lack of white space issue reported in forums.
2023-10-25 09:40:14 -04:00
48b5960fac
Can't copy by ref, the limit will affect unfiltered as well
2023-10-17 14:57:57 -04:00
c06f32fd67
Only load event OBject and test post_sql_conditions if the filter has any. Save a little processing. Copy unfiltered rows by reference.
2023-10-16 12:04:14 -04:00
9ff31ab4f5
Only print logged in user name if we are actually logged in, in order to avoid errors in logs
2023-10-05 17:03:42 -04:00
44c5c3c70c
Introduce new download mode that concats event videos into 1 file per monitor
2023-10-04 12:04:11 -04:00
5a7bd74521
Remove commented out code
2023-09-28 12:59:51 -04:00
51500d494f
Add group by when doing advnaced search
2023-09-26 15:15:47 -04:00
1fdf7f2b31
Remove debug
2023-09-25 16:32:01 -04:00
4410757037
Fix use of RETURNING Id which isn't supported in all mysql. Use dbInsertId instead.
2023-09-15 11:26:15 -04:00
f8c89a0405
Merge branch 'master' into tags
2023-09-14 16:42:06 -04:00
de8f387207
Restrict mid to a cardinal value. Fixes GHSA-9cmr-7437-v9fj
2023-09-13 10:12:04 -04:00
e353523073
Fix int()=>(int) causing events to not load
2023-09-12 09:07:46 -04:00
a194fe81d3
Only allow Events Columns for sort. Fixes GHSA-2qp3-fwpv-mc96. Fixes GHSA-9cmr-7437-v9fj
2023-09-11 11:29:54 -04:00
a13c9c06f2
Handle when filter limit is '0'
2023-09-09 12:38:47 -04:00
b44216d3da
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-09-08 14:19:09 -04:00
473d34e220
Update events frameimage status code to use Event object. Make not finding the frame a debug because of bulk frames.
2023-09-08 14:17:36 -04:00
18d74ed7ac
(feat): Tags
...
fix(tag): Create tags on mobile
chore(tags): Change TagName to Name
chore(tags): eslint
chore(tags): dbFetchAll to dbQuery for removetag
chore(events): eslint (attempt 2)
feat(tags): Better handling of keyboard
fix(tags): Enter key for creating new tag
fix(tags): Don't allow space as a tag name
feat(tags): Delete tag if last assignment removed
fix(tags): Increase height of dropdown
in progress
fix(Tags): Use T.Id on the events page dropdown
fix(Tags): Remove $availableTags from events.php
chore(sql): Formatting sql statements
feat(Tags): Working OR on filters and events pages
fix(filter): Populate availableTags
chore(Tags): code formatting
fix(tag): Add tag on create tag
Fix(tags): Remove tag from available if last
feat(tags): Add zm_update.sql
fix(chosen): Undo css width
fix(chosen): tags dropdown width
fix(tags): dropdown over timeline
fix(tags): Full width input
fix(events): Refresh table on page show
chore(filter): Clean up availableTags
chore(event): Clean up available & selected Tags
fix(event): Update available tags on remove
fix(event): Remove hack for selected tags
feat(tags): Blur input after adding tag
doc(tags): Initial tags documentation
fix(tags): Dark theme dropdown
fix(tags): Dark theme for tags on input
fix(tags): Dark theme for highlight in dropdown
fix(tags): Populate filter tags droplist
chore(): Bump zm_update to 1.37.42
chore(tags): Move mobile check to skin.js
chore(tags): Comment debug statements
fix(tags): Enter key to create tag on mobile Chome
chore(tags): Space in 'All Tags' for translation
Temporary commit to handle cookie expiration times
chore(tags): Remove unnecessary Tag(s) from en_gb
chore(): Cleanup unnecessary Error and Debug
chore(): Resolve merge conflicts
chore(): Address merge conflicts with master
2023-08-31 15:50:08 -04:00
6fd119157a
Text corrections
2023-08-27 02:00:59 +02:00
67e2c80851
Check for existence of modal before including it.
2023-08-22 12:19:48 -04:00
ea581e521f
Add default value for order
2023-08-18 16:56:50 -04:00
d31f918abc
Change the api for frameimage status request to split id into eid and fid instead of having id as an array.
2023-08-15 09:15:24 -04:00
042edd25e5
Add classes to tr so they can be styled
2023-08-08 09:54:47 -04:00
5c9588c012
Adds RTSP2Web support for live view
2023-07-29 23:46:31 -05:00
03155da5b6
Use the full integer value instead of the first char of mi. Fixes failure to get status on janus viewing pages
2023-07-25 15:18:35 -04:00
cae8fda326
Remove debug
2023-07-15 10:29:38 -04:00
59ff7f3a31
Improve logged wrt insufficient permissions
2023-06-08 09:17:16 -04:00
6046398981
Add event Name to the event detail modal
2023-05-12 15:15:55 -04:00
df983039c4
Add an import modal for use in add_monitor view
2023-05-12 15:14:46 -04:00
3436999665
Populate EndTime when NULL. Deal with case insensitive LIKE searching
2023-05-12 15:13:48 -04:00
0f847f87f8
put event thumbnail in a div with fixed height to fix zoomed image going absolute
2023-04-27 13:46:41 -04:00
dd064f606a
Fix two straggling array uses of user
2023-04-24 10:16:46 -04:00
e7f44f2776
fix logic to use count on unviewableMonitorIds
2023-04-23 13:26:03 -04:00
d951173388
Add new lines to thumbnail html
2023-04-23 13:15:11 -04:00
969baa3891
Convert user from an array to a User object
2023-04-23 12:57:29 -04:00
d1543f7dd9
Fix missing )
2023-04-22 09:37:53 -04:00
4d8d4b6ee5
Update add_monitors to make it scan the network.
2023-04-21 17:52:14 -04:00
6a2d28d92f
If Monitor is deleted, don't show event
2023-04-19 18:56:19 -04:00
2447f6e0db
Fix wrong number of parameters when using text search
2023-04-13 13:27:20 -04:00
01b886ef49
Add scale to status and fix cast on elapsed
2023-04-06 15:15:36 -04:00
86768d108a
Fix values not being used in log query causing errors when level filter isused
2023-04-01 09:41:37 -04:00
44c7582003
Don't shorten analysis
2023-02-20 17:30:48 -05:00
119e4e6756
use detaintPath on modal to prevent including other files instead of real modals
2023-02-20 11:58:10 -05:00
357ce14c94
format endtime
2023-02-09 18:46:01 -05:00
0462efdef0
Don't strip tags from log Message. It removes anything involving > OR <
2023-02-07 10:54:25 -05:00
1c538a4bf0
Include Capturing, Analysing, Recording instead of Function
2022-12-14 08:28:21 -05:00
0a28a3e659
Add check for REQUEST['entity']. Add missing quotes around state word because it gets executed as code
2022-12-12 13:06:13 -05:00
b53eed852c
Merge branch 'master' of ../cloudmule
2022-12-07 12:39:58 -05:00
b7d5b53d67
Add handling of StartDateTime,EndDateTime,MonitorId as specific filters
2022-12-07 12:36:05 -05:00
df591a677e
Handle when there is no filtering in getNearEvents
2022-12-07 12:27:12 -05:00
753ba9e22b
Fix no results when showing all frames due to undefined limit
2022-12-04 10:44:03 -05:00
9fe7ba8c8c
Cleanup the state modal. Fix form post
2022-11-16 10:14:24 -05:00
d583c10fa6
Return events when limit is > the # of events returned
2022-11-03 17:48:39 -04:00
6199613c40
Merge branch 'add_event_data'
2022-10-31 18:00:32 -04:00
85e1f21ca7
Make button on Filter Debug modal be Close instead of Cancel
2022-10-31 17:59:52 -04:00
1ef87ab0b8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-10-27 17:05:24 -04:00
b8a97b0fb9
Don't report errors from mkdir, it normally exists
2022-10-27 17:01:00 -04:00
f96c90ffa7
Fix saving Server modal. Form was incomplete, action and view were duplicated. Don't need javascript just use the submit button Save.
2022-10-26 09:00:25 -04:00
bfc4b5aa67
Implement filtering by ServerId
2022-10-25 13:36:02 -04:00
4f0f2224b2
Restructure code around build where part of sql, add specific filters for level, StartDateTime and EndDateTime.
2022-10-25 12:49:08 -04:00
20ebbc3c58
Fix saving from the function modal. Put action in the post variables and change the action to save instead of function.
2022-10-14 14:10:46 -04:00
5ae47c8671
Fix form structure, use of get instead of post and duplicated action input
2022-10-14 14:09:43 -04:00
371f1adbe7
update storage modal to fix buttons not being in form. Also remove duplicate view field and make button action be save instead of Save. Fixes #3605
2022-10-07 15:56:15 -04:00
de2866f957
Check value of System:Edit permission and ZM_LOG_INJECT to disable ajax log injection.
2022-10-06 14:51:29 -04:00
96b428edb5
Fix group modal. Use post instead of get, properly populate the save submit button
2022-10-03 15:48:05 -04:00
d289eb4860
File must be escaped as well to prevent XSS
2022-09-30 09:57:35 -04:00
fe0e4fcb8f
handle lack of sysvsem support in php better. Turn errors back on, just don't display them. Proceed regardless of semaphore success but log an error.
2022-09-28 14:48:13 -04:00
63e4c81d9c
Try out just using connkey as the semaphore key instead of ftok
2022-09-22 16:22:36 -04:00
faa6b8c9e7
Add connkey and semaphore key to logging about failure to get semaphore. Add sem_release before every ajaxError call because ajaxError exits and so we never release the semaphore.
2022-09-22 11:30:59 -04:00
46de7afb0f
Add fade to the logout modal which for some reason fixes it not showing after a hide
2022-09-14 13:09:51 -04:00
37dac7d3a6
Add transform support and use Event::createVideo
2022-09-12 13:44:18 -04:00
1fe3d52c96
remove extra spacing, move dropdown option own to where they are used
2022-09-12 13:44:18 -04:00
e24432ee4d
Merge branch 'master' into reports
2022-08-30 19:40:14 +02:00
84f14a03b0
Set auto_relay as well as auth_hash. getNavBar uses it
2022-08-17 15:00:01 -04:00
a41cba5c33
Quote and spacing
2022-08-15 17:59:17 -04:00
852b67bf21
Don't call format on an empty string and only pass the integer part of it
2022-08-10 17:58:11 -04:00
e10c1e8d65
Fix deprecation warning due to implicit conversion to integer. Make it explicit.
2022-08-10 09:18:39 -04:00
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
ad764ca0bb
rough in major actions for reports
2022-08-04 09:11:24 -04:00
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
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
e38dd4649d
Convert missed strftimes to dateTimeFormatter. Fixes #3526
2022-07-13 18:47:27 -04:00
db2a22fcb9
translations
2022-07-11 13:02:33 -06:00
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
3299f5ed49
Handle php versions < 5.6.1 which don't have non-blocking semaphore support
2022-06-13 15:56:52 -04:00
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
baebdb277e
Only return error messages, not a bunch of empty arrays
2022-06-06 13:09:41 -04:00
5068cf5e62
Add a progress ticker, and delete events in chunks of 10. Fixes #3444
2022-06-06 13:09:41 -04:00
d45f6bb7f6
fix formatter->format
2022-06-03 14:25:19 -04:00
d135be17ba
Must pass time() to format()
2022-06-03 14:25:19 -04:00
2dfc8297d5
Use dateTimeFOrmatter to format the date/time on session access
2022-06-01 16:02:47 -04:00
d3b1ede73a
Use dateTimeFOrmatter to format the date/time on events
2022-06-01 15:46:18 -04:00
6325dc6d1c
Use dateTimeFOrmatter to format the date/time on frames
2022-06-01 15:43:15 -04:00
b4d5029884
Use dateTimeFOrmatter to format the date/time on logs
2022-06-01 15:42:44 -04:00
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
Isaac Connor
Simpler1
Alejandro Criado-Pérez
Jonathan Bennett
Doug Nazar
ovargasp
Nic Boet