ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,176 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

1724 Commits

Author SHA1 Message Date
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
Isaac Connor 1b50314f9e Add DisableAlarms function 2021-04-12 15:59:31 -04:00
Isaac Connor 7e579fd851 Implement Snapshots user permission 2021-04-12 15:59:31 -04:00
Isaac Connor 3dcb71933e Add event summary fields to Monitor Object 2021-04-09 19:46:25 -04:00
Isaac Connor 2e22cd5c3b Mark snapshot events as Archived 2021-04-08 15:20:44 -04:00
Isaac Connor 7e3d6f867e Set the default crf so that encoding works 2021-04-01 11:53:57 -04:00
Isaac Connor 6c4e423a8b Spacing 2021-03-30 18:20:31 -04:00
Isaac Connor cbd8b22efb Fix setting value when not empty 2021-03-30 14:28:17 -04:00
Isaac Connor 8582c1a652 Once again fix saving string value to '' so that we can empty LabelFormat 2021-03-30 13:31:26 -04:00
Isaac Connor beb7a75d5a Implement canView for Monitors 2021-03-30 11:52:04 -04:00
Isaac Connor aeb98ec790 Implement canView for Groups. Implement Monitors() and Children() functions. Use canView when populating Group dropdown 2021-03-30 11:51:52 -04:00
Isaac Connor 8e1b2ccbc7 Add MaxImageBufferCount 2021-03-26 17:02:17 -04:00
Isaac Connor be0841832e enable reporting saving errors back to web ui. 2021-03-22 12:59:41 -04:00
Isaac Connor 3fdd2bff7f Have to use === because apparently null == NOW() according to php. 2021-03-22 12:59:18 -04:00
Isaac Connor fa08240a4d Fix set() and __call to use the default value when set value is ''. Fixes issues in monitor view when changing type 2021-03-22 12:06:25 -04:00
Isaac Connor c347261e19 Change default of ImageBufferCount to 3 2021-03-22 12:05:36 -04:00
Isaac Connor d0adaeaabe rework user saving action to use User object. Implement a duplicate username check. Deprecate php < 5.3 due to lack of bcrypt password hashing functions. Hence deprecate the use of mysql PASSWORD() 2021-03-21 09:18:12 -04:00
Isaac Connor 68f9c7c9e6 introduce a _last_error member to the object for reporting errors saving. 2021-03-20 19:27:53 -04:00
Isaac Connor 4cb38a119e Fix saving Filters and other objects. Apparently comparing 0 to NOW() doesn't work. 2021-03-18 14:09:15 -04:00
Isaac Connor 28700fd56b Implement saving DecodingEnabled from function view 2021-03-16 12:09:14 -04:00
Isaac Connor 5eae1c0a9f spacing, add code comment 2021-03-13 12:10:55 -05:00
Isaac Connor b50916e02a Allow unknown columns in filters. Allow specifying the table name in FilterTerm. 2021-03-12 10:52:10 -05:00
Isaac Connor 11c2318a05 Rough in the ui for Snapshots 2021-03-12 09:28:05 -05:00