Commit Graph

33 Commits

Author SHA1 Message Date
Isaac Connor 33473eac6a Add arp-scan as a tool for getting list of devices on network. Add an interface specifier to monitor probe just like on onvif-probe. Rough in support for Hikvision cameras 2022-02-07 12:33:53 -05:00
Xulunix 2cbb24d7b9 Fixed bug in onvifprobe
The arguments for "/usr/bin/zmonvif-probe.pl" was always `probe 1.1,1.2 1` with the last argument always being `1` instead of the network interface name selected in the menu.
This change fixes this issue by using the selected interface name instead of the boolean return value of the `isset()` function.
2021-06-03 02:26:24 +02:00
Andrew Bauer c7690a7088 go back rather than close window 2021-01-08 12:40:26 -06:00
Isaac Connor 10c0a6617c Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php. 2020-10-14 10:39:25 -04:00
Andrew Bauer ea99bc173e add navbar to monitor probe views 2020-09-25 14:49:14 -05:00
Isaac Connor fa780c5020 use xhtmlFooter instead of html since it now contains all the javascript 2020-09-02 17:35:24 -04:00
Isaac Connor aba403e3f2 Correct handling of Transport in onvif results 2020-06-16 16:48:17 -04:00
Isaac Connor e72c357fd0 Unable to probe should not be fatal 2020-05-23 16:13:48 -04:00
Isaac Connor 074e270e79 populate network interfaces list, rescan on change. 2020-05-19 16:58:26 -04:00
Isaac Connor 75082064fd Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream 2020-05-09 16:40:17 -04:00
Isaac Connor 732bb5416f Merge branch 'master' into onvif_updated 2020-05-09 16:26:29 -04:00
Isaac Connor d141632256 general clean of onvif probe view. Use buttons instead of inputs and use data-on-change-this instead of inline js. Also rename username and password to Username and Password to not conflict with authentication to ZM ui. 2019-09-11 09:18:03 -04:00
Isaac Connor 85b9b045cc Copy Profile Token to ControlDevice for use with Netcat PTZ script 2019-06-21 12:42:26 -04: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
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
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 26ac1fd695 Include soap version in list of onvif cameras 2018-02-01 11:32:13 -05:00
Isaac Connor a5f9c01298 fixes braces and spacing and add some debug lines when the onvif-probe output doesn't match what is expected 2017-07-13 10:26:09 -04:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor ac24865647 add NoDetectProfiles instead of reusing NoDetectedCameras 2016-10-04 14:33:51 -04:00
Isaac Connor 09c5e3012a username and password don't actually have to be specified 2016-10-04 14:09:32 -04:00
Isaac Connor 21a94a6200 better error message 2016-10-04 10:29:37 -04:00
Andy Bauer 6eda3eff72 do not set maxfps fields during onvif probe 2016-03-26 08:38:28 -05:00
Jan M. Hochstein ae58da31ea Changed WSDiscovery from 1.1 to 1.0 2016-03-19 19:04:09 +01:00
Andrew Bauer 3a94712db2 add translate function 2015-05-10 08:10:30 -05:00
SteveGilvarry 98d91ded90 Found some introduced short tags 2015-04-08 20:13:27 +10:00
Jan M. Hochstein a18399af69 Basic support for SOAP 1.1 and 1.2 2014-11-14 17:15:58 +01:00
Jan M. Hochstein 198d537bff Removed hard coded binary path and perl binary location 2014-11-14 17:11:23 +01:00
Jan M. Hochstein 3fd8f4addf Added basic ONVIF support views 2014-11-14 17:00:16 +01:00
Jan M. Hochstein 5f1fda43a0 Basic support for SOAP 1.1 and 1.2 2014-08-17 21:24:27 +02:00
Jan M. Hochstein 99e794a97b Removed hard coded binary path and perl binary location 2014-08-07 18:25:07 +02:00
Jan M. Hochstein a91331de66 Added basic ONVIF support views 2014-07-14 20:59:36 +02:00