61d0cec1fa
Debug the result of the auth header split, not the same line over and over
2023-08-18 16:56:37 -04:00
e163509d57
auto_reconnect id deprecated.
2023-08-16 09:53:07 -04:00
5b7defb57b
Remove warnings about ControlDevice, because that is now channel. Detect duration not being in microseconds and adjust.
2023-08-15 14:02:12 -04:00
769f6ce372
Only set channel from the default (1) if ControlDevice is populated
2023-08-08 13:28:18 -04:00
206be0ea96
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-08-02 13:36:33 -04:00
1628c4fa6b
Handle term->val not being defined, and fix the code to strip quotes from the value.
2023-08-02 13:28:44 -04:00
f1b3bc08c1
Use opendir instead of glob when copying files. For performance reasons.
2023-08-02 13:27:45 -04:00
54000bc204
Reduce redundant debugging
2023-08-02 13:05:57 -04:00
5c9588c012
Adds RTSP2Web support for live view
2023-07-29 23:46:31 -05:00
bd71b35403
Handle RateControl being undef
2023-07-27 11:47:02 -04:00
b3fb68b293
Fix test for undef
2023-07-25 13:24:57 -04:00
30c8052e60
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-07-25 12:32:40 -04:00
0134f8e447
Change detect_realm to return empty string instead o f undef. Just so that realm is always a string and not undefined. Fix integer comparison on strings and make detect_realm succeed as long as response isn't 401.
2023-07-24 12:42:20 -04:00
8c754fb97d
Merge branch 'ZoneMinder:master' into onvif_events
2023-07-24 13:53:07 +02:00
40516598fa
Fix errant `
2023-07-12 17:45:33 -04:00
3e3d628fa1
Sync up missing fields in Monitor class. Add code for Manufacturer and Model
2023-07-11 17:27:08 -04:00
efb27298c1
Rough in classes for Manufacturer and Model
2023-07-11 17:26:49 -04:00
93031e86d8
Add latitude and longitude to shmem
2023-07-09 12:03:51 -04:00
871bf1772f
fix: messages
2023-07-05 01:03:48 +02:00
e6be9210c5
fixes bug with zmonvif-trigger.pl (Perl) :
...
zmonvif-trigger.pl is a Perl script that is supposed to monitor and forward
onvif events to ZM . Currently this does not wok as :
SOAP requests need to have a header containing "Action" "To" and "UIID" fields
as per ONVIF specifications (tested with Reolink rlc-831A)
This patch fixes that (creates proper SOAP headers ) .
IT now works ( tested with Reolink rlc-831A)
2023-07-02 10:32:28 +02:00
2aa5de8d51
Sync up with zm_utils version
2023-06-10 12:19:52 -04:00
66d7f88edf
Clean up help text for ZM_LOG_DEBUG_FILE to not say that it can include a directory. It should be JUST a filename.
2023-06-09 17:27:54 -04:00
6148b805f6
Don't update non-existent Server entry
2023-06-04 09:43:32 -04:00
93ddf51cd7
Use ControlDevice for ChannelId. Update realm detection in PutCmd. Mostly debugging to see why a second put fails auth.
2023-06-01 10:00:51 -04:00
1f9559922c
Don't watch deleted monitors
2023-05-31 12:17:49 -04:00
2f827a5178
Fix EPATH substitution
2023-05-30 12:01:14 -04:00
e51ddc2492
Don't require loading the monitor object for MonitorId
2023-05-29 20:43:49 -04:00
e8cd673569
Add MID and EID substitutions
2023-05-29 16:23:15 -04:00
3c0bb3a7a0
Clean up realm usage, add some more debugging
2023-05-25 13:54:24 -04:00
6b415f5d55
Remove redundant request in PutCmd
2023-05-24 14:42:13 -04:00
c0e66644e9
Update Netcat to support Digest Auth, and fix bad cutnpaste
2023-05-17 19:12:36 -04:00
e0d0d17f5e
Fix not attaching body when not doing an html body. Fixes #3708
2023-05-16 09:56:01 -04:00
447e411aa7
Add getting username/password/address from Path instead of ContrnolAddress
2023-05-14 19:28:40 -04:00
06aff72292
feat(sound): Include default alarm sound (again)
2023-05-12 16:45:13 -04:00
becabbcd1a
Make objdetect attachments have unique filename
2023-04-26 14:54:02 -04:00
d81a8a9c9c
Add Deleted to Monitor perl object
2023-04-25 13:51:53 -04:00
1d7fe3f8ff
objdetect images not existing should not be a warning
2023-04-25 09:59:40 -04:00
3fbf16cf74
Only send summary email if there are events
2023-04-24 20:15:11 -04:00
d2fb365fa9
Add the ability to send a single summary email instead of individual emails per event
2023-04-24 17:53:16 -04:00
ffb4e05089
Missing objdetect.gif should be a debug, not a warning
2023-04-24 08:28:54 -04:00
12ecfa7dc9
DOn't start Deleted monitors
2023-04-22 09:54:51 -04:00
9b8dd156be
Update s3 support, moving it into the storage object.
2023-04-22 09:54:13 -04:00
8862fe9d87
Only start non deleted Monitors
2023-04-19 18:55:48 -04:00
4030da1caf
Fix cutnpaste typo
2023-03-26 10:09:25 -04:00
c7f6cdd6ce
Always check for Shallow events
2023-03-24 14:19:54 -04:00
cb8ec708fc
Add support for aws_bucket and subpath
2023-03-23 10:28:58 -04:00
d2751a7254
Move s3 object creation code to a sub s3 in storage so it gets cached.
2023-03-23 10:03:14 -04:00
7779af74ad
Populate missing serial field in Storage class
2023-03-19 11:31:12 -04:00
687bc3572a
Santizie cpuUserPercent and cpuSystemPercent
2023-03-07 12:02:08 -05:00
440ec48653
Must detaint rows and replace all ? with %s
2023-03-07 08:11:00 -05:00
f734054b46
zmDbDo instead of perldbi so that serverstats inserts get logged
2023-03-05 12:53:24 -05:00
e82451f2bb
Add ZM_WEB_HOMEVIEW option
2023-03-05 10:21:04 -05:00
5280c423bb
Add comment explaining cpuload values
2023-03-01 14:08:28 -05:00
e08ec34e51
Add CpuUserPercent and CpuSystemPercent to ServerStats
2023-03-01 14:08:09 -05:00
89f0565edc
TimeStamp column is not int10, it is a timestamp. Fix logged errors from zm_stats.pl
2023-02-23 09:25:03 -05:00
ef9ce9b714
Fix inserts into Server_Stats
2023-02-18 18:02:15 -05:00
0cf80c2ac0
Add Deleting of Server_Stats rows after 1 day
2023-02-18 18:02:15 -05:00
0879252d13
Add Server Stats table and insert into it in zmstats.pl
2023-02-18 18:02:15 -05:00
3e34b36ec0
Fix email structure for ios
2023-02-16 17:24:23 -05:00
d750daebbc
Fix NewStorage=>self
2023-02-16 12:17:38 -05:00
42da035f27
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-16 11:52:27 -05:00
9aa44645dd
Hack s3 with LWP to not cache connections so that we don't run out of files
2023-02-16 11:52:16 -05:00
f437aadbe6
Update s3fs url parsing to match that in Event
2023-02-16 11:51:11 -05:00
07115422e7
Handle case where event has been moved but db not updated. This can happen when using a transaction and the db goes away.
2023-02-16 09:39:54 -05:00
c50209f66c
Listing dir contents really fills up logs. Make it only report on level 4
2023-02-16 09:30:47 -05:00
4b6f47eebd
Fixup email structure so that inline images properly display while also having a text version.
2023-02-15 17:41:19 -05:00
03b52a1ee5
Strip https off host and don't use virtualhost method.
2023-02-13 17:27:51 -05:00
c6e93036f3
Include command line in debug output when generating images
2023-02-13 14:46:33 -05:00
b6c729c700
Improve s3 url parsing and use Net::Amazon::S3::Vendor
2023-02-12 16:49:46 -05:00
aba6281296
Fix typo
2023-02-12 16:49:46 -05:00
6893a3d84d
Prevent duplicate attachments. Use eri_encode to escape content-id
2023-02-11 15:35:10 -05:00
44f75508c8
Attach a text version of body
2023-02-11 12:36:51 -05:00
def5a1794c
Don't try to do AWS delete if parsing failed
2023-02-11 12:36:33 -05:00
6821be5d17
Add Content-ID to attachments
2023-02-11 09:21:00 -05:00
7960496044
Handle https?:// in the host
2023-02-11 09:19:53 -05:00
691e21997b
Test out replacing attached image tag with cid based img
2023-02-10 18:49:50 -05:00
c747059996
Add a sleeping flag so that when we get sigterm, we can just exit instead of returning to the sleep
2023-02-07 09:27:38 -05:00
f617a20fe5
Adding :80 to address is not worthy of an Error log
2023-02-07 09:11:29 -05:00
2884afdef5
Handle Monitor attr which is really MOnitorId
2023-02-07 09:00:42 -05:00
a980788394
Update with newer username/password parsing from Path. Implement get/set config, ping, probe
2023-01-31 10:06:06 -05:00
ebad3a8411
Make version and telemetry options visible
2023-01-27 15:50:18 -05:00
2b789f0051
Properly quote some fields and add missing fields to defaults
2023-01-17 12:54:21 -05:00
907d00ffc7
Add ZM_WEB_NAVBAR_STICKY to web options
2023-01-16 16:38:35 -05:00
0ec9a9f732
Don't delete archived empty events.
2022-12-09 10:14:59 -05:00
8bb80cb1ac
Put back authenticating to '/cgi/ptdc.cgi' instead of /.
2022-12-05 12:50:32 -05:00
a0de514e8d
Add 2>&1 to command to delete event dir so that we get error messages logged.
2022-12-04 10:44:03 -05:00
1d19d362ae
Add status to debug logging of executeShellCommand
2022-12-04 10:44:03 -05:00
06a14f1410
Use object save method for Archive/Unarchive and don't do UpdateDiskSpace if event was deleted.
2022-12-02 15:57:47 -05:00
d76fb5e5cb
Unhide the snapshot feature setting
2022-11-30 13:52:24 -05:00
6adec2eb37
Add SSL support to Dahua PTZ
2022-11-29 14:03:27 -05:00
fd9b59a94b
Improve info when moving event to show source and Dest paths
2022-11-27 17:38:56 -05:00
92a82d603b
Fix testing of state in reboot(). Set state in open()
2022-11-24 09:27:49 -05:00
7065678065
Fix crash in zmfilter DiskSpace Update when Event doesn't exist
2022-11-22 12:38:48 -05:00
e52a77f206
Slightly betr clone
2022-11-17 14:53:19 -05:00
3fbfce459c
Clone the Control object because it is not monitor specific
2022-11-17 14:41:55 -05:00
2e23aedbbc
Add in clone function
2022-11-17 14:41:41 -05:00
f965249ac6
Don't clear Diskspace a second time
2022-11-01 18:42:22 -04:00
6e5b4ff6e1
Fix _ instead of __git_main in file::Find::find, clean up use of __git_main
2022-11-01 18:42:10 -04:00
7e4f9f49e8
Fix not handling Shallow storage areas
2022-10-14 09:25:58 -04:00
f305ac668b
Update db calls to use zmDbDo which will handle debug and errorl loging. Add a delete from Monitor_Status for Monitors that are set to None
2022-10-12 19:11:55 -04:00
73d9f2482c
Add ZM_LOG_INJECT config parameter to disable unprivileged log injection through api.
2022-10-06 14:51:56 -04:00
1e43f55479
Fix spelling
2022-09-28 15:58:59 -04:00
9db64b860c
Don't try to close the event if we have no Frame information
2022-09-28 15:58:28 -04:00
0b11418c6a
Update Execute function: Only add the path if there are no substitutions. Include status in debug output. Reload the Event from DB before updating the Executed flag because the executed command may have changed it.
2022-09-28 12:38:21 -04:00
812ce283ab
Use zmDbFetchOne instead of incorrect dbFetchOne
2022-09-28 12:37:01 -04:00
44fd2f99e0
Add zmSQLExecute and zmDbFetchOne to Exports. Add a debug to zmDbFetchOne
2022-09-28 12:35:48 -04:00
3e43a1159a
Add EPATH to substitutions and don't add path to execute unless no substitutions are being done
2022-09-28 11:08:06 -04:00
ae07db6104
Implement the close command in zmeventtool.pl
2022-09-28 11:07:31 -04:00
3a75f147ec
Implement Event::Close() which fixes up a crashed event.
2022-09-28 11:07:11 -04:00
64cae53a52
Include monitor Id in logs, for consistency as well as utility
2022-09-26 09:28:10 -04:00
a16e7aad62
Switch to utf8mb4 to support 4 byte unicode which is available since mysql 5.5
2022-09-22 10:15:57 -04:00
e1a2061ba2
Instar control for 720p CGI devices
...
Onvif just yielded the absolute basic functions, but especially no presets. This control fills the gap.
2022-09-16 15:14:05 +02:00
6936a3547c
shared data is frequently not valid or zmc not running. These shouldn't be errors as they generated too much noise. We can generate errors higher up.
2022-09-13 17:59:53 -04:00
c35bbc8c30
Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it
2022-09-07 15:49:47 -05:00
8aaa5e52b3
Merge pull request #3582 from megasaturnv/3516-CaseInsensitiveLogin
...
Issue #3516 case insensitive login
2022-09-06 16:39:53 -04:00
46b3edbb10
Add -t option to zmvideo.pl to add transforms like hue=s=0 support
2022-09-06 13:45:16 -04:00
783fadc2d4
Make GenearteVideo code handle more options for generating video, including transforms like=hue=s=0
2022-09-06 13:44:53 -04:00
9d8e32b28c
Modified description for ZM_CASE_INSENSITIVE_USERNAMES
2022-09-05 15:49:26 +01:00
6c0f40f570
Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516
2022-09-02 12:03:47 +01:00
63e5b63eec
Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516
2022-09-02 11:58:02 +01:00
29750a56e7
Merge branch 'master' into add_mqtt
2022-08-25 18:37:54 -04:00
4c5ec4c01f
Add a Control file for Grandstream cameras
2022-08-17 14:59:02 -04:00
dc24be4d99
Test for success loading Control
2022-08-17 14:58:18 -04:00
6762ec5166
Split out realm detection and use it in sendCmdPost. Our initial query on / doesn't fail as the camera doesn't require authorization for /.
2022-08-16 13:19:29 -04:00
ebd4a30666
Update ZM_MIN_RTSP_PORT description
2022-08-09 15:04:09 -05:00
165ccf5820
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-08-09 15:48:06 -04:00
f09355f2ff
If monitor has Control configured and control supports rebooting, reboot camera on fail to capture.
2022-08-09 13:41:43 -04:00
6c0e34e84b
Fix loading info from ControlAddress. Fix path used when testing auth.
2022-08-09 13:41:14 -04:00
6753a04e91
Latest version of zmAlarmServer
2022-08-05 16:46:11 -06:00
8978ebcc3b
Adds Alarm Server for NETSurveillance WEB IP cameras
2022-08-05 15:59:42 -06:00
3190051287
Make proportional and continuous movement actually work
2022-08-04 12:40:31 -04:00
77472492e2
Make zoom buttons work for Axis P5655-E
2022-08-03 09:57:57 -04:00
b40423d720
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-08-02 20:57:48 -04:00
1d40279fcf
Check heartbeat time for monitors that don't do decoding
2022-08-02 20:44:10 -04:00
42bb0c41a0
Rename zmc_heartbeat_time to just heartbeat_time
2022-08-02 20:43:49 -04:00
d0cbb7b478
Sync up with c++ shm alignment to fix same size of 32bit
2022-07-29 10:27:18 -04:00
802ecc293c
Roughed in Uniview PTZ module. Currently is a copy of Hikvision. Only reboot is correct.
2022-07-12 13:25:47 -04:00
82d20f3d1e
Restart has different results than start/stop, so actually handle it separately. Should fix zmdc.pl later.
2022-07-04 11:16:44 -04:00
7cb08c0ffa
Use ImportanceNumber instead of Importance because Importance is a string
2022-06-24 14:02:32 -04:00
2bfc85c816
Implement sub ImportanceNumber because Importance is a string but we want to do math on it
2022-06-24 14:01:42 -04:00
e03d42103b
Return true or false for open
2022-06-24 13:57:59 -04:00
0d48c92bc8
Calling zmMemInvalidate when detached should be fine, so turn Error into a debug
2022-06-24 13:57:10 -04:00
50df24f8da
Return undef if we failed in Monitor::connect. Fixes zmtrigger endlessly complaining about a dead monitor after it has been disabled or moved to a different server
2022-06-21 10:46:57 -04:00
4a54931292
Add ZM_TIME_FORMAT_PATTERN
2022-06-01 16:19:51 -04:00
5108c016cf
Add ZM_LOCALE_DEFAULT, ZM_DATE_FORMAT_PATTERN and ZM_DATETIME_FORMAT_PATTERN config entries
2022-06-01 15:44:57 -04:00
06a59ff4af
Test against a constant because None==1 not zero. Fixes failed suspend motion detection during move
2022-05-30 15:44:35 -04:00
4f0502fbe9
If shared_data:valid is invalid, disconnect and reconnect before erroring.
2022-05-30 15:43:54 -04:00
1fc66d3fbf
Add debug of reason why we are not running a monitor
2022-05-30 09:52:24 -04:00
8f5850e404
Turn on debugging of DB requests in Monitor
2022-05-30 09:52:07 -04:00
76b844530b
Config entries are not constants, duh
2022-05-19 14:06:30 -04:00
3d16be1f0f
Only keep ZM_COOKIE_LIFETIME entries in Sessions.
2022-05-18 18:59:37 -04:00
dd17bf5ef7
Make zmfilter.pl always honour ExecuteInterval. We might want it to be less than the default of 60
2022-05-17 14:49:54 -04:00
f502883ebe
Move code from Event to Storage to implement delete_path(). Implement delete_analysis_jpegs()
2022-05-17 12:30:49 -04:00
34610069ea
Move code from Event to Storage to implement delete_path()
2022-05-17 12:29:46 -04:00
4349106270
Rough in zmeventtool with command deleteanalysisjpegs
2022-05-17 12:26:33 -04:00
923a98f000
At least test for valid shmem for monitors with capturing=OnDemand or Decoding=OnDemand
2022-05-10 11:46:11 -04:00
b57c835ec6
Make ZM_PATH_FFMPEG a System config entry. Meaning it can only be set in /etc/zm/conf.d. Update help text to mention this.
2022-05-04 13:00:54 -04:00
6afd0ccfaf
cleanup code and update System column in Config table on zmupdate.pl -f
2022-05-04 12:58:49 -04:00
7d9525e28b
WARNING should be a DEBUG when restarting a process
2022-04-28 10:36:06 -04:00
5de88b8f9e
zmwatch.pl can work if Decoding == Keyframes Only
2022-04-13 16:35:17 -04:00
906951e450
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-04-06 10:37:10 -04:00
0e337cd8bf
Remove support for Cambozola which no longer works or is needed.
2022-04-06 10:37:02 -04:00
1f5d7866f7
Merge @alabamatoys' work to add focus controls
2022-04-06 09:03:27 -04:00
5b824f46c4
Load monitors when not in multi-server mode.
2022-04-04 15:06:34 -04:00
8046c21eeb
Add parenthesis to make logic more clear
2022-04-04 14:53:08 -04:00
9d9b363536
Add backtrace when no primary key
2022-03-31 19:32:34 -04:00
f95d184f02
Don't restart monitors that aren't decoding
2022-03-28 18:02:58 -04:00
8f013b55b2
Add Capturing, Analysing, Recording defaults. Add Decoding
2022-03-28 18:02:44 -04:00
55ae6ba4a5
rough in Url, UrlToZMS PathToZMS PathToIndex, UrlToIndex UrlToApi PathToApi in SERver object
2022-03-28 14:30:08 -04:00
a64102c890
Must preface config entries with ZM_ because we strip it out later
2022-03-21 16:09:29 -04:00
4f29875609
Fix password config type to be password in db
2022-03-21 16:08:13 -04:00
67f765bc82
Add password as a config entry type
2022-03-21 16:08:13 -04:00
d08cac052c
Add MQTT settings to config
2022-03-21 16:08:13 -04:00
0850e0db70
Remove Enabled test, replace with Capturing and Recording tests
2022-03-21 15:56:16 -04:00
965e256bbc
remove space
2022-03-20 19:13:46 -04:00
6a2d0fa81a
Fix
2022-03-09 21:14:25 +01:00
224d275950
Fix
2022-03-09 21:13:34 +01:00
3d093ed8a6
Fix monitor not change status when zoneminder state change
2022-03-09 21:07:39 +01:00
4a1dbc884d
Fix zmpkg recording status
2022-03-09 19:40:04 +01:00
858ab62fc4
Fix when using a custom state
2022-03-08 17:10:29 +01:00
0785e3571c
code style, remove duplicated code.
2022-03-08 09:06:31 -05:00
a748b0ed0a
When connecting to a monitor, if it fails, disconnect. This should fix a bug in zmtrigger and others where it would never reconnect. The idea is that we asked for a successful connection, if it failed, we shouldn't be in a failed connected state, we should be disconnected.
2022-03-08 09:06:06 -05:00
8fe0cb5e33
tidy up the mem_info hash and turn into a hash instead of a pointer to a hash. Check for validity flah before checking sizes. Improve debug logging.
2022-03-08 09:04:41 -05:00
addfdcd330
Remove sets::isin references
2022-02-28 15:41:57 -05:00
a32b77510d
Fix logic on error reporting of failure to connect to db
2022-02-28 09:38:54 -05:00
e33b41745d
Merge branch 'master' into replace_function_concept
2022-02-27 14:04:01 -05:00
0bcb9d276f
code style.
2022-02-26 18:25:51 -05:00
2bd85089f4
Put integers in quotes as well. Proper JSON has all values in quotes. This is important because integers like 0123 are invalid
2022-02-26 18:25:51 -05:00
2bc0ec269a
Merge branch 'master' into replace_function_concept
2022-02-15 17:02:03 -05:00
b2e0f805bd
Add NOT IN case. Also, fix bad SQL when value evals to false. Test for empty string instead. Fixes #3425
2022-02-15 10:29:58 -05:00
f66a463574
Merge branch 'master' into replace_function_concept
2022-02-08 12:07:30 -05:00
a7dc9d4e36
Implement General::jsonLoad
2022-02-08 10:14:00 -05:00
ac909d404a
Use the reported move with x=0 y=0 for autostop in addition to old stop movement code
2022-02-03 18:19:07 -05:00
ac39be33f5
Don't assume filename of mp4. We store it in the event record for a reason. Fixes #3422
2022-02-03 17:24:33 -05:00
caebef3103
Replace uses of Function
2022-02-03 12:38:26 -05:00
f40279b745
Remove active, add capturing, analysing, recording
2022-02-03 12:38:09 -05:00
f7099bc6cb
Replace another use of Function
2022-02-03 12:37:51 -05:00
10e39b3b13
:wqMerge branch 'master' into replace_function_concept
2022-02-02 17:08:01 -05:00
a4c91e9a3c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-02-02 14:36:15 -05:00
339f102196
Implement reboot and ping methods for Trendnet PTZ Control
2022-02-02 14:36:11 -05:00
Isaac Connor
Jonathan Bennett
sletteland
Alejandro Criado-Pérez
root
Isaac Connor
Simpler1
VikingGer
megasaturnv
ovargasp
Robert Jacobson
tftadmin Appleton
Javier Gonzalez