Commit Graph

19741 Commits (9e3900bce2cd7ce34842e7ad61e2f52180f0fa11)

Author SHA1 Message Date
Isaac Connor 9e3900bce2 Fix Monitor => monitor 2022-10-07 15:06:01 -04:00
Isaac Connor 7e78dadb91 Use canEdit['System'] and value of new ZM_LOG_INJECT to disable attempting to inject javascript errors into zm logs 2022-10-07 11:10:14 -04:00
Isaac Connor ef91e20532 Check value of System:Edit permission and ZM_LOG_INJECT to disable ajax log injection. 2022-10-07 11:09:59 -04:00
Isaac Connor 7f2789c3fd Add ZM_LOG_INJECT config parameter to disable unprivileged log injection through api. 2022-10-07 11:09:02 -04:00
Pliable Pixels 5f8ca42d96 whoops fixed errant enum values I forgot to delete 2022-10-07 10:12:01 -04:00
Isaac Connor 38e45c6c3b Add permissions checking to API/Logs. Fixes unprivileged user being to add/edit/delete/view logs. 2022-10-06 16:56:24 -04:00
Isaac Connor a14ea47364 Bump version to 1.36.27 in prep for release 2022-10-06 09:25:57 -04:00
Isaac Connor c578495779 Fix missing STATE_UNKNOWN 2022-10-06 09:24:06 -04:00
Isaac Connor 031fc072fb remove jquery-3.5.1 2022-10-04 11:41:10 -04:00
Isaac Connor 6895d4f952 Update jquery-ui to 1.13.2 2022-10-04 11:40:53 -04:00
Isaac Connor 71bcbbd121 Update jquery-ui to 1.13.2 2022-10-04 11:40:27 -04:00
Isaac Connor 0db076ac55 Upgrade jquery to 3.6.1 2022-10-04 11:38:55 -04:00
Isaac Connor 358467f426 Make form on console use post 2022-10-04 11:38:43 -04:00
Isaac Connor f8102b3cf0 save buttion is a submit button now, so doesn't need an onclick. Fix code setting action on delete. 2022-10-04 11:38:31 -04:00
Isaac Connor f704b2ec47 Switch to post instead of get in the groups form because we only do actions on post now. 2022-10-04 11:38:17 -04:00
Isaac Connor 3aa4310200 Only perform actions on post. Doing them on GET allows doing actions from things like img tags which is not good. 2022-10-04 11:38:03 -04:00
Isaac Connor e4a0d758d6 Fix group modal. Use post instead of get, properly populate the save submit button 2022-10-04 11:37:50 -04:00
Isaac Connor dbcfc8cb18 File must be escaped as well to prevent XSS 2022-09-30 09:59:09 -04:00
Isaac Connor 614140764b Include monitor Id in logs, for consistency as well as utility 2022-09-29 16:18:44 -04:00
Isaac Connor 3bf1a1300e Only look for action if there is a view 2022-09-29 16:17:10 -04:00
Isaac Connor f2143dfbba Fix export not working for filter due to limit set to 0. 2022-09-29 16:15:20 -04:00
Isaac Connor d44a1ad175 Handle filter[query] not being defined 2022-09-29 16:15:11 -04:00
Pliable Pixels 121fab2f6a make OutputCodec work in API 2022-09-25 13:29:36 -04:00
Isaac Connor 0ce8373bb1 Only warn about event exceeding section_length if we are not using close_mode=TIME. Fixes #3599 2022-09-25 10:05:09 -04:00
Isaac Connor 0df8b0cc7c Put the view and mid into the get query part of the form submit. Because it's a modal, view is not populated. We are also moving the action to actionsn/watch.php so specify watch view. This all fixes not saving v4l settings. 2022-09-25 09:55:03 -04:00
Isaac Connor 81a9d28f38 Bump version to 1.36.26 2022-09-22 11:31:25 -04:00
Isaac Connor a7e45752de 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:29:26 -04:00
Isaac Connor d3c13e7e99 In failure state populate imageData array to reduce output php errors 2022-09-22 10:16:18 -04:00
Isaac Connor 6dab3a57da We change stats so it has to be let 2022-09-22 10:16:18 -04:00
Isaac Connor 1c12320052 Update frame view js to use const etc instead of var. Put back EventId and FrameId in stats being links and fix FrameId not being populated. If no stats available disable the stats button and use the title to explain why. 2022-09-22 10:16:18 -04:00
Isaac Connor 59832dc69f Add spans and titles over the title h2 parts so that on mouseover it tells you what they are 2022-09-22 10:16:18 -04:00
Isaac Connor d52d02c619 Use y instead of Y for path generation when using Deep scheme. Fixes #3583 2022-09-21 09:08:09 -04:00
Isaac Connor 76d11f2b84 commit to free up locks when there is an error doing MoveTo (like does not exist on disk). Also remove commit from CopyTo which does no transactions/locking. 2022-09-19 09:27:24 -04:00
Isaac Connor ddb6741e5f Use zm_setcookie, which will automatically set samesite on the session cookie. Maybe fixes #3517 2022-09-16 13:35:30 -04:00
VikingGer b3bad6a653 Update control_functions.php
The Reboot button was not shown without activating another one. Probably not intended  so  I did this micro adjustment
2022-09-16 11:52:14 -04:00
Isaac Connor a04510d392 Add libio-interface-perl to dependencies. Fixes #3577 2022-09-16 09:44:56 -04:00
Isaac Connor 16c785f708 Fix contents of values on LOCALE_DEFAULT. 2022-09-15 17:06:25 +00:00
Isaac Connor 98b7965c9f Only try to set TIMEZONE when loading dateTimeFormatter if it is set. Handle the exception when any of TIMEZONE or LOCALE are invalid. 2022-09-15 17:06:02 +00:00
Isaac Connor be50ea893d fix export from event view. There is a global exportEvent Function, so rename ours 2022-09-15 16:43:22 +00:00
Isaac Connor c395a61719 Specify that only main page content tables should have the first colunm be min-width: 300px. This was affecting the logout dialog table content. 2022-09-15 16:38:39 +00:00
Isaac Connor aa393c7841 Spacing, ignore auth_relay, clean up clickLogout a bit 2022-09-14 17:02:05 +00:00
Isaac Connor c4baddbf2a Add fade to the logout modal which for some reason fixes it not showing after a hide 2022-09-14 17:00:59 +00:00
Isaac Connor 726f78e8d1 Only init the boostrap events table if we can view Events. 2022-09-08 15:12:21 -04:00
Isaac Connor d2176c83af Restore status value to pre 1.36.16 value by substracting 1. So Unknown == -1, 0 = IDLE etc. Fixes #3584 2022-09-08 13:02:02 -04:00
Isaac Connor 2d63dd72e4 Fix typo on dateTimeFormater=>dateTimeFormatter. Fixes #3580. Make conversion to integer on Length explicit to remove warning on php8. 2022-08-31 10:08:51 -04:00
Isaac Connor 700ed2d9f5 cleanup migrateHash. Use better parameter names to avoid conflict with global . 2022-08-29 16:02:04 -04:00
Isaac Connor 1f8fc96226 Fix typo Pasword => Password 2022-08-29 15:49:48 -04:00
Isaac Connor 8dcc1b9ac2 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2022-08-29 14:11:03 -04:00
Isaac Connor f45ea8941b When there are less than 3 storage areas, just list them in the header instead of making it a dropdown 2022-08-29 14:10:47 -04:00
Isaac Connor 88d669fdf4 Remove unused variable 2022-08-29 12:22:32 -04:00