ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
19,350 Commits
32 Branches
93 Tags
162 MiB
Commit Graph

1746 Commits (7a0af0cac1c5f3a0c90d3d9ae0c56aa2fd369337)

Author SHA1 Message Date
Isaac Connor 2969a00dcb Remove loading=lazy as it causes problems with ajax Querying 2022-04-27 17:39:33 -04:00
Isaac Connor 6ff0ce4793 Add STATE_UNKOWN == -1 2022-04-27 17:38:26 -04:00
Isaac Connor 3088a7a181 Fix test for chrome version 7 by not including periods. We only care about the major and php is confused. 2022-04-04 17:00:41 -04:00
Isaac Connor a56b5607c3 Remove extra { breaking ptz 2022-04-03 17:16:47 -04:00
Ben Dailey 1ad191e8d6 Most programmatic images are lazy. 2022-03-29 18:45:13 -04:00
Isaac Connor f4103e6e6e Use net zm_setcookie 2022-03-29 18:34:02 -04:00
Isaac Connor 7532d4aaaa Use net zm_setcookie 2022-03-29 18:12:32 -04:00
Isaac Connor 8fa924f3ba Add handling of NOT IN and =\[\] and \!\[\] 2022-03-29 18:11:52 -04:00
Isaac Connor ee6ae94dd8 Add debugging, but commented out 2022-03-29 18:11:12 -04:00
Isaac Connor e12dfb1025 better debugging when the row has no Id 2022-03-29 18:10:59 -04:00
Isaac Connor 86e95ff0ce spacing 2022-03-29 18:10:29 -04:00
Isaac Connor 2d07fda6fc Implement zm_setcookie to simplify setting cookies, set samesite, deal with older php etc. Use it. 2022-03-29 18:09:12 -04:00
Isaac Connor 789b729fd6 Add numCoords, Coords, Area, AlarmRGB to Zone object. Also add Points(), AreaCoords, svg_polygon utility functions to it. 2022-03-29 18:03:42 -04:00
Isaac Connor 5856aad74b Implement Server function which figures out which Server likely has the video. Use it to remove duplicate logic 2022-03-29 18:01:50 -04:00
Isaac Connor 15156cd62e remove duplicated factor code, define speed so that it doesn't generate an error if not HasSpeed in Control. 2022-03-29 17:20:06 -04:00
Isaac Connor 71fe3741fb Add filtering to Username to prevent XSS 2022-03-23 14:54:10 -04:00
Isaac Connor 540748c923 Fix auth'd user information being saved to session before switching session id's leaving bogus authenticated user in previous session. 2022-03-23 14:51:39 -04:00
Isaac Connor 2396e98fb9 detaint language file. 2022-02-08 14:17:30 -05:00
Isaac Connor 6268652520 Test for valid language file when saving user. 2022-02-08 14:16:50 -05:00
Isaac Connor 5b9ccc6889 Implement a check on change of language. Make sure that the specified language file exists. Reports errors to UI 2022-02-08 13:37:39 -05:00
Isaac Connor df16099463 Default limit to 0 which means no limit 2022-02-02 11:02:34 -05:00
Isaac Connor 01030e9850 Preface Debug with ZM 2022-01-13 22:15:29 -05:00
Isaac Connor 756aa56710 Detect group hierarchy loops and break them. 2021-12-03 13:27:05 -05:00
Isaac Connor d5f9eb11c6 WHen saving v4l settings redirect back to watch instead of console. 2021-11-16 15:00:04 -05:00
Isaac Connor 1b3e0eda13 dbError is supposed to take the sql that caused the error. So pass something to satisfy php 2021-11-16 15:00:04 -05:00
Isaac Connor 90e3345440 implement Event::canEdit 2021-11-16 15:00:04 -05:00
Isaac Connor 29fe7f76a2 implement UrlToZMS in Monitor 2021-11-16 15:00:04 -05:00
Isaac Connor 55e739d4ea Whitespace 2021-11-09 10:51:16 -05:00
Isaac Connor 33a067c085 fix validInt to take negative integers. Introduce validCardinal to handle positive integers 2021-10-28 13:11:44 -04:00
Isaac Connor 65418abf98 Add sort_asc, sort_field and limit to the filter QueryString 2021-10-28 13:10:37 -04:00
Isaac Connor 1a27ac9ab3 Handle when SERVER['HTTP_HOST'] is not set 2021-10-06 10:36:35 -04:00
Isaac Connor a42786afd1 Add missing Importance member 2021-09-08 13:59:21 -04:00
Isaac Connor 4612f4ae75 add getMonitorStatuses function to return string values for status numbers 2021-09-04 09:57:56 -04:00
r01k 2d965e7d50 Fixed bug that caused 'Call to undefined function Error()' in control_functions.php. Exception was being raised due to logger.php not being included in control_functions.php. 2021-09-03 22:28:37 -04:00
Isaac Connor 30aad6ab9a Spacing and quotes 2021-09-03 22:25:43 -04:00
Isaac Connor bed79039f3 implement Event->canView 2021-09-03 22:25:14 -04:00
Isaac Connor a1fe4e2638 Change monitor->canView semantics so that a specified monitorId trumps the Monitors:None setting. This is so that the console can be hidden, but the group dropdown still gets populated. 2021-09-03 22:22:47 -04:00
Isaac Connor 809183716a clean up code logic so that if we are executing an unchanged filter we don't do the unecessary save. 2021-09-03 22:21:40 -04:00
Isaac Connor 3ca920f1a9 spacing. Add defaults for AutoMoveTo and AutoCopyTo so that we don't get false changes. redirect is a global, so make it so. Re-null the Id of the filter object after temp execute so that we don't reference a no longer existing filter. 2021-09-03 22:21:21 -04:00
Isaac Connor b306f92116 event may have changed (have endtime set) between load and saving Archived bit. Lock the event which now also reloads it. 2021-09-03 22:19:57 -04:00
Isaac Connor ae1e3d88b2 When locking, use the results to reload the object fields fresh as they may have changed since the object was loaded 2021-09-03 22:19:39 -04:00
Isaac Connor 2c7af3886c Actually delete the snapshot record, not just the event connection 2021-09-03 22:18:38 -04:00
Isaac Connor d59118fc47 Add redirect so that Yes I'd like to donate now goes to the zoneminder /donate website. This used to happen in javascript but got removed when it was turned into a modal. 2021-05-25 11:33:12 -04:00
Isaac Connor 0b4c35c58e Merge pull request #3241 from connortechnology/fix_3239 
Fix 3239
 2021-05-19 20:39:42 -04:00
Isaac Connor 44e8107cac Fix AlarmedZoneId filter term not working because I wrote AlarmZoneId instead 2021-05-02 13:38:06 -04:00
Isaac Connor 7901950c48 spacing 2021-04-26 09:40:08 -04:00
Isaac Connor 9254c99ab8 Add ModectDuringPTZ 2021-04-23 14:52:29 -04:00
Isaac Connor 37e0f010e3 Require session to be instantiated 2021-04-23 09:08:48 -04:00
Isaac Connor 95249d5eb4 Merge branch 'release-1.34' 2021-04-12 16:32:57 -04:00
Isaac Connor 3335976cba implement remote api Trigger support. 2021-04-12 15:59:31 -04:00