Commit Graph

2023 Commits

Author SHA1 Message Date
Isaac Connor 1928d1153f spacing and quotes 2019-06-11 13:32:15 -04:00
Isaac Connor 2e624522c7
fixes #2294 (#2637) 2019-06-10 09:43:56 -04:00
Isaac Connor 983da41c7a Reduce log level for filter execution from Info to Debug 2019-06-03 09:46:28 -04:00
Isaac Connor 3be0b774bd better error logging 2019-05-23 16:26:21 -04:00
Isaac Connor 4466ef13fd Merge branch 'pliablepixels-crypt-replacement3' into storageareas 2019-05-23 15:21:58 -04:00
Isaac Connor 2bf022d69c Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement3 2019-05-23 14:26:05 -04:00
Isaac Connor bdbbab0d3e Handle no results from get_ProbeMatch() 2019-05-21 17:15:08 -04:00
Isaac Connor 93aeceecfc Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement 2019-05-17 10:18:15 -04:00
Isaac Connor 3888d140a8 Merge branch 'master' into storageareas 2019-05-17 10:16:29 -04:00
Pliable Pixels 915e9f05a9 merged fifo changes 2019-05-16 16:14:06 -04:00
Mitch Capper eb005e8b9c FIFO support for zoneminder zone debugging (#2594)
Adds fifo options for diagnostic images for much lower impact diagnostics mode.  Diagnostic images are only written when there is a client listening for them (otherwise they are skipped).  Also added a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion.  This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
2019-05-16 15:37:03 -04:00
Pliable Pixels 0e72080c4a Migrate from libdigest to crypt-eks-blowfish due to notice 2019-05-16 09:37:11 -04:00
Pliable Pixels e9f843f297 bulk overlay hash mysql encoded passwords 2019-05-13 14:29:24 -04:00
Pliable Pixels 87e407aa90 forgot to checkin update file 2019-05-13 10:31:09 -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 74095963cc Merge branch 'master' into storageareas 2019-05-12 19:39:09 -04:00
Pliable Pixels 881d531fe9 make old API auth optional, on by default 2019-05-12 18:19:19 -04:00
Pliable Pixels c1891e35b9 moved API enable back to system 2019-05-12 12:15:08 -04:00
Pliable Pixels e6b7af4583 initial baby step for api tab 2019-05-10 15:11:35 -04:00
Isaac Connor d9f7e93df3 Fix typo gegress to degrees. Fixes #2601 2019-05-10 14:27:51 -04:00
Isaac Connor 1498027f12 Add option to attach the objdetect image in emails 2019-05-08 22:45:04 -04:00
Isaac Connor f0e5a435cf spacing and quotes, but the main change is using aud_print instead of Info 2019-05-06 10:04:53 -04:00
Isaac Connor 25614bb75e Merge branch 'master' into storageareas 2019-05-01 08:57:20 -04:00
Rémi Da Costa 16697565bf Netcat ONVIF: adding ONVIF authentication 2019-04-30 07:48:47 +02:00
cnighswonger dfa997a989
Add camera relative iris control methods
This set of methods invoke realtive iris size in the direction indicated by
    the <Large/Small> portion of their name. They accept no arguments.

    NOTE:

    This only just does work. The Dahua API specifies "multiples" as the input.
    We pass in a 1 for that as it does not seem to matter what number (0-8) is
    provided, the camera iris behaves the same.
2019-04-29 16:05:44 -04:00
redaco 76dd411341 Netcat ONVIF: Added support for "profile token" (#2589) 2019-04-29 15:56:55 -04:00
Isaac Connor 9421c0208d Add instructions for enabling the web user to run shutdown 2019-04-12 14:48:47 -04:00
Isaac Connor 0dd4a23770 Add Config for showing a system shutdown/restart option 2019-04-12 09:36:30 -04:00
Isaac Connor 3abf263e7a fixup half-merged changes to filter to view in montagereview 2019-04-08 16:57:41 -04:00
Isaac Connor aa83239069 rework zmcontrol.pl. If command is given and server is not up, use zmdc.pl to start it. Give up after 10 seconds. 2019-04-05 15:18:03 -04:00
Isaac Connor e1873b1693 debug response content 2019-04-05 15:17:13 -04:00
Isaac Connor aaef151815 ZM_VERSION is a constant not a scalar variable 2019-04-05 13:18:06 -04:00
Andrew Bauer 2bb15c4f90 daemonize zmcontrol (#2563) 2019-04-01 17:26:24 -04:00
Isaac Connor d579faa291 attr in modern ZM should be StartWeekday. Continue to support legacy filters 2019-03-28 15:13:53 -04:00
Isaac Connor 9a70dff143 to single quotes, include monitor Id when logging the closing of an event 2019-03-28 09:43:17 -04:00
Isaac Connor 7b878a4c64 Sync up quotes and space differences frmo zma_to_thread 2019-03-19 17:15:32 -04:00
Isaac Connor 3f9564c10a Merge branch 'master' into storageareas 2019-03-19 10:37:35 -04:00
Isaac Connor 18f1881ffd spacing 2019-03-18 17:13:19 -04:00
Chris ad5f6a8729 Camera reboot function (#2554)
* Adding a button for camera reboot function

This series of commits will add a camera reboot function to the
control interface if supported by the camera configuration.

* Adding reboot function option to contorl configuration

This patch adds a reboot option to the camera control configuration
view.

* Adding Reboot field to Controls table

This patch adds a Reboot field to the Controls table to support
a camera reboot control option.

* Correcting button value to match reset

* Updating language files

I'm not sure of the proper procedure to trigger updating of
non-english language files so I'm updating them all with English
hoping that that will draw attention to the changes and others
will translate accordingly.

* Add missing forward slash
2019-03-18 14:49:05 -04:00
Isaac Connor 63982a6282 Disable PRIVACY enable 2019-03-18 14:42:05 -04:00
Isaac Connor 520c41da23 Merge ../ZoneMinder.connortechnology.bad into storageareas 2019-03-18 14:40:03 -04:00
Isaac Connor e486b035f0 Revert "Implement a date filter to zmaudit so that it only looks in directories by date."
This reverts commit d86b1ea49c.
2019-03-18 13:50:00 -04:00
Isaac Connor d86b1ea49c Implement a date filter to zmaudit so that it only looks in directories by date. 2019-03-18 13:48:55 -04:00
Chris 6ee689f4bf Dahua control improvements (#2552)
* Adding a presetHome method

The Dahua protocol does not appear to support a preset Home feature. We could
allow the user to assign a preset slot as the "home" slot. Dahua does appear
to support naming presets which may lend itself to this sort of thing. At
this point, we'll just send the camera back to center and zoom wide. (0°,0°,0)

* Adjusting naming of private methods and adding POD

* Adding relative focus methods

This patch also adds the return value of the get request used to
send the command to the camera.

Furthermore, it fixes a small bug in the authentication of requests
sent to the camera after the connection is opened. I really have no
idea why the problem occurred and it appeared to have no practical
effect on the execution of the command. It showed up when I enabled
debug, so this attempts to fix it or at least quiet it.

* Adding POD for the new relative focus methods

Also doing a bit of cleanup on POD in general.

* Adding some documentation to demystify control motion types

This was not clear to me at the outset, and I could not locate existing
documentation which explained the prioritization and exclusion aspects.

Maybe it will help someone else.

* Renaming private methods and adding more POD

This patch renames private methods by prefixing an underscore to
them. This at least helps visually distinguish them as private
when reading through the code.

It also adds more documentation on public methods.

* Grouping all relative motion methods together

This makes for easier reading.

* Adding in a reset method from Issue #2414

This method was supplied by kobold81 who got it from
bobylapointe69300 who posted it in the following forum post:

https://forums.zoneminder.com/viewtopic.php?f=9&t=27000&p=104601&hilit=dahua#p104601

This patch also includes some POD cleanup.

* Adding continuous movement methods and fixing reset

This patch adds the continuous movement methods provided in the patch
for Issue #2414. Note that these are not truly continuous as they
result in movement for less than a ms. Adapting the code to support
truly continuous movement would invovle some considerable work.

This patch also correct the reset method and adds a reboot method.
The two are different creatures with different effects.

POD added as well.

* Removing redundant get request code

Two slightly different versions of code are currently used to post
the get request to the camera in order to execute commands. This
patch modifies the open method in order to allow its re-use and
removes redundant code.

Note: This is the first installment on changes towards improving
the way the HTTP transactions are handled.

* Making authenication failures fatal

Authentication failures result in camera commands not being executed.
They may as well be fatal and return the general reason to the user
directly.

* Work on persistent sessions

I think this will have to wait since it appears that the camera expects
some sort of keepalive/heartbeat signal to keep the session open.

* Restoring accidentally deleted code
2019-03-12 11:09:57 -04:00
Isaac Connor 016fda22ce reduce duplicated db code from Config. Use fully namespace'd variables so we can use require instead of use 2019-03-01 12:31:41 -05:00
Isaac Connor 1828ea2d6f small cleanup of zmstats 2019-03-01 10:26:55 -05:00
Isaac Connor af9c87a112 Merge branch 'master' into storageareas 2019-02-27 10:53:19 -05:00
Isaac Connor 849442502c add support for server based zmeventnotification 2019-02-27 09:28:15 -05:00
Isaac Connor fd310c0f0a Merge branch 'master' into storageareas 2019-02-22 11:33:47 -05:00
Isaac Connor 2b90bf15a6
Improve session (#2487)
* Introduce ZM_COOKIE_LIFETIME which sets the life of the SESSION cookie, instead of using what is in php.ini

* Use zm specific session functions, which are now located in includes/session.php.  Be more agressive about clearing session on logout.

* Move session code to includes/session.php

* remove duplicate line

* Move is_session_open to session.php.  Move code to clear a session into session.php

* improve debug line when there is a problem updating config entry

* split description into description and help text for COOKIE_LIFETIME

* Remove redirect on line.  We do it in javascript on postlogin view so that we can say logging in before switching to console

* If there is a username in the session, then we are logged in, but we need to load the user object from the db.  We can't just trust it from the session. The user may have been deleted and having that data in the session can be a security risk. So load the user object on every request.

* Use session_regenerate_id instead of our broken code to do the same

* Move auth code to includes/auth.php

* add autocomplete tags to username and password inputs

* Don't redirect to login if we are already viewing login.  Put auth before including skin includes

* need to include session.php in auth.php

* update to php namespace
2019-02-22 09:43:38 -05:00