Commit Graph

271 Commits

Author SHA1 Message Date
Isaac Connor 7b93a445b8 Finish updating the linked Monitors dropdown 2019-10-02 15:42:56 -04:00
Isaac Connor b4d5d92d86 Add some non standard resolutions available on some vivotek cameras 2019-09-30 15:06:32 -04:00
Isaac Connor 9a94ce6e41 remove debug 2019-09-23 10:22:25 -04:00
Isaac Connor b9b52c964e Upgrade monitor saving and viewing 2019-09-19 14:56:16 -04:00
Isaac Connor d5ee73a9ee use CaptureResolution instead of CaptureDimensions because it is already in language 2019-09-19 10:50:20 -04:00
Isaac Connor 1bd70319a9 Add a dimensions dropdown to ease entering monitor dimensions 2019-09-19 10:48:25 -04:00
Isaac Connor 91ef4f5932 x264 encode works on arm now, so let people choose it 2019-08-28 08:51:42 -04:00
Isaac Connor 305a954ee2 Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2019-06-25 22:20:19 -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 4879249d77 V4LMultiBuffer has a string value so testing against an integer fails. 2019-06-06 12:53:25 -04:00
Tom Hodder a6f3303859 add options help to linked monitors option (#2633)
* add options help to linked monitors option

* fix typo and clarify instructions for new widget
2019-06-04 10:05:08 -04:00
Isaac Connor e2d56597bf Don't use an onlick inline js to show the caution text 2019-05-24 12:40:02 -04:00
Isaac Connor b6747e9b1f spacing 2019-05-24 11:49:59 -04:00
Isaac Connor 3888d140a8 Merge branch 'master' into storageareas 2019-05-17 10:16:29 -04:00
Isaac Connor 1855ee441a Fix #2609 invalid value horz instead of hori in orientations enumeration 2019-05-15 19:35:19 -04:00
Jonathan Meredith 74d9f4f1aa Spelling and grammar fixes in help (#2603)
* Edit Help array to make it match others below. This should not affect the results

* Misc. grammer and spelling fixes along with removing some duplicated words.  This should not affect compilation.

* More grammer and spelling errors

* Replace Javascript with ZoneMinder because it did not make sense there.

* More spelling and grammar edits
2019-05-13 07:58:18 -04:00
Isaac Connor 626342f00e Merge branch 'master' into storageareas 2019-04-26 10:44:00 -04:00
Isaac Connor ee4b452e42 Update monitor edit to not use inline js 2019-03-25 16:25:09 -04:00
Isaac Connor f5dfa0d740 Spacing and fix clone monitor by setting the Id to 0 instead of nextId, so that when we go to save it, we use an insert instead of an update 2019-03-20 15:03:20 -04:00
Isaac Connor 71cd024fda spacing updates. Use MP4 instead of H264/H265 in viewing codec dropdown 2019-03-19 12:16:31 -04:00
Isaac Connor 6c8eac1ac8 Merge branch 'storageareas' into h265 2019-03-06 11:10:01 -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
Matthew Noorenberghe 99f1e23c5b Replace usage of PHP_SELF in views/. Fixes #2450 2019-02-09 21:39:19 -08:00
Matthew Noorenberghe ef0e5f453a monitor.php: Fix XSS from LinkedMonitors. Fixes #2463 2019-02-09 17:11:53 -08:00
Matthew Noorenberghe 9705edfe24 monitor.php: Escape monitor method. Fixes #2464 2019-02-09 17:01:45 -08:00
Matthew Noorenberghe cef54feaf9 monitor.php: Escape a bug of output variables. Fixes #2465 2019-02-09 16:54:06 -08:00
Matthew Noorenberghe 254b7286b4 monitor.php: Escape SignalCheckColour to prevent XSS. Fixes #2451 2019-02-09 16:41:54 -08:00
Isaac Connor ee3a0c1fd1 fix validateForm running on monitor cancel due to lack of type=button on cancel button 2019-02-08 09:55:32 -05:00
Matt N d3f8037e58 Replace onclick='submitTab(...' with a click listener (#2424) 2019-01-19 09:42:12 -05:00
Matt N 6bb5aa1b87 More inline JS / nonce conversions (#2415)
* monitor.php: Add nonce and move <script> inside </body>

* export_functions.php: Untested: Add @nonce to <script>

* blank.php: Add @nonce to <script> and add to CSP enforced views

* Enforce CSP on login and privacy views

* group.php: Add nonce and move <script> inside </body>

* filter.php: Add @nonce to <script>

* Fix updateButtons argument on the filter page upon change and page load

* events.php: Add @nonce to <script>
2019-01-18 09:51:06 -05:00
Isaac Connor 87d1390fed Merge branch 'storageareas' into h265 2019-01-16 15:20:17 -05:00
Matt N d33fec9c3f Add a CSP script-src policy with nonce-source and convert more inline event handlers (#2413)
* Add Content-Security-Policy-Report-Only: script-src 'self' 'nonce-' policy

* Use @data-on-click-this to attach inline click event handlers which expect being called with 'this'

Only handle ones that don't return a value.

* Use @data-on-click to attach inline click event handlers with no args and no return value

* Use @data-on-click-true to attach inline click event handlers with 'true' as the only argument

* Enforce a script-src CSP on views without inline JS

* Convert some onchange attributes to data-on-change
2019-01-16 09:59:58 -05:00
Matt N 083f284599 Replace onclick inline event handlers for createPopup (#2410)
* Move <script> before </body>

* Change makePopupLink to not use onclick

* Change makePopupButton to not use onclick

* Use .popup-link in control_functions.php

* Use makePopupButton in controlcaps.php

* Prevent double-encoding in makePopup*

* Use makePopupButton in devices.php

* Use makePopupButton in logout.php

* Use makePopupLink in monitor.php

* Use makePopupLink and .popup-link in montage.php

* Use makePopupButton in options.php

* Use makePopupButton, makePopupLink, and .popup-link in zones.php
2019-01-15 09:01:58 -05:00
Isaac Connor f726666f54 Merge branch 'master' into h265 2019-01-14 12:36:11 -05:00
Isaac Connor c1e4fbac6a extend input path and options to the full width of the popup 2019-01-09 12:37:42 -05:00
Andrew Bauer 21a98f3653 Merge branch 'remove_default_view' of https://github.com/connortechnology/ZoneMinder into connortechnology-remove_default_view 2018-12-11 09:44:13 -06:00
Isaac Connor e24a308481 Merge branch 'master' into h265 2018-11-14 17:15:37 -05:00
Isaac Connor 490fb40917 DefaultView in the past was used to control whether the watch view starts up with ptz controls visible or the events list. Isaac changed the watch view to always have the controls visible... so this setting is no longer useful. 2018-11-14 09:22:38 -05:00
Isaac Connor 702143e51b Create a function called getBodyTopHTML that outputs the body tag and anything else that should go at the top.
Things like the we require javascript message, and any other messages like error messages.
Use this on the monitor and console view to stick an error message at the top when saving a monitor fails.

This is a pretty quick, crude implementation.
2018-11-07 12:33:54 -05:00
Andrew Bauer a50c2bae35
Merge pull request #2289 from connortechnology/audio_only_with_ffmpeg
Audio only with ffmpeg
2018-11-03 20:39:18 -05:00
Isaac Connor 589b6f3eef add further note about needing h264 passthrough 2018-10-31 11:35:06 -04:00
Isaac Connor 69f7d36729 Make it clear that audio recording is only for ffmpeg input type 2018-10-31 11:34:30 -04:00
Isaac Connor 2024df4393 use json_encode/decode instead of serialize/unserialize to pass onvif probe results around. Also clean up some code/ add some missing things. Fixes #2271 and #2272 2018-10-24 09:49:56 -04:00
Isaac Connor a8329465fb Merge branch 'master' into h265 2018-10-22 10:30:01 -04:00
Andrew Bauer 1978882825 dim x264 encode when on arm (#2227) 2018-10-01 09:17:22 -04:00
Andy Bauer f53533e61e fix populating onvif probe data 2018-09-20 10:30:23 -05:00
Isaac Connor 93bec93d4a Fix DefaultCodec in monitor 2018-09-10 15:09:27 -04:00
Isaac Connor 03f769eacc Rough in codec specification for Events 2018-09-10 12:22:55 -04:00
Isaac Connor b72d520e02 implement the ability to pass a disabled option to htmlSelect. Use it to disable the h264 passthrough option for non-ffmpeg monitors. Instead of disappearing it. 2018-08-03 10:02:42 -04:00
Isaac Connor 7ed316d3a5 We no longer base64_encode the probe data, we just use htmlspecialchars, so don't base64_decode it. Fixes #2148 2018-07-10 11:49:45 -04:00
Isaac Connor 09aa3afaac Fix capitalisation of Ffmpeg 2018-06-16 16:47:09 -04:00
Isaac Connor f2d00b6af5 update Storage Video Writer options to only allow Passthrough for FFmpeg 2018-06-14 13:39:13 -04:00
Isaac Connor 8a80cf686b Merge branch 'master' into storageareas 2018-04-26 21:58:34 -04:00
Andrew Bauer 86b2f6a12e New Monitor Type - Website (#2065)
* implement website monitor

* don't check certain fields when using website monitor

* continue to fix javascript errors for website monitors

* check $monitor, not $new_monitor here

* add website monitor documentation

was somehow left out of the initial commit

* fix corruption of functions.php

* add missing comma

* remove errors by testing for existence of key.  If it's a new monitor, then none of the keys will be valid

* If the monitor type is WebSite, then default Status to Running.

* put back start function that got lost in merge.  Don't start StreamCmd's if it's a WebSite

* Add midding comma

* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite

* Don't show control or any of the status fields for WebSite type monitors

* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
Isaac Connor 80f73854c7 Include the groupIds hidden when not on general tab 2018-04-25 09:33:02 -04:00
Isaac Connor 983cd83054 Add default for SignalCheckPoints and add it as a hidden field to the non-misc tabs 2018-04-19 10:01:04 -04:00
Isaac Connor cd70ed3dec always show SignalCheckColour and add a SignalCheckPoints option 2018-04-19 09:45:28 -04:00
Isaac Connor 49aeb4b467 whitespace 2018-04-03 10:38:38 -07:00
Isaac Connor 0bb1c5ce71 load groups when duping a monitor 2018-03-23 13:35:45 -07:00
Isaac Connor c5eec7e2fd hide save button on successful form completion so we don't get a duplicate submit 2018-02-27 15:10:45 -08:00
Isaac Connor 83fad681b3 use button tags and hide the button content after click 2018-02-27 11:49:13 -08:00
Isaac Connor c50627fd88 GroupIds needs to be an array 2018-02-27 11:21:04 -08:00
Isaac Connor 6a6eb87686 fix defaults 2018-02-26 18:00:02 -08:00
Isaac Connor 793e87c26d Apply chosen style to group and linked monitors dropdown 2018-02-26 17:58:20 -08:00
Isaac Connor 92c34f6043 add Groups to monitor edit 2018-02-26 16:09:36 -08:00
Isaac Connor 42a27c2ca9 Fix Servers dropdown 2018-01-25 08:41:54 -08:00
Isaac Connor b09bb528a5 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-16 08:42:41 -08:00
Isaac Connor 9284e26512 get rid of the snapshot setting. If we aren't storing all frames, then we should always store the snapshot. 2018-01-13 15:15:14 -05:00
Isaac Connor 5f8756d7ad Set Tesla defaults for new monitors 2018-01-12 08:11:37 -08:00
Isaac Connor d6bc727c9c use htmlSelect to create the Colours dropdown, which fixes a problem caused when I inverted the Colours array 2017-11-26 11:12:00 -05:00
Isaac Connor 9dd0f29e88 Merge branch 'storageareas' into tesla 2017-11-22 11:41:11 -08:00
Isaac Connor 489d3ba6ed Merge ../ZoneMinder.master into storageareas 2017-11-21 12:23:17 -05:00
Isaac Connor 1632aa7349 fix nvsocket 2017-11-13 14:25:19 -08:00
Isaac Connor 14e9a13c99 wip 2017-11-09 11:53:04 -08:00
Isaac Connor bc150574c7 wip import 2017-10-26 18:56:10 -07:00
Isaac Connor b6dde354be rename AnalysisFPS to AnalysisFPSLimit 2017-10-24 17:34:32 -07:00
Isaac Connor 8abb8a9259 add Type to Storage 2017-10-12 07:32:48 -07:00
APHW2 MFGENG 354262c557 wip nvsocket 2017-10-03 13:28:56 -07:00
Isaac Connor 54b8cce5e4 fix tabs to spaces 2017-09-11 16:57:51 -04:00
Isaac Connor edb7762cf3 Merge branch 'master' into storageareas 2017-09-11 16:57:08 -04:00
Andrew Bauer 496ba70819 remove checks for empty and just check for true (#1980)
Yeah I agree.  I think the exists was from pre-object method days.
2017-09-11 13:27:17 -04:00
Isaac Connor 5a73c38237 video storage fixes (#1958)
* use a monitor object instead of just a db array.

* fix braces, spacing, move pod docs to bottom

* Fix memleak by freeing input and output frames

* Always set the packet stream_index to the id of the output stream.
2017-08-02 16:29:23 -04:00
Isaac Connor cfbfc0dd44 Merge branch 'master' into storageareas 2017-07-21 11:04:32 -04:00
Isaac Connor aff7e94725 default to TCP for Method 2017-07-13 10:23:30 -04:00
Isaac Connor 363303efa9 use isset instead of empty to get rid of warning 2017-07-13 10:08:36 -04:00
Isaac Connor 6fc1581b9e use a monitor object instead of just a db array. 2017-06-28 20:33:53 -04:00
Isaac Connor 91a070b835 Merge branch 'master' into storageareas 2017-06-15 13:13:08 -04:00
Isaac Connor 1f14870b38 updates, fix merge problems 2017-06-14 15:35:35 -04:00
Isaac Connor e2139920a8 change some more quotes 2017-06-14 15:09:21 -04:00
Isaac Connor 451714a403 Merge branch 'master' into storageareas 2017-06-04 21:42:56 -04:00
Isaac Connor 1df147e183 adjust spacing 2017-05-31 22:01:35 -04:00
Isaac Connor 83da2dfa05 double to single quotes 2017-05-31 21:30:19 -04:00
Isaac Connor 8596891e4d fix double to single quote mistakes 2017-05-31 12:55:27 -04:00
Isaac Connor cbe7924041 fix spacing 2017-05-30 19:53:02 -04:00
Isaac Connor 83d6f415b3 cleanup whitespace 2017-05-30 14:07:37 -04:00
Isaac Connor 8b3b9eb30e more merges/fixes from SA 2017-05-30 13:47:30 -04:00
Isaac Connor e9adc3bc5b restore SA version 2017-05-30 13:14:27 -04:00
Isaac Connor 13265a8f4f undo StorageAreas contents 2017-05-23 10:41:21 -04:00
Isaac Connor 319712a4c1 Merge updates from sa branch 2017-05-18 15:16:59 -04:00