ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
23,706 Commits
33 Branches
94 Tags
170 MiB
Commit Graph

628 Commits (support_mariadb)

Author SHA1 Message Date
Isaac Connor 6046398981 Add event Name to the event detail modal 2023-05-12 15:15:55 -04:00
Isaac Connor df983039c4 Add an import modal for use in add_monitor view 2023-05-12 15:14:46 -04:00
Isaac Connor 3436999665 Populate EndTime when NULL. Deal with case insensitive LIKE searching 2023-05-12 15:13:48 -04:00
Isaac Connor 0f847f87f8 put event thumbnail in a div with fixed height to fix zoomed image going absolute 2023-04-27 13:46:41 -04:00
Isaac Connor dd064f606a Fix two straggling array uses of user 2023-04-24 10:16:46 -04:00
Isaac Connor e7f44f2776 fix logic to use count on unviewableMonitorIds 2023-04-23 13:26:03 -04:00
Isaac Connor d951173388 Add new lines to thumbnail html 2023-04-23 13:15:11 -04:00
Isaac Connor 969baa3891 Convert user from an array to a User object 2023-04-23 12:57:29 -04:00
Isaac Connor d1543f7dd9 Fix missing ) 2023-04-22 09:37:53 -04:00
Isaac Connor 4d8d4b6ee5 Update add_monitors to make it scan the network. 2023-04-21 17:52:14 -04:00
Isaac Connor 6a2d28d92f If Monitor is deleted, don't show event 2023-04-19 18:56:19 -04:00
Isaac Connor 2447f6e0db Fix wrong number of parameters when using text search 2023-04-13 13:27:20 -04:00
Isaac Connor 01b886ef49 Add scale to status and fix cast on elapsed 2023-04-06 15:15:36 -04:00
Isaac Connor 86768d108a Fix values not being used in log query causing errors when level filter isused 2023-04-01 09:41:37 -04:00
Isaac Connor 44c7582003 Don't shorten analysis 2023-02-20 17:30:48 -05:00
Isaac Connor 119e4e6756 use detaintPath on modal to prevent including other files instead of real modals 2023-02-20 11:58:10 -05:00
Isaac Connor 357ce14c94 format endtime 2023-02-09 18:46:01 -05:00
Isaac Connor 0462efdef0 Don't strip tags from log Message. It removes anything involving > OR < 2023-02-07 10:54:25 -05:00
Isaac Connor 1c538a4bf0 Include Capturing, Analysing, Recording instead of Function 2022-12-14 08:28:21 -05:00
Isaac Connor 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
Isaac Connor b53eed852c Merge branch 'master' of ../cloudmule 2022-12-07 12:39:58 -05:00
Isaac Connor b7d5b53d67 Add handling of StartDateTime,EndDateTime,MonitorId as specific filters 2022-12-07 12:36:05 -05:00
Isaac Connor df591a677e Handle when there is no filtering in getNearEvents 2022-12-07 12:27:12 -05:00
Isaac Connor 753ba9e22b Fix no results when showing all frames due to undefined limit 2022-12-04 10:44:03 -05:00
Isaac Connor 9fe7ba8c8c Cleanup the state modal. Fix form post 2022-11-16 10:14:24 -05:00
Isaac Connor d583c10fa6 Return events when limit is > the # of events returned 2022-11-03 17:48:39 -04:00
Isaac Connor 6199613c40 Merge branch 'add_event_data' 2022-10-31 18:00:32 -04:00
Isaac Connor 85e1f21ca7 Make button on Filter Debug modal be Close instead of Cancel 2022-10-31 17:59:52 -04:00
Isaac Connor 1ef87ab0b8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-10-27 17:05:24 -04:00
Isaac Connor b8a97b0fb9 Don't report errors from mkdir, it normally exists 2022-10-27 17:01:00 -04:00
Isaac Connor 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
Isaac Connor bfc4b5aa67 Implement filtering by ServerId 2022-10-25 13:36:02 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 5ae47c8671 Fix form structure, use of get instead of post and duplicated action input 2022-10-14 14:09:43 -04:00
Isaac Connor 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
Isaac Connor de2866f957 Check value of System:Edit permission and ZM_LOG_INJECT to disable ajax log injection. 2022-10-06 14:51:29 -04:00
Isaac Connor 96b428edb5 Fix group modal. Use post instead of get, properly populate the save submit button 2022-10-03 15:48:05 -04:00
Isaac Connor d289eb4860 File must be escaped as well to prevent XSS 2022-09-30 09:57:35 -04:00
Isaac Connor 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
Isaac Connor 63e4c81d9c Try out just using connkey as the semaphore key instead of ftok 2022-09-22 16:22:36 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 37dac7d3a6 Add transform support and use Event::createVideo 2022-09-12 13:44:18 -04:00
Isaac Connor 1fe3d52c96 remove extra spacing, move dropdown option own to where they are used 2022-09-12 13:44:18 -04:00
Isaac Connor e24432ee4d Merge branch 'master' into reports 2022-08-30 19:40:14 +02:00
Isaac Connor 84f14a03b0 Set auto_relay as well as auth_hash. getNavBar uses it 2022-08-17 15:00:01 -04:00
Isaac Connor a41cba5c33 Quote and spacing 2022-08-15 17:59:17 -04:00
Isaac Connor 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
Isaac Connor e10c1e8d65 Fix deprecation warning due to implicit conversion to integer. Make it explicit. 2022-08-10 09:18:39 -04:00
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