Commit Graph

19782 Commits (5b29e018d0166c9fc46fd729b18a80b1c2016eff)

Author SHA1 Message Date
Isaac Connor 5b29e018d0 IN () being false could still result in a true result of used in an OR, so instead of just returning, use an always false sql equivalent 2022-10-18 15:45:44 -04:00
Isaac Connor 0e88c58e0c return empty array when passing empty as SQLvalue 2022-10-18 15:45:34 -04:00
Isaac Connor feec790d45 Turn off deprecation notices so that we work with php8.2 2022-10-17 17:43:09 -04:00
Isaac Connor c296b3d774 Bump version to 1.36.31 2022-10-17 17:39:19 -04:00
Isaac Connor 2fda0af85a Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2022-10-17 17:38:39 -04:00
Isaac Connor 38cbaff409 Use REQUEST instead of SESSION to store the post login redirect because we clear the session on login. Fixes #3517 2022-10-17 16:40:34 -04:00
Isaac Connor dda4b53347 quotes and spacing 2022-10-17 15:14:10 -04:00
Isaac Connor 0c8e419d42 Add setting remoteAddr in session after regenerating 2022-10-17 15:12:07 -04:00
Isaac Connor 5498c60391 Remove debug 2022-10-17 12:39:50 -04:00
Isaac Connor ef119e3ed4 Minor cleanup, remove dead code 2022-10-17 12:35:00 -04:00
Isaac Connor 96a2e6f6fb Put view in the form get part for visibility 2022-10-17 12:31:26 -04:00
Isaac Connor 4a98138ec4 Revert "add remoteaddr to session when regenerating"
This reverts commit d97f94573c.
2022-10-17 12:28:03 -04:00
Isaac Connor d97f94573c add remoteaddr to session when regenerating 2022-10-17 12:23:47 -04:00
Isaac Connor ca58b8fd60 Add debug, add validateId function to session handler. Change it to be a a subclass of SessionHandlerInterface so that we don't have to provide createId. Fixes session breakage in php8.2 2022-10-17 12:17:22 -04:00
Isaac Connor c21eb94fad remoteAddr is set when session is opened. So no need to do it in auth. session_clear closes the session so no need to close it first 2022-10-17 12:14:16 -04:00
Isaac Connor cc9a05aba0 Bump version to 1.36.30 for releaes 2022-10-14 11:30:01 -04:00
Isaac Connor d3f7c006f3
Merge pull request #3609 from connortechnology/fix_non_post_auth
Move relevant code out of includes/actions/auth.php into includs/auth…
2022-10-14 11:29:04 -04:00
Isaac Connor 82da07a589 Don't panic if no font file found. Perhaps we can continue with diminished function 2022-10-13 17:34:48 -04:00
Isaac Connor 8e29c5cd8b Move relevant code out of includes/actions/auth.php into includs/auth.php. Note that Google recaptcha is now incompatible with api. Fixes inability to login using GET method. 2022-10-13 16:31:23 -04:00
Isaac Connor e29c35b805 Turn failure to send into a debug. When running under fpm etc we may not get SIGPIPE. 2022-10-13 10:50:40 -04:00
Isaac Connor 1264908aa3 when a config value is overridden via *.conf files, put up a warning/explanation. 2022-10-13 09:57:08 -04:00
Isaac Connor 1b311b4102 left align option value column 2022-10-13 09:56:30 -04:00
Isaac Connor c7eac3383a Fix form structure, use of get instead of post and duplicated action input 2022-10-13 09:08:41 -04:00
Isaac Connor 0071d3da40 Fix saving from the function modal. Put action in the post variables and change the action to save instead of function. 2022-10-12 21:23:58 -04:00
Isaac Connor 36ed68590d Test for definition of ZM_LOG_INJECT. We don't include the config when not logged in. So it won't be defined 2022-10-12 19:36:57 -04:00
Isaac Connor 600894682e Test for matches[operator]. Fixes #3607 2022-10-11 15:50:41 -04:00
Isaac Connor d6d3ce66c7 Move LIBAVCODEC_VERSION_CHECK so that it is defined when the include files are under ffmpeg 2022-10-11 12:46:34 -04:00
megasaturnv c78edb387a Case insensitive login - Fix spacing ZoneMinder/zoneminder#3516 2022-10-11 10:56:10 -04:00
megasaturnv 475869cf36 Modified description for ZM_CASE_INSENSITIVE_USERNAMES 2022-10-11 10:51:58 -04:00
megasaturnv f9ecb5b1e2 Moved case-insensitive username checks to SQL 2022-10-11 10:51:58 -04:00
megasaturnv ac5be4ed35 Fix typo 2022-10-11 10:51:58 -04:00
megasaturnv 97a731f8b7 Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516 2022-10-11 10:51:58 -04:00
megasaturnv c9c692bac4 Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516 2022-10-11 10:51:58 -04:00
Isaac Connor 2a5632ed66 Bump version to 1.36.29 2022-10-11 10:25:39 -04:00
Isaac Connor 1569816f5e Check for definition of CAMBOZOLA defines. The purpose is just to easy running the 1.36 UI against a 1.37 database. 2022-10-11 10:23:10 -04:00
Isaac Connor 7c3daf9723 Fix eslint 2022-10-11 10:09:08 -04:00
Isaac Connor 4e5278882d use ajax() instead of getJSON so that we can specify no timeout. This prevents log queries from stacking up overloading the db 2022-10-11 10:04:55 -04:00
Isaac Connor 00f2b325b0 Just use the master version of ajax/log.php 2022-10-07 23:53:50 -04:00
Isaac Connor d6be08f4c9 Bump version for release to 1.36.28 2022-10-07 15:59:21 -04:00
Isaac Connor 25d85bddf0 Don't attach onclick to save button on stoage modal as it is a submit button 2022-10-07 15:57:34 -04:00
Isaac Connor 3f8352c256 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:48:40 -04:00
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