Commit Graph

154 Commits

Author SHA1 Message Date
Isaac Connor 3e3af0bca5 Fix zmcontrol.pl command line to not use = to match with usage elsewhere 2020-09-21 11:24:17 -04:00
Isaac Connor 42dc4e46b1 add canEdit method to Monitor object 2020-09-17 20:56:04 -04:00
Isaac Connor 6f5acece66 FIx Record Entry 2020-09-03 18:20:51 -04:00
Isaac Connor fb9129a4d3 Add missing Mocord option 2020-09-03 10:40:10 -04:00
Isaac Connor c0b54ee790 introduce connKey method. Use it to generate a connKey if one hasn't been assigned yet. 2020-09-02 13:56:55 -04:00
Isaac Connor 762bea0761 Bulk load monitor/Group relationships. Instead of using DESCRIBE Monitors Function, use a new function getMonitorFUnctionTypes to get this data for dropdown purposeses. Reduces db hits a lot. 2020-08-31 18:30:05 -04:00
Isaac Connor 11f165a99f remove width and height from zms url. zms doesn't support them and having them in the url is confusing 2020-08-27 10:29:50 -04:00
Isaac Connor 3c1651d98f in getStreamSrc if scale isn't set figure it out from width and height if passed 2020-08-24 14:35:59 -04:00
Isaac Connor 63da7f0074 Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent. 2020-08-10 14:02:25 -04:00
Isaac Connor d716d1d686 Merge branch 'release-1.34' 2020-07-20 16:25:41 -04:00
Isaac Connor 4e2633d22b Update code to make calls to api on remote servers 2020-07-20 16:25:29 -04:00
Isaac Connor cb0e54d3be consider Monitor->Controllable as well in stopping zmtrack. Don't complain about ControlCommand being told to start/stop 2020-07-20 10:23:26 -04:00
Isaac Connor dcd67a1acf Remove args with non-sensical values from cgi params as a micro-opt 2020-07-13 14:50:21 -04:00
Isaac Connor 69e5feb28b Add ONVIF* to Monitor object 2020-05-12 15:47:00 -04:00
Isaac Connor 28a3691b9c Merge branch 'release-1.34' 2020-05-01 19:46:38 -04:00
Isaac Connor 9dbeaa2c7b Add default for Orientation. Fixes saving WebSite type monitors 2020-05-01 15:32:26 -04:00
Isaac Connor 82188c266e Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol. 2020-05-01 13:23:39 -04:00
Isaac Connor cb44f2c5de Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol. 2020-04-29 16:30:59 -04:00
Isaac Connor f5bf474ba6 filter bad characters out of Monitor Name 2020-04-23 14:59:21 -04:00
Isaac Connor 81ed022d5a Add a filter_regexp to Monitor Name 2020-04-10 12:16:32 -04:00
Isaac Connor eec634c1b0 Add Source() support for VNC type 2020-03-30 10:10:06 -04:00
Isaac Connor af36cc3e52 Fix starting and stopping zmcontrol processes across servers. 2020-03-26 13:57:00 -04:00
Isaac Connor 8fcd5b37ed API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials 2020-02-25 17:15:59 -05:00
Isaac Connor 7787ba1040 Fix adding auth string screwing up url to remote api in zmaControl and zmcControl 2020-02-25 17:15:45 -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 d433590f74 use find_one in stead of new to use Cached Server 2020-01-10 12:45:30 -05:00
Isaac Connor c3641df531 spaces 2020-01-05 17:30:06 -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 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 689956bba7 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-12-13 17:49:00 -05:00
Isaac Connor d2a23e4822 add possing port to Monitor->UrlToIndex 2019-12-13 11:50:11 -05:00
Isaac Connor 4632bbd124 Apply relevant changes to deal with php7,4 deprecations 2019-12-07 11:45:32 -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 54a15573ad Make 32bit the default for COlours 2019-11-26 15:06:24 -05:00
Isaac Connor 9d8a230252 Prevent deletion of entire events directory when monitor has empty name 2019-11-02 10:12:43 -04:00
Isaac Connor f2300f2e8c Add isPortrait and isLandscape functions. Rename Width and Height to ViewWidth and ViewHeight to return the rotated dimensions suitable for viewing 2019-10-29 17:39:12 -04:00
Isaac Connor ebebcad10d Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-10-16 10:13:31 -04:00
Isaac Connor d145adf9c6 set default for V4LCapturePerFrame to 1 instead of null. 2019-10-16 10:07:50 -04:00
Isaac Connor 70396c5897 Don't warn about the spaces in the command 2019-10-09 13:10:43 -04:00
Isaac Connor 4126554092 Move sendControlCommand out of includes/control_functions.php into Monitor.php. Make it smarted about talking to zmcontrol.pl. Fix sending the quit command 2019-10-08 18:07:33 -04:00
Isaac Connor 475432449f Add default values for Status record 2019-09-25 10:13:56 -04:00
Isaac Connor d16d77d6b3 quotes and spacing 2019-09-23 12:39:24 -04:00
Isaac Connor 23b3ae5783 Remove debug 2019-09-22 21:06:54 -04:00
Isaac Connor 6d16363f07 Restore monitor defaults 2019-09-21 10:40:24 -04:00
Isaac Connor b41e998a3a Remove Control stuff from Monitor 2019-09-19 14:55:27 -04:00
Isaac Connor 056449590a Update Monitor object, using Object methods for saving monitors 2019-09-08 12:26:11 -04:00
Isaac Connor b84e3499f4 Implement code to auto-load monitor status info if not already loaded. Check for Connected instead of Capturing in watch to display warning message 2019-07-07 17:25:49 -04:00