Commit Graph

1289 Commits

Author SHA1 Message Date
Isaac Connor 02e9096d2b When saving an existing Filter and we are unchecking Background, need to stop the filter before saving. Remove dead code 2020-01-13 17:32:57 -05:00
Isaac Connor e4ba1fd432 fix restarting zmcontrol on remote servers by passing object=filter as well 2020-01-13 17:16:15 -05:00
Isaac Connor d7dc7cdc47 Add ServerId to database log entries in php 2020-01-13 16:18:01 -05:00
Isaac Connor 9036b6db77 fix typo 2020-01-13 16:17:39 -05:00
Isaac Connor f3a9e608db Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-13 16:11:19 -05:00
Isaac Connor b11815cfa9 Introduce Storage->EventCount to get the # of events per storage without actually loading all events. 2020-01-13 12:53:50 -05:00
Isaac Connor 6cd76ee2ff Clear cache after loading Events so as to free ram. 2020-01-13 12:53:05 -05:00
Isaac Connor f7e2359818 Implement a clear_cache function so that we can free up cached objects 2020-01-13 10:57:56 -05:00
Isaac Connor 398688550b fixtypo 2020-01-10 20:15:52 -05:00
Isaac Connor 0c478c7962 fix Monitor->Server 2020-01-10 20:13:09 -05:00
Isaac Connor 5ee0158735 Set defaults for vars == '' 2020-01-10 16:42:41 -05:00
Isaac Connor f61f6eaf7d remove line cutnpasted erroneously 2020-01-10 12:45:47 -05:00
Isaac Connor d433590f74 use find_one in stead of new to use Cached Server 2020-01-10 12:45:30 -05:00
Isaac Connor ef4ecd40fb Set defaults before saving Objects 2020-01-10 12:44:59 -05:00
Isaac Connor 0571909d05 add remote_IP to log entries on php side 2020-01-07 17:08:29 -05:00
Isaac Connor c3641df531 spaces 2020-01-05 17:30:06 -05:00
Isaac Connor e951b0af1c add code to set default value for checkboxes 2020-01-03 16:35:04 -05:00
Isaac Connor d42e9beddc Add warnings when the type of movement is not selected 2020-01-02 17:03:52 -05:00
Isaac Connor e9815bf9c7 add ZM Namespace to Error calls 2020-01-02 16:54:50 -05:00
Isaac Connor 714d304528 Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation 2019-12-31 19:10:29 -05:00
Isaac Connor 77cfb7c190 fix spacing 2019-12-31 12:42:49 -05:00
Andrew Bauer 2301103da5 use small, non-zero values, for image buffer & pre & post buffers 2019-12-28 09:49:42 -06:00
Isaac Connor 9e43e06a55 Add empty array value for terms when there isn't any to get rid of warning when loading all events 2019-12-26 11:22:42 -05:00
Isaac Connor 958a6b8218 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-12-18 19:06:19 -05:00
Isaac Connor d21fa5c48a Do not set defaults in Object->set(). This allows us to set an empty timestamp. 2019-12-18 19:03:37 -05:00
Isaac Connor 34354f5871 Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab. 2019-12-18 12:13:00 -05:00
Isaac Connor 2a4d06f93b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-12-15 10:35:56 -05:00
Isaac Connor 4d9d4ba957 Do not allow deletion of archived events. 2019-12-15 10:35:43 -05:00
Isaac Connor 689956bba7 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-12-13 17:49:00 -05:00
Isaac Connor b24e912050 Use ZM\Server::find_one for loading server so that it gets cached. Use a single regexp to determine config line validity instead of two for efficiency 2019-12-13 17:46:56 -05:00
Isaac Connor d2a23e4822 add possing port to Monitor->UrlToIndex 2019-12-13 11:50:11 -05:00
Isaac Connor bedc61a347 handle dbFetchNext on null result more gracefully 2019-12-13 11:49:55 -05:00
Isaac Connor ea89ebf150 more mysql8 fixes 2019-12-08 21:33:29 -05:00
Isaac Connor 3bd0525e64 escape column names for mysql8 2019-12-08 14:27:07 -05:00
Isaac Connor 0de6396a5b Test for null in user before testing for access in CanEdit et all 2019-12-07 12:39:28 -05:00
Isaac Connor 4632bbd124 Apply relevant changes to deal with php7,4 deprecations 2019-12-07 11:45:32 -05:00
Isaac Connor cc6d40d67e Missing -> 2019-12-07 10:38:51 -05:00
Isaac Connor df9f6103e4 fix syntax error 2019-12-04 09:00:20 -05:00
Isaac Connor 78912584e1 re-arrange code to hopefully get rid of syntax error reported by some people 2019-12-04 07:10:33 -05:00
Isaac Connor 576dd23907 test for existence of filter in query 2019-12-02 12:30:15 -05:00
Isaac Connor 355fceccb4 test for existence of default 2019-12-02 12:30:03 -05:00
Isaac Connor eedb31730e fix saving Monitor values that don't get passed when empty, like Enabled 2019-11-29 14:49:43 -05:00
Isaac Connor cab1056328 improve debugging in recursive_array_diff 2019-11-29 14:49:10 -05:00
Isaac Connor d6a414a1a4
Merge pull request #2767 from connortechnology/fix_2692
Fix 2692
2019-11-29 14:24:00 -05:00
Isaac Connor 29572abef2 Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:56:02 -05:00
Isaac Connor a9d8e73f68 Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:53:46 -05:00
Pliable Pixels 7b99c89541
its not necessary the token is a refresh. Can also be empty 2019-11-26 20:57:25 -05:00
Isaac Connor 54a15573ad Make 32bit the default for COlours 2019-11-26 15:06:24 -05:00
Isaac Connor 5ebf929598 Add Event counts, event disk usage to storage tab of options. Disable checkbox selection when there are events stored on the storage area. 2019-11-26 14:36:39 -05:00
Isaac Connor 1dc83700c0 Do a better job of handling the non-server, non-multiport case. Put the code in Url so that it works for other functions that call Url() 2019-11-21 13:32:27 -05:00