Commit Graph

139 Commits

Author SHA1 Message Date
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 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 f5bf474ba6 filter bad characters out of Monitor Name 2020-04-23 14:59:21 -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
Isaac Connor a28f17653f Add DecoderHWAccel fields to Monitor 2019-06-25 15:34:45 -04:00
Isaac Connor 6ed0074077
End continuous events on alarm (#2644)
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it

* Spacing, google code style and tabs to spaces

* add update script to add MinSectionLength

* Add min_section_length to enforce a minimum event length when closing continuous events on alarm
2019-06-24 11:29:00 -04:00
Isaac Connor 08cc4e0383 add null value to set() function 2019-06-05 10:22:20 -04:00
Isaac Connor 8a90176a2c Add CanReboot to Controls 2019-04-02 09:25:50 -04:00
Isaac Connor f434042c52 fix spacing 2019-03-21 14:14:15 -04:00
Isaac Connor 6c8eac1ac8 Merge branch 'storageareas' into h265 2019-03-06 11:10:01 -05:00
Isaac Connor 73ae3f49ed Merge branch 'master' into storageareas 2019-03-05 11:35:55 -05:00
Isaac Connor 49a1954f96 fix typo and remove deprecated DefaultView 2019-03-05 11:01:39 -05:00
Isaac Connor 8b29c5f54c Fix typo: Ineterval to Interval 2019-03-05 10:58:23 -05:00
Isaac Connor f446e73ff7 Typo: AnalysisUpdateDelete to AnalysisUpdateDelay 2019-03-05 10:55:27 -05:00
Isaac Connor 190142b24c Merge branch 'master' into storageareas 2019-03-01 17:47:07 -05:00
Isaac Connor 7703661cb1 Don't use streaming port in UrlToIndex because xmlHttpRequest won't send cookies to a different port 2019-03-01 17:25:17 -05:00
Isaac Connor fd310c0f0a Merge branch 'master' into storageareas 2019-02-22 11:33:47 -05:00
Isaac Connor 8dd8888975
Php namespace (#2537)
* experiment with namespaces on the Server class

* experiment with namespaces on the Server class

* Implement the ZM namespace on objects

* Implement the ZM namespace on objects

* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
Isaac Connor 555cb4780d Merge branch 'master' into storageareas 2019-02-10 12:37:45 -05:00